mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into prod 

# Conflicts:
#	config/app.js
This commit is contained in:
weipengfei 2023-12-01 16:21:06 +08:00
parent 6751909431 1176e928bf
commit 089e105e67
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pages/product/goodsOnSale/index.vue
View File

@ -45,8 +45,14 @@
<span>销量：{{ item.sales }}</span>
</view>
<view class="shop_list_item_shop_con_price">
<span>￥{{ item.price }}</span>
<del>￥{{ item.ot_price }}</del>
<block v-if="mer_info.type_code=='TypeSupplyChain'">
<block v-if="item.attrValue[0]">
<text class='price font-color'>￥{{item.attrValue[0].procure_price}}</text>
<text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
</block>
<text v-else class='ot_price'>商品规格错误</text>
</block>
<text v-else class='price font-color'>￥{{item.price}}</text>
</view>
</view>
</view>
@ -87,6 +93,7 @@ export default {
childIndex: 0,
menuList: [],
merId: '',
mer_info: {},
shopList: [],
loaded: false,
loading: false,
@ -110,6 +117,9 @@ export default {
},
onLoad(opt) {
let user = this.$store.state.app.userInfo;
if(typeof user == 'string') user = JSON.parse(user);
this.mer_info = user.mer_info;
this.merId = opt.mer_id;
this.getProductTitle();
this.$set(this, 'type', opt.type ? Number(opt.type) : 1);
@ -420,6 +430,12 @@ export default {
font-size: 26rpx;
}
}
.ot_price {
color: #bebebe;
font-size: 26rpx;
margin-left: 10rpx;
// text-decoration: line-through;
}
}
}
&_handle {

12
pages/product/list/index.vue
View File

@ -112,8 +112,14 @@
<text class="num">销量: {{item.sales}}</text>
</view>
<view class='money-wrap'>
<text class='price font-color'>￥{{item.price}}</text>
<text class='ot_price'>￥{{item.ot_price}}</text>
<block v-if="mer_info.type_code=='TypeSupplyChain'">
<block v-if="item.attrValue[0]">
<text class='price font-color'>￥{{item.attrValue[0].procure_price}}</text>
<text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
</block>
<text v-else class='ot_price'>商品规格错误</text>
</block>
<text v-else class='price font-color'>￥{{item.price}}</text>
</view>
</view>
@ -985,7 +991,7 @@
.ot_price {
color: #bebebe;
font-size: 26rpx;
text-decoration: line-through;
// text-decoration: line-through;
}
}