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

common/router/index.js

@@ -28,7 +28,6 @@ router.beforeEach((to, from, next) => {
 		}else{
 		  next({ path: '/pages/login/login'})
 		}
-		next()
 	} 
 })
 // 全局路由后置守卫

common/service/config.service.js

@@ -9,7 +9,7 @@ try {
 }
  let newUrl = 'http://'+fwq
 if (process.env.NODE_ENV == 'development') {
-	BASE_URL = "http://10.2.175.100:8080/xgwcs"
+	BASE_URL = "http://192.168.30.16:9080/xgwcs"
 } else {
 	BASE_URL = "http://10.2.175.100:8080/xgwcs"
 

common/util/appUpdate.js

@@ -45,6 +45,7 @@ export default function appUpdate(loginApp) {
 				apptype: appType,
 				appid: '__UNI__79C58F0',
 			}).then((res) => {
+				console.log(res,'res')
 				if (res) {
 					plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
 						let client_version = parseInt(wgtinfo.version);
@@ -56,6 +57,7 @@ export default function appUpdate(loginApp) {
 						var flag_hot = true;
 						console.log(verC)
 						if (verC >=0) {
+							console.log('无更新')
 							loginApp.showProcess('无版本更新,欢迎使用', 100)
 							uni.hideLoading()
 							loginApp.$Router.replaceAll({
@@ -156,9 +158,10 @@ export default function appUpdate(loginApp) {
 				})
 			
 			}).finally(() => {
-
+				
 			})
 		} catch (e) {
+			console.log(e,'err')
 			uni.hideLoading()
 			if(!hasLogin){
 				loginApp.$Router.replaceAll({
@@ -185,7 +188,7 @@ export default function appUpdate(loginApp) {
 						let verC = versionStringCompare(wgtinfo.version, res.data.version + '');
 						var flag_hot = true;
 						if (verC >=0) {
-							loginApp.showProcess('无版本更新,欢迎使用金属科技安全云', 100)
+							loginApp.showProcess('无版本更新,欢迎使用', 100)
 							// if(!hasLogin){
 								
 							// }

pages/dl_cmaterial/index.vue

@@ -549,15 +549,15 @@
 		},
 		onLoad(e) {
 			this.f5Gw()
-			eventBus.$on('sendInfo', function(data) {
-				// this.wlinfor = data.wlinfor
-				if(data.type=='xzppdh'){
-					this.ppdInfo.djid=data.data.djid
-					this.ppdInfo.pptzdid=data.data.id
-				}
-				console.log(data,'bySendInfo')
-			}.bind(this));
-			if (!e.query) {
+			/* 配盘单号无法选中，暂时取消 */
+			// eventBus.$on('sendInfo', function(data) {
+			// 	if(data.type=='xzppdh'){
+			// 		this.ppdInfo.djid=data.data.djid
+			// 		this.ppdInfo.pptzdid=data.data.id
+			// 	}
+			// 	console.log(data,'bySendInfo')
+			// }.bind(this));
+			if (!e.query) { 
 				return
 			}
 			let einfor = JSON.parse(e.query)