Merge branch 'nwafu_1st_lhwrrs_v1.3_20260702(危险废物登记流程调优)' into SCHOOL-XiBeiNongLin

pages/views/login/accountLogin.vue

@@ -254,12 +254,6 @@
 					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/login.vue

@@ -58,7 +58,7 @@
 				const {
 					data
 				} = await configInfo({
-					type: '5'
+					type: '4'
 				});
 				if (data.code == 200) {
 					let list = JSON.parse(data.data)
@@ -72,8 +72,10 @@
 					})
 					if(config.weChatProgramVersion === newData.weChatProgramVersion){
 						this.$set(this,'weChatProgramVersion',true);
+						uni.setStorageSync('weChatProgramVersion', true)
 					}else{
 						this.$set(this,'weChatProgramVersion',false);
+						uni.setStorageSync('weChatProgramVersion', false)
 					}
 				}
 			},

pages/views/login/ssoCertification.vue

@@ -193,12 +193,6 @@
 					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))