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

65690df2 · Xuguangxing · ab81e1d5 · c09a2e83 · 65690df2 · 65690df2
Commit 65690df2 authored Sep 22, 2021 by Xuguangxing
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

index.html public/index.html +2 -2

List.vue src/views/orderList/components/List.vue +5 -2

No files found.
--- a/public/index.html
+++ b/public/index.html
@@ -105,12 +105,12 @@
  </script>
  </head>
  <body>
-    <!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
    <script>
        // init vConsole
        var vConsole = new VConsole();
        console.log('Hello world');
-    </script> -->
+    </script>
    <noscript>
      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>

--- a/src/views/orderList/components/List.vue
+++ b/src/views/orderList/components/List.vue
@@ -56,14 +56,14 @@
            >
              查看订单
            </cr-button>
-            <!-- v-if="item.showOrderDetail" -->
            <!-- 支付中按钮跳转支付页面 -->
            <cr-button
+              v-if="item.openGroupStatus === 0"
              size="small"
              plain
              type="primary"
              shape="circle"
-              @click.stop="goGroupDetails(item)"
+              @click.stop="goGroupPayPages(item)"
            >
              去支付
            </cr-button>
@@ -152,6 +152,9 @@ export default {
        newUrl: `/pages/order/orderDetail?orderNo=${skuInfo.orderNo}`
      });
    },
+    goGroupPayPages(skuInfo) {
+      this.$router.push(`/pay?orderNo=${skuInfo.orderNo}`);
+    },

    async openShareEvent(skuInfo) {
      let options = await this.getShareData(skuInfo);