|
|
|
|
@ -342,7 +342,7 @@ |
|
|
|
|
</view> |
|
|
|
|
</form> |
|
|
|
|
</view> |
|
|
|
|
<view class="orderType"> |
|
|
|
|
<view class="orderType" v-if="productType!=1"> |
|
|
|
|
<view class="orderTypeTitle"> |
|
|
|
|
订单类型 |
|
|
|
|
</view> |
|
|
|
|
@ -350,7 +350,7 @@ |
|
|
|
|
<label class="item acea-row row-between-wrapper" v-for="(item,index) in typeList" :key="index"> |
|
|
|
|
|
|
|
|
|
<view> |
|
|
|
|
<radio :value="item.id.toString()" :checked="item.id == 1" /> |
|
|
|
|
<radio :value="item.id.toString()" /> |
|
|
|
|
</view> |
|
|
|
|
<view class="name">{{item.name}}</view> |
|
|
|
|
</label> |
|
|
|
|
@ -454,8 +454,8 @@ |
|
|
|
|
</view> |
|
|
|
|
<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100' |
|
|
|
|
@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view> |
|
|
|
|
<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100' |
|
|
|
|
v-if="is_burst==1" @tap="SubOrder">{{couponData.status != "noAddress" ? '确认寄售':'选择地址'}}</view> |
|
|
|
|
<!-- <view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100' |
|
|
|
|
v-if="is_burst==1" @tap="SubOrder">{{couponData.status != "noAddress" ? '确认寄售':'选择地址'}}</view> --> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<block v-if="coupon.status"> |
|
|
|
|
@ -696,8 +696,9 @@ |
|
|
|
|
{id:0,name:'商品'}, |
|
|
|
|
{id:1,name:'积分'}, |
|
|
|
|
], |
|
|
|
|
orderType:1, |
|
|
|
|
is_burst:null, |
|
|
|
|
orderType:null, |
|
|
|
|
// is_burst:null, |
|
|
|
|
productType:null, |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
@ -717,7 +718,7 @@ |
|
|
|
|
mounted: function() { |
|
|
|
|
}, |
|
|
|
|
onLoad: function(options) { |
|
|
|
|
this.is_burst = options.is_burst |
|
|
|
|
// this.is_burst = options.is_burst |
|
|
|
|
// #ifdef H5 |
|
|
|
|
this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' |
|
|
|
|
// #endif |
|
|
|
|
@ -1065,7 +1066,21 @@ |
|
|
|
|
use_integral: that.use_integral |
|
|
|
|
}).then(res => { |
|
|
|
|
// 默认选中 |
|
|
|
|
that.is_take = false |
|
|
|
|
that.is_take = false; |
|
|
|
|
if(res.data.order[0]&&res.data.order[0].list[0]&&res.data.order[0].list[0].product){ |
|
|
|
|
if(res.data.order[0].list[0].product.is_retail==1){ |
|
|
|
|
// 零售 |
|
|
|
|
that.productType = 2 |
|
|
|
|
}else if(res.data.order[0].list[0].product.is_wholesale==1){ |
|
|
|
|
// 批发 |
|
|
|
|
that.productType = 1 |
|
|
|
|
}else{ |
|
|
|
|
// 普通 |
|
|
|
|
that.productType = null |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
res.data.order.forEach(el => { |
|
|
|
|
if(el.order.isTake == 1)that.is_take = true |
|
|
|
|
el.isTake = 0 |
|
|
|
|
@ -1558,6 +1573,11 @@ |
|
|
|
|
title: '请阅读并勾选协议，否则无法进行操作' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if(!that.orderType){ |
|
|
|
|
return that.$util.Tips({ |
|
|
|
|
title: '请选择订单类型' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if (that.is_take) { |
|
|
|
|
if(!that.post.real_name){ |
|
|
|
|
return that.$util.Tips({ |
|
|
|
|
@ -1652,12 +1672,20 @@ |
|
|
|
|
receipt_data: this.invoiceData, |
|
|
|
|
extend: this.extend, |
|
|
|
|
post: this.post, |
|
|
|
|
gift_type:this.orderType, |
|
|
|
|
is_burst:this.is_burst, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// is_burst:this.is_burst, |
|
|
|
|
// #ifdef H5 |
|
|
|
|
return_url: 'http://' + window.location.host + '/pages/users/order_list/index', |
|
|
|
|
// #endif |
|
|
|
|
}; |
|
|
|
|
if(this.productType==2){ |
|
|
|
|
// gift_type:this.orderType, |
|
|
|
|
this.$set(data,'gift_type',this.orderType) |
|
|
|
|
} |
|
|
|
|
if(this.productType==2||this.productType==1){ |
|
|
|
|
this.$set(data,'order_type',this.productType) |
|
|
|
|
} |
|
|
|
|
if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) { |
|
|
|
|
that.$util.Tips({ |
|
|
|
|
title: '备注不允许输入表情！' |
|
|
|
|
|
liudan
5 months ago