|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
|
<template> |
|
|
|
|
<view :style="viewColor"> |
|
|
|
|
<view class='order-submission'> |
|
|
|
|
<view v-if="allow_address && order_model == 0&&productType!=1" class="allAddress" @click="onAddress"> |
|
|
|
|
<view v-if="allow_address && order_model == 0&&productType!=2" class="allAddress" @click="onAddress"> |
|
|
|
|
<view class='address acea-row row-between-wrapper' v-if='shippingType == 0 '> |
|
|
|
|
<view class='addressCon' v-if="addressInfo.real_name"> |
|
|
|
|
<view class='name'> |
|
|
|
|
@ -144,7 +144,7 @@ |
|
|
|
|
<view class='discount' v-else>免运费</view> |
|
|
|
|
</view> |
|
|
|
|
<view class='item acea-row row-between-wrapper' |
|
|
|
|
v-if="order_type != 3 && order_type != 4 && item.order.enabledCoupon"> |
|
|
|
|
v-if="order_type != 3 && order_type != 4 && item.order.enabledCoupon &&productType==2"> |
|
|
|
|
<view>店铺优惠券</view> |
|
|
|
|
<block v-if="item.coupon.length>0"> |
|
|
|
|
<!-- @tap='couponTap(item,index)' --> |
|
|
|
|
@ -343,7 +343,7 @@ |
|
|
|
|
</view> |
|
|
|
|
</form> |
|
|
|
|
</view> |
|
|
|
|
<view class="orderType" v-if="productType!=1"> |
|
|
|
|
<view class="orderType" v-if="productType!=2"> |
|
|
|
|
<view class="orderTypeTitle"> |
|
|
|
|
订单类型 |
|
|
|
|
</view> |
|
|
|
|
@ -423,7 +423,7 @@ |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class='item acea-row row-between-wrapper' |
|
|
|
|
v-if="order_type != 3 && order_type != 4 && enabledPlatformCoupon"> |
|
|
|
|
v-if="order_type != 3 && order_type != 4 && enabledPlatformCoupon &&productType==2"> |
|
|
|
|
<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view> |
|
|
|
|
<block v-if="platformCoupon.length > 0"> |
|
|
|
|
<!-- @tap='couponTap2(platformCoupon,0)' --> |
|
|
|
|
@ -1074,10 +1074,10 @@ |
|
|
|
|
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 |
|
|
|
|
that.productType = 1 |
|
|
|
|
}else if(res.data.order[0].list[0].product.is_wholesale==1){ |
|
|
|
|
// 批发 |
|
|
|
|
that.productType = 1 |
|
|
|
|
that.productType = 2 |
|
|
|
|
}else{ |
|
|
|
|
// 普通 |
|
|
|
|
that.productType = null |
|
|
|
|
@ -1583,7 +1583,7 @@ |
|
|
|
|
title: '请阅读并勾选协议，否则无法进行操作' |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
if(!that.orderType&&that.productType!=1){ |
|
|
|
|
if(!that.orderType&&that.productType!=2){ |
|
|
|
|
return that.$util.Tips({ |
|
|
|
|
title: '请选择订单类型' |
|
|
|
|
}); |
|
|
|
|
@ -1689,7 +1689,7 @@ |
|
|
|
|
return_url: 'http://' + window.location.host + '/pages/users/order_list/index', |
|
|
|
|
// #endif |
|
|
|
|
}; |
|
|
|
|
if(this.productType==2){ |
|
|
|
|
if(this.productType==1){ |
|
|
|
|
// gift_type:this.orderType, |
|
|
|
|
this.$set(data,'gift_type',this.orderType) |
|
|
|
|
} |
|
|
|
|
|
liudan
5 months ago