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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

Browse Source
This commit is contained in:
zmr900709
2020-07-18 14:06:01 +08:00
parent c90b2c3912 5c419e6710
commit e34c74c303
21 changed files with 782 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pages/shop/index.vue
View File

@@ -38,16 +38,16 @@
</view>
<view class="hr" style="margin-top:80rpx"></view>
<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
<view class="hr" style="margin-top:40rpx"></view>
<seckill v-if="spikeList.length"></seckill>
<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>
<recommend v-if="0"></recommend>
<view class="hr" style="margin-top:40rpx" v-if="0"></view>
<recommend v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush" type='group'></recommend>
<view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
<group></group>
<image class="lingquan"></image>
<youhq></youhq>
<view class="hr" style="margin-top:40rpx"></view>
<list :classifyList="classifyList" :goodsList="goodsList"></list>
<list v-if="couponGroupList.length" :classifyList="couponGroupList"></list>
<view class="cart" @click="toCartPage">
<image src="/static/image/common/3.png"></image>
</view>
@@ -85,18 +85,22 @@ export default {
list:[],
goodsClassify: [], // 商品分类
classifyList: [],
goodsList: [],
recommendedSpike: {}, // 秒杀推荐
spikeList: [], // 全部秒杀列表
seckillTime: {}, // 秒杀时间
couponGroupList: [], // 优惠券拼团分类
pinTuanList: [], // 拼团商品
pinTuanPush: {}, // 拼团推荐
}
},
onLoad() {
this.getShopTopList();
this.getGoodsRecommend();
},
onShow() {
this.getRecommendedSpike();
this.getSpikeList();
this.getGoodsClass();
this.getPinTuanPush();
},
methods: {
sousuo(){
@@ -124,25 +128,45 @@ export default {
getRecommendedSpike() {
this.$u.api.recommendedSpike().then(res => {
if(res.errCode == 0) this.recommendedSpike = res.data;
console.log(this.recommendedSpike);
// console.log(this.recommendedSpike);
})
},
// 拼团推荐
getPinTuanPush() {
this.$u.api.getPinTuanPush().then(res => {
if(res.errCode == 0) {
this.pinTuanPush = res.data;
}
})
},
// 获取优惠券拼团分类
getGoodsClass() {
this.$u.api.getGoodsClass().then(res => {
if(res.errCode == 0) {
this.couponGroupList = res.data;
this.getPinTuanList(this.couponGroupList[0].gc_id);
}
})
},
// 全部秒杀
getSpikeList() {
this.$u.api.getSpikeList({ page: 0 }).then(res => {
if(res.errCode == 0) this.spikeList = res.data;
if(res.errCode == 0) {
this.spikeList = res.data.list;
this.seckillTime = {
bigHour: res.data.bigHour,
littleHour: res.data.littleHour,
}
}
})
},
getGoodsRecommend() {
this.$u.api.getGoodsRecommend({
page: 1,
}).then((res)=>{
if (res.errCode == 0) {
this.classifyList = res.data.classifyList;
this.goodsList = res.data.goodsList;
// console.log(this.classifyList);
}
// 拼团列表
getPinTuanList(id) {
this.$u.api.getPinTuanList({
page: 0,
gc_id: id,
}).then(res => {
this.pinTuanList = res.data;
})
},
clickImage(index) {