|
@@ -101,12 +101,13 @@
|
|
|
</view>
|
|
</view>
|
|
|
</tui-list-cell>
|
|
</tui-list-cell>
|
|
|
|
|
|
|
|
- <!-- 未达标提示:加运费/加包装费/不能下单 -->
|
|
|
|
|
- <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="showShMethodUnMeetWarning">
|
|
|
|
|
- <view>
|
|
|
|
|
- <text style="color: red;width:100%;font-weight: bold;font-size: 30upx;text-decoration: underline;">{{ shMethodUnMeetWarningText }}</text>
|
|
|
|
|
|
|
+ <!-- 未达标提示:还差扎数/金额,引导加购或说明加收费用 -->
|
|
|
|
|
+ <view class="unmeet-warning" v-if="showShMethodUnMeetWarning">
|
|
|
|
|
+ <view class="unmeet-warning-inner">
|
|
|
|
|
+ <text class="unmeet-warning-badge">!</text>
|
|
|
|
|
+ <text class="unmeet-warning-text">{{ shMethodUnMeetWarningText }}</text>
|
|
|
</view>
|
|
</view>
|
|
|
- </tui-list-cell>
|
|
|
|
|
|
|
+ </view>
|
|
|
|
|
|
|
|
<!-- 配送地址状态提示 -->
|
|
<!-- 配送地址状态提示 -->
|
|
|
<tui-list-cell v-if="form.sendType == 2 && ghsInfo.openIntraCity != 1" class="line-cell" :hover="false" :arrow="false">
|
|
<tui-list-cell v-if="form.sendType == 2 && ghsInfo.openIntraCity != 1" class="line-cell" :hover="false" :arrow="false">
|
|
@@ -168,14 +169,22 @@
|
|
|
<view>
|
|
<view>
|
|
|
<text :class="isFreePt ? 'delivery-price-free' : 'delivery-price-normal'">¥{{ form.sendCost }}</text>
|
|
<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="free-delivery-tag">¥0</text>
|
|
|
- <!-- 展示最接近的免运费差额提示;右侧问号提示可点击查看全部条件 -->
|
|
|
|
|
- <view v-if="!isFreePt" class="delivery-policy-link" @click="showDeliveryPolicyModal">
|
|
|
|
|
- <text>{{ nearestDeliveryPolicyText }}</text>
|
|
|
|
|
- <text class="policy-icon">?</text>
|
|
|
|
|
- </view>
|
|
|
|
|
</view>
|
|
</view>
|
|
|
</tui-list-cell>
|
|
</tui-list-cell>
|
|
|
|
|
|
|
|
|
|
+ <!-- 免跑腿费差额提示:单独成条,点击可看全部条件 -->
|
|
|
|
|
+ <view
|
|
|
|
|
+ v-if="form.sendType == 2 && !isFreePt && showDeliveryPolicy"
|
|
|
|
|
+ class="free-pt-tip"
|
|
|
|
|
+ @click="showDeliveryPolicyModal"
|
|
|
|
|
+ >
|
|
|
|
|
+ <view class="free-pt-tip-inner">
|
|
|
|
|
+ <text class="free-pt-tip-badge">惠</text>
|
|
|
|
|
+ <text class="free-pt-tip-text">{{ nearestDeliveryPolicyText }}</text>
|
|
|
|
|
+ <text class="free-pt-tip-action">?</text>
|
|
|
|
|
+ </view>
|
|
|
|
|
+ </view>
|
|
|
|
|
+
|
|
|
<!-- 额外费用(包装费/运费) -->
|
|
<!-- 额外费用(包装费/运费) -->
|
|
|
<tui-list-cell class="line-cell" :hover="false" v-if="showShMethodExtraFee">
|
|
<tui-list-cell class="line-cell" :hover="false" v-if="showShMethodExtraFee">
|
|
|
<view class="tui-title">{{ shMethodExtraFeeLabel }}</view>
|
|
<view class="tui-title">{{ shMethodExtraFeeLabel }}</view>
|
|
@@ -1683,6 +1692,46 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+/* 未达标提示条:浅红底 + 左侧强调,比纯红下划线更醒目且易读 */
|
|
|
|
|
+.unmeet-warning {
|
|
|
|
|
+ padding: 0 24upx 16upx;
|
|
|
|
|
+ background-color: #fff;
|
|
|
|
|
+}
|
|
|
|
|
+.unmeet-warning-inner {
|
|
|
|
|
+ display: flex;
|
|
|
|
|
+ flex-direction: row;
|
|
|
|
|
+ align-items: flex-start;
|
|
|
|
|
+ padding: 20upx 24upx;
|
|
|
|
|
+ background-color: #fff5f5;
|
|
|
|
|
+ border: 2upx solid #ffd0d0;
|
|
|
|
|
+ border-left-width: 8upx;
|
|
|
|
|
+ border-left-color: #e64545;
|
|
|
|
|
+ border-radius: 12upx;
|
|
|
|
|
+ box-sizing: border-box;
|
|
|
|
|
+}
|
|
|
|
|
+.unmeet-warning-badge {
|
|
|
|
|
+ flex-shrink: 0;
|
|
|
|
|
+ width: 36upx;
|
|
|
|
|
+ height: 36upx;
|
|
|
|
|
+ margin-right: 16upx;
|
|
|
|
|
+ margin-top: 2upx;
|
|
|
|
|
+ border-radius: 50%;
|
|
|
|
|
+ background-color: #e64545;
|
|
|
|
|
+ color: #fff;
|
|
|
|
|
+ font-size: 24upx;
|
|
|
|
|
+ font-weight: bold;
|
|
|
|
|
+ line-height: 36upx;
|
|
|
|
|
+ text-align: center;
|
|
|
|
|
+}
|
|
|
|
|
+.unmeet-warning-text {
|
|
|
|
|
+ flex: 1;
|
|
|
|
|
+ color: #c62828;
|
|
|
|
|
+ font-size: 30upx;
|
|
|
|
|
+ font-weight: bold;
|
|
|
|
|
+ line-height: 1.45;
|
|
|
|
|
+ word-break: break-all;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
/* 跑腿费价格样式 */
|
|
/* 跑腿费价格样式 */
|
|
|
.delivery-price-normal {
|
|
.delivery-price-normal {
|
|
|
color: #3385FF;
|
|
color: #3385FF;
|
|
@@ -1698,30 +1747,57 @@ export default {
|
|
|
margin-left: 20upx;
|
|
margin-left: 20upx;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-.delivery-policy-link {
|
|
|
|
|
- display: inline-flex;
|
|
|
|
|
- align-items: center;
|
|
|
|
|
- color: rgb(201, 52, 52);
|
|
|
|
|
- font-size: 32upx;
|
|
|
|
|
- margin-left: 20upx;
|
|
|
|
|
- font-weight: bold;
|
|
|
|
|
|
|
+/* 免跑腿费提示条:跑腿费下方独立展示,橙色系与红色未达标提示区分 */
|
|
|
|
|
+.free-pt-tip {
|
|
|
|
|
+ padding: 0 24upx 16upx;
|
|
|
|
|
+ background-color: #fff;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-/* 右侧问号提示符:表明文案可点击查看全部免运费条件 */
|
|
|
|
|
-.policy-icon {
|
|
|
|
|
- display: inline-flex;
|
|
|
|
|
|
|
+.free-pt-tip-inner {
|
|
|
|
|
+ display: flex;
|
|
|
|
|
+ flex-direction: row;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
- justify-content: center;
|
|
|
|
|
- width: 28upx;
|
|
|
|
|
- height: 28upx;
|
|
|
|
|
- margin-left: 8upx;
|
|
|
|
|
|
|
+ padding: 20upx 24upx;
|
|
|
|
|
+ background-color: #fff8ef;
|
|
|
|
|
+ border: 2upx solid #ffe0b8;
|
|
|
|
|
+ border-left-width: 8upx;
|
|
|
|
|
+ border-left-color: #f0a020;
|
|
|
|
|
+ border-radius: 12upx;
|
|
|
|
|
+ box-sizing: border-box;
|
|
|
|
|
+}
|
|
|
|
|
+.free-pt-tip-badge {
|
|
|
|
|
+ flex-shrink: 0;
|
|
|
|
|
+ width: 40upx;
|
|
|
|
|
+ height: 40upx;
|
|
|
|
|
+ margin-right: 16upx;
|
|
|
|
|
+ border-radius: 8upx;
|
|
|
|
|
+ background-color: #f0a020;
|
|
|
|
|
+ color: #fff;
|
|
|
font-size: 22upx;
|
|
font-size: 22upx;
|
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
|
- line-height: 28upx;
|
|
|
|
|
- color: rgb(201, 52, 52);
|
|
|
|
|
- background-color: transparent;
|
|
|
|
|
- border: 2upx solid rgb(201, 52, 52);
|
|
|
|
|
|
|
+ line-height: 40upx;
|
|
|
|
|
+ text-align: center;
|
|
|
|
|
+}
|
|
|
|
|
+.free-pt-tip-text {
|
|
|
|
|
+ flex: 1;
|
|
|
|
|
+ color: #c56a00;
|
|
|
|
|
+ font-size: 30upx;
|
|
|
|
|
+ font-weight: bold;
|
|
|
|
|
+ line-height: 1.45;
|
|
|
|
|
+ word-break: break-all;
|
|
|
|
|
+}
|
|
|
|
|
+/* 右侧问号:提示可点击查看全部免运费条件 */
|
|
|
|
|
+.free-pt-tip-action {
|
|
|
|
|
+ flex-shrink: 0;
|
|
|
|
|
+ width: 32upx;
|
|
|
|
|
+ height: 32upx;
|
|
|
|
|
+ margin-left: 12upx;
|
|
|
border-radius: 50%;
|
|
border-radius: 50%;
|
|
|
|
|
+ border: 2upx solid #f0a020;
|
|
|
|
|
+ color: #f0a020;
|
|
|
|
|
+ font-size: 22upx;
|
|
|
|
|
+ font-weight: bold;
|
|
|
|
|
+ line-height: 32upx;
|
|
|
|
|
+ text-align: center;
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
|
}
|
|
}
|
|
|
|
|
|