Merge remote-tracking branch 'origin/2025北京诚祥App' into 2025北京诚祥App

common/styles/global/components.scss

@@ -519,6 +519,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.phone-green-btn{font-size: 28rpx;}
 }
 
+// 分享
 .share-popup-box{
 	box-sizing: border-box;padding: 32rpx;position: relative;
 	.share-title{font-size: 32rpx;color: #333;text-align: center;margin-bottom: 36rpx;}
@@ -536,4 +537,19 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	}
 	.share-close{width: 360rpx;height: 70rpx;line-height: 70rpx;background-color: #fff;border: 1rpx solid #3fd2a1;
 		color: #3fd2a1;text-align: center;border-radius: 8rpx;margin: 32rpx auto 0;border-radius: 35rpx;}
+}
+
+
+/* head---tab*/
+.phone-head-tab-box{
+	width: 100%;display: flex;align-items: center;justify-content: space-evenly;
+	border: 1rpx solid #e5e4e4;border-left: 0;border-right: 0;
+	padding: 16rpx 0;background-color: #fff;
+	.tab-item-box{font-size: 28rpx;color: #333;padding: 0 10rpx;}
+	.active{font-weight: bolder;position: relative;}
+	.active::after{
+		content: '';width: 100%;height: 6rpx;display: block;
+		position: absolute;bottom: -16rpx;left:0;
+		background-color: #3fd2a1;
+		}
 }

common/styles/global/pages.scss

@@ -213,7 +213,12 @@
 		background-color: #fff;border-radius: 8rpx;margin-bottom: 16rpx;}
 	.card-item-box{
 		width: 25%;display: flex;flex-direction: column;align-items: center;
-		font-size: 24rpx;color: #333;
+		font-size: 24rpx;color: #333;position: relative;
+		.num-icon-box{
+			min-width: 16rpx;height: 24rpx;color: #fff;font-size: 24rpx;text-align: center;
+			position: absolute;top: -8rpx;right: 28rpx;background-color: red;
+			border-radius: 24rpx;z-index: 3;padding: 4rpx 8rpx;box-sizing: content-box;
+			display: flex;align-items: center;justify-content: center;}
 		.index-icon{width: 100rpx;height: 100rpx;@include ezy-no-repeat-cover;margin-bottom: 6rpx;}
 	}
 	.card-item-box:nth-child(5) ~ *{margin-top: 30rpx;}
@@ -1267,10 +1272,11 @@
 			display: flex;flex-direction: column;justify-content: space-evenly;border: 1rpx solid #f0f1f5;
 			background-color: #fdfdfd;border-radius: 16rpx;margin-top: 24rpx;padding: 12rpx 0;min-height: 220rpx;
 			.body-row{display: flex;align-items: center;padding: 12rpx 24rpx;box-sizing: border-box;}
-			.user-icon,.tel-icon,.idcard-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();margin-right: 20rpx;}
+			.user-icon,.tel-icon,.idcard-icon,.data-icon{width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();margin-right: 20rpx;}
 			.user-icon{background-image: url("@/static/images/common/user-green-icon.png");}
 			.tel-icon{background-image: url("@/static/images/common/tel-green-icon.png");}
 			.idcard-icon{background-image: url("@/static/images/common/zymc-icon.png");}
+			.data-icon{background-image: url("@/static/images/common/date-icon.png");}
 		}
 	}
 	
@@ -1358,12 +1364,6 @@
 	.sfht-scroll-view{height: calc(100vh - 398rpx - var(--status-bar-height));background-color: #f4f6fa!important;}
 	.uni-list--border-top{display: none!important;}
 	
-	.all-type-box{
-		position: absolute;top: 80rpx;left: 0;right: 0;bottom: 0;
-		z-index: 2;background-color: rgba(0,0,0,0.3);
-		.data-check-radio-group{height: 200rpx;border:1rpx solid #f5f5f5;}
-	}
-	
 	.sfht-list-item-box{
 		width: 100%;background-color: #f4f6fa!important;
 		.uni-list--border{display: none!important;}
@@ -1557,6 +1557,7 @@
 				font-size: 24rpx;padding: 8rpx 18rpx;text-align: center;border-radius: 8rpx;}
 		}
 	}
