订单bug修改
This commit is contained in:
parent
bbb482fb35
commit
ef7e2ed969
@ -664,6 +664,13 @@
|
|||||||
openType = 1;
|
openType = 1;
|
||||||
else
|
else
|
||||||
openType = 2;
|
openType = 2;
|
||||||
|
// 没有同意协议 就是一般用户 不是商户
|
||||||
|
let user = this.$store.state.app.userInfo;
|
||||||
|
if (!user.mer_info || !user.mer_info.mer_settlement_agree_status || user
|
||||||
|
.mer_info.mer_settlement_agree_status != 1) {
|
||||||
|
openType = 1;
|
||||||
|
}
|
||||||
|
|
||||||
item.url = '/pages/users/order_list/index?status=2&openType=' + openType
|
item.url = '/pages/users/order_list/index?status=2&openType=' + openType
|
||||||
break
|
break
|
||||||
case '待评价':
|
case '待评价':
|
||||||
|
@ -31,7 +31,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
|
<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
|
||||||
<view>待收货</view>
|
<view>待收货</view>
|
||||||
<view class='num '>{{orderData.noDeliver || 0}}</view>
|
<view class='num' v-if="sale_type == 1">{{(Number(orderData.noDeliver)) || 0}} </view>
|
||||||
|
<view class='num' v-else>{{( Number(orderData.mer_noDeliver)) || 0}} </view>
|
||||||
</view>
|
</view>
|
||||||
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
|
<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
|
||||||
<view>待评价</view>
|
<view>待评价</view>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user