refactor：订单详情样式修改

common/js/api.js

@@ -232,7 +232,7 @@ export default {
 	// post请求，余额支付（根据订单ID）
 	balancePay(data) {
 		return request({
-			url: '/business/balancePay/pay',
+			url: '/business/balancePay/pay?orderNo='+data.orderNo +'&password='+data.password,
 			method: 'POST',
 			data: data
 		})

orderPages/bookService/index.rpx.scss

@@ -3,7 +3,7 @@
 }
 .group{
   background: #FFFFFF;
-  padding: 0 32rpx;
+  padding: 32rpx 32rpx;
 }
 
 .group2{

orderPages/bookService/index.vue

@@ -414,6 +414,9 @@ export default {
                 schedulingDate:date
             }).then(res =>{
                 this.periodTimeList = res.data.data
+                if (this.periodTimeList.length===0){
+                    uni.$u.toast('暂无排班时段')
+                }
             })
         },
 

orderPages/orderDetail/index.rpx.scss

@@ -79,7 +79,6 @@
   font-family: PingFangSC-Semibold, PingFang SC;
   font-weight: 600;
   color: #333333;
-  line-height: 68rpx;
   text-align: center;
 }
 .plan{
@@ -327,3 +326,15 @@
   text-align: center;
   margin-top: 80rpx;
 }
+
+.yuyue{
+  height: 164rpx;
+  background: #FFFEF7;
+  padding-left: 28rpx;
+  padding-right: 62rpx;
+  margin-top: 24rpx;
+}
+
+.jishi{
+  padding-right: 62rpx;
+}

orderPages/orderDetail/index.vue

@@ -22,8 +22,8 @@
                             <text  class="serviceType">{{order.serviceType}}</text>
                         </view>
 
-                        <view class="flex-row justify-between">
-                            <view class="flex-col">
+                        <view class="flex-row justify-between  jishi">
+                            <view class="flex-col ">
                                 <view class=" flex-row">
                                     <u-icon name="/static/order/ud1.png" color="#93D21A" size="18"></u-icon>
                                     <text  class="key">服务对象：</text>
@@ -41,7 +41,7 @@
                                 </view>
                             </view>
 
-                            <view class="flex-col">
+                            <view class="flex-col justify-center " v-if="order.serviceAttribute == 1">
                                 <view class="planNumber flex-row justify-center">
                                     <text>{{order.planNumber}}</text>
                                 </view>
@@ -52,7 +52,39 @@
                         </view>
 
 
-                        <view class="flex-row justify-center">
+                        <view class="flex-row justify-between yuyue " v-if="order.serviceAttribute == 2">
+                            <view class="flex-col justify-center ">
+                                <view class=" flex-row">
+
+                                    <u-icon name="clock" size="16"></u-icon>
+                                    <text  class="key">服务日期：</text>
+                                    <text  class="value">{{order.serviceDate}}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <u-icon name="/static/order/ud2.png" color="#93D21A" size="18"></u-icon>
+                                    <text class="key">服务时段：</text>
+                                    <text class="value">{{order.serviceStartTime}}</text>
+                                </view>
+                                <view class="flex-row">
+                                    <u-icon name="/static/order/ud3.png" color="#93D21A" size="18"></u-icon>
+                                    <text class="key">服务人员：</text>
+                                    <text class="value">{{order.servicePersonName}}</text>
+                                </view>
+                            </view>
+
+                            <view class="flex-col justify-center ">
+                                <view class="planNumber flex-row justify-center">
+                                    <text>{{order.planNumber}}</text>
+                                </view>
+                                <view class="plan flex-row justify-center">
+                                    <text class="plan">预约号</text>
+                                </view>
+                            </view>
+                        </view>
+
+
+
+                        <view class="flex-row justify-center"  v-if="order.orderStatus != 2">
                             <view class="scan flex-row justify-center" @click="scanCodeOrder(order)">
                                 <u-icon name="scan" size="18"></u-icon>
                                 <text>扫码</text>

pages/order/module/mescrollUni-item.vue

@@ -116,7 +116,7 @@
 										</view>
 
 										<view class="planNumber1 flex-row justify-center">
-											<text>排号</text>
+											<text>预约号</text>
 										</view>
 									</view>
 								</view>
@@ -126,7 +126,7 @@
 							</view>
 						</view>
 						<view class="nav-bar">
-							<view class="btn"  @click="scanCodeOrder(item)">
+							<view class="btn" v-if="item.orderStatus != 2"  @click="scanCodeOrder(item)">
 								<u-icon name="scan" size="18" />
 								<text>扫码</text>
 							</view>