+	.btn-tip{color: #476df9;font-size: 28rpx;text-align: center;margin-bottom: 20rpx;}
 	.room-box{
 		display: flex;justify-content: space-between;align-items: center;color: #222;
 		.room-info-box{

components/writeSign/index.vue

@@ -4,10 +4,10 @@
 			<view>手写签名</view>
 			<jp-signature ref="signatureRef"></jp-signature>
 			<view class="qm-tip-text">
-				注意事项：<br/>
-				1.请仔细阅读全文，确认完全理解条款后签名。<br/>
-				2.需本人手写签名，签字即视为认可合同内容。<br/>
-				3.签名具有法律效力，签署后须履行约定义务，纠纷以签名数据为法律凭据。
+				 注意事项：<br/>
+				 1.请仔细阅读合同，确认完全理解条款后签名。<br/>
+				 2.需本人清晰、工整手写签名，签字即视为认可合同内容。<br/>
+				 3.签名具有法律效力，签署后须履行约定义务，纠纷以签名数据为法律凭据。
 			</view>
 		</view>
 	</view>

pages/admin/Hetong/sanfangHetong.vue

@@ -5,27 +5,19 @@
 			<text class="nav-bar-title">三方合同</text>
 			<uni-icons class="nav-bar-right-icon bar-ml10" type="search" size="20" @click="toggle('top')"></uni-icons>
 		</view>
-		<view class="jiazheng-search-box">
-			<view @click.stop="clickAlltype" class="select-item-box">
-				<text class="select-text">{{data.statusText}}</text>
-				<icon class="select-jt-default" />
+		
+		<view class="phone-head-tab-box">
+			<!-- 技能块展示 -->
+			<view v-for="item in listStatus" @click="handleSelectStatus(item)" :key="item.status"
+				class="tab-item-box" :class="{ active: data.status === item.status }">
+				{{ item.statusText }}
 			</view>
 		</view>
-
+		
 		<view class="list-new-btn-box">
 			<button type="default" class="phone-green-btn" @click="handleAdd">新增合同</button>
 		</view>
 
-		<!-- 状态面板 -->
-		<view class="all-type-box" v-show="isOpen" @click="clickAlltype">
-			<view class="phone-radio-group data-check-radio-group">
-				<!-- 技能块展示 -->
-				<view v-for="item in listStatus" @click="handleSelectStatus(item)" :key="item.status"
-					class="phone-radio-item">
-					{{ item.statusText }}
-				</view>
-			</view>
-		</view>
 
 		<view>
 			<search-dialog ref="searchDialogRef" :shenfen="shenfen" @search-btn="dialogSearchBtn"
@@ -131,7 +123,7 @@
 	const searchDialogRef = ref(null);
 	const commonDialogRef = ref(null)
 	const data = reactive({
-		status: 0,
+		status: -1,
 		statusText: '待签字',
 		state: 'more',
 		list: [], // 考试列表
@@ -141,22 +133,23 @@
 		page: 0,
 		size: 10,
 	})
-	const isOpen = ref(false)
 
 	const active = ref(null);
 
 	const listStatus = ref([{
-			statusText: '有效',
-			status: 2,
-		},
-		{
+			statusText: '全部',
+			status: -1,
+		},{
+			statusText: '待签字',
+			status: 0,
+		},{
 			statusText: '待审核',
 			status: 1,
+		},{
+			statusText: '有效',
+			status: 2,
 		},
 		{
-			statusText: '待签字',
-			status: 0,
-		}, {
 			statusText: '失效',
 			status: 3,
 		}
@@ -211,10 +204,6 @@
     uni.navigateBack()
 	}
 
-	function clickAlltype() {
-		isOpen.value = !isOpen.value;
-	}
-
 	function handleSelectStatus(item) {
 		data.status = item.status;
 		data.statusText = item.statusText;

pages/admin/ShouYe/shouye.vue

@@ -83,11 +83,13 @@
 		<view class="card-list-box">
 			<view class="card-list-title">合同管理</view>
 			<view @click="goToPage('jzht')" class="card-item-box">
-				<icon class="index-icon ht-a-icon" v-if="indexInfoData.tixingFlag"></icon>
-				<icon class="index-icon ht-icon" v-else></icon>
+				<icon class="index-icon ht-a-icon" v-if="indexInfoData.status === 0">待签</icon>
+				<icon class="index-icon ht-a-icon" v-if="indexInfoData.status === 1">待审核</icon>
+				<icon class="index-icon ht-icon" v-if="indexInfoData.status === 2 && indexInfoData.status === 3">其他</icon>
 				<text>家政合同</text>
 			</view>
 			<view @click="goToPage('sfht')" class="card-item-box">
+				<view class="num-icon-box" v-if="indexInfoData.sfCount > 0">{{indexInfoData.sfCount}}</view>
 				<icon class="index-icon sfht-icon"></icon>
 				<text>三方合同</text>
 			</view>
@@ -166,9 +168,9 @@
 		jzName: '',
 		kechengCount: 0, //剩余课程数量
 		kechengUsed: 0, //售出课程数量
-		tixingFlag:false,
+		status:null,// 合同状态：0待签字，1审核中，2生效,3失效
 		jzHtId:null,
-
+		sfCount:null,
 	});
 	const swiperInfo = ref([]);
 	const dotStyle = reactive({
@@ -234,8 +236,9 @@
 			indexInfoData.jzName = res.data.jzName;
 			indexInfoData.kechengCount = res.data.kechengCount;
 			indexInfoData.kechengUsed = res.data.kechengUsed;
-			indexInfoData.tixingFlag =res.data.tixingFlag;
+			indexInfoData.status =res.data.status;
 			indexInfoData.jzHtId =res.data.jzHtId;
+			indexInfoData.sfCount = res.data.sfCount;
 		})
 	}
 
@@ -315,7 +318,7 @@
 			break;
 			// 家政合同	
 			case 'jzht':
-				if(indexInfoData.tixingFlag){
+				if(indexInfoData.status === 0){
 					uni.navigateTo({
 						url: `/pages/admin/Hetong/Hetong?id=${indexInfoData.jzHtId}`
 					})

pages/admin/kehu/kehuList.vue

@@ -41,6 +41,8 @@
 								<view class="body-row"><icon class="user-icon"></icon>{{item.realName}}</view>
 								<view class="body-row"><icon class="tel-icon"></icon>{{item.userName}}</view>
 								<view class="body-row" v-if="item.idcard"><icon class="idcard-icon"></icon>{{item.idcard}}</view>
+								<view class="body-row" v-if="item.createTime"><icon class="data-icon"></icon>录入时间：{{item.createTime}}</view>
+								<view class="body-row" v-if="item.updateTime"><icon class="data-icon"></icon>更新时间：{{item.updateTime}}</view>
 							</view>
 							
 						</view>

pages/admin/mianshi/index.vue

@@ -23,6 +23,7 @@
 						v-if="data.room">进入房间</button>
 					<!-- <button @click="openUrl2">进入房间2</button> -->
 				</view>
+				<view class="btn-tip">每个邀请链接仅限一人使用，请勿重复分享</view>
 				<!-- phone-white-btn -->
 				<button @click="yqBtn(3)" type="default" class="phone-green-btn yqkh-btn" v-if="data.room">邀请阿姨</button>
 				<button @click="yqBtn(2)" type="default" class="phone-green-btn yqkh-btn"