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

src/service/pay.service.js

@@ -60,7 +60,7 @@ function payByWeixinH5(info) {
     info.params = {};
   }
   const vccToken = localStorage.get('vccToken');
-  const orderNo = cookies.get('orderNo')?.orderNo;
+  const orderNo = cookies.get('orderNo');
   info.params.isWxH5 = 1;
   info.params.vccToken = vccToken;
   info.params.orderNo = orderNo;
@@ -109,6 +109,7 @@ function payByALIH5(info) {
 function payByThirdPartyCashier(info) {
   if (!info.url) return;
   const orderNo = cookies.get('orderNo')?.orderNo;
+  alert('bbbb-' + orderNo)
   info.params.third = 1;
   info.params.orderNo = orderNo;
   const currentPath = encodeURIComponent(

src/views/orderList/components/List.vue

@@ -192,6 +192,22 @@ export default {
     },
     goGroupPayPages(skuInfo) {
       this.$router.push(`/pay?orderNo=${skuInfo.orderNo}`);
+      if (isWxMp) {
+        this.nativeBridge.openNewUrl({
+          newUrl: `/pages/pay/index?orderNo=${skuInfo.orderNo}&from=groupbuy`
+        });
+      } else if (isApp) {
+        this.$router.push({ path: `/pay?orderNo=${skuInfo.orderNo}` });
+      } else {
+        // todo 处理纯h5情况
+        this.$dialog({
+          message: '请在App或小程序中参与活动~',
+          title: '',
+          showCancelButton: false,
+          confirmButtonText: '我知道了'
+        });
+        return;
+      }
     },
     async getGroupShareInfo(order) {
       const res = await groupBuyApi.getGroupShareInfo(order);

src/views/pay/index.vue

@@ -221,8 +221,8 @@ export default {
   mounted() {
     this.getQuery();
     this.setIsOrder();
-    this.orderNo = this.$route.query.orderNo || cookies.get('orderNo')?.orderNo;
-    cookies.set('orderNo', { orderNo: this.orderNo });
+    this.orderNo = this.$route.query.orderNo;
+    cookies.set('orderNo', this.orderNo);
     if (this.$route?.query?.ocrflag) {
       this.payInfo = cookies.get('info') || {};
       cookies.remove('ocrflag');