theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'update goods price 8.12' (#163) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/163
This commit is contained in:
hansu 2020-08-12 15:24:54 +08:00
commit a6907f3f69
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pageB/sdetails/index.vue
View File

@ -23,10 +23,13 @@
<text class="goods-name">{{ goodsInfo.goods_name }}</text> <text class="goods-name">{{ goodsInfo.goods_name }}</text>
</view> </view>
<view class="price-collect"> <view class="price-collect">
<view class="pic" v-if="type != 3"> <view class="pic" v-if="type == 2">
<text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text> <text>￥{{ goodsInfo.pintuan_price || '0.00' }}</text>
<s>￥{{ goodsInfo.goods_price || '0.00' }}</s> <s>￥{{ goodsInfo.goods_price || '0.00' }}</s>
</view> </view>
<view class="pic" v-else-if="type == 1">
<text>￥{{ goodsInfo.goods_price || '0.00' }}</text>
</view>
<view class="collect" @click="switchCollect(goodsInfo.is_collect)"> <view class="collect" @click="switchCollect(goodsInfo.is_collect)">
<u-icon name="star" color="#474747" size="28" v-if="goodsInfo.is_collect == 0"></u-icon> <u-icon name="star" color="#474747" size="28" v-if="goodsInfo.is_collect == 0"></u-icon>
<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon> <u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>

6
pageC/groupBuy/index.vue
View File

@ -10,8 +10,8 @@
<view v-if="pinTuanList[index]"> <view v-if="pinTuanList[index]">
<SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods> <SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods>
</view> </view>
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="!pinTuanList[index] || pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore> <u-empty text="暂无商品" mode="list" color="#000" margin-top="120" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty> <u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList[index] && pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
</swiper> </swiper>
@ -22,7 +22,7 @@ import SpecialGoods from "../../components/shop/special-shop/index";
export default { export default {
data() { data() {
return { return {
pageSize: 12, pageSize: 6,
tabList: [], tabList: [],
current: -1, current: -1,
swiperCurrent: 0, swiperCurrent: 0,