Merge branch 'master' of gitlab.gavelinfo.com:lisu/xgdlapp

common/router/index.js

@@ -13,6 +13,12 @@ const router = new Router({
 const whiteList = ['/pages/login/update','/pages/login/login','/pages/login/fwqsz'] 
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
+	/* 清除所有定时器 */
+	let timer=setInterval(()=>{console.log(timer)},10000)
+	clearInterval(timer)
+	for(let i=0;i<=timer;i++){
+		clearInterval(i)
+	}
 	let token=uni.getStorageSync(ACCESS_TOKEN);
 	if(token){
 		 next()

pages/dl_kw_adjust/index.vue

@@ -80,7 +80,7 @@
 					    }
 					});
 				} else {
-					this.$tip.alert("请先扫描有效托盘信息");
+					this.$tip.alert("请先扫描有效地码信息");
 				}
 
 			},