|
|
|
|
@ -2,7 +2,7 @@
|
|
|
|
|
<view class="order-submission"> |
|
|
|
|
<view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'"> |
|
|
|
|
<view class="nav acea-row"> |
|
|
|
|
<view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)" v-if="systemStore"></view> |
|
|
|
|
<!-- <view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)" v-if="systemStore"></view> --> |
|
|
|
|
<view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)" v-if="systemStore && !isIntegral"></view> |
|
|
|
|
</view> |
|
|
|
|
<view class="address acea-row row-between-wrapper" v-if="shipping_type === 0" @click="addressTap"> |
|
|
|
|
@ -17,7 +17,7 @@
|
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="addressCon" v-else> |
|
|
|
|
<view class="setaddress">设置收货地址</view> |
|
|
|
|
<view class="setaddress">设置地址</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="iconfont icon-jiantou"></view> |
|
|
|
|
</view> |
|
|
|
|
@ -71,9 +71,10 @@
|
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="item acea-row row-between-wrapper" v-if="shipping_type === 0"> |
|
|
|
|
<view>快递费用</view> |
|
|
|
|
<view class="discount"> |
|
|
|
|
{{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }} |
|
|
|
|
<view>配送费用</view> |
|
|
|
|
<view class="discount"> |
|
|
|
|
19元起送,配送免费,请保持手机畅通~ |
|
|
|
|
<!-- {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }} --> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view v-if="shipping_type === 1"> |
|
|
|
|
@ -107,10 +108,10 @@
|
|
|
|
|
<view class="name acea-row row-center-wrapper"> <view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 </view> |
|
|
|
|
<view class="tip">微信快捷支付</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')"> |
|
|
|
|
<!-- <view class="payItem acea-row row-middle" v-if="!isIntegral" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')"> |
|
|
|
|
<view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付 </view> |
|
|
|
|
<view class="tip">可用余额：{{ userInfo.nowMoney || 0 }}</view> |
|
|
|
|
</view> |
|
|
|
|
</view> --> |
|
|
|
|
<view class="payItem acea-row row-middle" v-if="isIntegral" :class="active === 'integral' ? 'on' : ''" @click="payItem('integral')"> |
|
|
|
|
<view class="name acea-row row-center-wrapper"> <view class="iconfont icon-icon-test" :class="active === 'integral' ? 'bounceIn' : ''"></view>积分支付 </view> |
|
|
|
|
<view class="tip">可用积分：{{ userInfo.integral || 0 }}</view> |
|
|
|
|
@ -188,7 +189,7 @@
|
|
|
|
|
.order-submission .allAddress .nav .item.on:before { |
|
|
|
|
position: absolute; |
|
|
|
|
bottom: 0; |
|
|
|
|
content: '快递配送'; |
|
|
|
|
content: '免费送货'; |
|
|
|
|
font-size: 0.28 * 100rpx; |
|
|
|
|
display: block; |
|
|
|
|
height: 0; |
|
|
|
|
@ -273,7 +274,7 @@ export default {
|
|
|
|
|
offlinePayStatus: 2, |
|
|
|
|
from: this.$deviceType, |
|
|
|
|
deduction: true, |
|
|
|
|
enableIntegral: true, |
|
|
|
|
enableIntegral: false, |
|
|
|
|
enableIntegralNum: 0, |
|
|
|
|
isWeixin: _isWeixin, |
|
|
|
|
pinkId: 0, |
|
|
|
|
@ -293,7 +294,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
mark: '', |
|
|
|
|
systemStore: {}, |
|
|
|
|
shipping_type: 0, |
|
|
|
|
shipping_type: 1, |
|
|
|
|
contacts: '', |
|
|
|
|
contactsTel: '', |
|
|
|
|
storeSelfMention: 0, |
|
|
|
|
@ -444,7 +445,16 @@ export default {
|
|
|
|
|
this.addressInfo = addressInfo |
|
|
|
|
this.computedPrice() |
|
|
|
|
}, |
|
|
|
|
createOrder() { |
|
|
|
|
createOrder() { |
|
|
|
|
// if (this.orderPrice.payPrice < 19){ |
|
|
|
|
// uni.showToast({ |
|
|
|
|
// title: '19元起送.', |
|
|
|
|
// icon: 'none', |
|
|
|
|
// duration: 2000, |
|
|
|
|
// }) |
|
|
|
|
// return |
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
if (this.isIntegral) { |
|
|
|
|
// 积分支付 |
|
|
|
|
if (this.userInfo.integral < this.orderPrice.payIntegral) { |
|
|
|
|
@ -485,7 +495,7 @@ export default {
|
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(this.contactsTel)) { |
|
|
|
|
if (!/^1(3|4|5|7|8|9|6|7)\d{9}$/.test(this.contactsTel)) { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '请填写正确的手机号', |
|
|
|
|
icon: 'none', |
|
|
|
|
@ -495,7 +505,7 @@ export default {
|
|
|
|
|
} |
|
|
|
|
if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(this.contacts)) { |
|
|
|
|
uni.showToast({ |
|
|
|
|
title: '请填写您的真实姓名', |
|
|
|
|
title: '请填写您的称呼', |
|
|
|
|
icon: 'none', |
|
|
|
|
duration: 2000, |
|
|
|
|
}) |
|
|
|
|
|
