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 @@
           </view>
           <view class="group-box">
             <view class="goods-item" v-for="(groupon, index) in grouponList" :key="groupon.id">
-              <activity-card
-                  :cId="groupon.id"
-                  :title="groupon.title"
-                  :info="groupon.info"
-                  :img="groupon.image"
-                  :price="groupon.price"
-                  :productPrice="groupon.productPrice"
-              >
+              <activity-card :cId="groupon.id" :title="groupon.title" :info="groupon.info" :img="groupon.image"
+                :price="groupon.price" :productPrice="groupon.productPrice">
                 <block slot="tag">
                   <view class="tag" v-if="index < 3">TOP{{ index + 1 }}</view>
                 </block>
@@ -29,200 +23,210 @@
                     <text class="group-num">{{ groupon.people || 0 }}人团</text>
                   </view>
                 </block>
-                <block slot="btn"><button class="cu-btn buy-btn" @tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
+                <block slot="btn"><button class="cu-btn buy-btn"
+                    @tap.stop="jump('/pages/activity/GroupDetails/index', { id: groupon.id })">马上拼</button></block>
               </activity-card>
             </view>
           </view>
         </view>
-        <!-- 空白 -->
-<!--        <Shop-empty v-if="!grouponList.length && !isLoading" :emptyData="emptyData"></Shop-empty>-->
-        <!-- 加载更多 -->
-        <view v-if="grouponList.length" class="cu-load text-gray" :class="loadStatus"></view>
-        <!-- loading -->
-        <Shop-load v-model="isLoading"></Shop-load>
       </scroll-view>
     </view>
-    <!-- 自定义底部导航 -->
-    <Shop-tabbar></Shop-tabbar>
+    <Loading :loaded="loaded" :loading="loading"></Loading>
   </view>
 </template>
 
 <script>
