Merge branch 'master' of http://47.102.110.240:3000/yuxiangpei/jzmall_wx

pages/ucenter/orderDetail/orderDetail.wxml

@@ -7,8 +7,7 @@
       <view> 待支付，剩余<text>{{utils.formatOverTime(payOverTime)}}</text></view>
     </view>
     <view class="over-time">超过30分钟未支付,订单将自动取消</view>
-    <view class="pay-now" catchtap="payOrder" data-id="{{orderInfo.id}}" data-sn="{{orderInfo.orderSn}}"
-      wx:if="{{orderInfo.handleOption.pay}}">立即支付</view>
+    <view class="pay-now" catchtap="payOrder" data-id="{{orderInfo.id}}" data-sn="{{orderInfo.orderSn}}" wx:if="{{orderInfo.handleOption.pay}}">立即支付</view>
   </view>
 
   <!-- 卡片 -->
@@ -24,7 +23,7 @@
     </view>
     <view class="top-tips">预约后，将为您上门服务，详情请咨询客服。</view>
     <!-- tt-if="{{orderInfo.orderStatusVal!='服务已完成'}}" -->
-    <view class="appoint-tag" data-detail="{{orderInfo.detailId}}"  bindtap="goAppoint" wx:if="{{orderInfo.handleOption.book}}">预约服务</view>
+    <view class="appoint-tag" data-detail="{{orderInfo.detailId}}" bindtap="goAppoint" wx:if="{{orderInfo.handleOption.book}}">预约服务</view>
 
   </view>
 
@@ -90,8 +89,36 @@
           <text>开始时间：</text>{{item.bookStartTime}}
         </view>
         <view class="row" wx:else="">
-          <text>上门时段：</text>{{item.bookTime}}
+          <text>预约时段：</text>{{item.bookTime}}
         </view>
+
+        <!-- <view class="several-people" wx:if="{{item.isMultiWorker}}">
+          <view class="title-tips">
+            <view class="image">
+              <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="service-name">
+              {{iitem.skillName}}
+            </view>
+            <view class="service-peoplenum">
+              ({{iitem.workerNum}}人)
+            </view>
+            <view class="service-time">
+              {{iitem.bookTime}}
+            </view>
+          </view>
+        </view> -->
+
+
+
+
         <view class="row" wx:if="{{isShowPL}}">
           <text>服务内容：</text>{{orderInfo.skuName}}
         </view>
@@ -106,12 +133,12 @@
             <view>{{item.fraShopName}}</view>
           </view>
           <view>服务咨询</view>
-           <view class="store-right" bindtap="makeStorePhone" data-phone="{{item.shopPhone}}">
-           
+          <view class="store-right" bindtap="makeStorePhone" data-phone="{{item.shopPhone}}">
+
             <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-order-phone.png"></image>
           </view>
         </view>
-      
+
         <view class="service-remark" wx:if="{{item.reminder}}">
           <text>提醒：</text>
           {{item.reminder}}
@@ -121,15 +148,13 @@
       <view wx:if="{{item.ticketVo}}" class="ticket">
         <view class="title">
           <view style="font-weight: 600;">售后进度</view>
-          <view class="comment" bindtap="showTicketTips" data-id="{{item.ticketVo.ticketId}}"
-            wx:if="{{item.ticketVo.isSatisfaction}}">评价售后</view>
+          <view class="comment" bindtap="showTicketTips" data-id="{{item.ticketVo.ticketId}}" wx:if="{{item.ticketVo.isSatisfaction}}">评价售后</view>
         </view>
 
         <view class="timeline">
           <block wx:for="{{item.ticketVo.actions}}" wx:for-index="index" wx:for-item="action" wx:key="action">
             <view class="timeline-event">
-              <view style="{{index==0?'background-color: #09afff':'background-color: rgb(193 194 195)'}}"
-                class="timeline-marker"></view>
+              <view style="{{index==0?'background-color: #09afff':'background-color: rgb(193 194 195)'}}" class="timeline-marker"></view>
               <!-- <view wx:else style="background-color: rgb(193 194 195);border-radius: 50%; height: 15px;width: 15px;"></view> -->
 
               <view class="timeline-event-copy">
