From fdef23064b801a06bbf369785dbbc14db14b707f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 22 Mar 2024 17:15:53 +0800
Subject: [PATCH] 回滚代码至2月28日

---
 subPackage/task/index.vue |   63 +++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index 268b282..0718a15 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -22,13 +22,13 @@
 				</view>
 			</view>
 		</view> -->
-		<view class="nav bgc-ff mb-20 mt-20" v-if="comprehensive.length">
-			<view class="caption">
+		<view class="nav bgc-ff mt-20" v-if="comprehensive.length">
+			<!-- <view class="caption">
 				<view class="flex a-i-c">
 					<view class="line"></view>
 					<text class="f-32 fw">综治任务</text>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)" v-for="i in comprehensive">
 				<text class="f-28">{{i.name}}</text>
@@ -118,23 +118,30 @@
 				</view>
 			</view>
 		</view> -->
-		<view class="nav bgc-ff mb-20" v-if="securityList.length">
-			<view class="caption">
+		<view class="nav bgc-ff mb-20 mt-20" v-if="securityList.length">
+			<!-- <view class="caption">
 				<view class="flex a-i-c">
 					<view class="line"></view>
 					<text class="f-32 fw">公安任务</text>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="nav-item flex j-c-s-b a-i-c" @click="navTo(`${i.path}&from=task`)" v-for="i in securityList">
 				<text class="f-28">{{i.name}}</text>
 				<view class="flex">
+					<block v-if="i.count > 0">
+						<text class="f-28 c-99">待处理</text>
+						<view class="dot bgc-main">{{i.count}}</view>
+					</block>
+					<u-icon name="arrow-right" color="#999"></u-icon>
+				</view>
+				<!-- <view class="flex">
 					<block v-if="bailCount > 0">
 						<text class="f-28 c-99">待处理</text>
 						<view class="dot bgc-main">{{bailCount}}</view>
 					</block>
 					<u-icon name="arrow-right" color="#999"></u-icon>
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</view>
@@ -199,21 +206,37 @@
 						let data = res.data;
 						this.countInfo = res.data;
 						for (let i of this.comprehensive) {
-							if (i.name == "场所审核") {
+							if (i.name.trim() == "场所审核") {
 								i.count = data.cssh;
-							} else if (i.name == "报事报修") {
+							} else if (i.name.trim() == "报事报修") {
 								i.count = data.bsbx;
-							} else if (i.name == "住户审核") {
+							} else if (i.name.trim() == "住户审核") {
 								i.count = data.zhsh
-							} else if (i.name.trim() == "标签报事") {
-								i.count = data.bqsj
-							} else if (i.name == "租房管理") {
+							} else if (i.name.trim() == "租户确认") {
 								i.count = data.czsh
-							} else if (i.name == "走访任务") {
+							} else if (i.name.trim() == "走访任务") {
+								i.count = data.zfrw;
+							} else if (i.name.trim() == "走访任务") {
 								i.count = data.zfrw;
 							}
 						}
-						this.bailCount = data.qbhs
+						// this.bailCount = data.qbhs
+
+						for (let i of this.securityList) {
+							if (i.name.trim() == "二手交易") {
+								i.count = data.bqsj
+							} else if (i.name.trim() == "消防自查") {
+								i.count = data.xfzc;
+							} else if (i.name.trim() == "消防隐患整改") {
+								i.count = data.xfyhzg;
+							} else if (i.name.trim() == "居住证申请") {
+								i.count = data.jzzsq;
+							} else if (i.name.trim() == "从业人员审核") {
+								i.count = data.cssh;
+							} else {
+								i.count = data.qbhs;
+							}
+						}
 					}
 				})
 			},
@@ -229,14 +252,20 @@
 
 
 			navTo(url) {
-
 				if (!url || url == "暂无") {
 					uni.showToast({
 						title: "功能开发中~",
 						icon: "none"
 					})
 				} else {
-					this.$u.func.globalNavigator(`${url}?from=task`)
+					console.log("url===>", url)
+					uni.navigateTo({
+						url: `${url}?from=task`,
+						complete: (res) => {
+							console.log("errr=>", res)
+						}
+					})
+					// this.$u.func.globalNavigator(`${url}?from=task`)
 				}
 			}
 		}

--
Gitblit v1.9.3