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

src/components/groupShare.vue

@@ -64,6 +64,7 @@ export default {
       });
     },
     shareDialogConfirm() {
+      this.$store.dispatch('goods_share_close');
       this.$dialog({
         message: '请点击小程序右上角更多进行分享~',
         showCancelButton: false,

src/config/env.config.js

@@ -10,6 +10,7 @@ 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 = 'http://192.168.29.89:8098'; // 唐峰
 // const talosHost = 'http://192.168.25.210:8080'; // 张超
 // const talosHost = 'http://192.168.28.83:80'; // 董彪
@@ -21,6 +22,7 @@ const TERMINAL = 'H5';
 const VERSION = '7.9.00';
 // const talosHost = protocol + '//talos.xyqb.com';
 export default {
+  localHost,
   faceHost,
   talosHost,
   test: true,

src/config/prod.config.js

@@ -8,8 +8,9 @@ const TERMINAL = 'H5';
 const VERSION = '7.9.00';
 const kdspHost = 'https://kdsp-api.q-gp.com';
 const opapiHost = `${protocol}//opapi.xyqb.com`;
-
+const localHost = 'https://mall.q-gp.com/group-buying'; // 正式环境页面地址
 export default {
+  localHost,
   // apiHost,
   faceHost,
   test: false,

src/views/goodsList/components/goodsCard.vue

@@ -88,8 +88,9 @@ export default {
     handleProgressByStatus(item) {
       if (!item) return 0;
       let percentage = 0;
-      const { goodsCount, activitySkuTotalCount } = item;
-      percentage = (goodsCount / activitySkuTotalCount) * 100;
+      // saleCount / activitySkuTotalCount
+      const { saleCount, activitySkuTotalCount } = item;
+      percentage = (saleCount / activitySkuTotalCount) * 100;
       percentage = percentage < 0 ? 0 : percentage;
       percentage = this.btnByStatus.d ? 0 : percentage;
       return Math.round(percentage * 100) / 100;

src/views/goodsList/index.vue

@@ -84,7 +84,8 @@ import localStorage from '@/service/localStorage.service';
 import goodsCheckMixin from '@/mixins/goodsCheck.mixin';
 import { setAppTitleColor, EventBus } from '@/service/utils.service';
 import { registeredEvents } from '@/service/sa.service';
-console.log(EventBus);
+import config from '@/config';
+console.log(config.localHost);
 export default {
   // eslint-disable-next-line vue/name-property-casing
   name: 'groupBuyList',
@@ -151,7 +152,7 @@ export default {
   deactivated() {
     clearTimeout((this.$refs.swipeRota && this.$refs.swipeRota.timer) || null);
     this.showLoops = false;
-    // EventBus.$off();
+    EventBus.$off('shareClickItem');
   },
   activated() {
     this.showLoops = true;
@@ -188,8 +189,9 @@ export default {
       });
     },
     onShareEventChange() {
+      const vm = this;
       EventBus.$on('shareClickItem', async function({ ev, nativeBridge }) {
-        let shareDic = await this.getShareData();
+        let shareDic = await vm.getShareData();
         if (ev === 'pic') {
           // 分享海报跳转小程序海报分享页面
           nativeBridge.openNewUrl({
@@ -199,6 +201,7 @@ export default {
           });
         }
         if (ev === 'weixin') {
+          console.log(shareDic);
           // 分享朋友派发微信postMessage事件
           nativeBridge.run({
             event: 'showShareView',
@@ -211,13 +214,13 @@ export default {
     },
 
     async getShareData() {
-      const { title, sharePosterTemplateUrl, img } = this.goodsTemp;
-      const link = window.location.href;
+      const { sharePosterTemplateUrl, shareTitle, shareSubTitle, shareIconUrl } = this.goodsTemp;
+      const link = `${config.localHost}/groupBuy/list?activityId=${this.activityId}`;
       return Promise.resolve({
-        title,
-        desc: '我正在免费拿商品，请你帮帮我',
-        link: `pages/webview/webview?url=${link}/`, // 页面地址
-        imgUrl: img, // 图片地
+        title: shareTitle,
+        desc: shareSubTitle,
+        link: `pages/webview/webview?url=${encodeURIComponent(JSON.stringify(link))}`, // 页面地址
+        imgUrl: shareIconUrl, // 图片地
         posterUrl: sharePosterTemplateUrl
       });
     },
@@ -297,8 +300,8 @@ async function getActivityList(urlQuery, next) {
   if (result?.templateInfo) {
     let t = result.templateInfo;
     // 即将开始
-    t.startTime = '2021-09-23 20:00:00';
-    t.endTime = '2021-09-23 20:02:00';
+    // t.startTime = '2021-09-23 20:00:00';
+    // t.endTime = '2021-09-23 20:02:00';
     // 正在活动中
     // t.startTime = '2021-09-23 00:00:00';
     // t.endTime = '2021-09-25 00:00:00';

src/views/orderList/index.vue

@@ -18,7 +18,7 @@
         />
       </cr-tab>
     </cr-tabs>
-
+    <share-pic ref="sharePic" :share-pic-data="sharePicData" @outputPicUrl="outputPicUrl" />
     <!-- <cr-action-sheet
       v-model="showExpressPopup"
       title="请选择物流单号"
@@ -35,7 +35,9 @@ import List from './components/List';
 import { isApp } from '@/service/validation.service';
 import localStorage from '@/service/localStorage.service';
 import { EventBus } from '@/service/utils.service';
+import sharePic from '@/components/sharePic';
 import qs from 'qs';
+import MpBridge from '@/service/mp';
 const commonParams = {
   loading: false,
   finished: false,
@@ -46,11 +48,14 @@ const commonParams = {
 export default {
   name: 'OrderList',
   components: {
-    List
+    List,
+    sharePic
   },
   data() {
     return {
       isApp,
+      nativeBridge: null,
+      sharePicData: {},
       showCancelPopup: false,
       showExpressPopup: false,
       currentTab: 0,
@@ -81,9 +86,19 @@ export default {
     this.getstatusQuery();
     this.getList();
     this.onShareEventChange();
-    // this.$track.registeredEvents('H5_2B_MyOrderPageExposure');
+  },
+  beforeDestroy() {
+    EventBus.$off('shareClickItem');
+  },
+  created() {
+    this.nativeBridge = new MpBridge();
   },
   methods: {
+    outputPicUrl(posterUrl) {
+      this.nativeBridge.openNewUrl({
+        newUrl: `/pages/goodshare/index?url=${encodeURIComponent(JSON.stringify(posterUrl))}`
+      });
+    },
     async getShareData(shareInfo) {
       const linkPath = qs.stringify({
         h: 0,
@@ -94,32 +109,24 @@ export default {
         templateId: shareInfo.templateId,
         templateDetailId: shareInfo.templateId
       });
+      const detailUrl = `${window.location.origin}/groupBuy/skuInfoSmallPic?${linkPath}`;
       return Promise.resolve({
         title: shareInfo.skuName,
-        link: `pages/webview/webview?url=${window.location.origin}?url=${encodeURIComponent(
-          JSON.stringify(linkPath)
-        )}`, // 页面地址
+        link: `pages/webview/webview?url=${encodeURIComponent(JSON.stringify(detailUrl))}`, // 页面地址
         imgUrl: shareInfo.skuImg // 图片地
       });
     },
     onShareEventChange() {
       const vm = this;
-      console.log('update');
       EventBus.$on('shareClickItem', async function({ ev, nativeBridge }) {
-        console.log(ev);
+        const shareDic = await vm.getShareData(vm.sharePicData);
+        console.log(shareDic);
         if (ev === 'pic') {
+          vm.$refs.sharePic.createAndUploadPic();
           // 分享海报跳转小程序海报分享页面
-          // nativeBridge.openNewUrl({
-          //   newUrl: `/pages/goodshare/index?url=${encodeURIComponent(
-          //     JSON.stringify(shareDic.posterUrl)
-          //   )}`
-          // });
         }
         if (ev === 'weixin') {
-          console.log('监听事件');
           // const res = await groupBuyApi.getGroupShareInfo(this.shareInfo.order);
-          const [res] = await groupBuyApi.getGroupShareInfo('1440884214932389888');
-          const shareDic = await vm.getShareData(res);
           // 分享朋友派发微信postMessage事件
           nativeBridge.run({
             event: 'showShareView',
@@ -142,10 +149,18 @@ export default {
     handleLoad() {
       this.getList();
     },
-    openShareEvent() {
-      this.$store.dispatch('goods_share_open');
+    async openShareEvent() {
+      try {
+        const [res] = await groupBuyApi.getGroupShareInfo('1440884214932389888');
+        console.log(res);
+        this.sharePicData = res;
+        this.$store.dispatch('goods_share_open');
+      } catch (err) {
+        console.log(err);
+      }
     },
     handleOptionClick(info) {
+      console.log(info);
       this.currentOrder = info;
       switch (info.eventType) {
         case 'share':