zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突提交

master
lemon橪 2021-12-20 17:35:38 +08:00
parent c1d4d39265 892f49c83a
commit 1b1b239ba0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/product/goods.vue
View File

@ -344,7 +344,7 @@
@queryCart="cartCount()" @queryCart="cartCount()"
:goodsDetail="goodsDetail" :goodsDetail="goodsDetail"
:goodsSpec="goodsSpec" :goodsSpec="goodsSpec"
:isGroup="isGroup" :isGroup="isGroup"
:id="productId" :id="productId"
v-if="goodsDetail.id" v-if="goodsDetail.id"
:pointDetail="pointDetail" :pointDetail="pointDetail"

6
pages/promotion/point/pointList.vue
View File

@ -19,13 +19,13 @@
<view class="index-items"> <view class="index-items">
<view class="index-item" v-for="(item, key) in nav.goods" :key="key" @click="toGoods(item)"> <view class="index-item" v-for="(item, key) in nav.goods" :key="key" @click="toGoods(item)">
<view class="index-item-img"> <view class="index-item-img">
<u-image :src="item.goodsSku.thumbnail" mode="aspectFill"> <u-image :src="item.thumbnail" mode="aspectFill">
<u-loading slot="loading"></u-loading> <u-loading slot="loading"></u-loading>
</u-image> </u-image>
<view class="index-item-title">{{ item.goodsSku.goodsName }}</view> <view class="index-item-title">{{ item.goodsName }}</view>
<view class="index-item-price"> <view class="index-item-price">
{{ item.points }}积分 {{ item.points }}积分
<span class="tipsMkt">¥{{ item.goodsSku.price | unitPrice }}</span> <span class="tipsMkt">¥{{ item.price | unitPrice }}</span>
</view> </view>
</view> </view>
</view> </view>