zouling hai 3 meses
pai
achega
0c5ef4923d

+ 21 - 18
property_ui/.hbuilderx/launch.json

@@ -1,20 +1,23 @@
-{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "custom",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

+ 6 - 4
property_ui/App.vue

@@ -7,7 +7,8 @@ import {updateUserProfile,findVersion} from "@/api/system/user.js"
   export default {
 	data(){
 		return{
-			platform:'Android'  
+			platform:'Android',
+			appPort:'1', //appPort    1:物管端,2:用户端
 		}
 	},
     onLaunch: function() {
@@ -31,10 +32,11 @@ 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)  
+				// console.log(res)  
 				if (res.code == "200") {
 					let versionNos = res.data.code;
 					// console.log(versionNos,'versionNos')

+ 2 - 1
property_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

+ 2 - 2
property_ui/manage/pages/community/newsyg.vue

@@ -118,8 +118,8 @@
 			getDetail(data){
 				if(this.type=='ystv'){
 					this.$tab.navigateTo("/manage/pages/community/newsygdetail?id="+data)
-				// }else{
-				// 	this.$tab.navigateTo("/manage/pages/community/newsaddvideo?id="+data)
+				}else{
+					this.$tab.navigateTo("/manage/pages/community/newsaddvideo?id="+data)
 				}
 			},
 			getPut(id){

+ 2 - 2
property_ui/manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧社区物管端",
     "appid" : "__UNI__35B39A9",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

+ 3 - 1
property_ui/pages/mine/index.vue

@@ -201,6 +201,7 @@
 				deptId: this.$store.state.user.deptId,
 				wgtcode: this.$store.state.user.wgtcode,
 				platform: 'Android',
+				appPort:'1', //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") {

+ 11 - 5
property_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') {