From 1cdad97b3e8755fa45b6f967133e8e1b3914153e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 7 Nov 2023 18:06:17 +0800
Subject: [PATCH] 2023-11-7

---
 .../views/organizational/userManageList.vue   |  4 +--
 supervise-uniapp/App.vue                      | 36 ++++++++++++++++---
 supervise-uniapp/common/config.js             |  2 +-
 .../pages/index/DataAssembleList2.vue         | 17 ++++++---
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/supervise-organizational-ui/src/views/organizational/userManageList.vue b/supervise-organizational-ui/src/views/organizational/userManageList.vue
index 28921220..56f86789 100644
--- a/supervise-organizational-ui/src/views/organizational/userManageList.vue
+++ b/supervise-organizational-ui/src/views/organizational/userManageList.vue
@@ -36,9 +36,9 @@
       </el-table-column>
       <el-table-column label="操作" width="380px" align="center">
         <template slot-scope="scope">
-          <el-button @click="setRole(scope.row)" type="primary" size="mini">
+         <!-- <el-button @click="setRole(scope.row)" type="primary" size="mini">
             设置角色
-          </el-button>
+          </el-button> -->
           <el-button @click="initPwd(scope.row)" type="danger" size="mini">
             初始化密码
           </el-button>
diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue
index bd5c55e7..f59da39e 100644
--- a/supervise-uniapp/App.vue
+++ b/supervise-uniapp/App.vue
@@ -4,9 +4,9 @@
 		globalData: {
 			// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
 			// wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin",// 静默登录
-			wxSilentLoginURL: "http://192.168.1.103:7009/v1/app/wxuser/wxSilentLogin",
+			wxSilentLoginURL: "http://192.168.1.104:7009/v1/app/wxuser/wxSilentLogin",
 			wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxAuthLogin",
-			SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// 注册
+			SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin", // 注册
 			token: "",
 			isLogin: false,
 			sid: "",
@@ -25,15 +25,41 @@
 
 			console.log("》》》》", 22222222222);
 
+			const updateManager = uni.getUpdateManager();
+
+			updateManager.onCheckForUpdate(function(res) {
+				// 请求完新版本信息的回调
+				console.log(res.hasUpdate);
+			});
+
+			updateManager.onUpdateReady(function(res) {
+				uni.showModal({
+					title: '更新提示',
+					content: '新版本已经准备好，是否重启应用？',
+					success(res) {
+						if (res.confirm) {
+							// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+							updateManager.applyUpdate();
+						}
+					}
+				});
+
+			});
+
+			updateManager.onUpdateFailed(function(res) {
+				// 新的版本下载失败
+			});
+
+
 			// // 不要删除
 			// console.log('高德地图定位Web服务key', '59970402d1c3f7dc1efff17d4dfcff21')
 		},
 		onShow: function() {
-		
+
 		},
 		onHide: function() {
-				console.log("onHide》》》》", "onHide");
-				wx.clearStorage()
+			console.log("onHide》》》》", "onHide");
+			wx.clearStorage()
 		},
 
 		methods: {
diff --git a/supervise-uniapp/common/config.js b/supervise-uniapp/common/config.js
index 716f5c06..c30b5b20 100644
--- a/supervise-uniapp/common/config.js
+++ b/supervise-uniapp/common/config.js
@@ -8,7 +8,7 @@
 module.exports = {
 	// baseUrl: 'http://jg.yyundong.com',// 测试
 	// baseUrl: 'https://supervise.yxtsoft.com/reportwxmpapi',//正式
-	baseUrl: 'http://192.168.1.103:7009',  
+	baseUrl: 'http://192.168.1.104:7009',  
 	// baseUrl: 'http://192.168.1.110:8112',  
 	tokenName: "Authorization", // 请求头中token的名字，与服务器端对应
 	loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码
diff --git a/supervise-uniapp/pages/index/DataAssembleList2.vue b/supervise-uniapp/pages/index/DataAssembleList2.vue
index 321f2f1e..07c3d4eb 100644
--- a/supervise-uniapp/pages/index/DataAssembleList2.vue
+++ b/supervise-uniapp/pages/index/DataAssembleList2.vue
@@ -31,13 +31,15 @@
 				<view class="item" :class="{'item2':index==dataList.length-1}">
 
 					<view class="item-name">{{item.projectName}}</view>
+					
+					<text class="item-num" v-show="item.isReport=='2'">当日无数据</text>
 
-					<view>
+					<view  v-show="item.isReport=='1'">
 						<text class="item-num" :class="{'item-num2':item.state=='2'}">{{item.pledgeRatePercent}}%</text>
 						<text class="item-num">/ {{item.bankPledgeRate}}%</text>
 					</view>
 
-					<image src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;" mode="aspectFill">
+					<image  v-show="item.isReport=='1'" src="../../static/baseIcon/zy.png" style="width: 15px;height: 15px;" mode="aspectFill">
 					</image>
 				</view>
 
@@ -137,9 +139,14 @@
 			itemClick(item) {
 				console.log('itemClick', item)
 				console.log('orderDate', this.params.orderDate)
-				uni.navigateTo({
-					url: '../index/RegulatoryReporting?projectSid=' + item.projectSid + "&orderDate=" + this.params.orderDate
-				});
+				
+				if(item.isReport=='1'){
+					uni.navigateTo({
+						url: '../index/RegulatoryReporting?projectSid=' + item.projectSid + "&orderDate=" + this.params.orderDate
+					});
+				}
+				
+				
 			}
 		}
 	}