样式修改

common/styles/global/pages.scss

@@ -206,6 +206,8 @@
 	.lx-icon{background-image: url("@/static/images/index/lx-icon.png");}
 	.kc-icon{background-image: url("@/static/images/index/kc-icon.png");}
 	.zjz-icon{background-image: url("@/static/images/index/zjzgs-icon.png");}
+	.ht-a-icon{background-image: url("@/static/images/index/ht-a-icon.png");}
+	.ht-icon{background-image: url("@/static/images/index/ht-icon.png");}
 }
 /*** 考试页面***/
 .phone-list-page{
@@ -1120,3 +1122,16 @@
 } 
 // 等级选择弹窗
 .dj-select-item{border:1rpx solid #c5c5c5;text-align: center;margin:0 5% 30rpx;padding: 16rpx 0;font-size: 26rpx;border-radius: 8rpx;}
+
+/* 合同页 */
+.phone-hetong-page{
+	height: 100vh;display: flex;flex-direction: column;
+	.pdf-box{flex: 1;}
+	.ht-btn{width: 180px;margin-bottom: 24px;}
+}
+.ht-qm-popup{
+	width: 100%;height: 100vh;box-sizing: border-box;
+	display: flex;flex-direction: column;padding: 24rpx;
+	.ht-qm-box{border: 1rpx solid #ccc;border-radius: 6rpx;flex: 1;}
+	.ht-btn-box{display: flex;margin: 32rpx 64rpx;}
+}

components/writeSign/index.vue

@@ -1,12 +1,12 @@
 <template>
-	<view style="width: 750rpx ;height: 500rpx;">
+	<view class="ht-qm-box">
 		<jp-signature ref="signatureRef"></jp-signature>
 	</view>
 	<image v-show="false" :src="url" alt="" />
-	<view>
-		<button @click="clear">清空</button>
-		<button @click="undo">撤消</button>
-		<button @click="save">保存</button>
+	<view class="ht-btn-box">
+		<button size="mini" @click="save" type="default" class="phone-green-btn">保存</button>
+		<button size="mini" @click="clear" type="default" class="phone-white-btn">清空</button>
+		<button size="mini" @click="undo" type="default" class="phone-white-btn">撤消</button>
 	</view>
 </template>
 

pages.json

@@ -287,6 +287,13 @@
 			{
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/admin/Hetong/HetongInfo",
+			"style" :
+			{
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"tabBar": {

pages/admin/Hetong/Hetong.vue

@@ -1,32 +1,33 @@
 <template>
-	<view class="phone-zjzgs-page">
-		<view class="icon-title-navBar-box">
+	<view class="phone-hetong-page">
+		<view class="phone-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">合同</text>
+			<uni-icons class="nav-bar-right-icon bar-ml10" type="list" @click="handleGoLishi"
+				size="30"></uni-icons>
+				
 		</view>
-		
-		<view @click="handleGoLishi">历史合同</view>
-		
 		<template v-if="info.id">
+			<view class="pdf-box">
+				
+			</view>
 			<!-- -->
 			<!-- 	<web-view class="dljt-pdf-view" :src="pdfUrl1" v-if="show"
 				webview-styles="height: 50vh;margin-top: 75px"></web-view> -->
 		</template>
 		<template v-else>
-			暂无合同
+			<view>暂无合同</view>
 		</template>
 
-		<view @click="handleQianming" v-if="info.id && info.status == 0">合同签名</view>
+		<button v-if="info.id && info.status == 0" type="default" class="phone-green-btn ht-btn" @click="handleQianming">我已阅读</button>
 
-		<uni-popup ref="popupRef" type="bottom" background-color="#fff" :is-mask-click="false" :mask-click="false"
-			style="height: 100vh">
-			<view style="height: 100vh;">
-				<view>
-					<view @click="goback2" class="nav-bar-icon">
-							<text class="nav-bar-title">签名</text>
-					</view>
-					<writeSign @getBase64="getBase64"></writeSign>
+		<uni-popup ref="popupRef" type="bottom" background-color="#fff" :is-mask-click="false" :mask-click="false">
+			<view class="ht-qm-popup">
+				<view class="icon-title-navBar-box">
+					<view @click="goback2" class="nav-bar-icon"></view>
+					<text class="nav-bar-title">签名</text>
 				</view>
+				<writeSign @getBase64="getBase64"></writeSign>
 			</view>
 		</uni-popup>
 	</view>
@@ -71,7 +72,7 @@
 
 	function handleGoLishi() {
 		uni.redirectTo({
-			url: ''
+			url: '/pages/admin/Hetong/HetongList'
 		})
 	}
 

pages/admin/ShouYe/shouye.vue

@@ -79,7 +79,8 @@
 		<view class="card-list-box">
 			<view class="card-list-title">管理合同</view>
 			<view @click="goToPage('jzht')" class="card-item-box">
-				<icon class="index-icon kz-icon" :class="indexInfoData.tixingFlag"></icon>
+				<icon class="index-icon ht-a-icon" v-if="indexInfoData.tixingFlag"></icon>
+				<icon class="index-icon ht-icon" v-else></icon>
 				<text>家政合同</text>
 			</view>
 		</view>
@@ -200,7 +201,7 @@
 			indexInfoData.jzName = res.data.jzName;
 			indexInfoData.kechengCount = res.data.kechengCount;
 			indexInfoData.kechengUsed = res.data.kechengUsed;
-			// indexInfoData.tixingFlag =
+			indexInfoData.tixingFlag =res.data.tixingFlag;
 		})
 	}
 
@@ -278,6 +279,9 @@
 				uni.redirectTo({
 					url: '/pages/admin/Hetong/Hetong'
 				})
+				/* uni.redirectTo({
+					url: '/pages/admin/Hetong/HetongList'
+				}) */
 				break;
 			case 'demo':
 				uni.redirectTo({