样式修改

common/styles/global/components.scss

@@ -128,7 +128,7 @@ view{box-sizing: border-box;}
 }
 // 两个元素
 .icon-title-navBar-box,.icon-title-bjcolor-navBar-box{
-	height: 100rpx;line-height: 100rpx;flex-shrink: 0;
+	width: 100%;height: 100rpx;line-height: 100rpx;flex-shrink: 0;
 	display: flex;align-items: center;justify-content: center;background-color: #fff;
 	padding: calc(var(--status-bar-height)) 20rpx 0 0;box-sizing: content-box;position: relative;
 	.nav-bar-title{

common/styles/global/pages.scss

@@ -1438,6 +1438,10 @@
 			.uni-collapse-item__title.is-open.uni-collapse-item-border{border-bottom: 1rpx solid #f4f4f4;}
 			
 			.uni-collapse-item__title-text{font-size: 30rpx;color: #000;}
+			.uni-collapse-item__title-text::before{
+				content: '';width: 6rpx;height: 30rpx;background-color:#3fd2a1;display: inline-block;
+				vertical-align: middle;margin-right: 10rpx;border-radius: 4rpx;
+				}
 		}
 		
 		.form-label-input,.form-label-select{border-bottom: 1rpx solid #f8f8f8;}
@@ -1684,4 +1688,14 @@
 	  background-color: #fff;border-radius: 8rpx;
 	  font-size: 30rpx;line-height: 1.8;overflow: auto;flex: 1;word-break: break-all;
 	 }
+}
+
+//合同预览
+.ht-preview-page{
+	width: 100%;height: 100vh;display: flex;flex-direction: column;
+	.uni-popup__wrapper{width: 100%;height: 100vh;display: flex!important;flex-direction: column;}
+	.pdf-box{
+		flex: 1;overflow-y: auto;
+		img{margin: 0;padding: 0;max-width: 100%;}
+		}
 }

pages/admin/Hetong/addSanfangHetong.vue

@@ -8,8 +8,8 @@
 		<view class="sfht-form-box">
 			<!-- 合同模板 -->
 			<view class="form-label-select form-radius-box">
-				<view class="phone-form-label"><text class="form-label-require"></text>合同模板 
-				<i @click="handlePreviewPdf">预览</i></view>
+				<view @click="handlePreviewPdf" class="phone-form-label" v-if="data.mobanIndex != null" style="color: #3fd2a1;"><text class="form-label-require"></text>合同模板预览</view>
+				<view @click="handlePreviewPdf" class="phone-form-label" v-else><text class="form-label-require"></text>合同模板</view>
 				<picker :range="data.mobanList" mode='selector' :value="data.mobanIndex" range-key="name"
 					@change="onMobanSelect" class="select-picker-box">
 					<view class="form-radio-select">
@@ -21,8 +21,6 @@
 
 			<!-- 客户信息 -->
 			<kehuCardVue></kehuCardVue>
-			<!-- 家政人员 -->
-			<jiazhengCardVue></jiazhengCardVue>
 
 			<template v-if="data.mobanIndex == 0">
 
@@ -63,7 +61,6 @@
 	import * as httpApi from "@/api/sanfang.js"
 
 	import hetongCardVue from "./components/hetongCard.vue";
-	import jiazhengCardVue from "./components/jiazhengCard.vue";
 	import kehuCardVue from "./components/kehuCard.vue";
 	import qianMingVue from "./components/qianMing.vue";
 	import qiTaYueDingVue from "./components/qiTaYueDing.vue";

pages/admin/Hetong/components/jiazhengCard.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="sfht-mt24">
-		<!-- 合同模板 -->
-		<view class="form-label-select form-radius-box">
+	<!--  class="sfht-mt24" -->
+	<view>
+		<!-- 合同模板 form-radius-box-->
+		<view class="form-label-select" style="border: 0;">
 			<view class="phone-form-label"><text class="form-label-require">*</text>家政人员</view>
 			<view class="form-radio-select" @click="handleSelect">
 				<view v-show="!!data.hetong.realName">{{data.hetong.realName}}</view>

pages/admin/Hetong/components/kehuCard.vue

@@ -21,14 +21,20 @@
 				<view class="phone-form-label"><text class="form-label-require"></text>具体地址</view>
 				<uni-easyinput v-model="data.hetong.jutidizhi" placeholder="请输入具体地址" />
 			</view>
+			<!-- 家政人员 -->
+			<jiazhengCardVue></jiazhengCardVue>
 		</uni-collapse-item>
+		
 	</uni-collapse>
 
 	<!-- 客户 -->
 	<selectKh ref="khRef" @select="onKhSelect"></selectKh>
+	
+	
 </template>
 
 <script setup>
+	import jiazhengCardVue from "./jiazhengCard.vue";
 	import {
 		ref,
 		reactive,

pages/admin/Hetong/components/pdfPreview.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
-		<uni-popup ref="popupRef" background-color="#fff" :animation="true" :is-mask-click="false" :mask-click="false">
-			<view class="icon-title-navBar-box">
+		<uni-popup ref="popupRef" background-color="#fff" :animation="true" :is-mask-click="false" :mask-click="false"
+		class="ht-preview-page">
+			<view class="icon-title-navBar-box border-navBar-box">
 				<view @click="goUpPage" class="nav-bar-icon"></view>
 				<text class="nav-bar-title">合同预览</text>
 			</view>
-			<view class="pdf-box" style="height: calc(100vh - 60px);overflow-y: auto;">
-				<img v-for="item in imgList" mode="aspectFit" style="height: auto;width: 100%" :src="`data:image/png;base64,${item}`"
+			<view class="pdf-box">
+				<img v-for="item in imgList" mode="aspectFit"  :src="`data:image/png;base64,${item}`"
 					@click="previewBase64Image(`data:image/png;base64,${item}`)" class="pdf-img" />
 			</view>
 		</uni-popup>