From 3cb20117b0e4db3c4a2a753e717ef63479e89c52 Mon Sep 17 00:00:00 2001
From: Gao xiaosong <704041637@qq.com>
Date: Sun, 13 Sep 2020 21:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=9B=A2=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/activity/GoodsGroup/index.vue | 352 ++++++++++++++--------------
pages/shop/Live/LiveList/index.vue | 2 +-
2 files changed, 179 insertions(+), 175 deletions(-)
diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue
index bb629b1..379e6b5 100644
--- a/pages/activity/GoodsGroup/index.vue
+++ b/pages/activity/GoodsGroup/index.vue
@@ -9,14 +9,8 @@
-
+
TOP{{ index + 1 }}
@@ -29,200 +23,210 @@
{{ groupon.people || 0 }}人团
-
+
-
-
-
-
-
-
-
-
+
diff --git a/pages/shop/Live/LiveList/index.vue b/pages/shop/Live/LiveList/index.vue
index e2b6ec2..bcc8936 100644
--- a/pages/shop/Live/LiveList/index.vue
+++ b/pages/shop/Live/LiveList/index.vue
@@ -94,7 +94,7 @@
page: that.currentPage,
size: that.size
}).then(res => {
- that.liveList = [...that.liveList, ...res.data.content];
+ that.liveList = that.liveList.concat(res.data.content)
this.currentPage++;
this.loaded = res.data.content.length < that.size;
this.loading = false;