From ae53783f9b5793427e6021c8b9ad4ca51c9d30b9 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 17 Jun 2025 10:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E4=B9=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                        | 29 ++++++++++++-----------------
 api/bind.js                    |  1 +
 main.js                        |  1 +
 pages/home/index.vue           |  3 +--
 pages/workBench/index.vue      | 35 +++++++++++++++--------------------
 root/home/editTownsman.vue     | 37 +++++++++++++++++++++----------------
 root/home/quickApplication.vue |  6 +++---
 7 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/App.vue b/App.vue
index ea3fe5c..dca0be2 100644
--- a/App.vue
+++ b/App.vue
@@ -51,24 +51,19 @@ export default {
 		checkNum() {
 			let that = this;
 			if (uni.getStorageSync("apply-token")) {
-				that.G.Get(
-					that.api.bind_getWaitNum + "/" + 1,
-					{
-					},
-					(res) => {
-						console.log("获取待处理数量：", res);
-						if (res.unread > 0) {
-							uni.setTabBarBadge({
-								index: 1,
-								text: String(res.unread),
-							});
-						} else {
-							uni.removeTabBarBadge({
-								index: 1,
-							});
-						}
+				that.G.Get(that.api.bind_getApplyNum, {}, (res) => {
+					console.log("获取待处理数量：", res);
+					if (res.approvePassHasNotRed > 0) {
+						uni.setTabBarBadge({
+							index: 1,
+							text: String(res.approvePassHasNotRed),
+						});
+					} else {
+						uni.removeTabBarBadge({
+							index: 1,
+						});
 					}
-				);
+				});
 			}
 		},
 	},
diff --git a/api/bind.js b/api/bind.js
index 9bc95e1..0f24dde 100644
--- a/api/bind.js
+++ b/api/bind.js
@@ -7,6 +7,7 @@ let bindInfo = {
 	bind_recordSubmit:"/assistant/circle/agency/apply/agree",// 通过申请提交事件
 	bind_enterpriseDetail:"/assistant/circle/agency/detail",// 企业详情
 	bind_getWaitNum:"/assistant/circle/agency/countPending",// 获取统计处理中的数量
+	bind_getApplyNum:"/assistant/circle/agency/countHasNotReadNum",// 获取通过未读的关注数
 	bind_isSee:"/assistant/circle/agency/himSee",// 让不让他看
 	bind_getGroupDetail:"/assistant/circle/agency/info",// 团队详情
 	bind_list:"/assistant/circle/agency/list",// 上下游列表
diff --git a/main.js b/main.js
index 1a4e5fc..dd4464e 100644
--- a/main.js
+++ b/main.js
@@ -164,6 +164,7 @@ export function createApp () {
     /* 上传图片
    */
     uploadImgByCamera (callback = () => { }, type = 'default', $num = 1, $sourceType = ['camera']) {
+      var that = this;
       G.uploadImage($num, (imgRes) => {
         console.log('imgRes', imgRes);
         uni.showLoading({
diff --git a/pages/home/index.vue b/pages/home/index.vue
index cef82c2..bf1d801 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -19,8 +19,7 @@
 					</div>
 					<!-- #ifdef MP-WEIXIN -->
 					<div>
-						<div class="sticky">
-							<div class="g_bg_f_5 g_flex_row_between flex_center" id="tttop">
+						<div class="sticky">							<div class="g_bg_f_5 g_flex_row_between flex_center" id="tttop">
 								<div class="g_flex_1">
 									<u-tabs bg-color="transparent" from="index" gutter="20" :list="tabInfo.list" :is-scroll="true" :current="tabInfo.active" active-color="#00b666" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="34" duration="0.05" height="76"></u-tabs>
 								</div>
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index f1d2768..1397013 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -48,7 +48,7 @@
 
 			<view class="g_mt_24" v-if="agencyInfo.supplierAccount == 1">
 				<!-- <view class="g_mb_10 g_fw_600 g_pl_16 g_fs_17">仅项目方可见：</view> -->
-				<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover"  @click="goPage('/root/bind/search?active=1')">
+				<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
 					<view class="g_flex_row_start flex_center">
 						<!-- <view class="t-icon g_w_48 g_h_48 _i t-icon-fazhandaili1"></view> -->
 						<img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/fazhandaili0610.svg" class="g_w_48 g_h_48 g_radius_50" alt="" />
@@ -322,26 +322,21 @@ export default {
 		},
 		getNum() {
 			let that = this;
-			that.G.Get(
-				that.api.bind_getWaitNum + "/" + 1,
-				{
-				},
-				(res) => {
-					console.log("获取待处理数量：", res);
-					if (res.unread > 0) {
-						uni.setTabBarBadge({
-							index: 1,
-							text: String(res.unread),
-						});
-						that.readed = false;
-					} else {
-						uni.removeTabBarBadge({
-							index: 1,
-						});
-						that.readed = true;
-					}
+			that.G.Get(that.api.bind_getApplyNum + "/" + 1, {}, (res) => {
+				console.log("获取待处理数量：", res);
+				if (res.approvePassHasNotRed > 0) {
+					uni.setTabBarBadge({
+						index: 1,
+						text: String(res.approvePassHasNotRed),
+					});
+					that.readed = false;
+				} else {
+					uni.removeTabBarBadge({
+						index: 1,
+					});
+					that.readed = true;
 				}
-			);
+			});
 		},
 
 		goLogin() {
diff --git a/root/home/editTownsman.vue b/root/home/editTownsman.vue
index 8806a17..380ab92 100644
--- a/root/home/editTownsman.vue
+++ b/root/home/editTownsman.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="p-root-detail-fellow g_w_all g_h_all g_bg_f_5 g_kuaishou">
 		<view>
-      <view class="g_h_10"></view>
+			<view class="g_h_10"></view>
 			<g-panel-form-slot
 				:list="[
 					{
@@ -29,7 +29,7 @@
 						value: info.name,
 						path: '',
 						tip: 'slot-upID',
-            img:info.idCardImageUrl,
+						img: info.idCardImageUrl,
 						placeholder: '手动输入或拍照自动识别 → ',
 						type: 'slot',
 						pColumn: 8,
@@ -57,7 +57,7 @@
 						type: 'slot',
 						pColumn: 12,
 						require: true,
-						customRequire:true
+						customRequire: true,
 					},
 					{
 						icon: '',
@@ -81,8 +81,8 @@
 						tip: 'slot-nation',
 						pColumn: 12,
 						require: true,
-						type:'slot',
-						customRequire:true
+						type: 'slot',
+						customRequire: true,
 					},
 					{
 						icon: '',
@@ -95,7 +95,20 @@
 						type: 'slot',
 						pColumn: 8,
 					},
-					
+				]"
+				@changeName="handleClickName"
+				@changeSex="handleClickSex"
+				@changeAge="handleClickAge"
+				@changeNation="handleClickNation"
+				@changeIDcard="handleClickIDcard"
+				@changeAddress="handleClickAddress"
+				@updateFile="updateFile"
+				@updateIDInfo="handlerIDInfo"
+			>
+			</g-panel-form-slot>
+			<view class="g_h_10"></view>
+			<g-panel-form-slot
+				:list="[
 					{
 						icon: '',
 						label: '上传附件',
@@ -106,14 +119,7 @@
 						pColumn: 16,
 					},
 				]"
-				@changeName="handleClickName"
-				@changeSex="handleClickSex"
-				@changeAge="handleClickAge"
-				@changeNation="handleClickNation"
-				@changeIDcard="handleClickIDcard"
-				@changeAddress="handleClickAddress"
 				@updateFile="updateFile"
-				@updateIDInfo="handlerIDInfo"
 			>
 				<template v-slot:after>
 					<view class="g_flex_row_start g_p_10" v-if="imgList.length > 0">
@@ -121,9 +127,8 @@
 							<i class="iconfont icon-guanbi img-close" @click="delImg(index)"></i>
 							<image :src="item" class="g_w_56 g_h_56 g_radius_8" />
 						</view>
-					</view>
-				</template>
-			</g-panel-form-slot>
+					</view> </template
+			></g-panel-form-slot>
 			<g-panel-fixed>
 				<slot>
 					<view class="g_flex_row_center">
diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue
index 63c2fdc..b63be04 100644
--- a/root/home/quickApplication.vue
+++ b/root/home/quickApplication.vue
@@ -51,7 +51,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="g_flex_row_center flex_center g_flex_1 g_h_48 g_bg_f g_fs_16 g_c_main g_ml_10 g_mr_10 g_radius_8" @click="goFellow('')" v-if="!persenInfo[0]">
+			<view class="g_flex_row_center flex_center g_flex_1 g_h_48 g_bg_f g_fs_16 g_c_main g_ml_10 g_mr_10 g_radius_8" @click="goFellow('')" v-if="persenInfo.length <= 2">
 				<!-- <view class="g_w_18 g_h_18 g_mr_6 g_text_c g_radius_20 g_border_main g_fsi_18" style="line-height: 13px">+</view> -->
 				<view class="g_flex_column_center">
 					<i class="iconfont icon-jia1 g_c_min g_mr_6" style="font-size: 18px"></i>
@@ -111,7 +111,7 @@ export default {
 			} else if (data.info.index) {
 				that.persenInfo[data.info.index] = data.info;
 			} else {
-				// that.persenInfo[that.persenInfo.length] = { ...data.info, index: that.persenInfo.length };
+				that.persenInfo[that.persenInfo.length] = { ...data.info, index: that.persenInfo.length };
 			}
 			that.$forceUpdate();
 		});
@@ -464,7 +464,7 @@ export default {
 					title: "报名成功",
 					duration: 2000,
 				});
-				that.persenInfo = [];
+				// that.persenInfo = [];
 
 				// that.$forceUpdate();
 				setTimeout(() => {