|
|
@@ -168,8 +168,11 @@
|
|
|
<view>
|
|
|
<text :class="isFreePt ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
|
|
|
<text v-if="isFreePt" class="free-delivery-tag">¥0</text>
|
|
|
- <!-- 展示相对当前订单最接近的一条免运费条件，点击仍可看全部 -->
|
|
|
- <text v-if="!isFreePt" class="delivery-policy-link" @click="showDeliveryPolicyModal">{{ nearestDeliveryPolicyText }}</text>
|
|
|
+ <!-- 展示最接近的免运费差额提示；右侧问号提示可点击查看全部条件 -->
|
|
|
+ <view v-if="!isFreePt" class="delivery-policy-link" @click="showDeliveryPolicyModal">
|
|
|
+ <text>{{ nearestDeliveryPolicyText }}</text>
|
|
|
+ <text class="policy-icon">?</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
@@ -749,12 +752,12 @@ export default {
|
|
|
return "免运费"
|
|
|
}
|
|
|
if (lackNum > 0 && lackAmount > 0) {
|
|
|
- return `还差${lackNum}扎${lackAmount}元免运费`
|
|
|
+ return `差${lackNum}扎${lackAmount}元免运费`
|
|
|
}
|
|
|
if (lackNum > 0) {
|
|
|
- return `还差${lackNum}扎免运费`
|
|
|
+ return `差${lackNum}扎免运费`
|
|
|
}
|
|
|
- return `还差${lackAmount}元免运费`
|
|
|
+ return `差${lackAmount}元免运费`
|
|
|
},
|
|
|
// 展示包配送政策弹窗
|
|
|
showDeliveryPolicyModal() {
|
|
|
@@ -1688,16 +1691,28 @@ export default {
|
|
|
}
|
|
|
|
|
|
.delivery-policy-link {
|
|
|
+ display: inline-flex;
|
|
|
+ align-items: center;
|
|
|
color: rgb(201, 52, 52);
|
|
|
font-size: 32upx;
|
|
|
margin-left: 20upx;
|
|
|
font-weight: bold;
|
|
|
- text-decoration: underline;
|
|
|
}
|
|
|
|
|
|
+/* 右侧问号提示符：表明文案可点击查看全部免运费条件 */
|
|
|
.policy-icon {
|
|
|
- font-size: 28upx;
|
|
|
- margin-left: 4upx;
|
|
|
+ display: inline-flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ width: 28upx;
|
|
|
+ height: 28upx;
|
|
|
+ margin-left: 8upx;
|
|
|
+ font-size: 22upx;
|
|
|
+ font-weight: bold;
|
|
|
+ line-height: 28upx;
|
|
|
+ color: #fff;
|
|
|
+ background-color: rgb(201, 52, 52);
|
|
|
+ border-radius: 50%;
|
|
|
}
|
|
|
|
|
|
.policy-popup-content {
|
