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

package.json

@@ -11,13 +11,13 @@
   "dependencies": {
     "@better-scroll/core": "^2.0.0-beta.6",
     "@qg/cherry-ui": "^2.23.6",
+    "@qg/html2canvas": "0.0.2",
     "@qg/js-bridge": "^1.1.9",
     "@qg/qg-scroll": "^1.4.2",
     "@qg/ui-request": "^0.0.20",
     "@qg/ui-track-web": "0.0.3",
     "core-js": "^3.6.5",
     "crypto-js": "^3.1.9-1",
-    "html2canvas": "^1.3.2",
     "intersection-observer": "^0.12.0",
     "js-cookie": "^2.2.1",
     "qiniu-js": "^3.3.1",

src/components/countDown.vue

 <template>
-  <cr-count-down :time="time" :auto-start="true" @finish="finishEndChange">
+  <cr-count-down
+    :time="time"
+    :auto-start="true"
+    :class="{
+      bigFont: from === 'desc'
+    }"
+    @finish="finishEndChange"
+  >
     <template #default="timeData">
       <template v-if="timeData.d != 0">
         <span :class="blockNoBg ? 'block-no-bg' : 'block'">{{ fillZero(timeData.d) }}</span>
@@ -23,6 +30,10 @@ export default {
     blockNoBg: {
       type: Boolean,
       default: false
+    },
+    from: {
+      type: String,
+      default: ''
     }
   },
   computed: {
@@ -48,6 +59,11 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.bigFont {
+  .block-no-bg {
+    font-size: 18px !important;
+  }
+}
 .cr-count-down {
   display: flex;
   align-items: center;

src/components/sharePic.vue

@@ -126,7 +126,7 @@
   </div>
 </template>
 <script>
-import html2canvas from 'html2canvas';
+import html2canvas from '@qg/html2canvas';
 import qiNiuApi from '@/api/qiniu.api';
 import groupBuyApi from '@/api/groupBuy';
 import { upload } from 'qiniu-js';
@@ -263,8 +263,8 @@ body {
   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;
+  @font-family: 'Helvetica Neue', Helvetica, Segoe UI, Arial, Roboto, 'PingFang SC',
+    'Hiragino Sans GB', 'Microsoft Yahei', sans-serif !important;
 }
 .groupInfo {
   background: #fff;
@@ -422,12 +422,12 @@ body {
 }
 .skuName {
   color: #333333;
-  text-overflow: -o-ellipsis-lastline;
+  // text-overflow: -o-ellipsis-lastline;
   overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
+  // text-overflow: ellipsis;
+  // display: -webkit-box;
+  // -webkit-line-clamp: 2;
+  // -webkit-box-orient: vertical;
 }
 .shareInfo {
   background: #f7f8f9;

src/style/var.less

@@ -79,7 +79,7 @@
 }
 
 @font-weight-bold: 600;
-@font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica, Segoe UI, Arial,
+@font-family: 'Helvetica Neue', Helvetica, Segoe UI, Arial,
   Roboto, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei', sans-serif;
 @font-din: 'din';
 @deep: ~'>>>';

src/views/goodsDetail/components/bottomNav.vue

@@ -158,7 +158,7 @@ export default {
   padding-left: 12px;
   padding-right: 12px;
   box-sizing: border-box;
-  z-index: 99;
+  z-index: 89;
   button {
     flex: 1;
     font-size: 16px;

src/views/goodsDetail/components/groupDescInfo.vue

@@ -7,9 +7,9 @@
         </template>
         <template v-else>
           <p class="desc">
-            还差<span>{{ groupInfo.groupBuyNeedUserCount }}人</span>成团，距结束还剩
+            还差<span>{{ groupInfo.groupBuyNeedUserCount }}人</span>成团，距结束仅剩
           </p>
-          <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" />
+          <countDown v-if="!!timestemp" :block-no-bg="true" :end-time="timestemp" from="desc" />
         </template>
       </template>
       <template v-else>

src/views/goodsDetail/index.vue

@@ -185,7 +185,7 @@
       </div>
     </cr-popup>
     <bottom-nav
-      v-if="!isPrimordialBrowser && !isWeixinBrowser && inProgress == 1"
+      v-if="inProgress == 1"
       type="shoppingCar"
       :disabled="false"
       :group-id="groupId"

yarn.lock

@@ -935,6 +935,11 @@
     "vue-lazyload" "^1.3.3"
     "vue-video-player" "^5.0.2"
 
+"@qg/html2canvas@0.0.2":
+  "integrity" "sha512-ze54mfp4RiehNCKii/JICOxwZm9ELvScs+GWdlDPSjkYLDtbnDGbxyR3v+a+/FFN6HoWGbqMMrpksqd5CFZxnQ=="
+  "resolved" "http://npmprivate.quantgroups.com/@qg%2fhtml2canvas/-/html2canvas-0.0.2.tgz"
+  "version" "0.0.2"
+
 "@qg/js-bridge@^1.1.11", "@qg/js-bridge@^1.1.9":
   "integrity" "sha512-WVvkSUg2zcc2nblzYGxM/bVo+VDcANy/dw7vcbxLoW1Jega9Jm2d5FGSb7uS6m4746waghUUqcAWNJZ0Q5yeqA=="
   "resolved" "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz"
@@ -1862,16 +1867,6 @@
     "mixin-deep" "^1.2.0"
     "pascalcase" "^0.1.1"
 
-"base64-arraybuffer@^0.2.0":
-  "integrity" "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
-  "resolved" "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz"
-  "version" "0.2.0"
-
-"base64-arraybuffer@^1.0.1":
-  "integrity" "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
-  "resolved" "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz"
-  "version" "1.0.1"
-
 "base64-js@^1.0.2":
   "integrity" "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
   "resolved" "http://npmprivate.quantgroups.com/base64-js/-/base64-js-1.3.1.tgz"
@@ -2915,13 +2910,6 @@
     "postcss" "^7.0.1"
     "timsort" "^0.3.0"
 
-"css-line-break@2.0.1":
-  "integrity" "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w=="
-  "resolved" "http://npmprivate.quantgroups.com/css-line-break/-/css-line-break-2.0.1.tgz"
-  "version" "2.0.1"
-  dependencies:
-    "base64-arraybuffer" "^0.2.0"
-
 "css-loader@^3.5.3":
   "integrity" "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="
   "resolved" "http://npmprivate.quantgroups.com/css-loader/-/css-loader-3.6.0.tgz"
@@ -3352,9 +3340,9 @@
   "resolved" "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz"
   "version" "0.1.2"
 
-"dom7@^2.1.3":
-  "integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA=="
-  "resolved" "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz"
+"dom7@^2.0.1", "dom7@^2.1.3":
+  "integrity" "sha1-p5QRAXgAsx2EAAcM2uu/ySwfY3c="
+  "resolved" "https://registry.nlark.com/dom7/download/dom7-2.1.5.tgz?cache=0&sync_timestamp=1629879453685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom7%2Fdownload%2Fdom7-2.1.5.tgz"
   "version" "2.1.5"
   dependencies:
     "ssr-window" "^2.0.0"
@@ -4673,14 +4661,6 @@
     "toposort" "^1.0.0"
     "util.promisify" "1.0.0"
 
-"html2canvas@^1.3.2":
-  "integrity" "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ=="
-  "resolved" "http://npmprivate.quantgroups.com/html2canvas/-/html2canvas-1.3.2.tgz"
-  "version" "1.3.2"
-  dependencies:
-    "css-line-break" "2.0.1"
-    "text-segmentation" "^1.0.2"
-
 "htmlparser2@^3.3.0", "htmlparser2@^3.8.3":
   "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="
   "resolved" "http://npmprivate.quantgroups.com/htmlparser2/-/htmlparser2-3.10.1.tgz"
@@ -8325,13 +8305,13 @@
     "tweetnacl" "~0.14.0"
 
 "ssr-window@^1.0.1":
-  "integrity" "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
-  "resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz"
+  "integrity" "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+  "resolved" "https://registry.nlark.com/ssr-window/download/ssr-window-1.0.1.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-1.0.1.tgz"
   "version" "1.0.1"
 
 "ssr-window@^2.0.0":
-  "integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
-  "resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz"
+  "integrity" "sha1-mMMBrvmVIzF/jWlhjwAQeRCW78Q="
+  "resolved" "https://registry.nlark.com/ssr-window/download/ssr-window-2.0.0.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-2.0.0.tgz"
   "version" "2.0.0"
 
 "ssri@^6.0.1":
@@ -8674,12 +8654,11 @@
     "util.promisify" "~1.0.0"
 
 "swiper@^4.0.7":
-  "integrity" "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA=="
-  "resolved" "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz"
-  "version" "4.5.1"
+  "integrity" "sha1-iRdcKiPYZiLtqDRHQMJKNwGmsnA="
+  "resolved" "https://registry.npmmirror.com/swiper/download/swiper-4.0.7.tgz?cache=0&sync_timestamp=1632899438741&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fswiper%2Fdownload%2Fswiper-4.0.7.tgz"
+  "version" "4.0.7"
   dependencies:
-    "dom7" "^2.1.3"
-    "ssr-window" "^1.0.1"
+    "dom7" "^2.0.1"
 
 "table@^5.2.3":
   "integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="
@@ -8735,13 +8714,6 @@
     "source-map" "~0.6.1"
     "source-map-support" "~0.5.12"
 
-"text-segmentation@^1.0.2":
-  "integrity" "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw=="
-  "resolved" "http://npmprivate.quantgroups.com/text-segmentation/-/text-segmentation-1.0.2.tgz"
-  "version" "1.0.2"
-  dependencies:
-    "utrie" "^1.0.1"
-
 "text-table@^0.2.0":
   "integrity" "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
   "resolved" "http://npmprivate.quantgroups.com/text-table/-/text-table-0.2.0.tgz"
@@ -9148,13 +9120,6 @@
   "resolved" "http://npmprivate.quantgroups.com/utils-merge/-/utils-merge-1.0.1.tgz"
   "version" "1.0.1"
 
-"utrie@^1.0.1":
-  "integrity" "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg=="
-  "resolved" "http://npmprivate.quantgroups.com/utrie/-/utrie-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "base64-arraybuffer" "^1.0.1"
-
 "uuid@^3.3.2", "uuid@^3.4.0":
   "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
   "resolved" "http://npmprivate.quantgroups.com/uuid/-/uuid-3.4.0.tgz"
@@ -9274,8 +9239,8 @@
   "version" "1.1.2"
 
 "vue-awesome-swiper@3.1.3":
-  "integrity" "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg=="
-  "resolved" "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz"
+  "integrity" "sha1-BVALUB/7P+yb9+uZhbz0roNg7Z4="
+  "resolved" "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-3.1.3.tgz"
   "version" "3.1.3"
   dependencies:
     "object-assign" "^4.1.1"