code-image-backup-public/lilishop-uniapp
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git synced 2025-12-17 07:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ma'

Browse Source 
# Conflicts:
#	pages/product/goods.vue
#	pages/product/product/shop/-shop.vue
#	pages/product/product/style.scss
This commit is contained in:
mabo
2021-06-24 17:58:34 +08:00
parent 1489deb618 de639c808c
commit 60a8fe7361
5 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pages/product/goods.vue
View File

@@ -126,16 +126,16 @@
<span v-if="selectedGoods.spec">{{ selectedGoods.spec.specName }}-{{
selectedGoods.spec.specValue
}}</span>
<span v-else>默认</span>
</view>
<view class="card-bottom">
<u-icon name="more-dot-fill"></u-icon>
</view>
</view>
<view class="card-flex" @click="shutMask(3)">
<view class="card-title"> 送至 </view>
<view class="card-content">
<span v-if="delivery">{{
<span v-else>默认</span>
</view>
<view class="card-bottom">
<u-icon name="more-dot-fill"></u-icon>
</view>
</view>
<view class="card-flex" @click="shutMask(3)">
<view class="card-title"> 送至 </view>
<view class="card-content">
<span v-if="delivery">{{
delivery.consigneeAddressPath | clearStrComma
}}</span>
<span v-else>暂无地址信息</span>
@@ -878,10 +878,10 @@ export default {
</script>
<style lang="scss" scoped>
// #ifdef MP-WEIXIN
@import "./product/mp-goods.scss";
// #endif
// #ifdef MP-WEIXIN
@import "./product/mp-goods.scss";
// #endif
@import "./product/style.scss";
@import "./product/product.scss";
@import "./product/style.scss";
@import "./product/product.scss";
</style>