热更新

user_ui/App.vue

@@ -7,12 +7,13 @@ import {updateUserProfile,findVersion} from "@/api/system/user.js"
   export default {
 	data(){
 		return{
-			platform:'Android'  
+			platform:'Android',
+			appPort:'2', //appPort    1：物管端，2：用户端
 		}
 	},
     onLaunch: function() {
 		// #ifdef APP
-		// this.onlineWgt(); //版本更新
+		this.onlineWgt(); //版本更新
 		// #endif
 		this.initApp()
     },
@@ -31,7 +32,8 @@ import {updateUserProfile,findVersion} from "@/api/system/user.js"
 			let that = this;
 			// console.log("aaaaaaa===versionCode", versionCode);
 			const parmas = {
-				model: that.platform
+				model: that.platform,
+				appPort:that.appPort
 			}   
 			findVersion(parmas).then(res => {
 				console.log(res)  

user_ui/api/system/user.js

@@ -44,7 +44,8 @@ export function findVersion(data) {
   return request({
     url: '/system/app/new',
     method: 'get',
-    data: data
+    data: data,
+	lhide:true,
   })
 }
 // 字典值yzdqId

user_ui/health/pages/health/add.vue

@@ -106,7 +106,7 @@
 					<picker range-key='dictLabel' :disabled="isdisabled" :value="dslxidx" :range="dslxList"   @change='bindDateChanged'>
 						<uni-forms-item label="特殊类型" name="specialType">
 							<view class="flexc mh35">
-								<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.residentAppearance,dslxList,'dslx')}}</view>
+								<view class="flex1 txr f13 co27" v-if="datainfo.specialType&&!dslx">{{statusFormats(datainfo.specialType,dslxList,'dslx')}}</view>
 								<view class="flex1 txr f13" v-else :class="dslx?'co27':'coa'">{{dslx||"如有五保户等特殊类型，请选择"}}</view>
 								
 							</view>

user_ui/manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧社区用户端",
     "appid" : "__UNI__E57E235",
     "description" : "",
-    "versionName" : "1.1.0",
+    "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

user_ui/pages/mine/index.vue

@@ -210,6 +210,7 @@
 				deptId: this.$store.state.user.deptId,
 				wgtcode: this.$store.state.user.wgtcode,
 				platform: 'Android',
+				appPort:'2', //appPort    1：物管端，2：用户端
 				nvaHeight:44,
 			}
 		},
@@ -312,7 +313,8 @@
 				let that = this;
 				// console.log("aaaaaaa===versionCode", versionCode);
 				const parmas = {
-					model: that.platform
+					model: that.platform,
+					appPort:that.appPort
 				}
 				findVersion(parmas).then(res => {
 					if (res.code == "200") {

user_ui/utils/request.js

@@ -29,10 +29,13 @@ const request = config => {
     url = url.slice(0, -1)
     config.url = url
   }
-  // uni.showLoading({
-  // 	title:"加载中"
-  // })
-  vues.$loading(true)
+  if(config.lhide){
+  	  uni.showLoading({
+  	  	title:"加载中"
+  	  })
+  }else{
+  	vues.$loading(true)  
+  }
   return new Promise((resolve, reject) => {
     uni.request({
         method: config.method || 'get',
@@ -132,7 +135,10 @@ const request = config => {
         resolve(res.data)
       })
       .catch(error => {
-		vues.$loading(false)
+		if(config.lhide){
+		}else{
+		vues.$loading(false)  
+		}
 		uni.hideLoading()
         let { message } = error
         if (message === 'Network Error') {