From 7cbdb8cce363f45cd93a39158338a56da56981e5 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 5 Aug 2025 12:21:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=80=A7=E6=A3=80=E6=9F=A5=E5=8F=8A=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(contract): 修复合同签署按钮颜色问题
refactor(config): 将环境配置改为开发环境
feat(workItem): 添加职位不存在时的友好提示
feat(userItem): 添加用户数据不存在时的友好提示
feat(center): 添加个人和企业认证状态及到期提醒
feat(AddressPicker): 添加自定义插槽支持全部地区选择
fix(configPopup): 修复配置查询参数传递问题
feat(store): 添加查看次数检查功能
---
 components/AddressPicker.vue                 | 24 ++++++-
 components/config/configPopup.vue            |  2 +-
 components/list/userList/index.vue           |  3 +-
 components/list/userList/userItem.vue        | 72 ++++++++++++++++++--
 components/list/workList/workItem.vue        | 82 ++++++++++++++++++++++-
 components/screen/screenWork.vue             | 57 ++++++++++++++--
 pages/index/center.vue                       | 99 +++++++++++++++++++++++++---
 pages_order/contract/contract.vue            |  6 +-
 pages_order/contract/electronicSignature.vue |  8 +--
 pages_order/mine/GainPoints.vue              |  5 +-
 store/store.js                               | 20 ++++++
 11 files changed, 345 insertions(+), 33 deletions(-)

diff --git a/components/AddressPicker.vue b/components/AddressPicker.vue
index 650543a..31ee44b 100644
--- a/components/AddressPicker.vue
+++ b/components/AddressPicker.vue
@@ -9,10 +9,15 @@
 				</view>
 			</view>
 			
+			
+			
 			<view class="content">
 				<!-- 左侧一级地址列表 -->
 				<view class="left-panel">
 					<scroll-view scroll-y class="scroll-view">
+						<!-- 插槽：自定义内容 -->
+						<slot name="custom-options"></slot>
+						
 						<view 
 							class="address-item"
 							:class="{ active: selectedProvince && selectedProvince.id === item.id }"
@@ -448,6 +453,23 @@
 			}
 		}
 		
