mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
wpf 2024-03-12 14:34:48 +08:00
parent 9a1b5ed211
commit f949519a32
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/order_details/index.vue
View File

@ -321,7 +321,7 @@
</view> </view>
<block v-if="orderInfo.status == 0"> <block v-if="orderInfo.status == 0">
<view class="bnt cancel" @click="allRefund" <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>
<block v-if="orderInfo.status == 9"> <block v-if="orderInfo.status == 9">
<view class="bnt cancel" @click="getCombinationRemove">取消拼团</view> <view class="bnt cancel" @click="getCombinationRemove">取消拼团</view>
@ -336,7 +336,7 @@
查看拼团</view> 查看拼团</view>
<block v-if="orderInfo.status == 1"> <block v-if="orderInfo.status == 1">
<!-- <view class="bnt cancel" @click="allRefund" <!-- <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' <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">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator> </navigator>
@ -355,7 +355,7 @@
</block> </block>
<block v-if="orderInfo.status == 2"> <block v-if="orderInfo.status == 2">
<view class="bnt cancel" @click="allRefund" <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' <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">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator> </navigator>
@ -371,7 +371,7 @@
</block> </block>
<block v-if="orderInfo.status == 3"> <block v-if="orderInfo.status == 3">
<view class='bnt cancel' @click="delOrder">删除订单</view> <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>
<view class='bnt b-color' @click="goOrderConfirm" <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"> v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">

6
pages/user/index.vue
View File

@ -666,9 +666,9 @@
item.num = data.noComment item.num = data.noComment
break break
case '售后/退款': case '售后/退款':
// item.num = data.refund item.num = data.refund
item.num = 0 // item.num = 0
break break;
} }
}) })
}) })

17
pages/users/refund/logistics.vue
View File

@ -17,13 +17,16 @@
<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">复制单号</view> <view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">复制单号</view>
<!-- #endif --> <!-- #endif -->
</view> </view>
<view class='item' v-for="(item,index) in expressList" :key="index"> <block v-if="expressList.length>0">
<view class='circular' :class='index === 0 ? "on":""'></view> <view class='item' v-for="(item,index) in expressList" :key="index">
<view class='text' :class='index===0 ? "on-font on":""'> <view class='circular' :class='index === 0 ? "on":""'></view>
<view>{{item.status}}</view> <view class='text' :class='index===0 ? "on-font on":""'>
<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view> <view>{{item.status}}</view>
</view> <view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
</view> </view>
</view>
</block>
</view> </view>
<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend> <recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>
</view> </view>