|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<view class="container">
|
|
|
<!-- 收货地址 -->
|
|
|
- <view class="address" v-if="!Data.ojsType || Data.ojsType ==1">
|
|
|
+ <view class="address" v-if="Data.is_sell != 1">
|
|
|
<block v-if="DefaultAddress != '' && DefaultAddress.name !='' && DefaultAddress.name != undefined">
|
|
|
<view class="add_head flex_r flex_ac flex_jb">
|
|
|
<view class="user_info flex_r flex_ac">
|
|
|
@@ -44,12 +44,12 @@
|
|
|
<view class="list_name flex_r flex_jb"><text>数</text><text>量</text></view>
|
|
|
<view class="list_con">{{Data.num}}</view>
|
|
|
</view>
|
|
|
- <view class="order_list flex_r flex_ac flex_jb">
|
|
|
+ <view class="order_list flex_r flex_ac flex_jb" v-if="Data.is_sell != 1">
|
|
|
<view class="flex_r flex_ac">
|
|
|
<view class="list_name flex_r flex_jb"><text>运</text><text>费</text></view>
|
|
|
<view class="list_con p_color">({{freight}}元/每套)</view>
|
|
|
</view>
|
|
|
- <view class="list_con">￥{{freight}}</view>
|
|
|
+ <view class="list_con">￥{{freight * Data.num}}</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
|
|
|
<view class="flex_r flex_ac">
|
|
|
@@ -63,7 +63,7 @@
|
|
|
<view class="list_name flex_r flex_jb"><text>批</text><text>发</text><text>积</text><text>分</text></view>
|
|
|
<view class="list_con p_color">(可用{{userinfo.integral}})</view>
|
|
|
</view>
|
|
|
- <view class="list_con">{{goodsInfo.trade_num}} 批发积分</view>
|
|
|
+ <view class="list_con">{{goodsInfo.trade_num * Data.num}} 批发积分</view>
|
|
|
</view>
|
|
|
<view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
|
|
|
<view class="list_name flex_r flex_jb"><text>商</text><text>品</text><text>金</text><text>额</text></view>
|
|
|
@@ -140,8 +140,9 @@ export default {
|
|
|
this.freight = res.data.freight;
|
|
|
}
|
|
|
// 计算待支付
|
|
|
- let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price;
|
|
|
- let a = (p * this.Data.num + parseFloat(this.freight)) * 100;
|
|
|
+ let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
|
|
|
+ let y = this.Data.is_sell == 1 ? 0 : this.freight; // 运费 寄售的话退运费为0
|
|
|
+ let a = (p * this.Data.num + y * this.Data.num) * 100; //商品总价
|
|
|
let b = (a - this.userinfo.user_money * 100) / 100;
|
|
|
this.obligation = b > 0 ? b : 0
|
|
|
})
|
|
|
@@ -212,7 +213,6 @@ export default {
|
|
|
}
|
|
|
post('goods/submitOrder', {
|
|
|
...this.Data,
|
|
|
- // id: this.goodsInfo.goods_id,
|
|
|
address_id: this.DefaultAddress.id,
|
|
|
trade_type: type
|
|
|
}).then(res => {
|
|
|
@@ -233,7 +233,8 @@ export default {
|
|
|
}else{
|
|
|
appEv.errTips('支付成功')
|
|
|
setTimeout(() => {
|
|
|
- this.goto("/pages/szw-order-list/index")
|
|
|
+ if(this.Data.is_sell != 1) this.goto("/pages/szw-order-list/index")
|
|
|
+ else this.goto("/pages/account/consignment")
|
|
|
}, 1500);
|
|
|
}
|
|
|
}
|
DaMowang