@@ -148,11 +173,9 @@
       </view>
 
       <view class="service-operate" wx:if="{{item.status==1||item.status==7||item.acceptanceAble}}">
-        <view wx:if="{{item.canModify}}" bindtap="goEditAppoint" data-id="{{item.id}}" class="warning-color"
-          data-status="{{item.status}}" data-time="{{item.bookTime}}">修改预约</view>
+        <view wx:if="{{item.canModify}}" bindtap="goEditAppoint" data-id="{{item.id}}" class="warning-color" data-status="{{item.status}}" data-time="{{item.bookTime}}">修改预约</view>
         <view wx:if="{{item.acceptanceAble}}" bindtap="goReVisit" data-id="{{item.id}}">服务验收</view>
-        <view wx:if="{{item.isCancel}}" class="del" bindtap="goCancelBook" data-id="{{item.id}}"
-          data-phone="{{item.shopPhone}}">取消预约</view>
+        <view wx:if="{{item.isCancel}}" class="del" bindtap="goCancelBook" data-id="{{item.id}}" data-phone="{{item.shopPhone}}">取消预约</view>
       </view>
 
     </view>
@@ -203,8 +226,7 @@
       <view>
         {{orderInfo.orderSn}}
       </view>
-      <image mode="aspectFit" class="copy-img" src="https://mall.zhaijieshi.cc/file/jzmall-dy/icon-order-copy.png"
-        bindtap="copyOrder"></image>
+      <image mode="aspectFit" class="copy-img" src="https://mall.zhaijieshi.cc/file/jzmall-dy/icon-order-copy.png" bindtap="copyOrder"></image>
 
     </view>
     <view class="order-top">
@@ -254,8 +276,7 @@
     <view class="contact-store" wx:if="{{payOverTime>0}}">
       <view class="topic">联系门店</view>
       <view class="remark">预约、服务信息咨询</view>
-      <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-order-phone.png"
-        bindtap="makeStorePhone" data-phone="4009218987"></image>
+      <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-order-phone.png" bindtap="makeStorePhone" data-phone="4009218987"></image>
     </view>
     <view class="contact-company">
       <view class="topic">总部客服</view>
@@ -277,12 +298,9 @@
       <!-- <view  data-id="{{orderInfo.id}}" data-sn="{{orderInfo.orderSn}}" data-aid="{{orderInfo.addressId}}"
         data-type="{{orderInfo.type}}" wx:if="{{orderInfo.handleOption.book}}" class="eval-btn">评价</view> -->
 
-      <view wx:if="{{orderInfo.handleOption.book}}"  data-detail="{{orderInfo.detailId}}" class="appoint" catchtap="goAppoint">预约服务</view>
-      <view catchtap="payOrder" data-id="{{orderInfo.id}}" data-sn="{{orderInfo.orderSn}}"
-        wx:if="{{orderInfo.handleOption.pay}}">立即支付</view>
-      <view class="blue-color"
-        wx:if="{{orderInfo.orderStatus==201||orderInfo.orderStatus==205||orderInfo.orderStatus==206||orderInfo.orderStatus==301}}"
-        bindtap="showMsg">追加备注</view>
+      <view wx:if="{{orderInfo.handleOption.book}}" data-detail="{{orderInfo.detailId}}" class="appoint" catchtap="goAppoint">预约服务</view>
+      <view catchtap="payOrder" data-id="{{orderInfo.id}}" data-sn="{{orderInfo.orderSn}}" wx:if="{{orderInfo.handleOption.pay}}">立即支付</view>
+      <view class="blue-color" wx:if="{{orderInfo.orderStatus==201||orderInfo.orderStatus==205||orderInfo.orderStatus==206||orderInfo.orderStatus==301}}" bindtap="showMsg">追加备注</view>
       <!-- <view class="btn-rebuy" bindtap="buyAgain" data-id="{{orderInfo.goodsId}}"
         wx:if="{{orderInfo.orderStatusVal!='未支付'}}">再次购买</view> -->
     </view>
@@ -316,8 +334,7 @@
   <view class="title">
     订单备注
   </view>