+		.left-panel {
+			.select-all-item {
+				display: flex;
+				align-items: center;
+				color: #3796F8;
+				background: rgba(#3796F8, 0.1);
+				font-weight: bold;
+				padding: 30rpx 20rpx;
+				font-size: 28rpx;
+				border-bottom: 1px solid #f0f0f0;
+				
+				uv-icon {
+					margin-right: 10rpx;
+				}
+			}
+		}
+		
 		.confirm-btn {
 			position: sticky;
 			bottom: 0;
@@ -467,4 +489,4 @@
 		}
 	}
 }
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index 9103059..49cba91 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -23,7 +23,7 @@
 			//打开配置信息菜单
 			open(key){
 				this.$api('queryConfig', {
-					paramCode : 'config_vip_service',
+					paramCode : key,
 				})
 				.then(res => {
 					// this.content = this.configList[key]
diff --git a/components/list/userList/index.vue b/components/list/userList/index.vue
index cec956f..24236de 100644
--- a/components/list/userList/index.vue
+++ b/components/list/userList/index.vue
@@ -5,8 +5,7 @@
 	@scrolltolower="loadMoreData">
 		<view class="bossList">
 			<view
-				@click="$utils.navigateTo('/pages_order/work/userDetail?id=' + 
-				(keyName ? item[keyName] : item).id)"
+				@click="$store.commit('checkViewCount', (keyName ? item[keyName] : item).id)"
 				:key="index"
 				v-for="(item, index) in list">
 				<userItem :item="keyName && item[keyName] ? item[keyName] : item"
diff --git a/components/list/userList/userItem.vue b/components/list/userList/userItem.vue
index 418ba84..cac2662 100644
--- a/components/list/userList/userItem.vue
+++ b/components/list/userList/userItem.vue
@@ -1,19 +1,31 @@
 <template>
-	<view class="boss-item"
+	<!-- 数据不存在时的友好提示 -->
+	<view v-if="!item || !item.id" class="boss-item deleted-item">
+		<view class="deleted-content">
+			<view class="deleted-icon">⚠️</view>
+			<view class="deleted-text">
+				<view class="deleted-title">数据已被删除</view>
+				<view class="deleted-desc">该用户信息可能已被删除或不存在</view>
+			</view>
+		</view>
+	</view>
+	
+	<!-- 正常数据显示 -->
+	<view v-else class="boss-item"
 	@click="$emit('click')">
 		<view class="head">
 			<view class="headImage">
-				<image :src="item.hanHaiMember.headImage" mode=""></image>
+				<image :src="item.hanHaiMember && item.hanHaiMember.headImage" mode=""></image>
 			</view>
 			<view class="info">
 				<view class="name">
 					<!-- 李老板 -->
-					{{ item.employAuthenticationPerson.name }}
-					<view>
+					{{ item.employAuthenticationPerson && item.employAuthenticationPerson.name }}
+					<view v-if="item.typeId_dictText">
 						<!-- 装配电工 -->
 						{{ item.typeId_dictText }}
 					</view>
-					<view>
+					<view v-if="item.natureId_dictText">
 						<!-- 装配电工 -->
 						{{ item.natureId_dictText }}
 					</view>
@@ -79,14 +91,27 @@
 		},
 		computed : {
 			headImage(){
-				return this.image || this.item.headImage || '/static/image/center/headImage.png'
+				return this.image || (this.item && this.item.headImage) || '/static/image/center/headImage.png'
 			},
 			phone(){
-				return this.item.hanHaiMember && this.item.hanHaiMember.phone
+				return this.item && this.item.hanHaiMember && this.item.hanHaiMember.phone
 			},
+			// 检查数据是否有效
+			isDataValid(){
+				return this.item && this.item.id
+			}
 		},
 		methods: {
 			callPhone(){
+				// 检查数据是否有效和电话号码是否存在
+				if (!this.isDataValid || !this.phone) {
+					uni.showToast({
+						title: '联系方式不可用',
+						icon: 'none'
+					});
+					return;
+				}
+				
 				uni.makePhoneCall({
 					phoneNumber: this.phone,
 					success() {
@@ -105,6 +130,39 @@
 .boss-item{
 	background-color: #fff;
 	border-radius: 20rpx;
+	
+	&.deleted-item {
+		background-color: #f5f5f5;
+		border: 2rpx dashed #ccc;
+		padding: 40rpx 20rpx;
+		
+		.deleted-content {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			text-align: center;
+			
+			.deleted-icon {
+				font-size: 60rpx;
+				margin-bottom: 20rpx;
+			}
+			
+			.deleted-text {
+				.deleted-title {
+					font-size: 32rpx;
+					color: #666;
+					font-weight: bold;
+					margin-bottom: 10rpx;
+				}
+				
+				.deleted-desc {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+	}
 	.head {
 		display: flex;
 		align-items: center;
diff --git a/components/list/workList/workItem.vue b/components/list/workList/workItem.vue
index ff2c61e..c9c6cdb 100644
--- a/components/list/workList/workItem.vue
+++ b/components/list/workList/workItem.vue
@@ -1,5 +1,17 @@
 <template>
-	<view class="work-item"
+	<!-- 数据不存在时的友好提示 -->
+	<view v-if="!item || !item.id" class="work-item deleted-item">
+		<view class="deleted-content">
+			<view class="deleted-icon">⚠️</view>
+			<view class="deleted-text">
+				<view class="deleted-title">职位已被删除</view>
+				<view class="deleted-desc">该职位信息可能已被删除或不存在</view>
+			</view>
+		</view>
+	</view>
+	
+	<!-- 正常数据显示 -->
+	<view v-else class="work-item"
 	:class="{ 'expired': isExpired }"
 	@click="handledClick">
 		<view class="top">
@@ -64,6 +76,8 @@
 		},
 		computed : {
 			lableText(){
+				if (!this.item) return []
+				
 				let arr = 
 				this.item.tab ?
 				this.item.tab.split('、')
@@ -80,12 +94,16 @@
 			},
 			// 检查是否过期
 			isExpired(){
-				if(!this.item.deadline) return false
+				if(!this.item || !this.item.deadline) return false
 				
 				const now = this.$dayjs()
 				const deadline = this.$dayjs(this.item.deadline)
 				
 				return now.isAfter(deadline)
+			},
+			// 检查数据是否有效
+			isDataValid(){
+				return this.item && this.item.id
 			}
 		},
 		data() {
@@ -95,6 +113,15 @@
 		},
 		methods: {
 			callPhone(){
+				// 检查数据是否有效
+				if (!this.isDataValid) {
+					uni.showToast({
+						title: '职位信息不可用',
+						icon: 'none'
+					});
+					return;
+				}
+				
 				// 如果过期，禁止拨打电话
 				if(this.isExpired) {
 					uni.showToast({
@@ -104,6 +131,15 @@
 					return
 				}
 				
+				// 检查电话号码是否存在
+				if (!this.item.phone) {
+					uni.showToast({
+						title: '联系方式不可用',
+						icon: 'none'
+					});
+					return;
+				}
+				
 				uni.makePhoneCall({
 					phoneNumber: this.item.phone,
 					success() {
@@ -115,6 +151,15 @@
 				})
 			},
 			handledClick(){
+				// 检查数据是否有效
+				if (!this.isDataValid) {
+					uni.showToast({
+						title: '职位信息不可用',
+						icon: 'none'
+					});
+					return;
+				}
+				
 				// 如果过期，禁止点击
 				if(this.isExpired) {
 					uni.showToast({
@@ -137,6 +182,39 @@
 	border-radius: 20rpx;
 	position: relative;
 	
+	&.deleted-item {
+		background-color: #f5f5f5;
+		border: 2rpx dashed #ccc;
+		padding: 40rpx 20rpx;
+		
+		.deleted-content {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			text-align: center;
+			
+			.deleted-icon {
+				font-size: 60rpx;
+				margin-bottom: 20rpx;
+			}
+			
+			.deleted-text {
+				.deleted-title {
+					font-size: 32rpx;
+					color: #666;
+					font-weight: bold;
+					margin-bottom: 10rpx;
+				}
+				
+				.deleted-desc {
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+	
 	// 过期状态样式
 	&.expired {
 		opacity: 0.6;
diff --git a/components/screen/screenWork.vue b/components/screen/screenWork.vue
index 61cba51..33645b5 100644
--- a/components/screen/screenWork.vue
+++ b/components/screen/screenWork.vue
@@ -81,7 +81,14 @@
 		</uv-popup>
 		
 		<!-- 地址选择组件 -->
-		<AddressPicker ref="addressPicker" @confirm="onAddressConfirm" />
+		<AddressPicker ref="addressPicker" showSelectWholeCity @confirm="onAddressConfirm">
+			<template #custom-options>
+				<view class="address-item select-all-item" @click="selectAllAreas">
+					<uv-icon name="checkmark-circle" size="30rpx" color="#3796F8"></uv-icon>
+					选择全部地区
+				</view>
+			</template>
+		</AddressPicker>
 	</view>
 </template>
 
@@ -333,7 +340,7 @@
 						this.result.push({
 							name: n.type,
 							label: this.popupSelectedAddress,
-							value: this.popupSelectedAddress
+							value: this.popupSelectedAddress == '全部地区' ? 'all' : this.popupSelectedAddress
 						})
 					} else {
 						// 其他选项使用tag选择
@@ -347,13 +354,14 @@
 				})
 				
 				this.result = this.result.filter(item => this.defaultValue.indexOf(item.value) == -1);
-				
+
 				this.$emit('clickItem', this.result)
 				
 				this.$refs.popup.close()
 			},
 			// 弹窗中打开地址选择器
 			openAddressPickerInPopup() {
+                this.activeName = 'areaId'
 				this.$refs.addressPicker.open()
 			},
 			
@@ -377,12 +385,49 @@
 				// 关闭下拉菜单 - 通过发送事件来关闭
 				uni.$emit(`${this.sign}_CLOSEPOPUP`)
 			},
+			
+			// 选择全部地区
+			selectAllAreas() {
+				// 更新弹窗中的地址显示
+				this.popupSelectedAddress = '全部地区'
+				
+				// 更新areaId的状态
+				this.areaId.label = '全部地区'
+				this.areaId.value = 'all'
+				
+				// 调用clickItem来更新result数组并触发父组件事件
+				this.clickItem({
+					label: '全部地区',
+					value: 'all',
+				})
+				
+				// 关闭地址选择器
+				this.$refs.addressPicker.close()
+				
+				// 关闭下拉菜单
+				uni.$emit(`${this.sign}_CLOSEPOPUP`)
+			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
 .page{
+	// 全部地区按钮样式
+	::v-deep .select-all-item {
+		display: flex;
+		align-items: center;
+		color: #3796F8;
+		background: rgba(#3796F8, 0.1);
+		font-weight: bold;
+		padding: 30rpx 20rpx;
+		font-size: 28rpx;
+		border-bottom: 1px solid #f0f0f0;
+		
+		uv-icon {
+			margin-right: 10rpx;
+		}
+	}
 	.popup{
 		width: 80vw;
 		padding: 40rpx;
@@ -429,8 +474,10 @@
 						margin-left: 10rpx;
 					}
 				}
-			}
-		}
+            }
+        }
+
+
 		.btn {
 			display: flex;
 			justify-content: center;
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 24a29e7..a8816da 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -31,6 +31,16 @@
 					<view class="name"
 					@click="$utils.navigateTo('/pages_order/mine/updateUser?back=true')">
 						{{username}}
+						<!-- 个人实名认证图标 -->
+						<image v-if="UserExtensionInfo.personAuthenticationStatus == '1'" 
+							:src="configList.config_person_icon" 
+							class="auth-icon"
+							mode="aspectFit"></image>
+						<!-- 企业认证图标 -->
+						<image v-if="UserExtensionInfo.companyAuthenticationStatus == '1'" 
+							:src="configList.config_person_icon" 
+							class="auth-icon"
+							mode="aspectFit"></image>
 						<view>
 							<uv-icon name="edit-pen" size="40rpx" color="#fff"></uv-icon>
 							修改资料
@@ -42,6 +52,25 @@
 					<view>
 						{{ UserExtensionInfo.vipType || '' }}
 					</view>
+
+					<!-- 个人实名认证到期提醒 -->
+					<view v-if="personAuthDaysLeft" :class="personAuthDaysLeft === 'expired' ? 'auth-expired' : 'auth-warning'">
+						<template v-if="personAuthDaysLeft === 'expired'">
+							⚠️ 个人实名认证已过期
+						</template>
+						<template v-else>
+							⚠️ 个人实名认证还有{{personAuthDaysLeft}}天到期
+						</template>
+					</view>
+					<!-- 企业认证到期提醒 -->
+					<view v-if="companyAuthDaysLeft" :class="companyAuthDaysLeft === 'expired' ? 'auth-expired' : 'auth-warning'">
+						<template v-if="companyAuthDaysLeft === 'expired'">
+							⚠️ 企业认证已过期
+						</template>
+						<template v-else>
+							⚠️ 企业认证还有{{companyAuthDaysLeft}}天到期
+						</template>
+					</view>
 				</view>
 			</template>
 			
@@ -279,13 +308,13 @@
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
-	import { mapState } from 'vuex'
-	export default {
-		components: {
-			tabber,
-		},
-		computed: {
-			...mapState(['userInfo', 'role','banner', 'UserExtensionInfo']),
+    import { mapState } from 'vuex'
+    export default {
+        components: {
+            tabber,
+        },
+        computed: {
+            ...mapState(['userInfo', 'role','banner', 'UserExtensionInfo']),
 			// 判断是否已登录
 			isLoggedIn(){
 				return this.userInfo && this.userInfo.id
@@ -300,8 +329,32 @@
 				return this.userInfo.phone || '未绑定手机'
 			},
 			bannerList(){
-				return this.banner.filter(n => n.type == 1)
-			},
+                return this.banner.filter(n => n.type == 1)
+            },
+            // 个人实名认证剩余天数
+            personAuthDaysLeft(){
+                if(!this.UserExtensionInfo.personAuthenticationValidTime) return null
+                const validTime = new Date(this.UserExtensionInfo.personAuthenticationValidTime)
+                const now = new Date()
+                const diffTime = validTime.getTime() - now.getTime()
+                const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+                // 如果已过期，返回特殊标识
+                if(diffDays <= 0) return 'expired'
+                // 如果在7天内，返回剩余天数
+                return diffDays <= 7 ? diffDays : null
+            },
+            // 企业认证剩余天数
+            companyAuthDaysLeft(){
+                if(!this.UserExtensionInfo.companyAuthenticationValidTime) return null
+                const validTime = new Date(this.UserExtensionInfo.companyAuthenticationValidTime)
+                const now = new Date()
+                const diffTime = validTime.getTime() - now.getTime()
+                const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+                // 如果已过期，返回特殊标识
+                if(diffDays <= 0) return 'expired'
+                // 如果在7天内，返回剩余天数
+                return diffDays <= 7 ? diffDays : null
+            },
 		},
 		data() {
 			return {
@@ -371,7 +424,15 @@
 			.name {
 				font-size: 32rpx;
 				display: flex;
+				align-items: center;
 				padding-bottom: 10rpx;
+				
+				.auth-icon {
+					width: 40rpx;
+					height: 40rpx;
+					margin-left: 10rpx;
+				}
+				
 				view{
 					display: flex;
 					font-size: 20rpx;
@@ -384,6 +445,26 @@
 				font-size: 26rpx;
 				color: #fff;
 			}
+			
+			.auth-warning {
+				font-size: 24rpx;
+				color: #FFD700;
+				background: rgba(255, 215, 0, 0.2);
+				padding: 8rpx 16rpx;
+				border-radius: 8rpx;
+				margin-top: 8rpx;
+				border: 1rpx solid rgba(255, 215, 0, 0.5);
+			}
+			
+			.auth-expired {
+				font-size: 24rpx;
+				color: #FF4444;
+				background: rgba(255, 68, 68, 0.2);
+				padding: 8rpx 16rpx;
+				border-radius: 8rpx;
+				margin-top: 8rpx;
+				border: 1rpx solid rgba(255, 68, 68, 0.5);
+			}
 		}
 
 		.loginBtn {
diff --git a/pages_order/contract/contract.vue b/pages_order/contract/contract.vue
index 10ba91c..460a854 100644
--- a/pages_order/contract/contract.vue
+++ b/pages_order/contract/contract.vue
@@ -44,7 +44,7 @@
 						<view class="sign-btn" 
 							v-if="(role && item.bossStatus === 0) || (!role && item.employeeStatus === 0)"
 							@click.stop="$utils.navigateTo('/pages_order/contract/electronicSignature?id=' + item.id)">
-							<uv-icon name="edit-pen" color="#2979ff" size="30rpx"></uv-icon>
+							<uv-icon name="edit-pen" color="#fff" size="30rpx"></uv-icon>
 							<text>签署</text>
 						</view>
 					</view>
@@ -87,6 +87,10 @@
 		methods: {
 			clickTabs({index}) {
 				this.type = index
+				if(index == 0){
+					delete this.queryParams.status
+				}
+				this.queryParams.status = index
 				this.getData()
 			},
 			showPDF(item){
diff --git a/pages_order/contract/electronicSignature.vue b/pages_order/contract/electronicSignature.vue
index ac47601..c7acb1a 100644
--- a/pages_order/contract/electronicSignature.vue
+++ b/pages_order/contract/electronicSignature.vue
@@ -105,10 +105,10 @@
 					imageWidth : graph.w,
 					positionX : graph.x,
 					positonY : graph.y,
-					// pdfPath : this.detail.contract,
-					// imagePath,
-					pdfPath : 'https://augcl.oss-cn-guangzhou.aliyuncs.com/test/mytest.pdf',
-					imagePath : 'https://augcl.oss-cn-guangzhou.aliyuncs.com/test/image.png',
+					pdfPath : this.detail.contract,
+					imagePath,
+					// pdfPath : 'https://augcl.oss-cn-guangzhou.aliyuncs.com/test/mytest.pdf',
+					// imagePath : 'https://augcl.oss-cn-guangzhou.aliyuncs.com/test/image.png',
 					pageNo : parseInt(pageNo) + 1,
 				})
 				
diff --git a/pages_order/mine/GainPoints.vue b/pages_order/mine/GainPoints.vue
index fe5b7b2..90093ce 100644
--- a/pages_order/mine/GainPoints.vue
+++ b/pages_order/mine/GainPoints.vue
@@ -25,7 +25,7 @@
 					<view>邀请工友获取积分</view>
 				</view>
 				<view class="txt">成功邀请一名新好友注册，最高可获得
-					<text style="color: red;font-size: 32rpx;">2</text>
+					<text style="color: red;font-size: 32rpx;">{{ configList.config_share_score }}</text>
 					个正式积分。
 					<view style="color: red;">多邀多得！可叠加！</view>
 				</view>
@@ -67,6 +67,9 @@
 		onLoad() {
 			this.$store.commit('getUserExtensionInfo')
 		},
+        onShow(){
+            this.$store.commit('initConfig')
+        },
 		methods: {
 			checkin(){
 				this.$api('addScoreBySign', res => {
diff --git a/store/store.js b/store/store.js
index 7a20ad9..a76d3e9 100644
--- a/store/store.js
+++ b/store/store.js
@@ -247,6 +247,26 @@ const store = new Vuex.Store({
 		setChildAddressList(state, { pid, list }){
 			state.addressTreeMap[pid] = list
 		},
+		// 检查当前查看次数，在进入简历页面
+        checkViewCount(state, id){
+            api('getUserCenterData', res =>{
+				if(res.code == 200){
+					state.UserExtensionInfo = res.result
+
+                    if (state.UserExtensionInfo.checkNum > 0) {
+                        return uni.navigateTo({
+                            url: '/pages_order/work/userDetail?id=' + id
+                        })
+                    }
+
+                    uni.showToast({
+                        title: '您的查看次数已用完，无法继续查看',
+                        icon: 'none'
+                    })
+				}
+			})
+            
+        }
 	},
 	actions: {
 		// 获取子级地址列表