guhongwei 2 年之前
父節點
當前提交
60e059129e
共有 56 個文件被更改,包括 3376 次插入292 次删除
  1. 1 1
      common/config.js
  2. 18 0
      pages.json
  3. 24 28
      pages/index/index.vue
  4. 145 0
      pagesAccount/login/index.vue
  5. 59 0
      pagesAccount/register/index.vue
  6. 10 20
      pagesHome/account/index.vue
  7. 2 2
      unpackage/dist/build/app-plus/app-service.js
  8. 1 1
      unpackage/dist/build/app-plus/app-view.js
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  13. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageAccounnt/login/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map
  16. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map
  23. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  25. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  26. 314 33
      unpackage/dist/dev/app-plus/app-service.js
  27. 884 34
      unpackage/dist/dev/app-plus/app-view.js
  28. 303 0
      unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js
  29. 1 1
      unpackage/dist/dev/app-plus/pagesCommon/app-sub-service.js
  30. 18 7
      unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js
  31. 7 0
      unpackage/dist/dev/mp-weixin/app.json
  32. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  33. 25 11
      unpackage/dist/dev/mp-weixin/common/vendor.js
  34. 15 15
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  35. 29 31
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  36. 323 0
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js
  37. 7 0
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.json
  38. 1 0
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxml
  39. 42 0
      unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxss
  40. 216 0
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js
  41. 5 0
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.json
  42. 1 0
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.wxml
  43. 19 0
      unpackage/dist/dev/mp-weixin/pagesAccount/register/index.wxss
  44. 1 1
      unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js
  45. 24 18
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.js
  46. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxml
  47. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/app/index.js
  48. 14 14
      unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js
  49. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/find/index.js
  50. 2 2
      unpackage/dist/dev/mp-weixin/pagesHome/home/index.js
  51. 2 2
      unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js
  52. 665 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
  53. 6 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json
  54. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml
  55. 116 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
  56. 52 52
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

+ 1 - 1
common/config.js

