|
|
@@ -31,15 +31,12 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<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 topay-btn" @tap="toPay(li)">立即支付</view>
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
|
|
|
+ <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
|
|
|
+ <template v-if="li.order_status != 5">
|
|
|
+ <view class="btn cancel-btn" v-if="[0,1].includes(li.order_status)" @tap="toCancel(li)">取消订单</view>
|
|
|
+ <view class="btn topay-btn" v-if="[0,2].includes(li.pay_status)" @tap="toPay(li)">立即支付</view>
|
|
|
<view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1].includes(li.order_status)">确认收货</view>
|
|
|
</template>
|
|
|
-
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 未付款 end -->
|
|
|
@@ -166,9 +163,11 @@ export default {
|
|
|
uni.showModal({
|
|
|
title: "温馨提示",
|
|
|
content: "发起拼单24小时后，若未拼单成功将自动取消订单并退款哦~",
|
|
|
- showCancel: false,
|
|
|
+ // showCancel: false,
|
|
|
confirmText: "知道了",
|
|
|
confirmColor: "#f02f2f",
|
|
|
+ cancelText: "取消",
|
|
|
+ cancelColor: "#bbb",
|
|
|
success(res) {
|
|
|
if (res.confirm) {
|
|
|
post("my/orderCancel", {
|
DaMowang