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

common/styles/global/pages.scss

@@ -1192,7 +1192,9 @@
 
 /* 客户列表页 */
 .admin-kehu-list{
-	width: 100%;height: 100vh;
+	width: 100%;height: 100vh;background-color: #f4f6fa;
+	.uni-load-more{background-color: #f4f6fa;padding-bottom: 20rpx;}
+	.uni-list--border-top,.uni-list--border-bottom{display: none!important;}
 	.kh-new-btn-box{
 		padding: 20rpx 24rpx 20rpx;background-color: #f4f6fa;box-sizing: border-box;
 		.phone-green-btn{font-size: 28rpx;}
@@ -1245,13 +1247,14 @@
 
 /* 客户选择页 */
 .kehu-select-list{
-	width: 100%;height: 100vh;
+	width: 100%;height: 100vh;background-color: #f4f6fa;
 	.kh-new-btn-box{
 		padding: 20rpx 24rpx 20rpx;background-color: #f4f6fa;box-sizing: border-box;
 		.phone-green-btn{font-size: 28rpx;}
 	}
-	.kh-scroll-view{height: calc(100vh - 398rpx - var(--status-bar-height));}
-	.uni-list--border-top{display: none!important;}
+	.kh-scroll-view{height: calc(100vh - 358rpx - var(--status-bar-height));background-color: #f4f6fa!important;}
+	.uni-list--border-top,.uni-list--border-bottom{display: none!important;}
+	.uni-load-more{background-color: #f4f6fa;padding-bottom: 20rpx;}
 	.kh-list-item-box{
 		width: 100%;background-color: #f4f6fa!important;
 		.uni-list--border{display: none!important;}
@@ -1270,9 +1273,45 @@
 			.idcard-icon{background-image: url("@/static/images/common/zymc-icon.png");}
 		}
 	}
+	.select-kh-btn-box{
+		display: flex;padding: 0 100rpx;background-color: #fff;
+		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 46rpx auto;width: 60%;}
+	}
 	
 }
 
+/* 家政人员选择页 */
+.jz-select-list{
+	width: 100%;height: 100vh;background-color: #f4f6fa;
+	.jz-scroll-view{height: calc(100vh - 250rpx - var(--status-bar-height));background-color: #f4f6fa!important;}
+	.uni-list--border-top,.uni-list--border-bottom{display: none!important;}
+	.uni-load-more{background-color: #f4f6fa;padding-bottom: 20rpx;}
+	.select-jz-btn-box{
+		display: flex;padding: 0 100rpx;background-color: #fff;
+		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 46rpx auto;width: 60%;}
+	}
+	.jz-list-item-box{
+		width: 100%;background-color: #f4f6fa!important;
+		.uni-list--border{display: none!important;}
+		.uni-list-item__container{padding: 0 24rpx 20rpx;flex-direction: column;}
+	}
+	.jz-select-card{
+		background-color:#e5f8f4;display: flex;flex-direction: row;align-items: center;
+		box-sizing: border-box;padding: 16rpx;border-radius: 16rpx;border: 1rpx solid #f0f1f5;
+	}
+	.card-body-row{
+		display: flex;flex-direction: row;justify-content: space-evenly;border: 1rpx solid #f0f1f5;flex: 1;
+		background-color: #fdfdfd;border-radius: 16rpx;margin-left: 6rpx;padding: 0 24rpx 0 16rpx;min-height: 220rpx;
+		.body-content-row{width: 100%;display: flex;flex-direction: column;justify-content: space-evenly;}
+		.card-img-box{width: 170rpx;height: 240rpx;display: flex;align-items: center;margin-right: 24rpx;flex-shrink: 0;overflow: hidden;border-radius: 8rpx;}
+		img{width: 170rpx;height: auto;}
+		.content-text-row{
+			display: flex;justify-content: space-between;font-size: 30rpx;color: #333;line-height: 46rpx;
+			.text-status{font-size: 26rpx;color: #3fd2a1;border: 1rpx solid #3fd2a1;padding: 0 12rpx;border-radius: 8rpx;}
+		}
+	}
+}
+
 /* 三方合同新增*/
 .sfht-info-page{
 	height: 100vh;background-color: #f8f9fd;display: flex;flex-direction: column;
@@ -1399,7 +1438,7 @@
 	// 底部footer
 	.sfht-info-btn-box{
 		display: flex;padding: 0 100rpx;
-		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 20rpx auto 36rpx;width: 60%;}
+		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 36rpx auto;width: 60%;}
 	}
 	
 }

pages/admin/Hetong/components/selectJz.vue

@@ -1,6 +1,6 @@
 <template>
 	<uni-popup ref="popupRef" type="bottom" background-color="#fff" :is-mask-click="false" :mask-click="false">
-		<view class="ht-qm-popup">
+		<view class="jz-select-list">
 			<view class="phone-navBar-box">
 				<view @click="goback2" class="nav-bar-icon"></view>
 				<text class="nav-bar-title">选择家政阿姨</text>
@@ -12,21 +12,31 @@
 					@reset-search="dialogSearchReset"></search-dialog>
 			</view>
 			<!-- 无限滚动容器 -->
-			<view style="height: 300px">
 				<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 					:refresher-threshold="50" @scrolltolower="onScrolltolower" refresher-background="transparent"
 					@refresherrefresh="onRefresh" class="jz-scroll-view">
-					<uni-list class="admin-list-box">
+					<uni-list class="jz-scroll-view">
 						<radio-group @change="radioChange">
 							<uni-list-item v-for="item in data.list" class="jz-list-item-box">
 								<template v-slot:body>
-									<view>
-										<view>{{item.realName}}</view>
-										<view>{{item.age}}</view>
-										<view>{{item.zhuangtai}}</view>
-										<view>{{item.jiguanShiName}}</view>
-										<view>
-											<radio :value="item.id && item.id.toString()" :checked="item.id == data.activeData" />
+									<view class="jz-select-card">
+										<radio :value="item.id && item.id.toString()" :checked="item.id == data.activeData" />
+										<view class="card-body-row">
+											<view class="card-img-box">
+												<img :src="item.icon" v-if="item.icon">
+												<icon class="phone-default-userImg" v-else></icon>
+											</view>
+											<view class="body-content-row">
+												<view class="head-name">{{item.realName}}</view>
+												<view class="content-text-row">
+													<view> {{item.age}}岁<text v-if="item.jingyan"> ｜ {{item.jingyan}}经验</text>
+													</view>
+													<view class="text-status">{{item.zhuangtai}}</view>
+												</view>
+												<view class="content-text-row">
+													{{item.jiguanShengName === item.jiguanShiName ? item.jiguanShengName  : `${item.jiguanShengName} ${item.jiguanShiName}`}}人
+												</view>
+											</view>
 										</view>
 									</view>
 								</template>
@@ -36,10 +46,9 @@
 							:contentText="data.contentText"></uni-load-more>
 					</uni-list>
 				</scroll-view>
-			</view>
 
-			<view>
-				<button @click="handleSelect">选择此家政阿姨</button>
+			<view class="select-jz-btn-box">
+				<button @click="handleSelect" type="default" class="phone-green-btn">选择此家政阿姨</button>
 			</view>
 
 		</view>