Parcourir la source

1.我的订单,待确认 也可预约 根据权限

guo il y a 3 ans
Parent
commit
33fd1e9f17
1 fichiers modifiés avec 4 ajouts et 3 suppressions
  1. 4 3
      pages/order/orderDetail.vue

+ 4 - 3
pages/order/orderDetail.vue

@@ -123,7 +123,7 @@
 
 
 			<!-- 预约信息 -->
 			<!-- 预约信息 -->
 			<view class="yuyueBox"
 			<view class="yuyueBox"
-				v-if="orderData.SheetState==4 && (orderData.OrderState==2 || orderData.OrderState==3)">
+				v-if="(orderData.SheetState==4 || orderData.SheetState==2) && (orderData.OrderState==2 || orderData.OrderState==3)">
 
 
 				<view class="timeBox">
 				<view class="timeBox">
 
 
@@ -267,7 +267,7 @@
 			<view class="orderBottom" v-if="orderData.SheetState==2">
 			<view class="orderBottom" v-if="orderData.SheetState==2">
 				<view class="cancelBtn" v-if="(orderData.ServiceState == null || orderData.ServiceState == 3) && orderData.PayMoney>0" @click="$noMultipleClicks(refundMoney)">申请退款</view>
 				<view class="cancelBtn" v-if="(orderData.ServiceState == null || orderData.ServiceState == 3) && orderData.PayMoney>0" @click="$noMultipleClicks(refundMoney)">申请退款</view>
 				<view class="cancelBtn" v-else-if="orderData.ServiceState == 1 || orderData.ServiceState == 2" @click="refundDetail">退款详情</view>
 				<view class="cancelBtn" v-else-if="orderData.ServiceState == 1 || orderData.ServiceState == 2" @click="refundDetail">退款详情</view>
-
+				<view class="payBtn" @click="timeShowClick" v-if="orderData.OrderType==1 && orderData.OrderState==1">立即预约</view>
 			</view>
 			</view>
 
 
 			<view class="orderBottom" v-if="orderData.SheetState==3">
 			<view class="orderBottom" v-if="orderData.SheetState==3">
@@ -695,7 +695,8 @@
 			},
 			},
 			getOrderTimes() {
 			getOrderTimes() {
 				this.$http('worldKeepCar/keepCarMy/getTSheetTimes', {
 				this.$http('worldKeepCar/keepCarMy/getTSheetTimes', {
-					shopId: this.orderData.ShopID,
+					shopId: this.orderData.ShopID,
+					id:this.orderData.ID,
 				}, 'GET').then(res => {
 				}, 'GET').then(res => {
 
 
 					this.OrderTimes = res.data;
 					this.OrderTimes = res.data;