机构合同样式改版

common/styles/global/pages.scss

@@ -1130,12 +1130,20 @@
 /* 合同页 */
 .phone-hetong-page{
 	height: 100vh;display: flex;flex-direction: column;
-	.pdf-box{flex: 1;background-color: rgba(0, 0, 0, 0.5);;margin: 24rpx;border-radius: 8rpx;color: #666;padding: 16rpx 0;
-	display: flex;flex-direction: column;align-items: center;overflow: auto;position: relative;
-	border:1rpx solid  rgba(0, 0, 0, 0.3);;box-sizing: border-box;}
+	.lsht-icon{width: 73rpx;height: 73rpx;background-size: cover;
+	background-image: url("@/static/images/hetong/ls-ht-icon.png");}
+	.pdf-box{flex: 1;background-color: rgba(0, 0, 0, 0.5);margin: 24rpx;border-radius: 8rpx;
+	display: flex;flex-direction: column;align-items: center;overflow: auto;box-sizing: border-box;
+	padding: 16rpx 0;border:1rpx solid  rgba(0, 0, 0, 0.3);}
 	.pdf-img{width: 93%;margin: 16rpx auto;}
-	.pdf-tip{position: absolute;top: 0;left: 0;right: 0;bottom: 0;
-		display: flex;align-items: center;justify-content: center;color: #666;background-color: #fff;}
+	.pdf-tip-box{
+		position: absolute;top: calc(110rpx + var(--status-bar-height));left: 0;right:0;bottom: 0;
+		display: flex;align-items: center;justify-content: center;color: #666;background-color: #fff;
+		border: 24rpx solid #f8f9fd;}
+	.tip-img-box{display: flex;flex-direction: column;}
+	.tip-text{text-align: center;color: #666;}
+	.tip-text::before{content: '';width: 260rpx;height: 260rpx;display: block;margin-bottom: 16rpx;
+	background-image: url("@/static/images/common/loading-icon.gif");background-size: cover;}
 	.no-hetong-box{
 		height: 100vh;display: flex;flex-direction: column;
 		align-items: center;justify-content: center;color: #666;}
@@ -1145,20 +1153,43 @@
 .ht-qm-popup{
 	width: 100%;height: 100vh;
 	display: flex;flex-direction: column;
-	.ht-qm-box{border: 1rpx solid #ccc;border-radius: 6rpx;flex: 1;margin:0 24rpx;}
-	.ht-btn-box{display: flex;margin: 32rpx 64rpx;}
+	.ht-qm-box{background-color: #f8f9fd;flex: 1;}
+	.qm-tip-box{background-color: #fff;border-radius: 6rpx;margin: 24rpx;
+	padding: 16rpx 24rpx;box-sizing: border-box;}
+	.lime-signature{width: 100%!important;height: 400rpx!important;
+	background-color: #f0f9f8;border-radius: 8rpx;margin-top: 10rpx;}
+	.qm-tip-text{font-size: 24rpx;color: #333;margin: 48rpx 0 12rpx;line-height: 1.6;}
+	.ht-btn-box{
+		display: flex;margin: 32rpx 80rpx;
+		.phone-green-btn,.phone-white-btn{width: 200rpx;}
+	}
 }
 /* 合同列表页 */
 .ht-list-page{
-	.phone-time-icon{width: 25rpx;height: 25rpx;@include ezy-no-repeat-cover();
-	margin-right: 8rpx;flex-shrink: 0;}
-	.phone-time-icon{background-image: url("@/static/images/common/time-icon.png");}
-	.ht-card-row{width: 100%;}
-	.ht-status{font-size: 30rpx;color: #333;}
-	.ht-time{font-size: 28rpx;color: #666;display: flex;align-items: center;}
-	.ht-time + .ht-time,.ht-status + .ht-time{margin-top: 16rpx;}
+	.ht-list-box{background-color: #f8f9fd!important;padding: 12rpx 0;}
+	.ht-list-item-box{
+		margin:12rpx 24rpx;
+		.uni-list-item__container{padding: 0;border-radius: 12rpx;border: 1rpx solid #f2f2f4;}
+	}
+	.ht-card-row{width: 100%;padding: 36rpx 0;}
+	.ht-status-btn-row{
+		display: flex;justify-content: space-between;
+		.ht-status{width: 300rpx;height: 52rpx;line-height: 52rpx;font-size: 30rpx;
+		background-color: #42ca9c;box-sizing: border-box;padding: 0 24rpx;
+		color: #fff;border-radius: 0 26rpx 26rpx 0;}
+		.ht-biew-btn{
+			color: #666;font-size: 28rpx;padding: 0 16rpx;display: flex;align-items: center;color: #666;
+			.ht-jt{
+				width: 24rpx;height: 24rpx;background-image: url("@/static/images/common/nav-bar-jt-bottom.svg");
+				@include ezy-no-repeat-cover();transform: rotate(270deg);margin-left: 4rpx;
+			}
+		}
+	}
+	.ht-time{font-size: 28rpx;color: #666;display: flex;align-items: center;margin: 24rpx 24rpx 0;}
+	.phone-time-icon{width: 42rpx;height: 42rpx;@include ezy-no-repeat-cover();
+	margin-right: 8rpx;flex-shrink: 0;background-image: url("@/static/images/hetong/data-icon.png");}
 	.status-0,.status-1,.status-2{display: contents;}
-	.status-0 { color: #FFC000; } /* 红色 */
-	.status-1 { color: #FF0000; } /* 黄色 */
-	.status-2 { color: #00B050; } /* 绿色 */
+	.status-0 { color: #feff01; } /* 红色 */
+	.status-1 { color: #33ffff; } /* 黄色 */
+	.status-2 { color: #fff; } /* 绿色 */
 }

components/writeSign/index.vue

@@ -1,12 +1,22 @@
 <template>
 	<view class="ht-qm-box">
-		<jp-signature ref="signatureRef"></jp-signature>
+		<view class="qm-tip-box">
+			<view>手写签名</view>
+			<jp-signature ref="signatureRef"></jp-signature>
+			<view class="qm-tip-text">
+				注意事项：<br/>
+				1.请仔细阅读全文，确认完全理解条款后签名。<br/>
+				2.需本人手写签名，签字即视为认可合同内容。<br/>
+				3.签名具有法律效力，签署后须履行约定义务，纠纷以签名数据为法律凭据。
+			</view>
+		</view>
 	</view>
 	<image v-show="false" :src="url" alt="" />
+	
 	<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>
+		<!-- <button size="mini" @click="undo" type="default" class="phone-white-btn">撤消</button> -->
 	</view>
 </template>
 

pages/admin/Hetong/Hetong.vue

@@ -3,17 +3,18 @@
 		<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 class="lsht-icon" @click="handleGoLishi"></view>
 		</view>
 		<template v-if="tId">
 			<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 class="pdf-tip" v-if="isLoading">
-			 	加载中...
-			 </view>
+				 <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>
+			<!-- 加载提示 -->
+			<view class="pdf-tip-box" v-if="isLoading">
+				<view class="tip-img-box">
+					 <view class="tip-text">加载中...</view>
+				</view>
 			</view>
 		</template>
 		<view class="hetong-tip-box" v-if="info.status == 0">

pages/admin/Hetong/HetongInfo.vue

@@ -1,16 +1,19 @@
 <template>
 	<view class="phone-hetong-page">
-		<view class="icon-title-navBar-box">
+		<view class="phone-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">合同</text>
+			<view class="lsht-icon" @click="handleGoLishi"></view>
 		</view>
 		<template v-if="tId">
 			<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 class="pdf-tip" v-if="isLoading">
-					加载中...
+			</view>
+			<!-- 加载提示 -->
+			<view class="pdf-tip-box" v-if="isLoading">
+				<view class="tip-img-box">
+					 <view class="tip-text">加载中...</view>
 				</view>
 			</view>
 		</template>
@@ -137,7 +140,11 @@
 		handleQM(img)
 
 	}
-
+	function handleGoLishi() {
+		uni.redirectTo({
+			url: '/pages/admin/Hetong/HetongList'
+		})
+	}
 
 	function goback2() {
 		popupRef.value.close()

pages/admin/Hetong/HetongList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="phone-list-page ht-list-page">
-		<view class="icon-title-navBar-box border-navBar-box">
+		<view class="icon-title-navBar-box">
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">历史合同</text>
 		</view>
@@ -8,11 +8,14 @@
 	<scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="data.loading"
 		:refresher-threshold="50" refresher-background="transparent" @refresherrefresh="onRefresh"  @scrolltolower="onScrolltolower"
 		class="admin-phone-tabbar-view">
-		<uni-list class="admin-list-box">
-			<uni-list-item v-for="item in data.list" class="admin-list-item-box">
+		<uni-list class="admin-list-box ht-list-box">
+			<uni-list-item v-for="item in data.list" class="ht-list-item-box">
 				<template v-slot:body>
-					<view class="ht-card-row" @click="checkKecheng(item)">
-						<view class="ht-status">合同状态：<view :class="'status-' + item.status">{{formatStatus(item.status)}}</view></view>
+					<view class="ht-card-row">
+						<view class="ht-status-btn-row">
+							<view class="ht-status">合同状态：<view :class="'status-' + item.status">{{formatStatus(item.status)}}</view></view>
+							<view class="ht-biew-btn" @click="checkKecheng(item)">查看<icon class="ht-jt"></icon></view>
+						</view>
 						<view class="ht-time"><icon class="phone-time-icon" />合同开始时间：{{formatTime(item.startDate)}} </view>
 						<view class="ht-time"><icon class="phone-time-icon" />合同结束时间：{{formatTime(item.endDate)}} </view>
 					</view>