Skip to content

M
mallapp
Commit 3b203262 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

标签加上

parent 6db9cd53
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 6 deletions
components/goods/list.vue
View file @ 3b203262
......@@ -11,7 +11,19 @@
/>
</view>
<view class="good-name" v-if="setting.is_show_goods_name==1">
<view v-if="cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''" class="Logo" :style=
"{color: cx.marketingLogo.wordsColor,
background:cx.marketingLogo.wordsBack ,}">
{{cx.marketingLogo.words}}
</view>
<image
v-if="cx.marketingLogo.iswords&&cx.marketingLogo.iswords==2&& cx.marketingLogo.ico!=''"
mode="heightFix"
:src="cx.marketingLogo.ico"
style=" height: 16px;"
/>
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;"
v-if="cx.freeShippingFullMoneyPinkage>0 || cx.freeShippingFullNumPinkage>0"
......@@ -183,4 +195,7 @@ export default {
width: 40rpx;
text-align: right;
}
.u-good-list .Logo{
padding: 0 5px;display: inline-block;height: 32rpx;font-size: 20rpx;margin-right: 5rpx;line-height: 32rpx;
}
</style>
components/goods/order-good-list.vue
View file @ 3b203262
......@@ -25,7 +25,19 @@
<view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i">
<image :src="y.cover_pic" mode="aspectFill" class="image" />
<view class="goodinfo">
<view class="name">{{ y.name }}</view>
<view class="name">
<view v-if="y.marketingLogo.iswords && y.marketingLogo.iswords==1&& y.marketingLogo.words!=''" class="Logo" :style=
"{color: y.marketingLogo.wordsColor,
background:y.marketingLogo.wordsBack ,}">
{{y.marketingLogo.words}}
</view>
<image
v-if="y.marketingLogo.iswords&&y.marketingLogo.iswords==2&& y.marketingLogo.ico!=''"
mode="heightFix"
:src="y.marketingLogo.ico"
style=" height: 14px;line-height: 14px;"
/>
{{ 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;display: inline-block;" class="freeShippingstyle" v-if="y.freeShipping_Use==false&&y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
......
pages/cart/cart.vue
View file @ 3b203262
......@@ -72,7 +72,7 @@
"
>
<Text
<view
style="
font-size: 26rpx;
width: 440rpx;
......@@ -81,8 +81,20 @@
text-overflow: ellipsis;
"
>
<view v-if="item.MarketingLogo.iswords && item.MarketingLogo.iswords==1&& item.MarketingLogo.words!=''" class="Logo" :style=
"{color: item.MarketingLogo.wordsColor,
background:item.MarketingLogo.wordsBack ,}">
{{item.MarketingLogo.words}}
</view>
<image
v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
mode="heightFix"
:src="item.MarketingLogo.ico"
style=" height: 14px;line-height: 14px;"
/>
{{ item.GoodsName}}
</Text>
</view>
<view
style="
width: 440rpx;
......@@ -315,6 +327,9 @@ export default {
list.forEach(x => {
x.checked = false;
x.GoodsList.forEach(j => {
j.MarketingLogo = JSON.parse(j.MarketingLogo)
console.log(j.MarketingLogo)
j.checked = false;
j.id=j.Id;
});
......@@ -767,4 +782,7 @@ export default {
line-height: 20px;
border-radius: 10px;
}
.cartStyle .Logo{
padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
}
</style>
pages/goods/goods.vue
View file @ 3b203262
......@@ -38,7 +38,20 @@
</view>
</view>
<view class="g-info">
<view class="g-name u-skeleton-rect">{{ g.name }}</view>
<view class="g-name u-skeleton-rect">
<view v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==1 && g.marketingLogo.words!=''" class="Logo" :style=
"{color: g.marketingLogo.wordsColor,
background:g.marketingLogo.wordsBack ,}">
{{g.marketingLogo.words}}
</view>
<image
v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''"
mode="heightFix"
:src="g.marketingLogo.ico"
style=" height: 14px;"
/>
{{ g.name }}
</view>
<view class="g-price-box">
<view class="left">
<view class="price u-skeleton-rect" :style="{ color: mc }">
......@@ -415,6 +428,7 @@ export default {
res => {
if (res.resultCode == 1) {
this.g = res.data.goods;
this.g.marketingLogo = JSON.parse(this.g.marketingLogo)
this.isAllowShare = res.data.goods.isAllowShare; //1为可以分享 2为不能分享
if (this.isAllowShare == 2) {
//隐藏分享的按钮
......@@ -772,4 +786,7 @@ export default {
top: 300px;
right: 0;
}
.goods .Logo{
padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
}
</style>
pages/goods/list.vue
View file @ 3b203262
......@@ -175,6 +175,9 @@ export default {
console.log("res",res);
this.isloading = false;
if(res.resultCode==1){
res.data.pageData.forEach(x=>{
x.marketingLogo = JSON.parse(x.marketingLogo)
})
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
......
pages/order-submit/order-submit.vue
View file @ 3b203262
......@@ -28,7 +28,19 @@
<view class="goodbox" v-for="(y, yi) in x.goods_list" :key="yi">
<image :src="y.cover_pic" mode="aspectFill" class="image" />
<view class="goodinfo">
<view class="name">{{ y.name }}</view>
<view class="name">
<view v-if="y.marketingLogo.iswords && y.marketingLogo.iswords==1&& y.marketingLogo.words!=''" class="Logo" :style=
"{color: y.marketingLogo.wordsColor,
background:y.marketingLogo.wordsBack ,}">
{{y.marketingLogo.words}}
</view>
<image
v-if="y.marketingLogo.iswords&&y.marketingLogo.iswords==2&& y.marketingLogo.ico!=''"
mode="heightFix"
:src="y.marketingLogo.ico"
style=" height: 14px;"
/>
{{ y.name }}</view>
<view class="attr">已选择：
<span v-for="(item,index3) in y.specificationNameList" :ket="index3">
{{item}}
......@@ -510,6 +522,11 @@ export default {
this.address = res.data.address;
this.address_enable=res.data.address_enable;
this.mchs = res.data.mch_list;
this.mchs.forEach(x=>{
x.goods_list.forEach(j=>{
j.marketingLogo = JSON.parse(j.marketingLogo)
})
})
this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0,10);
this.formdata.DeliveryMethod=this.mchs[0].delivery.send_type;
this.ds = res.data;
......@@ -856,4 +873,7 @@ button[disabled]{
.ordersubmit .btton-box .right {
width: 120px;
}
.ordersubmit .Logo{
padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
}
</style>
pages/search/search.vue
View file @ 3b203262
......@@ -263,7 +263,11 @@ export default {
(res) => {
console.log(res,'搜索ress');
this.showLoading = true;
res.data.pageData.forEach(x=>{
x.marketingLogo = JSON.parse(x.marketingLogo)
})
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.isover = true;
......
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