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

src/components/sharePic.vue

@@ -201,10 +201,14 @@ export default {
           useCORS: true,
           scale: 1,
           allowTaint: false
-        }).then(canvas => {
-          canvas.name = `${this.randomString()}.jpeg`;
-          canvas.toBlob(blob => this.uploadPic(blob), 'image/jpeg', 0.85);
-        });
+        })
+          .then(canvas => {
+            canvas.name = `${this.randomString()}.jpeg`;
+            canvas.toBlob(blob => this.uploadPic(blob), 'image/jpeg', 0.85);
+          })
+          .catch(error => {
+            this.errorHandler(error);
+          });
       });
     },
     // 上传海报到七牛，成功后触发outputPicUr事件，参数是七牛文件地址
@@ -213,13 +217,13 @@ export default {
       const [res] = await qiNiuApi.getQiniuToken();
       const token = (res && res.token) || '';
       if (!token) {
-        this.uploadErrorHandler(new Error('七牛token无效'));
+        this.errorHandler(new Error('七牛token无效'));
         return;
       }
 
       upload(blob, null, token).subscribe({
         complete: this.uploadSuccess,
-        error: this.uploadError
+        error: this.errorHandler
       });
     },
     uploadSuccess({ hash }) {
@@ -228,8 +232,8 @@ export default {
       this.$store.dispatch('change_loading_pic', false);
       this.$emit('outputPicUrl', fileLink);
     },
-    uploadError(err) {
-      console.error('海报上传失败', err);
+    errorHandler(err) {
+      console.error('海报创建失败', err);
       this.$store.dispatch('change_loading_pic', false);
     }
   }
@@ -258,6 +262,9 @@ body {
   top: -9999px;
   left: -9999px;
   color: #333;
+  // 默认的字体包含了-apple-system，html2canvas解析导致bug，需要在根元素覆盖
+  @font-family: BlinkMacSystemFont, 'Helvetica Neue', Helvetica, Segoe UI, Arial, Roboto,
+    'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei', sans-serif;
 }
 .groupInfo {
   background: #fff;