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

src/api/groupBuy.js

@@ -54,9 +54,7 @@ export default {
     return http.get(`${talosHost}/api/kdsp/playBill/getMakePicData?${qsString}`);
   },
   getGroupShareInfo(orderNo) {
-    return http.get(`${talosHost}/api/kdsp/groupShareInfo?orderNo=${orderNo}`, {
-      hideLoading: true
-    });
+    return http.get(`${talosHost}/api/kdsp/groupShareInfo?orderNo=${orderNo}`);
   },
   getPlayBillUrl(m) {
     return http.get(`http://192.168.25.122/api/kdsp/playBill/getPlayBillUrl?m=${m}`);

src/components/groupShare.vue

@@ -63,6 +63,7 @@ export default {
         this.tipDialogMessage();
         return;
       }
+      this.$store.dispatch('change_loading', true);
       this.type = type;
       if (typeof shareInfo === 'object') {
         this.sharePicData = shareInfo;
@@ -109,9 +110,11 @@ export default {
     async getGroupShareInfo(orderNo) {
       try {
         const [res] = await groupBuyApi.getGroupShareInfo(orderNo);
+        this.$store.dispatch('change_loading', true);
         this.sharePicData = res;
         this.$refs.sharePic.createAndUploadPic(this.sharePicData);
       } catch (err) {
+        this.$store.dispatch('change_loading', false);
         console.log(err);
       }
     },