-  <textarea bindinput="bindMsgInput" placeholder="请输入订单备注信息,此信息会提醒到服务人员" value="{{message}}"
-    placeholder-style="font-size:26rpx;color:#666;" maxlength="100" class="remark-textarea"></textarea>
+  <textarea bindinput="bindMsgInput" placeholder="请输入订单备注信息,此信息会提醒到服务人员" value="{{message}}" placeholder-style="font-size:26rpx;color:#666;" maxlength="100" class="remark-textarea"></textarea>
   <view class="btn" bindtap="confirmMsg">
     确定
   </view>
@@ -335,19 +352,14 @@
       你的售后问题是否已被解决？您对售后服务是否满意？请打分。
     </view>
     <view style="display: flex;justify-content: center;">
-      <image class="ticket-img" data-id="1" bindtap="selectTicketValue"
-        src="/static/images/new/{{satisfaction==0?'star':(satisfaction==2||satisfaction==1?'star_red':'star_yellow')}}.png">
+      <image class="ticket-img" data-id="1" bindtap="selectTicketValue" src="/static/images/new/{{satisfaction==0?'star':(satisfaction==2||satisfaction==1?'star_red':'star_yellow')}}.png">
       </image>
-      <image class="ticket-img" data-id="2" bindtap="selectTicketValue"
-        src="/static/images/new/{{satisfaction<=1?'star':(satisfaction==2?'star_red':'star_yellow')}}.png"></image>
-      <image class="ticket-img" data-id="3" bindtap="selectTicketValue"
-        src="/static/images/new/{{satisfaction>=3?'star_yellow':'star'}}.png">
+      <image class="ticket-img" data-id="2" bindtap="selectTicketValue" src="/static/images/new/{{satisfaction<=1?'star':(satisfaction==2?'star_red':'star_yellow')}}.png"></image>
+      <image class="ticket-img" data-id="3" bindtap="selectTicketValue" src="/static/images/new/{{satisfaction>=3?'star_yellow':'star'}}.png">
       </image>
-      <image class="ticket-img" data-id="4" bindtap="selectTicketValue"
-        src="/static/images/new/{{satisfaction>=4?'star_yellow':'star'}}.png">
+      <image class="ticket-img" data-id="4" bindtap="selectTicketValue" src="/static/images/new/{{satisfaction>=4?'star_yellow':'star'}}.png">
       </image>
-      <image class="ticket-img" data-id="5" bindtap="selectTicketValue"
-        src="/static/images/new/{{satisfaction==5?'star_yellow':'star'}}.png">
+      <image class="ticket-img" data-id="5" bindtap="selectTicketValue" src="/static/images/new/{{satisfaction==5?'star_yellow':'star'}}.png">
       </image>
     </view>
 
@@ -367,13 +379,10 @@
       选择取消原因
     </view>
     <view class="remark-list">
-      <view class="remark-item" wx:for="{{cancelList}}" wx:key="index" data-id="{{item.id}}"
-        catchtap="cancelItemSelect">
+      <view class="remark-item" wx:for="{{cancelList}}" wx:key="index" data-id="{{item.id}}" catchtap="cancelItemSelect">
         <view class="remark-value">{{item.value}}</view>
-        <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-select-popup.png"
-          class="radio-img" wx:if="{{cancelReason==item.id}}"></image>
-        <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-unselect-popup.png"
-          class="radio-img" wx:else></image>
+        <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-select-popup.png" class="radio-img" wx:if="{{cancelReason==item.id}}"></image>
+        <image mode="aspectFit" src="https://jzmall.lifejingzhi.com/file/jzmall-dy/icon-unselect-popup.png" class="radio-img" wx:else></image>
       </view>
     </view>
     <view class="remark-conf-btn" catchtap="cancelItemConfirm">取消预约</view>

pages/ucenter/orderDetail/orderDetail.wxss

@@ -1386,4 +1386,52 @@
     margin: 0 auto;
     margin-top: 54rpx;
   
-  }
+  }
+  .several-people {
+		border-radius: 18rpx;
+		background-color: #F1FAFE;
+		width: 650rpx;
+		/* height: 150rpx; */
+		margin: auto;
+		padding: 16rpx;
+  }
+  .title-tips {
+		display: flex;
+	}
+	
+	.title-tips .tips-content {
+		font-size: 16rpx;
+		margin-left: 8rpx;
+		color: #999;
+		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;
+	}
+	
+	.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;
+	}