|
|
@@ -125,17 +125,19 @@
|
|
|
<block v-if="form.openIntraCity == 1">
|
|
|
<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true && Number(showDistance)>0">
|
|
|
<view class="tui-title">距离</view>
|
|
|
- <text v-if="showDistance > 100" style="color: #3385FF">{{ (showDistance/1000).toFixed(1) }}公里</text>
|
|
|
- <text v-else style="color: #3385FF">{{ showDistance }} 米</text>
|
|
|
+ <view>
|
|
|
+ <text v-if="showDistance > 100" style="color: #3385FF">{{ (showDistance/1000).toFixed(1) }}公里</text>
|
|
|
+ <text v-else style="color: #3385FF">{{ showDistance }} 米</text>
|
|
|
+ <text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
|
|
|
+ 免费配送条件
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false" v-if="displaySendCost == true">
|
|
|
<view class="tui-title">跑腿费</view>
|
|
|
<view>
|
|
|
<text :class="isFreeDelivery ? 'delivery-price-free' : 'delivery-price-normal'">¥ {{ form.sendCost }}</text>
|
|
|
<text v-if="isFreeDelivery" class="free-delivery-tag">【免跑腿费】</text>
|
|
|
- <text v-if="showDeliveryPolicy" class="delivery-policy-link" @click="showDeliveryPolicyModal">
|
|
|
- 免费配送条件
|
|
|
- </text>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
</block>
|
|
|
@@ -565,6 +567,13 @@ export default {
|
|
|
that.form.long = userInfo.long
|
|
|
that.form.lat = userInfo.lat
|
|
|
that.form.showAddress = userInfo.showAddress
|
|
|
+ that.form.receiveMobile = userInfo.mobile
|
|
|
+
|
|
|
+ let userName = userInfo.name?userInfo.name:''
|
|
|
+ if (/^\d+$/.test(userName)){
|
|
|
+ userName = '尾号'+userName.slice(-4)
|
|
|
+ }
|
|
|
+ that.form.receiveUserName = userName
|
|
|
|
|
|
if(!this.$util.isEmpty(userInfo.lat) && !this.$util.isEmpty(userInfo.long) && !this.$util.isEmpty(userInfo.address)){
|
|
|
this.validAddress = true
|
|
|
@@ -576,7 +585,6 @@ export default {
|
|
|
if(Number(openIntraCity) == 1 && that.form.sendType == 2 && this.validAddress == true){
|
|
|
that.getDeliveryQuotes()
|
|
|
const isFreeDelivery = that.checkFreeDelivery()
|
|
|
- console.log('getUserInfo -- isFreeDelivery: ',isFreeDelivery)
|
|
|
}
|
|
|
}
|
|
|
}).catch(()=>{})
|
|
|
@@ -1188,7 +1196,7 @@ export default {
|
|
|
.delivery-policy-link {
|
|
|
color: rgb(201, 52, 52);
|
|
|
font-size: 32upx;
|
|
|
- margin-left: 10upx;
|
|
|
+ margin-left: 30upx;
|
|
|
font-weight:bold;
|
|
|
text-decoration: underline;
|
|
|
}
|
