Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages/index/index.vue

@@ -8,7 +8,7 @@
 				<view class="left Flex">
 					<view class="info">
 						<view class="name">待办</view>
-						<view class="number">{{ totalData.Unconfirmed }}</view>
+						<view class="number">{{ totalData.UnderInvestigation }}</view>
 					</view>
 					<image style="width: 160rpx" mode="widthFix" :src="$.imgSrc + '/need.png'" class="need"></image>
 					<view class="bottom PositionA Flex Flex_C_S-A TextCenter blur">

pages/investigation/index.vue

@@ -14,7 +14,7 @@
 			<view class="tab">
 				<view class="tab-item" :class="tab === 1 ? 'active' : ''" @click='handleTabClick(1)'>
 					<text>待办</text>
-					<text v-if="showNumber" class="number">{{ totalData.Unconfirmed }}</text>
+					<text v-if="showNumber" class="number">{{ totalData.UnderInvestigation }}</text>
 				</view>
 				<!-- <view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='handleTabClick(2)'>
 					<text>正在办理</text>
@@ -22,7 +22,7 @@
 				</view> -->
 				<view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='handleTabClick(3)'>
 					<text>已完成</text>
-					<text class="number">{{ totalData.Finished }}</text>
+					<text class="number">{{ totalData.InGovernance }}</text>
 				</view>
 			</view>
 			<view class="Content MarginAuto BorderBox">
@@ -89,8 +89,7 @@
 		},
 
 		onShow: function() {
-			this.getData1()
+			this.getData()
-			this.getData2()
 		},
 		// 计算属性
 		computed: {
@@ -118,33 +117,7 @@
 				}
 				this.getList()
 			},
-			getData1() {
-				let datas = {
-					nuserid: this.$.getData('token'),
-					status: '10',
-				}
-				this.loadmorestatus = 'loading'
-				this.$request.globalRequest(
-						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
-					.then(res => {
-						console.log(res)
-						this.totalData.Unconfirmed = res.result.total
-					}).catch((err) => {})
-
-			},
-			getData2() {
-				let datas = {
-					nuserid: this.$.getData('token'),
-					status: '20',
-				}
-				this.loadmorestatus = 'loading'
-				this.$request.globalRequest(
-						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
-					.then(res => {
-						this.totalData.Finished = res.result.total
-					}).catch((err) => {})
 
-			},
 			getData() {
 				this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
 					nuserid: this.$.getData('token')