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

src/config/env.config.js

@@ -7,16 +7,16 @@
 const protocol = window.location.protocol;
 const qiniuHost = protocol + '//kdspstatic.q-gp.com/';
 const shenceHost = 'https://bn.xyqb.com/sa?project=default'; // 测试地址
-const talosHost = 'https://talos-vcc3.liangkebang.net';
-const faceHost = 'https://auth-vcc3.liangkebang.net';
-const kdspHost = 'https://kdsp-api-vcc3.liangkebang.net';
-const localHost = 'https://group-buy-vcc3.liangkebang.net'; // 测试环境页面地址
+const talosHost = 'https://talos-test1.liangkebang.net';
+const faceHost = 'https://auth-test1.liangkebang.net';
+const kdspHost = 'https://kdsp-api-test1.liangkebang.net';
+const localHost = 'https://group-buy-test1.liangkebang.net'; // 测试环境页面地址
 // const talosHost = 'http://192.168.29.89:8098'; // 唐峰
 // const talosHost = 'http://192.168.25.210:8080'; // 张超
 // const talosHost = 'http://192.168.28.83:80'; // 董彪
 // const talosHost = 'http://192.168.25.122:8098'; // 王永杰
 // const talosHost = protocol + '//192.168.28.41'; // 超人
-const opapiHost = 'https://opapi-vcc3.liangkebang.net';
+const opapiHost = 'https://opapi-test1.liangkebang.net';
 const VCC_CHANNEL = '';
 const TERMINAL = 'H5';
 const VERSION = '7.9.00';

src/views/goodsDetail/smallPic.vue

@@ -63,7 +63,7 @@
           <group-desc-info
             :group-info="detailInfo.groupBuyInfo || {}"
             :timestemp="groupTimestemp"
-            :show-button-group="showShareButton"
+            :show-button-group="true"
             @changeButtonVisible="changeButtonVisible"
           />
           <successInfo :group-info="detailInfo.groupBuyInfo || {}" />
@@ -119,7 +119,6 @@ export default {
       showInfo: false,
       inProgress: false, // 活动是否已经开始
       countDownText: '',
-      showShareButton: false, // 是否显示分享按钮
       stockPercentage: 0,
       // 以下是原有的data
       detailParam: {
@@ -188,7 +187,6 @@ export default {
         }
         console.log(this.stockPercentage);
       }
-      this.showShareButton = res.groupBuyInfo.groupBuyStatus == 1 ? true : false;
       this.imgList = res.imageUrl || [];
       this.detailInfo = res;
       this.setStartStatus(res);

src/views/pay/payResult.vue

@@ -63,7 +63,7 @@
         />
       </div>
     </div>
-    <Goods />
+    <!-- <Goods /> -->
     <sharePic ref="sharePic" :share-pic-data="sharePicData" @outputPicUrl="outputPicUrl" />
   </div>
 </template>
@@ -72,13 +72,13 @@ import { goUrlExtends } from './extends';
 import CouponCard from './components/CouponCard.vue';
 import { getCouponList } from '@/api/pay.api';
 import groupBuyApi from '@/api/groupBuy';
-import Goods from '@/components/RecoGoods/RecoGoods.vue';
+// import Goods from '@/components/RecoGoods/RecoGoods.vue';
 import { isApp, isWxMp } from '@/service/validation.service';
 import { EventBus } from '@/service/utils.service';
 import sharePic from '@/components/sharePic';
 export default {
   components: {
-    Goods,
+    // Goods,
     CouponCard,
     sharePic
   },
@@ -94,14 +94,15 @@ export default {
       payStatusName: '',
       payMethodName: '',
       payType: '',
-      sharePicData: {}
+      sharePicData: {},
+      picUrl: ''
     };
   },
   created() {
-    const { orderNo, reason, finalAmt, freeAmount, payType } = this.$route.query;
+    const { orderNo, reason, amount, freeAmount, payType } = this.$route.query;
     const { success } = this.$route.meta;
     this.payType = payType || '';
-    this.money = finalAmt || '';
+    this.money = amount || '';
     this.orderNo = orderNo;
     this.reason = reason || '';
     this.isSuccess = success || false;
@@ -111,9 +112,14 @@ export default {
     this.getCouponList();
   },
   mounted() {
-    EventBus.$on('shareClickItem', ({ ev }) => {
+    const _this = this;
+    EventBus.$on('shareClickItem', async function({ ev, nativeBridge }) {
       if (ev === 'pic') {
         // 处理图片url
+        nativeBridge.openNewUrl({
+          newUrl: `/pages/goodshare/index?url=${encodeURIComponent(JSON.stringify(_this.picUrl))}`
+        });
+        _this.$store.dispatch('goods_share_close');
       }
     });
   },
@@ -123,12 +129,12 @@ export default {
   methods: {
     outputPicUrl(res) {
       console.log(res);
-      this.$store.dispatch('goods_share_open', { res });
+      this.picUrl = res;
+      this.$store.dispatch('goods_share_open');
+      console.log(this.picUrl);
     },
     async setShareData() {
-      const [res] = await groupBuyApi.getGroupShareInfo({
-        orderNo: this.orderNo
-      });
+      const [res] = await groupBuyApi.getGroupShareInfo(this.orderNo);
       this.sharePicData = res;
       this.$refs.sharePic.createAndUploadPic();
     },