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

# Conflicts:
#	pages/admin/Hetong/components/fuWuNeiRong.vue

common/styles/global/pages.scss

@@ -1283,7 +1283,7 @@
 	}
 	
 	// collapse
-	.sfht-collapse-box{
+	.sfht-collapse-box,.fwnr-collapse-box{
 		background-color: #f8f9fd!important; padding: 24rpx 24rpx 0;box-sizing: border-box;
 		.uni-collapse-item{
 			background-color: #fff;border-radius: 16rpx;border: 1rpx solid #f0f1f5;overflow: hidden;
@@ -1303,8 +1303,12 @@
 		.form-label-input{border-bottom: 1rpx solid #f8f8f8;}
 		.form-label-input:last-child{border-bottom: 0;}
 	}
+	.fwnr-collapse-box{
+		background-color: #fff!important;padding: 0 16rpx;
+		.uni-collapse-item{border:0;border-radius:0;}
+	}
 	
-	// add btn
+	// 客户新增
 	.sfht-add-row{    
 		display: flex;text-align: right;justify-content: flex-end;
 		.sfht-title-add-btn{
@@ -1323,5 +1327,46 @@
 		}
 	}
 	
+	// 服务内容卡片
+	.fwnr-item-box{
+		background-color: #f3fcfb;margin: 20rpx 0;border-radius: 4rpx;
+		padding: 16rpx 16rpx 16rpx 0;box-sizing: border-box;position: relative;
+		.title-row-box{
+			display: flex;
+			text{background-color: #41d1a0;display: inline-block;padding: 4rpx 20rpx;
+			color: #fff;font-size: 30rpx;border-radius:0 30rpx 30rpx 0;}
+			.title-del-btn{
+				width: 60rpx;height: 60rpx;display: flex;align-items: center;justify-content: center;
+				position: absolute;right: 0;top: 0;
+				.del-icon{
+					width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
+					background-image: url("@/static/images/common/clear-green-icon.svg");
+				}
+			}
+		}
+		.fwnr-label-input{
+			width: 100%;display: flex;justify-content: space-between;align-items: center;
+			font-size: 30rpx;color: #333;
+			padding: 20rpx 50rpx 20rpx 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
+			.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
+			.fwnr-form-label{min-width: 180rpx;}
+			input{text-align: right;flex: 1;}
+			.is-input-border{border:0!important;}
+			uni-input{text-align: left;}
+			.uni-input-placeholder{overflow: unset;}
+			.uni-easyinput__placeholder-class{font-size: 28rpx!important;}
+			.content-clear-icon{color: rgb(192, 196, 204)!important;}
+			icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;flex-shrink: 0;
+				background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
+				transform: rotate(270deg);margin-left: 4rpx;}
+			// 文字行
+			.input-text-row{height:60rpx;display: flex;align-items: center;flex: 1;justify-content: flex-end;}
+			// 文字 超出省略
+			.text-ellipsis-row{overflow: hidden;}
+			.text-ellipsis{@include single-line-ellipsis();margin-left: 24rpx;}
+		}
+		
+	}
+	
 	
 }

pages/admin/Hetong/components/fuWuNeiRong.vue

@@ -1,5 +1,5 @@
 <template>
-	<uni-collapse ref="collapse" class="sfht-collapse-box" @change="handleChange">
+	<uni-collapse class="fwnr-collapse-box" @change="handleChange">
 		<uni-collapse-item title="服务内容" :open="true">
 			
 			<jiawuItemVue></jiawuItemVue>
@@ -15,16 +15,16 @@
 	import jiawuItemVue from './jiawuItem.vue';
 	import haiziNianlingVue from './haiziNianling.vue';
 	import {ref} from "vue"
-	
+
 	const emits = defineEmits(['change'])
-	
+
 	const collapse= ref(null)
-	
-	
+
+
 	function handleChange() {
 		emits('change')
 	}
-	
+
 	function onChange() {
 		setTimeout(() => {
 			collapse.value && collapse.value.resize();

pages/admin/Hetong/components/jiawuItem.vue

@@ -1,12 +1,17 @@
 <template>
-	<view>
-		<view><text>一般家务：</text>  <icon>delete</icon></view>
-		<view>
-			<view>住房面积</view>
+	<view class="fwnr-item-box">
+		<view class="title-row-box">
+			<text>一般家务：</text> 
+			 <view class="title-del-btn">
+				 <icon class="del-icon"></icon>
+			 </view>
+		</view>
+		<view class="fwnr-label-input">
+			<view class="fwnr-form-label"><text class="form-label-require"></text>住房面积</view>
 			<uni-easyinput v-model="data.hetong.lxName" placeholder="请输入住房面积" />
 		</view>
-		<view>
-			<view>常驻人口</view>
+		<view class="fwnr-label-input">
+			<view class="fwnr-form-label"><text class="form-label-require">*</text>常驻人口</view>
 			<uni-easyinput v-model="data.hetong.lxName" placeholder="请输入常驻人口" />
 		</view>
 	</view>

static/images/common/clear-green-icon.svg

@@ -0,0 +1 @@
+<svg t="1741596881468" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2901" data-spm-anchor-id="a313x.search_index.0.i3.5a013a81FW4SdR" width="60" height="60"><path d="M687.6 96.4H336.4v91.2h351.1V96.4zM636.7 398v405.5h-73.9V398h73.9z m-175.5 0v405.5h-73.9V398h73.9z m332.1-119.2H230.7l27.9 648.8h506.7l28-648.8zM696.8 5.1c40.4 0 73.3 35.6 73.9 79.8v102.7h147.8c20.2 0 36.6 17.8 37 39.9v41.2c0 5.5-4 10-9 10.1h-70.1L848 941.6c-1.8 42.9-33.7 76.6-72.6 77.3H249.8c-39 0-71.3-33.4-73.7-76l-0.1-1.3-28.5-662.7H77.7c-5 0-9.1-4.4-9.2-9.8v-40.9c0-22.2 16.2-40.2 36.3-40.5h148.4V86.2c0-44.3 32.5-80.4 72.7-81.1h370.9z" fill="#30c190" p-id="2902"></path></svg>