.

pages/fault/fault-report/fault-report.vue

@@ -83,6 +83,18 @@
 								delta:1
 							})
 						},1000)
+					}else if(res.status==="0" || res.status==="2"){
+						this.$refs.uToast.show({
+							type: 'error',
+							icon: false,
+							message: "该设备已经上报故障，即将返回上一页",
+							duration:1500
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						},1000)
 					}else{
 						this.model1.deviceName = res.name
 						this.model1.deviceNumber = res.barCode

pages/menus/menu/menu.vue

@@ -89,14 +89,14 @@
 				})
 			},
 			toRepeat(){
-				// uni.scanCode({
-				// 	scanType:['barCode'],
-				// 	success (res) {
-				// 		uni.navigateTo({
-				// 			url:'/pages/fault/fault-report/fault-report?id='+res.result
-				// 		})
-				// 	}
-				// })
+				uni.scanCode({
+					scanType:['barCode'],
+					success (res) {
+						uni.navigateTo({
+							url:'/pages/fault/fault-report/fault-report?id='+res.result
+						})
+					}
+				})
 			},
 			toHandleFault(){
 				uni.navigateTo({
@@ -109,21 +109,65 @@
 					title: '系统提示',
 					content: '是否确认退出登录？',
 					success (res) {
+						uni.showLoading({
+							title:'正在退出登录中',
+							icon:'none',
+							mask:true
+						})
+						if (res.confirm) {
+							try{
+								logout().then(res=>{
+									if(res.data.code===200&&res.data.msg==="退出成功"){
+										uni.hideLoading()
+										uni.reLaunch({
+											url:'/pages/home/home'
+										})
+									}
+								})
+							}catch(err){
+								uni.hideLoading()
+							}
+							
+						} else if (res.cancel) {
+							uni.hideLoading()
+							console.log('用户点击取消')
+						}
+						
+					}
+				})
+				//#endif
+				//#ifndef MP-WEIXIN
+				uni.showModal({
+					title: '系统提示',
+					content: '是否确认退出登录？',
+					success (res) {
+						uni.showLoading({
+							title:'正在退出登录中',
+							icon:'none',
+							mask:true
+						})
 						if (res.confirm) {
-							logout().then(res=>{
-								if(res.data.code===200&&res.data.msg==="退出成功"){
-									uni.reLaunch({
-										url:'/pages/home/home'
-									})
-								}
-							})
+							try{
+								logout().then(res=>{
+									if(res.data.code===200&&res.data.msg==="退出成功"){
+										uni.hideLoading()
+										uni.reLaunch({
+											url:'/pages/home/home'
+										})	
+									}
+								})
+							}catch(err){
+								uni.hideLoading()
+							}
+							
 						} else if (res.cancel) {
+							uni.hideLoading()
 							console.log('用户点击取消')
 						}
+						
 					}
 				})
 				//#endif
-				
 			}
 		},
 		onLoad() {

unpackage/dist/dev/mp-weixin/pages/menus/menu/menu.js

@@ -262,14 +262,14 @@ var _default = {
       });
     },
     toRepeat: function toRepeat() {
-      // uni.scanCode({
-      // 	scanType:['barCode'],
-      // 	success (res) {
-      // 		uni.navigateTo({
-      // 			url:'/pages/fault/fault-report/fault-report?id='+res.result
-      // 		})
-      // 	}
-      // })
+      uni.scanCode({
+        scanType: ['barCode'],
+        success: function success(res) {
+          uni.navigateTo({
+            url: '/pages/fault/fault-report/fault-report?id=' + res.result
+          });
+        }
+      });
     },
     toHandleFault: function toHandleFault() {
       uni.navigateTo({
@@ -281,15 +281,26 @@ var _default = {
         title: '系统提示',
         content: '是否确认退出登录？',
         success: function success(res) {
+          uni.showLoading({
+            title: '正在退出登录中',
+            icon: 'none',
+            mask: true
+          });
           if (res.confirm) {
-            (0, _user.logout)().then(function (res) {
-              if (res.data.code === 200 && res.data.msg === "退出成功") {
-                uni.reLaunch({
-                  url: '/pages/home/home'
-                });
-              }
-            });
+            try {
+              (0, _user.logout)().then(function (res) {
+                if (res.data.code === 200 && res.data.msg === "退出成功") {
+                  uni.hideLoading();
+                  uni.reLaunch({
+                    url: '/pages/home/home'
+                  });
+                }
+              });
+            } catch (err) {
+              uni.hideLoading();
+            }
           } else if (res.cancel) {
+            uni.hideLoading();
             console.log('用户点击取消');
           }
         }

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

@@ -20,7 +20,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.30.4",
-    "appid": "wx1ca8ba3e0ec38457",
+    "appid": "wx73027efb5f40cd02",
     "projectname": "lab-equipment-mini-program",
     "condition": {},
     "editorSetting": {

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

@@ -1,6 +1,6 @@
 {
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "mp-weixin",
+    "projectname": "lab-equipment-mini-program",
     "setting": {
         "compileHotReLoad": true
     }