Merge remote-tracking branch 'remotes/origin/VERSIONS-wfhs(危废回收)' into SCHOOL-XiBeiNongLin

api/request/config.js

@@ -38,6 +38,8 @@ const config = {
   schoolId:'1815293314666532865',
 	/************************************ 院级管理员身份ID ************************************/
   collegeId:'1815336278075838465',
+	/************************************ 版本号 ************************************/
+  weChatProgramVersion:'1.0.15',
 }
 export {
 	config

pages/views/login/accountLogin.vue

@@ -248,6 +248,12 @@
 					uni.setStorageSync('mqttUser', Decrypt(obj.mqttExtranetUser))
 					//MQTT密码
 					uni.setStorageSync('mqttPassword', Decrypt(obj.mqttExtranetPassword))
+					//版本号
+					if(config.weChatProgramVersion === obj.weChatProgramVersion){
+						uni.setStorageSync('weChatProgramVersion', true)
+					}else{
+						uni.setStorageSync('weChatProgramVersion', false)
+					}
 					//文件浏览环境
 					uni.setStorageSync('fileBrowseEnvironment','http://'+Decrypt(obj.fileBrowseEnvironment))
 					uni.setStorageSync('fileBrowseEnvironmentExtranet','https://'+Decrypt(obj.fileBrowseEnvironmentExtranet))

pages/views/login/ssoCertification.vue

@@ -193,6 +193,12 @@
 					uni.setStorageSync('mqttUser', Decrypt(obj.mqttExtranetUser))
 					//MQTT密码
 					uni.setStorageSync('mqttPassword', Decrypt(obj.mqttExtranetPassword))
+					//版本号
+					if(config.weChatProgramVersion === obj.weChatProgramVersion){
+						uni.setStorageSync('weChatProgramVersion', true)
+					}else{
+						uni.setStorageSync('weChatProgramVersion', false)
+					}
 					//文件浏览环境
 					uni.setStorageSync('fileBrowseEnvironment','http://'+Decrypt(obj.fileBrowseEnvironment))
 					uni.setStorageSync('fileBrowseEnvironmentExtranet','https://'+Decrypt(obj.fileBrowseEnvironmentExtranet))

pages/views/saoCode/chemicalsInstructionsVideo.vue

@@ -9,12 +9,18 @@
 		name: "chemicalsInstructionsVideo",
 		data() {
 			return {
-				webViewUrl:'https://labcontrol.nwafu.edu.cn/stream/#/?chemicalsInstructionsVideo',
+				webViewUrl:'',
 				pageType:false,
 			}
 		},
 		onLoad(option) {
-			this.$set(this,'pageType',true);
+			if(uni.getStorageSync('weChatProgramVersion')){
+				this.$set(this,'webViewUrl','https://labcontrol.nwafu.edu.cn/stream/#/?chemicalsInstructionsVideo');
+				this.$set(this,'pageType',true);
+			}else{
+				this.$set(this,'webViewUrl','');
+				this.$set(this,'pageType',false);
+			}
 			
 		},
 		mounted() {

pages_manage/views/laboratory/videoPlayer.vue

@@ -14,16 +14,20 @@
             }
         },
         onLoad(option) {
-					let obj = JSON.parse(decodeURIComponent(option.item))
-					console.log('obj',obj)
-					let url = '';
-					if(obj.type == 4){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
-					}else if(obj.type == 5){
-						url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+					if(uni.getStorageSync('weChatProgramVersion')){
+						let obj = JSON.parse(decodeURIComponent(option.item))
+						let url = '';
+						if(obj.type == 4){
+							url = uni.getStorageSync('cameraExtranetAgent')+'?source=2&type=4&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+						}else if(obj.type == 5){
+							url = uni.getStorageSync('cameraExtranetAgent')+'?source=5&type=5&floorId='+obj.floorId+'&subId='+obj.subId+'&touken='+uni.getStorageSync('token')
+						}
+						this.$set(this,'webViewUrl',url);
+						this.$set(this,'pageType',true);
+					}else{
+						this.$set(this,'webViewUrl','');
+						this.$set(this,'pageType',false);
 					}
-					this.$set(this,'webViewUrl',url);
-					this.$set(this,'pageType',true);
         },
 				onShow(){