上线代码

manifest.json

@@ -1,76 +1,76 @@
 {
-	"name": "text-installation",
-	"appid": "__UNI__1E05B40",
-
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxf0b2cd7a47e84f8c",
-		"lazyCodeLoading": "requiredComponents",
-		"setting": {
-			"urlCheck": false,
-			"es6": true,
-			"minified": true
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
-}
+    "name" : "text-installation",
+    "appid" : "__UNI__1E05B40",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {}
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx088570015124f217",
+        "lazyCodeLoading" : "requiredComponents",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true,
+            "postcss" : true
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
+}

pages.json

@@ -7,7 +7,6 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
-
 		},
 		{
 			"path": "pages/index/index",
@@ -106,18 +105,16 @@
 				// "backgroundColor": "#f25415"
 			}
 
+		}, {
+			"path": "pages/door-lock-module/door-lock-module",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "门锁模块",
+				"enablePullDownRefresh": false
+			}
+
 		}
-	    ,{
-            "path" : "pages/door-lock-module/door-lock-module",
-            "style" :                                                                                    
-            {
-					"navigationStyle": "custom",
-                "navigationBarTitleText": "门锁模块",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	],
 	"tabBar": {
 		"selectedColor": "#1296db",
 		"list": [{

pages/bluetooth/bluetooth.vue

@@ -30,7 +30,7 @@
  										{{item.deviceId}}
  									</view>
  									<view class="type">
- 										<text style="margin-left: 5px;">{{item.testTime|date}}</text>
+ 										<text style="margin-right: 5px;">{{item.testTime|date}}</text>
  										<text>信号值：{{item.signalNum}}</text>
  									</view>
  								</view>

pages/login/login.vue

@@ -41,7 +41,7 @@
 			</view>
 
 		</view>
-		<u-modal :show="show" :title="title" @confirm="confirm"  :zoom="true" :asyncClose="true">
+		<u-modal :show="show" :title="title" @confirm="confirm" :zoom="true" :asyncClose="true">
 			<view class="slot-content">
 				<rich-text :nodes="content"></rich-text>
 			</view>
@@ -60,24 +60,31 @@
 				name: true,
 				active: true,
 				loginMsg: {
-					// userName: 'testY',
-					// password: 'yy1021..'
-					userName: 'admin',
-					password: 'rW8[cD1!bQ6{'
+					userName: '',
+					password: ''
+					// userName: 'admin',
+					// password: 'rW8[cD1!bQ6{'
 				}
 
 			}
 		},
 		methods: {
+			onLoad() {
+				if (uni.getStorageSync('Token')) {
+					uni.switchTab({
+						url: "/pages/mine/mine"
+					})
+				}
+			},
 			confirm() {
 
 				setTimeout(() => {
 					// 3秒后自动关闭
-					this.active=false
+					this.active = false
 					this.show = false;
 				}, 1500)
 			},
-			
+
 			userAgreement() {
 				//用户协议
 				this.show = true
@@ -87,6 +94,10 @@
 				this.openPassword = !this.openPassword
 			},
 			async login() {
+				if(!this.loginMsg.userName||!this.loginMsg.password){
+					return 	this.$u.toast(`账号密码不能为空`)
+				}
+				console.log (1);
 				this.loading = true
 				try {
 					await uni.$http.post("/api/v1/user/login", this.loginMsg).then(res => {

pages/mine/mine.vue

@@ -62,10 +62,10 @@
 				console.log('弹出');
 			},
 			confirm(e) {
-				// console.log('confirm', e.value[0])
-				// console.log(this.arr,'全部项目');
+				console.log('confirm', e)
+				console.log(this.arr,'全部项目');
 				let getWay = this.arr.filter((item) => {
-					return item.name == e.value[0]
+					return item.description == e.value[0]
 				})
 				console.log(getWay, '过滤');
 				// console.log(getWay);

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9921,6 +9921,7 @@ function _ref() {
                     uni.showToast({
                       title: "token过期，请重新登录"
                     });
+                    uni.removeStorageSync('Token');
                     uni.redirectTo({
                       url: "/pages/login/login"
                     });

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -237,14 +237,22 @@ var _default = {
       name: true,
       active: true,
       loginMsg: {
-        // userName: 'testY',
-        // password: 'yy1021..'
-        userName: 'admin',
-        password: 'rW8[cD1!bQ6{'
+        userName: '',
+        password: ''
+        // userName: 'admin',
+        // password: 'rW8[cD1!bQ6{'
       }
     };
   },
+
   methods: {
+    onLoad: function onLoad() {
+      if (uni.getStorageSync('Token')) {
+        uni.switchTab({
+          url: "/pages/mine/mine"
+        });
+      }
+    },
     confirm: function confirm() {
       var _this = this;
       setTimeout(function () {
@@ -268,9 +276,16 @@ var _default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (!(!_this2.loginMsg.userName || !_this2.loginMsg.password)) {
+                  _context.next = 2;
+                  break;
+                }
+                return _context.abrupt("return", _this2.$u.toast("\u8D26\u53F7\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A"));
+              case 2:
+                console.log(1);
                 _this2.loading = true;
-                _context.prev = 1;
-                _context.next = 4;
+                _context.prev = 4;
+                _context.next = 7;
                 return uni.$http.post("/api/v1/user/login", _this2.loginMsg).then(function (res) {
                   if (res.data.code === 200) {
                     setTimeout(function () {
@@ -290,28 +305,28 @@ var _default = {
                     _this2.loading = false;
                   }
                 });
-              case 4:
-                _context.next = 10;
+              case 7:
+                _context.next = 13;
                 break;
-              case 6:
-                _context.prev = 6;
-                _context.t0 = _context["catch"](1);
+              case 9:
+                _context.prev = 9;
+                _context.t0 = _context["catch"](4);
                 console.log(_context.t0);
                 setTimeout(function () {
                   _this2.loading = false;
                 }, 2000);
-              case 10:
-                _context.prev = 10;
+              case 13:
+                _context.prev = 13;
                 setTimeout(function () {
                   _this2.loading = false;
                 }, 2000);
-                return _context.finish(10);
-              case 13:
+                return _context.finish(13);
+              case 16:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[1, 6, 10, 13]]);
+        }, _callee, null, [[4, 9, 13, 16]]);
       }))();
     },
     changActive: function changActive() {

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -234,10 +234,10 @@ var _default = {
       console.log('弹出');
     },
     confirm: function confirm(e) {
-      // console.log('confirm', e.value[0])
-      // console.log(this.arr,'全部项目');
+      console.log('confirm', e);
+      console.log(this.arr, '全部项目');
       var getWay = this.arr.filter(function (item) {
-        return item.name == e.value[0];
+        return item.description == e.value[0];
       });
       console.log(getWay, '过滤');
       // console.log(getWay);

unpackage/dist/dev/mp-weixin/project.config.json

@@ -7,7 +7,7 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
-    "postcss": false,
+    "postcss": true,
     "minified": true,
     "newFeature": true,
     "bigPackageSizeSupport": true,
@@ -19,8 +19,8 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "3.1.5",
-  "appid": "wxf0b2cd7a47e84f8c",
+  "libVersion": "3.3.0",
+  "appid": "wx088570015124f217",
   "projectname": "text-installation",
   "condition": {
     "search": {

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -35,7 +35,7 @@
     }
   },
   "setting": {
-    "urlCheck": false,
+    "urlCheck": true,
     "compileHotReLoad": false
   },
   "projectname": "text-installation"

utils/permission.js

@@ -32,6 +32,7 @@ export default async function() {
 					uni.showToast({
 						title: "token过期，请重新登录"
 					})
+					uni.removeStorageSync('Token')
 					uni.redirectTo({
 						url: "/pages/login/login"
 					})