修复bug
This commit is contained in:
parent
9a1b5ed211
commit
f949519a32
@ -321,7 +321,7 @@
|
||||
</view>
|
||||
<block v-if="orderInfo.status == 0">
|
||||
<view class="bnt cancel" @click="allRefund"
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view>
|
||||
</block>
|
||||
<block v-if="orderInfo.status == 9">
|
||||
<view class="bnt cancel" @click="getCombinationRemove">取消拼团</view>
|
||||
@ -336,7 +336,7 @@
|
||||
查看拼团</view>
|
||||
<block v-if="orderInfo.status == 1">
|
||||
<!-- <view class="bnt cancel" @click="allRefund"
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view> -->
|
||||
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
|
||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||
</navigator>
|
||||
@ -355,7 +355,7 @@
|
||||
</block>
|
||||
<block v-if="orderInfo.status == 2">
|
||||
<view class="bnt cancel" @click="allRefund"
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
|
||||
v-if="refundNum.length != cartInfo.length && orderInfo.refund_status && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款</view>
|
||||
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
|
||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||
</navigator>
|
||||
@ -371,7 +371,7 @@
|
||||
</block>
|
||||
<block v-if="orderInfo.status == 3">
|
||||
<view class='bnt cancel' @click="delOrder">删除订单</view>
|
||||
<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0">批量退款
|
||||
<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0 && orderInfo.order_status != 4 && orderInfo.order_status != 5">批量退款
|
||||
</view>
|
||||
<view class='bnt b-color' @click="goOrderConfirm"
|
||||
v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
|
||||
|
@ -666,9 +666,9 @@
|
||||
item.num = data.noComment
|
||||
break
|
||||
case '售后/退款':
|
||||
// item.num = data.refund
|
||||
item.num = 0
|
||||
break
|
||||
item.num = data.refund
|
||||
// item.num = 0
|
||||
break;
|
||||
}
|
||||
})
|
||||
})
|
||||
|
@ -17,13 +17,16 @@
|
||||
<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">复制单号</view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view class='item' v-for="(item,index) in expressList" :key="index">
|
||||
<view class='circular' :class='index === 0 ? "on":""'></view>
|
||||
<view class='text' :class='index===0 ? "on-font on":""'>
|
||||
<view>{{item.status}}</view>
|
||||
<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<block v-if="expressList.length>0">
|
||||
<view class='item' v-for="(item,index) in expressList" :key="index">
|
||||
<view class='circular' :class='index === 0 ? "on":""'></view>
|
||||
<view class='text' :class='index===0 ? "on-font on":""'>
|
||||
<view>{{item.status}}</view>
|
||||
<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
</view>
|
||||
<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>
|
||||
</view>
|
||||
|
Loading…
x
Reference in New Issue
Block a user