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

src/components/sharePic.vue

@@ -167,48 +167,69 @@ export default {
       }
       return n;
     },
-    async prepare(rawData) {
-      this.sharePicData = rawData;
+    // async prepare(rawData) {
+    //   this.sharePicData = rawData;
 
-      this.handleAvator(rawData);
+    //   this.handleAvator(rawData);
+
+    //   // 将每个字符套入行内标签，用于解决canvas fillText的不换行问题
+    //   let skuName = '';
+    //   const originSkuName = rawData.skuName || '';
+    //   for (let i = 0; i < originSkuName.length; i++) {
+    //     skuName += `<span>${originSkuName[i]}</span>`;
+    //   }
+    //   this.skuName = skuName;
+
+    //   const [endTimeYMD, endTimeHMS = ''] = (rawData.endTime && rawData.endTime.split(' ')) || [];
+    //   if (endTimeYMD) {
+    //     const day = new Date(endTimeYMD);
+    //     this.endTime = `${day.getMonth() + 1}月${day.getDate()}日 ${endTimeHMS}`;
+    //   }
+
+    //   const [qrcodeUrl] = await groupBuyApi.getQrcodeUrl(rawData);
+    //   this.qrcodeUrl = qrcodeUrl;
+    // },
+    async createAndUploadPic(sharePicData) {
+      this.$store.dispatch('change_loading_pic', true);
+
+      this.sharePicData = sharePicData;
+
+      this.handleAvator(sharePicData);
 
       // 将每个字符套入行内标签，用于解决canvas fillText的不换行问题
       let skuName = '';
-      const originSkuName = rawData.skuName || '';
+      const originSkuName = sharePicData.skuName || '';
       for (let i = 0; i < originSkuName.length; i++) {
         skuName += `<span>${originSkuName[i]}</span>`;
       }
       this.skuName = skuName;
 
-      const [endTimeYMD, endTimeHMS = ''] = (rawData.endTime && rawData.endTime.split(' ')) || [];
+      const [endTimeYMD, endTimeHMS = ''] =
+        (sharePicData.endTime && sharePicData.endTime.split(' ')) || [];
       if (endTimeYMD) {
         const day = new Date(endTimeYMD);
         this.endTime = `${day.getMonth() + 1}月${day.getDate()}日 ${endTimeHMS}`;
       }
 
-      const [qrcodeUrl] = await groupBuyApi.getQrcodeUrl(rawData);
+      const [qrcodeUrl] = await groupBuyApi.getQrcodeUrl(sharePicData);
       this.qrcodeUrl = qrcodeUrl;
-    },
-    async createAndUploadPic(sharePicData) {
-      this.$store.dispatch('change_loading_pic', true);
-
-      await this.prepare(sharePicData);
-
       this.$nextTick(() => {
-        html2canvas(this.$refs.sharePic, {
-          width: 1080,
-          height: 1920,
-          useCORS: true,
-          scale: 1,
-          allowTaint: false
-        })
-          .then(canvas => {
-            canvas.name = `${this.randomString()}.jpeg`;
-            canvas.toBlob(blob => this.uploadPic(blob), 'image/jpeg', 0.85);
+        setTimeout(() => {
+          html2canvas(this.$refs.sharePic, {
+            width: 1080,
+            height: 1920,
+            useCORS: true,
+            scale: 1,
+            allowTaint: false
           })
-          .catch(error => {
-            this.errorHandler(error);
-          });
+            .then(canvas => {
+              canvas.name = `${this.randomString()}.jpeg`;
+              canvas.toBlob(blob => this.uploadPic(blob), 'image/jpeg', 0.85);
+            })
+            .catch(error => {
+              this.errorHandler(error);
+            });
+        }, 300);
       });
     },
     // 上传海报到七牛，成功后触发outputPicUr事件，参数是七牛文件地址

src/main.js

@@ -12,7 +12,8 @@ import Raven from 'raven-js';
 import RavenVue from 'raven-js/plugins/vue';
 import { release } from '../.sentryclirc';
 import lazyload from '@qg/cherry-ui/src/lazyload/index';
-if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV !== 'production') {
+import 'intersection-observer';
+if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production') {
   Raven.config('//8d1b2a5f74bb42ad806e52a11b1173f2@sentry.q-gp.com/80', {
     release,
     environment: process.env.NODE_ENV

src/router/routes.js

@@ -13,14 +13,6 @@ export default [
     },
     component: () => import('../components/error')
   },
-  {
-    path: '/share-test',
-    name: 'share-test',
-    meta: {
-      title: '出错了'
-    },
-    component: () => import('../views/test/share-test.vue')
-  },
   {
     path: '*',
     name: 'notFound',

src/views/address/addressManage.vue

@@ -13,8 +13,6 @@
           v-model="address.receiverPhoneNo"
           class="address-input"
           name="手机号码"
-          type="tel"
-          max-length="11"
           label="手机号码"
           placeholder="请输入收货人手机号码"
         />
@@ -99,8 +97,8 @@ export default {
     firstGroupShare();
     this.type = this.$route.query.type || '';
     this.order = this.$route.query.type || false;
-    console.log(this.order);
     if (this.type === 'edit') {
+      console.log(JSON.stringify(this.$route.params));
       const data = { ...this.$route.params.editAddress };
       data.addrFullName = data.addrFullName
         .substring(0, data.addrFullName.length - data.detail.length)

src/views/goodsDetail/components/groupDescInfo.vue

@@ -104,22 +104,27 @@ export default {
   mounted() {
     this.$nextTick(() => {
       if (this.$refs.buttonArea) {
-        this.observer = new IntersectionObserver(entries => {
-          entries.forEach(item => {
-            if (item.intersectionRatio == 0) {
-              this.$emit('changeButtonVisible', true);
-            } else {
-              this.$emit('changeButtonVisible', false);
-            }
+        if (IntersectionObserver) {
+          this.observer &&
+            this.observer.unobserve &&
+            this.observer.unobserve(this.$refs.buttonArea);
+          this.observer = new IntersectionObserver(entries => {
+            entries.forEach(item => {
+              if (item.intersectionRatio == 0) {
+                this.$emit('changeButtonVisible', true);
+              } else {
+                this.$emit('changeButtonVisible', false);
+              }
+            });
           });
-        });
+        }
         this.observer.USE_MUTATION_OBSERVER = false;
         this.observer.observe(this.$refs.buttonArea);
       }
     });
   },
   beforeDestroy() {
-    if (this.$refs.buttonArea) {
+    if (this.$refs.buttonArea && this.observer) {
       this.observer.unobserve(this.$refs.buttonArea);
     }
   },

src/views/goodsDetail/index.vue

@@ -345,7 +345,7 @@ export default {
         delete checkParams.activityHundredGroupId;
       }
       const [checkStatus] = await goods.checkGroupBuyCreateOrder(checkParams);
-      if (!checkStatus.verifyResult) {
+      if (checkStatus && !checkStatus.verifyResult) {
         // 校验是否允许开团或者参团
         this.$dialog({
           message: checkStatus.failedReason || '',

src/views/order/createOrder.vue

@@ -173,10 +173,13 @@ export default {
           invalidSkuList,
           shopSkuList: []
         };
-        shopSkuList.forEach(item => {
-          if (!item) return;
-          orderInfo.shopSkuList = [...orderInfo.shopSkuList, ...item.skuList];
-        });
+
+        if (shopSkuList) {
+          shopSkuList.forEach(item => {
+            if (!item) return;
+            orderInfo.shopSkuList = [...orderInfo.shopSkuList, ...item.skuList];
+          });
+        }
         console.log(orderInfo);
         this.$set(this, 'orderInfo', orderInfo);
         this.isOutBuy = false;

src/views/test/share-test.vue

-<template>
-  <button style="width: 80%; height: 35px; background:#f00" @click="share">分享</button>
-</template>
-<script>
-import Bridge from '@qg/js-bridge';
-export default {
-  methods: {
-    share() {
-      const nativeBridge = new Bridge();
-      const data = {
-        event: 'showShareView',
-        data: {
-          platform: ['weChat', 'timeLine', 'QQ', 'QQZone', 'CopyLink', 'GeneratePoster'], //依次分别是微信、朋友圈、QQ好友、QQ空间、复制链接
-          shareDic: {
-            title: 'aaaa',
-            desc: 'bbbb',
-            link: `https://www.baidu.com`, // 页面地址
-            imgUrl: 'https://kdspstatic.q-gp.com/FnPUaThQoK23qZjhXTG9C8XopI4y', // 图片地址
-            posterUrl: 'https://kdspstatic.q-gp.com/FnPUaThQoK23qZjhXTG9C8XopI4y' // 海报地址
-          }
-        }
-      };
-      nativeBridge.showShareView(data);
-    }
-  }
-};
-</script>