样式修改

common/styles/global/pages.scss

@@ -1280,6 +1280,11 @@
 	.sfht-form-box{
 		flex: 1;overflow-y: auto;padding: 24rpx 24rpx 0;box-sizing: border-box;
 		.form-radius-box{border-radius: 16rpx;border: 1rpx solid #f0f1f5;}
+		.fwnr-label-radio{
+			background-color: transparent;
+			.form-radio-item{background-color: #fff;color: #888;border-color: #ddd;}
+			.genderActive{background-color:#e5f8f4;border:1rpx solid #6bccb0;color:#6bccb0;}
+		}
 		// .form-label-input{border: 1rpx solid #f8f8f8;}
 	}
 	
@@ -1301,7 +1306,7 @@
 			.uni-collapse-item__title-text{font-size: 30rpx;color: #000;}
 		}
 		
-		.form-label-input{border-bottom: 1rpx solid #f8f8f8;}
+		.form-label-input,.form-label-select{border-bottom: 1rpx solid #f8f8f8;}
 		.form-label-input:last-child{border-bottom: 0;}
 	}
 	.fwnr-collapse-box{
@@ -1374,10 +1379,16 @@
 		.fwnr-del-btn icon{width: 32rpx;height: 32rpx;background-image: url("@/static/images/common/jh-icon.svg");}
 	}
 	
+	// 单选按钮
+	.fwnr-radio-box{
+		display: flex;
+		.fwnr-radio-item{display: flex;}
+	}
+	
 	// 底部footer
 	.sfht-info-btn-box{
 		display: flex;padding: 0 100rpx;
-		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 20rpx auto 36rpx;width: 36%;}
+		.phone-green-btn,.phone-white-btn{font-size: 28rpx;margin: 20rpx auto 36rpx;width: 60%;}
 	}
 	
 }

pages/admin/Hetong/addSanfangHetong.vue

@@ -31,8 +31,7 @@
 		</view>
 		
 		<view class="sfht-info-btn-box">
-			<button type="default" class="phone-green-btn">下一步</button>
-			<button type="default" class="phone-white-btn">保存</button>
+			<button type="default" class="phone-green-btn">保存</button>
 		</view>
 
 

pages/admin/Hetong/components/hetongCard.vue

@@ -1,29 +1,38 @@
 <template>
 	<uni-collapse ref="collapse" class="sfht-collapse-box" @change="onChange">
 		<uni-collapse-item title="合同信息" :open="true">
-			<!-- 合同内容 -->
 			<!-- 服务类型 -->
-			<view class="phone-form-label"><text class="form-label-require"></text>服务类型</view>
-			<picker :range="leixings" mode='selector' :value="data.hetong.leixing-1" range-key="text"
-				@change="onSelectLeixing" class="select-picker-box">
-				<view class="form-radio-select">
-					<view v-if="leixings[data.hetong.leixing-1]">{{leixings[data.hetong.leixing-1].text}}</view>
-					<icon></icon>
-				</view>
-			</picker>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>服务类型</view>
+				<picker :range="leixings" mode='selector' :value="data.hetong.leixing-1" range-key="text"
+					@change="onSelectLeixing" class="select-picker-box">
+					<view class="form-radio-select">
+						<view v-if="leixings[data.hetong.leixing-1]">{{leixings[data.hetong.leixing-1].text}}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			
+			<view class="form-label-input" v-if="data.hetong.leixing == 4">
+				<view class="phone-form-label"><text class="form-label-require"></text>服务类型</view>
+				<uni-easyinput v-model="data.hetong.lxName" placeholder="请输入其他类型" />
+			</view>
+			
 			<view class="form-label-input" v-if="data.hetong.leixing == 4">
 				<view class="phone-form-label"><text class="form-label-require"></text>其他类型</view>
 				<uni-easyinput v-model="data.hetong.lxName" placeholder="请输入其他类型" />
 			</view>
 			<!-- 服务方式 -->
-			<view class="phone-form-label"><text class="form-label-require"></text>服务方式</view>
-			<picker :range="fuwus" mode='selector' :value="data.hetong.fangshi-1" range-key="text"
-				@change="onSelectFuwufangshi" class="select-picker-box">
-				<view class="form-radio-select">
-					<view v-if="fuwus[data.hetong.fangshi-1]">{{fuwus[data.hetong.fangshi-1].text}}</view>
-					<icon></icon>
-				</view>
-			</picker>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>服务方式</view>
+				<picker :range="fuwus" mode='selector' :value="data.hetong.fangshi-1" range-key="text"
+					@change="onSelectFuwufangshi" class="select-picker-box">
+					<view class="form-radio-select">
+						<view v-if="fuwus[data.hetong.fangshi-1]">{{fuwus[data.hetong.fangshi-1].text}}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
 			<view class="form-label-input" v-if="data.hetong.fangshi == 2">
 				<view class="phone-form-label"><text class="form-label-require"></text>服务时间</view>
 				<uni-easyinput v-model="data.hetong.lxName" placeholder="请输入非住家型服务时间" />

pages/admin/Hetong/components/laorenNianling.vue

@@ -1,11 +1,13 @@
 <template>
-	<view v-for="(item,index) in myData.children" :key="item.timer">
-		<view><text v-if="index == 0">老人年龄</text></view>
+	<view v-for="(item,index) in myData.children" :key="item.timer" class="fwnr-label-input">
+		<view class="fwnr-form-label"><text class="form-label-require"></text><template v-if="index == 0">老人年龄</template></view>
 		<uni-easyinput v-model="item.age" placeholder="请输入老人年龄" @change="onChange" />
-		<button @click="handleAdd" v-if="myData.children.length == 1">+</button>
-		<button @click="handleAdd"
-			v-else-if="myData.children.length-1 == index && myData.children.length != 1 && myData.children.length<3">+</button>
-		<button @click="handleDelete(item.timer)" v-else>-</button>
+		<view @click="handleAdd" v-if="myData.children.length == 1" class="fwnr-add-btn"><icon></icon></view>
+		<view @click="handleAdd" class="fwnr-add-btn"
+			v-else-if="myData.children.length-1 == index && myData.children.length != 1 && myData.children.length<3">
+				<icon></icon>
+		</view>
+		<view @click="handleDelete(item.timer)" v-else class="fwnr-del-btn"><icon></icon></view>
 	</view>
 </template>
 

pages/admin/Hetong/components/zhaoguLaoren.vue

@@ -6,18 +6,27 @@
 				<icon class="del-icon"></icon>
 			</view>
 		</view>
-		<view class="fwnr-label-input">
-			<view class="fwnr-form-label"><text class="form-label-require"></text>老人身体情况</view>
+		<!-- <view class="fwnr-label-input">
+			<view class="fwnr-form-label"><text class="form-label-require"></text>身体情况</view>
 			
-			<radio-group @change="radioChange">
-				<label class="uni-list-cell uni-list-cell-pd" v-for="item in items" :key="item.value">
-					<view>
-						<radio :value="item.value" :checked="item.value === data.shentizhuangkuang" />
-					</view>
+			<radio-group @change="radioChange" class="fwnr-radio-box">
+				<label class="fwnr-radio-item" v-for="item in items" :key="item.value">
+					<radio :value="item.value" :checked="item.value === data.shentizhuangkuang" />
 					<view>{{item.text}}</view>
 				</label>
 			</radio-group>
+		</view> -->
+		
+		<view class="form-label-radio fwnr-label-radio">
+			<view class="phone-form-label"><text class="form-label-require"></text>身体情况</view>
+			<view class="form-radio-group">
+				<!-- :class="{genderActive: formData.gender==1}" -->
+				<view class="form-radio-item genderActive">能自理</view>
+				<view class="form-radio-item">半自理</view>
+				<view class="form-radio-item">不能自理</view>
+			</view>
 		</view>
+		
 		<laorenNianling @change="onChange"></laorenNianling>
 	</view>
 </template>