|
@@ -30,8 +30,8 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view class="price-box flex_r flex_ac">
|
|
|
|
|
- <template v-if="li.pay_status === 0">
|
|
|
|
|
|
|
+ <view class="price-box flex_r flex_ac" >
|
|
|
|
|
+ <template v-if="(li.pay_status === 0 || li.pay_status === 2) && li.order_status != 5">
|
|
|
<view class="btn cancel-btn" @tap="toCancel(li)">取消订单</view>
|
|
<view class="btn cancel-btn" @tap="toCancel(li)">取消订单</view>
|
|
|
<view class="btn topay-btn" @tap="toPay(li)">立即支付</view>
|
|
<view class="btn topay-btn" @tap="toPay(li)">立即支付</view>
|
|
|
</template>
|
|
</template>
|
|
@@ -39,6 +39,7 @@
|
|
|
<view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
|
|
<view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
|
|
|
<view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
|
|
<view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
+
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<!-- 未付款 end -->
|
|
<!-- 未付款 end -->
|
|
@@ -211,10 +212,12 @@ export default {
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
|
|
|
+ // 0 支付状态 1 订单状态
|
|
|
tidyStatus() {
|
|
tidyStatus() {
|
|
|
return (da) => {
|
|
return (da) => {
|
|
|
if (da[0] === 0) return "待支付";
|
|
if (da[0] === 0) return "待支付";
|
|
|
- if (da[1] === 0) return "待发货";
|
|
|
|
|
|
|
+ if (da[1] === 0 && da[0] == 1) return "待发货";
|
|
|
|
|
+ if (da[1] === 0 && da[0] != 1) return "待支付";
|
|
|
if (da[1] == 1) return "待收货";
|
|
if (da[1] == 1) return "待收货";
|
|
|
if (da[1] == 2) return "已收货";
|
|
if (da[1] == 2) return "已收货";
|
|
|
if (da[1] == 3) return "申请退货";
|
|
if (da[1] == 3) return "申请退货";
|