添加花王认证提示以及预约提示

pages/ucenter/order/order.vue

@@ -156,6 +156,9 @@
 						<view class="btn-rebuy" @tap="buyAgain" :data-id="item.goodsId"
 							v-if="item.orderStatusVal != '未支付'">再次购买</view>
 					</view>
+					<view class="remain-content" v-if="item.showAppointmentAlert">
+						还剩{{item.notAppointmentTimes}}次可约，请记得预约哦
+					</view>
 				</view>
 			</view>
 		</view>
@@ -1813,4 +1816,14 @@
 		max-height: 800rpx;
 		overflow-y: scroll;
 	}
+	.remain-content{
+		    height: 50rpx;
+		    background-color: #FEEBD7;
+		    color: #000;
+		    line-height: 50rpx;
+		    border-radius: 12rpx;
+		    font-size: 24rpx;
+		    font-weight: bold;
+		    padding-left: 20rpx;
+	}
 </style>

pages/ucenter/orderDetail/orderDetail.vue

@@ -93,10 +93,7 @@
 									<view class="sercive-name">服务{{ utils.servciceName(index) }}</view>
 								</view>
 							</view>
-							<!-- <view class="service-title">
-								<view class="service-status">{{ item.statusVal }}</view>
-								<view class="sercive-name">服务{{ utils.servciceName(index) }}</view>
-							</view> -->
+							
 							<view class="service-num">
 								<view class="service-id">工单编号：{{ item.id }}</view>
 
@@ -121,9 +118,18 @@
 									<text>开始时间：</text>
 									{{ item.bookStartTime }}
 								</view>
-								<view class="row" v-else-if="">
-									<text>上门时段：</text>
+								<view class="row" v-else-if="" style="justify-content: space-between;">
+									<view class="">
+										<text>上门时段：</text>
 									{{ item.bookTime }}
+									</view>
+									
+									<view style="display: flex;color: #CEB399;float: right;" v-if="item.serviceInfoList[0].isHwAuth&!item.isMultiWorker"  @tap="goHwWorker(item.serviceInfoList[0].servantId)">
+										<view class="m">花王认证</view>
+										<view class="r" style="padding-top: 4rpx;">
+											<van-icon name="arrow" color="#CEB399" />		
+											</view>
+									</view>
 								</view>
 								<view class="row" v-if="isShowPL">
 									<text>服务内容：</text>
@@ -135,13 +141,13 @@
 											<image src="https://jzmall.lifejingzhi.com/file/jzmall-dy/dr.png"
 												mode="aspectFill"></image>
 										</view>
-								
+
 										<view class="tips-content">
 											本单为多人上门服务，上门时段可能不同，请您留意
 										</view>
 									</view>
-								
-									<view class="product-one" v-for="(iitem,iindex) in item.serviceInfoList">
+
+									<view class="product-one" v-for="(iitem,iindex) in item.serviceInfoList" :key="iindex">
 										<view class="service-name">
 											{{iitem.skillName}}
 										</view>
@@ -151,6 +157,12 @@
 										<view class="service-time">
 											{{iitem.bookTime}}
 										</view>
+										<view class="isHwAuth" style="display: flex;margin-left: 70rpx;" v-if="iitem.isHwAuth" @tap="goHwWorker(iitem.servantId)">
+											<view class="m" style="color: #CEB399;">花王保洁</view>
+											<view class="r" style="padding-top: 4rpx;">
+												<van-icon name="arrow" color="#CEB399" />
+											</view>
+										</view>
 									</view>
 								</view>
 								<view class="row">
@@ -571,6 +583,12 @@
 			clearInterval(this.timer);
 		},
 		methods: {
+			goHwWorker(servantId){
+				console.log("我的打印",servantId);
+				uni.navigateTo({
+				    url: '/pages/ucenter/resumeDetail/resumeDetail?servantId=' + servantId
+				});
+			},
 			onChange(event) {
 				console.log("event.detail", event.detail);
 				this.setData({
@@ -2695,18 +2713,19 @@
 		margin: 0 auto;
 		margin-top: 54rpx;
 	}
+
 	.several-people {
 		border-radius: 18rpx;
 		background-color: #FFEEE2;
 		width: 650rpx;
-		/* height: 150rpx; */
 		margin: auto;
 		padding: 16rpx;
 	}
+
 	.title-tips {
 		display: flex;
 	}
-	
+
 	.title-tips .tips-content {
 		font-size: 16rpx;
 		margin-left: 8rpx;
@@ -2714,33 +2733,36 @@
 		height: 36rpx;
 		padding-top: 5rpx;
 	}
-	
+
 	.title-tips .image {
 		width: 51rpx;
 		height: 36rpx;
 	}
-	
+
 	.title-tips .image image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.product-one {
 		margin-top: 10rpx;
 		display: flex;
+		/* justify-content: space-between; */
 	}
-	
+
 	.product-one .service-name {
 		margin-right: 15rpx;
 		font-size: 24rpx;
 	}
-	
+
 	.product-one .service-peoplenum {
 		margin-right: 25rpx;
 		font-size: 24rpx;
 	}
-	
+
 	.product-one .service-time {
 		color: #000;
 		font-size: 24rpx;
+		margin-right: 20rpx;
 	}
 </style>