Skip to content

M
mallapp
Commit 076be7b0 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

.

parent 5992ad52
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pages/order-submit/order-submit.vue
View file @ 076be7b0
......@@ -45,7 +45,10 @@
<view v-if="y.address_disabled">
<u-tag size="mini" text="不在配送范围内" type="warning" />
</view>
<view style="height: 22px;line-height: 22px;font-size: 11px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
<view v-if="y.freeShipping_Use==true" style="height: 22px;line-height: 22px;font-size: 11px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
<text>{{y.freeShippingDescription}}</text>
</view>
<view v-if="y.freeShipping_Use==false" style="height: 22px;line-height: 22px;font-size: 11px;color: #909399;background: #f4f4f5;padding: 0 5px;margin-bottom: 5px;display: inline-block;">
<text>{{y.freeShippingDescription}}</text>
</view>
......@@ -71,7 +74,7 @@
</view>
</template>
<template>
<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;align-items: center;flex-wrap: wrap;" v-if="x.pinkageList.length>0">
<view class="goodboxmore" style="font-size: 12px;color: #000000;display: flex;flex-direction: row;flex-wrap: wrap;" v-if="x.pinkageList.length>0 && x.goods_list.length>1 ">
已满足:
<view style="height: 22px;line-height: 22px;font-size: 12px;color: #FF4048;background: #fdf6ec;padding: 0 5px;margin-left: 10px;margin-bottom: 5px;" v-for="(y, yi) in x.pinkageList" :key="yi">
<text>{{y.Name}}</text>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment