Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/views/goodsList/components/goodsCard.vue

@@ -124,7 +124,7 @@ export default {
         }
         if (s === 3) {
           message = '您选的商品太火爆了,已经卖完了呢,您可以选择其他的团品重新开团哦～';
-          confirmButtonText = '知道了';
+          confirmButtonText = '选择更多';
         }
 
         this.$dialog({
@@ -133,12 +133,19 @@ export default {
           showCancelButton: true,
           confirmButtonText,
           onConfirm: () => {
-            s !== 3 && this.$toast('已订阅完成！');
+            s !== 3 ? this.$toast('已订阅完成！') : this.goToScrollTop();
           }
         });
       } catch (err) {
         alert(JSON.stringify(err));
       }
+    },
+    goToScrollTop() {
+      // 等待隐藏之后调用
+      const timer = setTimeout(() => {
+        document.getElementById('groupScroll').scrollIntoView();
+        clearTimeout(timer);
+      }, 0);
     }
   }
 };

src/views/goodsList/index.vue

@@ -11,7 +11,7 @@
     <!-- 配置头部动态信息 end -->
 
     <!-- 下方列表展示信息 start -->
-    <div class="group-bottom" :class="{ padtop: isShowSwiper }">
+    <div id="groupScroll" class="group-bottom" :class="{ padtop: isShowSwiper }">
       <div v-if="!isShowSwiper" class="group-portrait">
         <div class="group-portrait-head">
           <div class="group-portrait-swipe">

src/views/orderList/components/List.vue

@@ -211,6 +211,7 @@ export default {
         });
         this.$emit('option-click', { ...item.skuList[0], eventType: 'share' });
       } catch (err) {
+        this.$store.dispatch('change_loading', false);
         console.log(err);
       }
     },