@@ -1,6 +1,6 @@
 export default {
 	// 接口地址
-	serverUrl: "http://47.93.34.200",//http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
+	serverUrl: "http://192.168.1.144:10102",//http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
 	wechatUrl: "http://47.93.34.200",
 	// 设备信息
 	system: uni.getSystemInfoSync(),

+ 18 - 0
pages.json

@@ -55,6 +55,24 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pagesAccount", //账号管理
+			"pages": [ //
+				{
+					"path": "login/index",
+					"style": {
+						"navigationBarTitleText": "账号登录",
+						"enablePullDownRefresh": false //是否启用下拉刷新
+					}
+				},{
+					"path": "register/index",
+					"style": {
+						"navigationBarTitleText": "账号注册",
+						"enablePullDownRefresh": false //是否启用下拉刷新
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {

+ 24 - 28
pages/index/index.vue

@@ -37,39 +37,35 @@
 		methods: {
 			async search() {
 				const that = this;
-				let url = '/pagesHome/home/index';
-				// 不可返回
-				// uni.redirectTo({
-				// 	url
-				// })
-				// 可返回
-				uni.navigateTo({
-					url
-				})
-				// let res = await that.$api('appbasic', 'GET');
-				// if (res.errcode == '0') {
-				// 	that.$set(that, `basicInfo`, res.data)
-				// 	uni.setStorage({
-				// 		key: 'basicInfo',
-				// 		data: res.data,
-				// 		success: function() {
-				// 不可返回
-				// uni.redirectTo({
-				// 	url
-				// })
+				let url = '/pagesAccount/register/index';
 				// 可返回
 				// uni.navigateTo({
 				// 	url
 				// })
-				// 		}
-				// 	});
+				let res = await that.$api('appbasic', 'GET');
+				if (res.errcode == '0') {
+					that.$set(that, `basicInfo`, res.data)
+					uni.setStorage({
+						key: 'basicInfo',
+						data: res.data,
+						success: function() {
+							// 不可返回
+							// uni.redirectTo({
+							// 	url
+							// })
+							// 可返回
+							uni.navigateTo({
+								url
+							})
+						}
+					});
 
-				// } else {
-				// 	uni.showToast({
-				// 		title: res.errmsg,
-				// 		icon: 'none'
-				// 	})
-				// }
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
 			},
 		}
 	}

+ 145 - 0
pagesAccount/login/index.vue

@@ -0,0 +1,145 @@
+<template>
+	<view class="content">
+		<view class="one">
+			{{basicInfo.name}}
+		</view>
+		<view class="two">
+			<uni-forms ref="form" :model="form" :rules="rules" label-width="auto">
+				<uni-forms-item label="登录账号" name="account">
+					<uni-easyinput type="text" v-model="form.account" placeholder="请输入登录账号" />
+				</uni-forms-item>
+				<uni-forms-item label="登录密码" name="password">
+					<uni-easyinput type="text" v-model="form.password" placeholder="请输入登录密码" />
+				</uni-forms-item>
+			</uni-forms>
+			<view class="btn">
+				<button size="mini" @tap="toSubmit('form')">提交登录</button>
+			</view>
+		</view>
+		<view class="thr">
+			<button size="mini" @tap="toRegister()">账号注册</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 基本信息
+				basicInfo: {},
+				form: {},
+				rules: {
+					account: {
+						rules: [ //
+							{
+								required: true,
+								errorMessage: '请输入登录账号',
+							}
+						]
+					},
+					passowrd: {
+						rules: [ //
+							{
+								required: true,
+								errorMessage: '请输入登录密码',
+							}
+						]
+					}
+				},
+				// 协议
+				agree: true
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			const that = this;
+			that.searchBasic();
+		},
+		methods: {
+			searchBasic() {
+				const that = this;
+				uni.getStorage({
+					key: 'basicInfo',
+					success: (res) => {
+						let data = res.data
+						that.$set(that, `basicInfo`, data);
+					}
+				})
+			},
+			// 提交登录
+			async toSubmit(ref) {
+				const that = this;
+				let agree = that.agree;
+				let form = that.form;
+				if (agree) {
+					let res = await that.$api('user/login', 'POST', form)
+					if (res.errcode == '0') {
+						console.log(res.data);
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				} else {
+					uni.showToast({
+						title: '请阅读并同意用户协议和隐私政策',
+						icon: 'none'
+					})
+				}
+			},
+			toRegister() {
+				uni.navigateTo({
+					url: '/pagesAccount/register/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb000);
+		padding: 0 2vw;
+
+		.one {
+			text-align: center;
+			font-size: 30px;
+			font-family: monospace;
+			color: var(--rgbfff);
+			padding: 10vw 0 10vw 0;
+		}
+
+		.two {
+			margin: 0 0 4vw 0;
+
+			.uni-easyinput {
+				margin: 0 0 15px 0;
+			}
+
+			.btn {
+				padding: 2vw 0 0 0;
+				text-align: center;
+
+				button {
+					width: 80%;
+					background-color: var(--rgbfa4);
+					color: var(--rgbfff);
+					padding: 1vw 0;
+				}
+			}
+		}
+
+		.thr {
+			text-align: center;
+
+			button {
+				background-color: var(--rgbfa4);
+				color: var(--rgbfff);
+			}
+		}
+	}
+</style>

+ 59 - 0
pagesAccount/register/index.vue

@@ -0,0 +1,59 @@
+<template>
+	<view class="content">
+		<view class="one">
+			{{basicInfo.name}}
+		</view>
+		<view class="two">
+			注册
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 基本信息
+				basicInfo: {},
+
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			const that = this;
+			that.searchBasic();
+		},
+		methods: {
+			searchBasic() {
+				const that = this;
+				uni.getStorage({
+					key: 'basicInfo',
+					success: (res) => {
+						let data = res.data
+						that.$set(that, `basicInfo`, data);
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: var(--rgb000);
+		padding: 0 2vw;
+
+		.one {
+			text-align: center;
+			font-size: 30px;
+			font-family: monospace;
+			color: var(--rgbfff);
+			padding: 10vw 0 10vw 0;
+		}
+
+	}
+</style>

+ 10 - 20
pagesHome/account/index.vue

@@ -3,7 +3,6 @@
 		<view class="main">
 			<view class="one">
 				<view class="one_1">
-					<!-- <image src="../../static/logo.jpg" mode=""></image> -->
 					<image class="image" :src="logo_url" mode="">
 					</image>
 				</view>
@@ -16,12 +15,13 @@
 					</view>
 				</view>
 				<view class="one_3" v-if="!userInfo._id">
-					<button size="mini">注册/登录</button>
+					<button size="mini" @tap="toLogin()">注册/登录</button>
 				</view>
 			</view>
 			<view class="two">
-				<view class="list" v-for="(item,index) in btnList" :key="index">
-					<image class="image" src="../../static/logo.jpg" mode=""></image>
+				<view class="list" v-for="(item,index) in basicInfo.account_btn" :key="index">
+					<image class="image" :src="item.img_url&&item.img_url.length>0?item.img_url[0].url:''" mode="">
+					</image>
 					<view class="name">
 						{{item.name}}
 					</view>
@@ -45,22 +45,6 @@
 				userInfo: {},
 				// 头像
 				logo_url: '',
-				// 功能按钮
-				btnList: [ //
-					{
-						name: '我的喜欢'
-					}, {
-						name: '我的收藏'
-					}, {
-						name: '推广分享'
-					}, {
-						name: '应用中心'
-					}, {
-						name: '账号信息'
-					}, {
-						name: '退出登录'
-					}
-				]
 			};
 		},
 		onLoad() {
@@ -110,6 +94,12 @@
 				that.$set(that, `logo_url`, logo_url)
 
 			},
+			// 注册,登录
+			toLogin() {
+				uni.navigateTo({
+					url: '/pagesAccount/login/index'
+				})
+			},
 			// 跳转页面
 			toPath(e) {
 				let url = `/${e.route}`;

文件差異過大導致無法顯示
+ 2 - 2
unpackage/dist/build/app-plus/app-service.js


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageAccounnt/login/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/login/index.js.map


文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesAccount/register/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/app/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/components/home-frame.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/find/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/home/index.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hot/index.js.map


文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


文件差異過大導致無法顯示
+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js


文件差異過大導致無法顯示
+ 314 - 33
unpackage/dist/dev/app-plus/app-service.js


文件差異過大導致無法顯示
+ 884 - 34
unpackage/dist/dev/app-plus/app-view.js


文件差異過大導致無法顯示
+ 303 - 0
unpackage/dist/dev/app-plus/pagesAccount/app-sub-service.js


文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/app-plus/pagesCommon/app-sub-service.js


文件差異過大導致無法顯示
+ 18 - 7
unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/app.json

@@ -18,6 +18,13 @@
         "find/index",
         "account/index"
       ]
+    },
+    {
+      "root": "pagesAccount",
+      "pages": [
+        "login/index",
+        "register/index"
+      ]
     }
   ],
   "window": {

+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/upload/index":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"pagesHome/components/home-frame":1};
+/******/ 		var cssChunks = {"components/upload/index":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"pagesHome/components/home-frame":1,"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/upload/index":"components/upload/index","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","pagesHome/components/home-frame":"pagesHome/components/home-frame"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/upload/index":"components/upload/index","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","pagesHome/components/home-frame":"pagesHome/components/home-frame","uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

+ 25 - 11
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -769,8 +769,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__2080341",
     appName: "益智游戏",
-    appVersion: "1.1.0",
-    appVersionCode: "110",
+    appVersion: "1.1.1",
+    appVersionCode: "111",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "3.6.18",
     uniRuntimeVersion: "3.6.18",
@@ -868,8 +868,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__2080341",
       appName: "益智游戏",
-      appVersion: "1.1.0",
-      appVersionCode: "110",
+      appVersion: "1.1.1",
+      appVersionCode: "111",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,
@@ -1524,7 +1524,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8878,7 +8878,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8899,14 +8899,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9002,7 +9002,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"益智游戏","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -9578,7 +9578,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   // 接口地址
-  serverUrl: "http://47.93.34.200",
+  serverUrl: "http://192.168.1.144:10102",
   //http://47.93.34.200   http://www.freeskyghw.cn   http://192.168.1.144:10102
   wechatUrl: "http://47.93.34.200",
   // 设备信息
@@ -10145,7 +10145,21 @@ module.exports = _asyncToGenerator, module.exports.__esModule = true, module.exp
 /* 101 */,
 /* 102 */,
 /* 103 */,
-/* 104 */
+/* 104 */,
+/* 105 */,
+/* 106 */,
+/* 107 */,
+/* 108 */,
+/* 109 */,
+/* 110 */,
+/* 111 */,
+/* 112 */,
+/* 113 */,
+/* 114 */,
+/* 115 */,
+/* 116 */,
+/* 117 */,
+/* 118 */
 /*!**********************************************************************************!*\
   !*** D:/project/项目模板/uniapp/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \**********************************************************************************/

文件差異過大導致無法顯示
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/upload/index.js


+ 29 - 31
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -192,45 +192,43 @@ var _default = {
     search: function search() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var that, url;
+        var that, url, res;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 that = _this;
-                url = '/pagesHome/home/index'; // 不可返回
-                // uni.redirectTo({
-                // 	url
-                // })
-                // 可返回
-                uni.navigateTo({
-                  url: url
-                });
-                // let res = await that.$api('appbasic', 'GET');
-                // if (res.errcode == '0') {
-                // 	that.$set(that, `basicInfo`, res.data)
-                // 	uni.setStorage({
-                // 		key: 'basicInfo',
-                // 		data: res.data,
-                // 		success: function() {
-                // 不可返回
-                // uni.redirectTo({
-                // 	url
-                // })
-                // 可返回
+                url = '/pagesAccount/register/index'; // 可返回
                 // uni.navigateTo({
                 // 	url
                 // })
-                // 		}
-                // 	});
-
-                // } else {
-                // 	uni.showToast({
-                // 		title: res.errmsg,
-                // 		icon: 'none'
-                // 	})
-                // }
-              case 3:
+                _context.next = 4;
+                return that.$api('appbasic', 'GET');
+              case 4:
+                res = _context.sent;
+                if (res.errcode == '0') {
+                  that.$set(that, "basicInfo", res.data);
+                  uni.setStorage({
+                    key: 'basicInfo',
+                    data: res.data,
+                    success: function success() {
+                      // 不可返回
+                      // uni.redirectTo({
+                      // 	url
+                      // })
+                      // 可返回
+                      uni.navigateTo({
+                        url: url
+                      });
+                    }
+                  });
+                } else {
+                  uni.showToast({
+                    title: res.errmsg,
+                    icon: 'none'
+                  });
+                }
+              case 6:
               case "end":
                 return _context.stop();
             }

文件差異過大導致無法顯示
+ 323 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "账号登录",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+  }
+}

文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxml


+ 42 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/login/index.wxss

@@ -0,0 +1,42 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb000);
+  padding: 0 2vw;
+}
+.content .one {
+  text-align: center;
+  font-size: 30px;
+  font-family: monospace;
+  color: var(--rgbfff);
+  padding: 10vw 0 10vw 0;
+}
+.content .two {
+  margin: 0 0 4vw 0;
+}
+.content .two .uni-easyinput {
+  margin: 0 0 15px 0;
+}
+.content .two .btn {
+  padding: 2vw 0 0 0;
+  text-align: center;
+}
+.content .two .btn button {
+  width: 80%;
+  background-color: var(--rgbfa4);
+  color: var(--rgbfff);
+  padding: 1vw 0;
+}
+.content .thr {
+  text-align: center;
+}
+.content .thr button {
+  background-color: var(--rgbfa4);
+  color: var(--rgbfff);
+}
+

文件差異過大導致無法顯示
+ 216 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.js


+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "账号注册",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.wxml

@@ -0,0 +1 @@
+<view class="content"><view class="one">{{''+basicInfo.name+''}}</view><view class="two">注册</view></view>

+ 19 - 0
unpackage/dist/dev/mp-weixin/pagesAccount/register/index.wxss

@@ -0,0 +1,19 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.content {
+  background-color: var(--rgb000);
+  padding: 0 2vw;
+}
+.content .one {
+  text-align: center;
+  font-size: 30px;
+  font-family: monospace;
+  color: var(--rgbfff);
+  padding: 10vw 0 10vw 0;
+}
+

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesCommon/test/index.js

@@ -143,7 +143,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   Promise.all(/*! require.ensure | components/upload/index */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/upload/index")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 92));
+    return resolve(__webpack_require__(/*! @/components/upload/index.vue */ 106));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 24 - 18
unpackage/dist/dev/mp-weixin/pagesHome/account/index.js

@@ -102,6 +102,22 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var l0 = _vm.__map(_vm.basicInfo.account_btn, function (item, index) {
+    var $orig = _vm.__get_orig(item)
+    var g0 = item.img_url && item.img_url.length > 0
+    return {
+      $orig: $orig,
+      g0: g0,
+    }
+  })
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        l0: l0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -143,7 +159,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 107));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 121));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -157,23 +173,7 @@ var _default = {
       // 用户信息
       userInfo: {},
       // 头像
-      logo_url: '',
-      // 功能按钮
-      btnList: [
-      //
-      {
-        name: '我的喜欢'
-      }, {
-        name: '我的收藏'
-      }, {
-        name: '推广分享'
-      }, {
-        name: '应用中心'
-      }, {
-        name: '账号信息'
-      }, {
-        name: '退出登录'
-      }]
+      logo_url: ''
     };
   },
   onLoad: function onLoad() {},
@@ -220,6 +220,12 @@ var _default = {
       }
       that.$set(that, "logo_url", logo_url);
     },
