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

src/components/sharePic.vue

@@ -262,9 +262,9 @@ body {
   top: -9999px;
   left: -9999px;
   color: #333;
-  // ios15字体有bug,需要在根元素覆盖下
-  font-family: Helvetica, Tahoma, Arial, 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC', STXihei,
-    'Microsoft YaHei', SimHei;
+  // 默认的字体包含了-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;

src/components/weapp.vue

@@ -5,7 +5,7 @@
         <div>请在微信小程序中参与此活动哦~</div>
       </div>
       <div class="wchat-popup-footer">
-        <div plain type="primary" class="wchat-popup-confirm">
+        <div class="wchat-popup-confirm">
           打开微信小程序
           <!-- 狼大呜原始ID：gh_e1d790d67513
             羊小咩原始ID：gh_a976018bfb9e -->
@@ -17,7 +17,7 @@
             @error="launchError"
           >
             <script type="text/wxtag-template">
-              <style>.btn {height: 100%;width: 100%;}</style>
+              <style>.btn {height: 48px;width: 100%;}</style>
               <div class="btn">打开小程序</div>
             </script>
           </wx-open-launch-weapp>
@@ -30,6 +30,7 @@
 import wx from 'weixin-js-sdk';
 import groupBuy from '@/api/groupBuy';
 import config from '@/config';
+import { paramsParentheses } from '@/service/utils.service';
 export default {
   name: 'Weapp',
   props: {
@@ -50,7 +51,7 @@ export default {
   computed: {
     newJumpUrl() {
       const jumpUrl = this.jumpUrl;
-      const linkPath = window.location.href;
+      const linkPath = paramsParentheses(this) + encodeURIComponent('&vccToken={token}');
       return `${jumpUrl}?url=${encodeURIComponent(JSON.stringify(linkPath))}`;
     }
   },