7.16

pages/shop/index.vue

@@ -38,8 +38,8 @@
         </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>
@@ -88,6 +88,7 @@ export default {
 			goodsList: [],
 			recommendedSpike: {}, // 秒杀推荐
 			spikeList: [], // 全部秒杀列表
+			seckillTime: {}, // 秒杀时间
         }
 	},
 	onLoad() {
@@ -97,6 +98,7 @@ export default {
 	onShow() {
 		this.getRecommendedSpike();
 		this.getSpikeList();
+		this.getPinTuanList();
 	},
 	methods: {
         sousuo(){
@@ -124,13 +126,25 @@ 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);
 			})
 		},
 		// 全部秒杀
 		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,
+					}
+				}
+			})
+		},
+		// 拼团列表
+		getPinTuanList() {
+			this.$u.api.getPinTuanList().then(res => {
+
 			})
 		},
 		getGoodsRecommend() {