+    // 注册,登录
+    toLogin: function toLogin() {
+      uni.navigateTo({
+        url: '/pagesAccount/login/index'
+      });
+    },
     // 跳转页面
     toPath: function toPath(e) {
       var url = "/".concat(e.route);

文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/app/index.js

@@ -159,7 +159,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 107));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 121));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

文件差異過大導致無法顯示
+ 14 - 14
unpackage/dist/dev/mp-weixin/pagesHome/components/home-frame.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/find/index.js

@@ -168,7 +168,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 107));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 121));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pagesHome/home/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 99))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 113))
     },
   }
 } catch (e) {
@@ -236,7 +236,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 107));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 121));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

+ 2 - 2
unpackage/dist/dev/mp-weixin/pagesHome/hot/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 99))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 113))
     },
   }
 } catch (e) {
@@ -236,7 +236,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var homeFrame = function homeFrame() {
   __webpack_require__.e(/*! require.ensure | pagesHome/components/home-frame */ "pagesHome/components/home-frame").then((function () {
-    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 107));
+    return resolve(__webpack_require__(/*! ../components/home-frame.vue */ 121));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

文件差異過大導致無法顯示
+ 665 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

文件差異過大導致無法顯示
+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml


+ 116 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss

@@ -0,0 +1,116 @@
+.content {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  width: 100vw;
+  height: 100vh;
+}
+.uni-easyinput {
+  width: 100%;
+  flex: 1;
+  position: relative;
+  text-align: left;
+  color: #333;
+  font-size: 14px;
+}
+.uni-easyinput__content {
+  flex: 1;
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  border-color: #fff;
+  transition-property: border-color;
+  transition-duration: 0.3s;
+}
+.uni-easyinput__content-input {
+  width: auto;
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1;
+  font-size: 14px;
+  height: 35px;
+}
+.uni-easyinput__placeholder-class {
+  color: #999;
+  font-size: 12px;
+}
+.is-textarea {
+  align-items: flex-start;
+}
+.is-textarea-icon {
+  margin-top: 5px;
+}
+.uni-easyinput__content-textarea {
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1.5;
+  font-size: 14px;
+  margin: 6px;
+  margin-left: 0;
+  height: 80px;
+  min-height: 80px;
+  min-height: 80px;
+  width: auto;
+}
+.input-padding {
+  padding-left: 10px;
+}
+.content-clear-icon {
+  padding: 0 5px;
+}
+.label-icon {
+  margin-right: 5px;
+  margin-top: -1px;
+}
+.is-input-border {
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+}
+.uni-error-message {
+  position: absolute;
+  bottom: -17px;
+  left: 0;
+  line-height: 12px;
+  color: #e43d33;
+  font-size: 12px;
+  text-align: left;
+}
+.uni-error-msg--boeder {
+  position: relative;
+  bottom: 0;
+  line-height: 22px;
+}
+.is-input-error-border {
+  border-color: #e43d33;
+}
+.is-input-error-border .uni-easyinput__placeholder-class {
+  color: #f29e99;
+}
+.uni-easyinput--border {
+  margin-bottom: 0;
+  padding: 10px 15px;
+  border-top: 1px #eee solid;
+}
+.uni-easyinput-error {
+  padding-bottom: 0;
+}
+.is-first-border {
+  border: none;
+}
+.is-disabled {
+  background-color: #f7f6f6;
+  color: #d5d5d5;
+}
+.is-disabled .uni-easyinput__placeholder-class {
+  color: #d5d5d5;
+  font-size: 12px;
+}
+

文件差異過大導致無法顯示
+ 52 - 52
unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js