Skip to content

M
mallapp
Commit 2221ecef authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

1

parent fc9d502c
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
components/goods/order-good-list.vue
View file @ 2221ecef
......@@ -28,10 +28,10 @@
<view class="name">{{ y.name }}</view>
<view style="margin-bottom: 5px;height: 20px;" v-if="y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
<view style="font-size: 12px;color: #909399;padding: 3px 5px;background: #f4f4f5;" class="freeShippingstyle" v-if="y.freeShipping_Use==false&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
<view style="font-size: 12px;color: #909399;padding: 3px 5px;background: #f4f4f5;display: inline-block;" class="freeShippingstyle" v-if="y.freeShipping_Use==false&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
{{y.freeShippingDescription!=null ?y.freeShippingDescription:''}}
</view>
<view style="font-size: 12px;color: #ff9900;padding: 3px 5px;background: #fdf6ec;" class="freeShippingstyle" v-if="y.freeShipping_Use==true&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
<view style="font-size: 12px;color: #ff9900;padding: 3px 5px;background: #fdf6ec;display: inline-block;" class="freeShippingstyle" v-if="y.freeShipping_Use==true&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
{{y.freeShippingDescription!=null ?y.freeShippingDescription:''}}
</view>
</view>
......
pages/cart/cart.vue
View file @ 2221ecef
......@@ -73,7 +73,7 @@
>
<Text
style="
font-size: 24rpx;
font-size: 26rpx;
width: 440rpx;
overflow: hidden;
white-space: nowrap;
......@@ -94,7 +94,7 @@
<Text v-for="(attr, inde2x) in item.SpecificationList" :key="inde2x"
style="
color: #a0a09d;
font-size: 24rpx;
font-size: 20rpx;
margin-right: 5rpx;
"
>
......@@ -104,23 +104,25 @@
</view>
<view
style="
width: 440rpx;
max-width: 440rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-top: 2px;
"
>
<view style="color: #ff9900;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style="
color: #a0a09d;
font-size: 24rpx;
font-size: 20rpx;
margin-right: 5rpx;
">
{{item.FreeShippingName !=null ?item.FreeShippingName+':':''}}
<text v-if="item.FreeShippingFullMoneyPinkage==0 && item.FreeShippingFullNumPinkage>0">{{item.FreeShippingFullNumPinkage}}件包邮</text>
<text v-if="item.FreeShippingFullMoneyPinkage>0 && item.FreeShippingFullNumPinkage==0">满{{item.FreeShippingFullMoneyPinkage}}元包邮</text>
</Text>
</view>
</view>
......
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