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

src/components/groupShare.vue

@@ -231,8 +231,7 @@ export default {
       const data = {
         event: 'showShareView',
         data: {
-          // , 'CopyLink'
-          platform: ['weChat', 'timeLine', 'QQ', 'GeneratePoster'], //依次分别是微信、朋友圈、QQ好友、QQ空间、复制链接
+          platform: ['weChat', 'timeLine', 'QQ', 'CopyLink', 'GeneratePoster'], //依次分别是微信、朋友圈、QQ好友、QQ空间、复制链接
           shareDic: {
             title,
             desc,

src/components/weapp.vue

@@ -3,7 +3,7 @@
 羊小咩原始ID：gh_a976018bfb9e -->
   <wx-open-launch-weapp
     class="launch-btn"
-    username="gh_e1d790d67513"
+    username="gh_a976018bfb9e"
     :path="newJumpUrl"
     @launch="launch"
     @error="launchError"
@@ -65,7 +65,7 @@ export default {
 </script>
 <style lang="less">
 .launch-btn {
-  position: absolute;
+  position: fixed;
   top: 0;
   bottom: 0;
   width: 100%;

src/views/goodsList/index.vue

@@ -265,10 +265,12 @@ export default {
           } else {
             this.pageNo++;
           }
+          store.dispatch('change_group_loading', false);
         }
       } catch (error) {
         this.loading = false;
         this.finished = true;
+        store.dispatch('change_group_loading', false);
       }
     }
   }
@@ -348,7 +350,6 @@ async function getActivityList(urlQuery, next) {
       vm.pageNo = 1;
       vm.getGoodsList(true);
       vm.reload = false;
-      store.dispatch('change_group_loading', false);
     });
   } else {
     nextFns(vm => {