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

src/mixins/goodsCheck.mixin.js

@@ -38,7 +38,7 @@ export default {
           confirmButtonText: '登录',
           onConfirm: () => {
             if (isWxMp) {
-              this.nativeBridge.getToken();
+              this.nativeBridge.getToken({ from: 'groupbuy' });
             } else if (isApp) {
               // native调用getToken
               this.getToken();

src/service/mp.js

@@ -32,8 +32,8 @@ class Mp {
       wx.miniProgram.postMessage({ data });
     }
   }
-  getToken(callback = () => {}) {
-    this.run({ event: 'getToken' }, callback, true);
+  getToken(data, callback = () => {}) {
+    this.run({ event: 'getToken', ...data }, callback, true);
   }
   closeBrowser() {
     const { wx } = this;

src/views/goodsList/index.vue

@@ -152,6 +152,7 @@ export default {
   activated() {
     this.showLoops = true;
     this.$nextTick(() => {
+      console.log(this.$refs.swipeRota);
       this.$refs.swipeRota && this.$refs.swipeRota.onSlidePrevChange();
     });
   },

src/views/orderList/components/List.vue

@@ -139,7 +139,7 @@ export default {
         },
         2: {
           class: 'Ol__head-success',
-          message: '已成团，等待发货！',
+          message: '已成团',
           footTxt: '退款将原路返还，请注意帐户变动'
         },
         3: {