Commit 92922049 authored by 黄媛媛's avatar 黄媛媛

1

parent fd31ad15
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
margin-top: 2px; margin-top: 2px;
" "
@click="goUrl(item.FreeShippingUrl)"
v-if="item.FreeShippingName !=null && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)" v-if="item.FreeShippingName !=null && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)"
> >
...@@ -654,7 +655,12 @@ export default { ...@@ -654,7 +655,12 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/goods/goods?id=' + id url: '/pages/goods/goods?id=' + id
}); });
} },
goUrl(url) {
uni.navigateTo({
url: url
});
},
} }
}; };
</script> </script>
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
style="align-items: flex-start;" style="align-items: flex-start;"
> >
<view class="label" style="margin-top: 5px;">活动</view> <view class="label" >活动</view>
<view class="content" style="display: flex;flex-direction: column" > <view class="content" style="display: flex;flex-direction: column" >
<view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;" v-if="g.goods_marketing_award.integral.title != ''"> <view style="display: flex;flex-direction: row;align-items: center;margin-bottom: 5px;" v-if="g.goods_marketing_award.integral.title != ''">
<u-tag text="送积分" type="error" /> <u-tag text="送积分" type="error" />
...@@ -106,9 +106,29 @@ ...@@ -106,9 +106,29 @@
g.goods_marketing_award.PresentFXGradeMsg g.goods_marketing_award.PresentFXGradeMsg
}}</text> }}</text>
</view> </view>
<view style="margin-top: 5px;" v-if="g.goods_marketing_award.PresentFXGradeMsg == '' && g.goods_marketing_award.integral.title == ''"> <view style="display: flex;flex-direction: row;align-items: center" v-if=" g.freeShippingName!=null && g.freeShippingName !='' &&(g.fullMoneyPinkage > 0 || g.fullNumPinkage>0)"
<text>暂无活动</text> @click="goUrl(g.FreeShippingUrl)"
>
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style="
font-size: 20rpx;
margin-right: 5rpx;
">
{{g.freeShippingName !=null ?g.freeShippingName:''}}
</Text>
</view>
<!-- <view class="label" style="color: #FF4048;">{{g.freeShippingName}}</view> -->
<!-- <view class="content" v-if="g.fullMoneyPinkage==0 && g.fullNumPinkage>0">{{g.fullNumPinkage}}件包邮</view>
<view class="content" v-if="g.fullMoneyPinkage>0 && g.fullNumPinkage==0">{{g.fullMoneyPinkage}}元包邮</view> -->
</view> </view>
<!-- <view style="margin-top: 5px;" v-if="
g.goods_marketing_award.PresentFXGradeMsg == ''
&& g.goods_marketing_award.integral.title == '' &&
g.freeShippingName!=null && g.freeShippingName !='' &&(g.fullMoneyPinkage == 0 && g.fullNumPinkage==0)
">
<text>暂无活动</text>
</view> -->
</view> </view>
</view> </view>
...@@ -165,17 +185,13 @@ ...@@ -165,17 +185,13 @@
</view> </view>
</view> </view>
<view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1'&& g.fullMoneyPinkage==0 && g.fullNumPinkage==0"> <view class="sku-box u-skeleton-rect" v-if="setting.is_express == '1' ">
<view class="label">快递</view> <view class="label">快递</view>
<view class="content">{{ <view class="content">{{
g.express == "" ? "免运费" : "¥" + g.express g.express == "" ? "免运费" : "¥" + g.express
}}</view> }}</view>
</view> </view>
<view class="sku-box u-skeleton-rect" v-if="g.express>0 && g.freeShippingName!=null && g.freeShippingName !=''">
<view class="label" style="color: #000000;">{{g.freeShippingName}}:</view>
<view class="content" v-if="g.fullMoneyPinkage==0 && g.fullNumPinkage>0">{{g.fullNumPinkage}}件包邮</view>
<view class="content" v-if="g.fullMoneyPinkage>0 && g.fullNumPinkage==0">满{{g.fullMoneyPinkage}}元包邮</view>
</view>
<view <view
class="sku-box u-skeleton-rect" class="sku-box u-skeleton-rect"
style="margin-top: -10;" style="margin-top: -10;"
...@@ -702,7 +718,12 @@ export default { ...@@ -702,7 +718,12 @@ export default {
}, },
closeBtn(){ closeBtn(){
this.showCoupons = false this.showCoupons = false
} },
goUrl(url) {
uni.navigateTo({
url: url
});
},
}, },
}; };
......
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