-import activityCard from './children/activity-card.vue';
-import { getCombinationList } from "@/api/activity";
-export default {
-  components: {
-    activityCard
-  },
-  data() {
-    return {
-      emptyData: {
-        img: '/static/imgs/empty/empty_goods.png',
-        tip: '还没有拼团商品噢，去首页看看吧~',
-        path: '/pages/index/index',
-        pathText: '去首页逛逛'
-      },
-      status:'',
-      isLoading: true,
-      loadStatus: '', //loading,over
-      lastPage: 0,
-      currentPage: 1,
-      grouponList: []
-    };
-  },
-  onLoad() {
-    this.getGrouponList();
-  },
-  onPullDownRefresh() {},
-  computed: {},
-  methods: {
-    // 路由跳转
-    jump(path, parmas) {
-      this.$yrouter.push({
-        path: path,
-        query: parmas
-      });
+  import activityCard from './children/activity-card.vue';
+  import Loading from "@/components/Loading";
+
+
+  import {
+    getCombinationList
+  } from "@/api/activity";
+  export default {
+    components: {
+      activityCard,
+      Loading
     },
-    // 加载更多
-    loadMore() {
-      if (this.currentPage < this.lastPage) {
-        this.currentPage += 1;
-        this.getGrouponList();
+    data() {
+      return {
+        emptyData: {
+          img: '/static/imgs/empty/empty_goods.png',
+          tip: '还没有拼团商品噢，去首页看看吧~',
+          path: '/pages/index/index',
+          pathText: '去首页逛逛'
+        },
+        loaded: false,
+        loading: false,
+        lastPage: 0,
+        currentPage: 1,
+        limit: 10,
+        grouponList: []
+      };
+    },
+    onLoad() {
+      this.getGrouponList();
+    },
+    onPullDownRefresh() {},
+    computed: {},
+    methods: {
+      // 路由跳转
+      jump(path, parmas) {
+        this.$yrouter.push({
+          path: path,
+          query: parmas
+        });
+      },
+      // 加载更多
+      loadMore() {
+
+      },
+      // 拼团列表
+      getGrouponList() {
+        let that = this;
+        if (this.loading || this.loaded) return;
+        this.loading = true;
+        getCombinationList({
+          page: that.currentPage,
+          limit: this.limit
+        }).then(res => {
+          that.grouponList = that.grouponList.concat(res.data.storeCombinationQueryVos)
+          this.currentPage++;
+          this.loaded = res.data.storeCombinationQueryVos.length < this.limit;
+          this.loading = false;
+        });
+
+        // that.$api('goods.grouponList', {
+        //   page: that.currentPage
+        // }).then(res => {
+        //   if (res.code === 1) {
+        //     that.isLoading = false;
+        //     that.grouponList = [...that.grouponList, ...res.data.data];
+        //     // that.grouponList=[];
+        //     that.lastPage = res.data.last_page;
+        //     if (that.currentPage < res.data.last_page) {
+        //       that.loadStatus = '';
+        //     } else {
+        //       that.loadStatus = 'over';
+        //     }
+        //   }
+        // });
       }
     },
-    // 拼团列表
-    getGrouponList() {
-      let that = this;
-      that.isLoading = true;
-      that.loadStatus = 'loading';
-      getCombinationList({ page:that.currentPage, limit: 10 }).then(res => {
-        that.status = res.data.length < 10;
-        that.grouponList.push.apply(that.grouponList, res.data);
-        that.lastPage = res.data.last_page;
-          if (that.currentPage < res.data.last_page) {
-            that.loadStatus = '';
-          } else {
-            that.loadStatus = 'over';
-          }
-        that.loading = false;
-      });
-
-      // that.$api('goods.grouponList', {
-      //   page: that.currentPage
-      // }).then(res => {
-      //   if (res.code === 1) {
-      //     that.isLoading = false;
-      //     that.grouponList = [...that.grouponList, ...res.data.data];
-      //     // that.grouponList=[];
-      //     that.lastPage = res.data.last_page;
-      //     if (that.currentPage < res.data.last_page) {
-      //       that.loadStatus = '';
-      //     } else {
-      //       that.loadStatus = 'over';
-      //     }
-      //   }
-      // });
+    onReachBottom() {
+      !this.loading && this.getGrouponList();
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss">
-.group-wrap {
-  background: url('~@/static/images/index-bg.png') no-repeat;
-  background-size: 100% 374rpx;
-}
-.group-head {
-  padding: 0 25rpx;
-  height: 100rpx;
-  .group-head__title {
-    font-size: 32rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: rgba(255, 255, 255, 1);
+  .group-wrap {
+    background: url('~@/static/images/index-bg.png') no-repeat;
+    background-size: 100% 374rpx;
   }
-  .group-head__notice {
-    font-size: 26rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: rgba(255, 255, 255, 1);
-  }
-}
 
-.group-box {
-  width: 710rpx;
-  background: linear-gradient(#fff, #f5f5f5);
-  border-radius: 20rpx;
-  margin: 0 auto;
-  min-height: 1000rpx;
-  .goods-item {
+  .group-head {
+    padding: 0 25rpx;
+    height: 100rpx;
+
+    .group-head__title {
+      font-size: 32rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: rgba(255, 255, 255, 1);
+    }
+
+    .group-head__notice {
+      font-size: 26rpx;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: rgba(255, 255, 255, 1);
+    }
+  }
+
+  .group-box {
+    width: 710rpx;
+    background: linear-gradient(#fff, #f5f5f5);
     border-radius: 20rpx;
-    overflow: hidden;
-    position: relative;
-    margin-bottom: 20rpx;
-    .tag {
-      position: absolute;
-      left: 0;
-      top: 10rpx;
-      z-index: 2;
-      line-height: 35rpx;
-      background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1));
-      border-radius: 0px 18rpx 18rpx 0px;
-      padding: 0 10rpx;
-      font-size: 24rpx;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: rgba(255, 255, 255, 0.8);
-    }
-    /deep/.goods-right {
-      width: 460rpx;
-      .title {
-        width: 460rpx;
+    margin: 0 auto;
+    min-height: 1000rpx;
+
+    .goods-item {
+      border-radius: 20rpx;
+      overflow: hidden;
+      position: relative;
+      margin-bottom: 20rpx;
+
+      .tag {
+        position: absolute;
+        left: 0;
+        top: 10rpx;
+        z-index: 2;
+        line-height: 35rpx;
+        background: linear-gradient(132deg, rgba(255, 153, 93, 1), rgba(255, 99, 97, 1));
+        border-radius: 0px 18rpx 18rpx 0px;
+        padding: 0 10rpx;
+        font-size: 24rpx;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: rgba(255, 255, 255, 0.8);
       }
-      .tip {
+
+      /deep/.goods-right {
         width: 460rpx;
+
+        .title {
+          width: 460rpx;
+        }
+
+        .tip {
+          width: 460rpx;
+        }
       }
-    }
-    .buy-btn {
-      position: absolute;
-      right: 0;
-      bottom: -10rpx;
-      width: 160rpx;
-      height: 60rpx;
-      background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1));
-      box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22);
-      border-radius: 30rpx;
-      font-size: 28rpx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #fff;
-      padding: 0;
-    }
-    .group-num {
-      font-size: 20rpx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: rgba(153, 153, 153, 1);
-      margin-left: 20rpx;
-    }
-    .sell-box {
-      background: rgba(255, 224, 226, 0.3);
-      border-radius: 16rpx;
-      line-height: 32rpx;
-      padding: 0 10rpx;
-      .sell-num {
+
+      .buy-btn {
+        position: absolute;
+        right: 0;
+        bottom: -10rpx;
+        width: 160rpx;
+        height: 60rpx;
+        background: linear-gradient(90deg, rgba(254, 131, 42, 1), rgba(255, 102, 0, 1));
+        box-shadow: 0px 7rpx 6rpx 0px rgba(255, 104, 4, 0.22);
+        border-radius: 30rpx;
+        font-size: 28rpx;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #fff;
+        padding: 0;
+      }
+
+      .group-num {
         font-size: 20rpx;
         font-family: PingFang SC;
-        font-weight: 400;
-        color: rgba(247, 151, 156, 1);
+        font-weight: 500;
+        color: rgba(153, 153, 153, 1);
+        margin-left: 20rpx;
       }
 
-      .cuIcon-hotfill {
-        font-size: 26rpx;
-        color: #e1212b;
-        margin-right: 8rpx;
+      .sell-box {
+        background: rgba(255, 224, 226, 0.3);
+        border-radius: 16rpx;
+        line-height: 32rpx;
+        padding: 0 10rpx;
+
+        .sell-num {
+          font-size: 20rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: rgba(247, 151, 156, 1);
+        }
+
+        .cuIcon-hotfill {
+          font-size: 26rpx;
+          color: #e1212b;
+          margin-right: 8rpx;
+        }
       }
     }
   }
-}
 </style>
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;