|
@@ -26,7 +26,7 @@
|
|
|
<!-- 全部订单 -->
|
|
<!-- 全部订单 -->
|
|
|
<view class="cont_one" v-if="orderType != 3 && XCXIsSelect == '是'">
|
|
<view class="cont_one" v-if="orderType != 3 && XCXIsSelect == '是'">
|
|
|
<view v-for="(item, index) in orderList" :key="index" @click="goNav('/pages/order/takefood?orderId=' + item.orderId + '&shopId=' + item.shopId)">
|
|
<view v-for="(item, index) in orderList" :key="index" @click="goNav('/pages/order/takefood?orderId=' + item.orderId + '&shopId=' + item.shopId)">
|
|
|
- <view class="cont" v-if="item.orderType == 1">
|
|
|
|
|
|
|
+ <view class="cont" v-if="item.orderType == 1 && item.status != 0">
|
|
|
<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
|
|
<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
|
|
|
<view class="order_success">
|
|
<view class="order_success">
|
|
|
<view class="order_name" v-if="item.status == 6">制作中</view>
|
|
<view class="order_name" v-if="item.status == 6">制作中</view>
|
|
@@ -79,7 +79,7 @@
|
|
|
<view v-if="item.status == 0" class="btn_" @click.stop="goPay_throttle(item)">继续支付</view>
|
|
<view v-if="item.status == 0" class="btn_" @click.stop="goPay_throttle(item)">继续支付</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view class="cont" v-if="item.orderType == 2">
|
|
|
|
|
|
|
+ <view class="cont" v-if="item.orderType == 2 && item.status != 0">
|
|
|
<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
|
|
<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
|
|
|
<view class="order_success">
|
|
<view class="order_success">
|
|
|
<view class="order_name" v-if="item.status == 3">
|
|
<view class="order_name" v-if="item.status == 3">
|
