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

Merge branch 'master' into xbx

Browse Source
This commit is contained in:
luyuan
2020-07-21 21:03:56 +08:00
parent 063da7bef3 50c0ac55e6
commit 03d10b1749
18 changed files with 611 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/shop/index.vue
View File

@@ -37,11 +37,13 @@
<!-- 秒杀 -->
<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
<view v-if="JSON.stringify(recommendedSpike) != '{}'" class="hr" style="margin-top:40rpx"></view>
<!-- 秒杀列表 -->
<seckill v-if="spikeList.length" :list="spikeList" :time="seckillTime"></seckill>
<view v-if="spikeList.length" class="hr" style="margin-top:40rpx"></view>
<!-- 拼团 -->
<!-- 拼团推荐 -->
<pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
<view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
<!-- 拼团列表 -->
<group :groupList="pinTuanList" :classifyList="couponGroupList"></group>
<image class="lingquan"></image>
<youhq></youhq>