Skip to content

G
group-buy-ui
Commit e430b530 authored by Xuguangxing's avatar Xuguangxing
Browse files
Options

fix: html2canvas海报ios13无法调起问题

parent f545bdea
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 149 deletions
package-lock.json
View file @ e430b530
......@@ -9,13 +9,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",
......@@ -1221,6 +1221,12 @@
"vue-video-player": "^5.0.2"
}
},
"node_modules/@qg/html2canvas": {
"version": "0.0.2",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fhtml2canvas/-/html2canvas-0.0.2.tgz",
"integrity": "sha512-ze54mfp4RiehNCKii/JICOxwZm9ELvScs+GWdlDPSjkYLDtbnDGbxyR3v+a+/FFN6HoWGbqMMrpksqd5CFZxnQ==",
"license": "ISC"
},
"node_modules/@qg/js-bridge": {
"version": "1.1.11",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz",
......@@ -2784,14 +2790,6 @@
"node": ">=0.10.0"
}
},
"node_modules/base64-arraybuffer": {
"version": "0.2.0",
"resolved": "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
"integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==",
"engines": {
"node": ">= 0.6.0"
}
},
"node_modules/base64-js": {
"version": "1.3.1",
"resolved": "http://npmprivate.quantgroups.com/base64-js/-/base64-js-1.3.1.tgz",
......@@ -4537,15 +4535,6 @@
"node": ">4"
}
},
"node_modules/css-line-break": {
"version": "2.0.1",
"resolved": "http://npmprivate.quantgroups.com/css-line-break/-/css-line-break-2.0.1.tgz",
"integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
"license": "MIT",
"dependencies": {
"base64-arraybuffer": "^0.2.0"
}
},
"node_modules/css-loader": {
"version": "3.6.0",
"resolved": "http://npmprivate.quantgroups.com/css-loader/-/css-loader-3.6.0.tgz",
......@@ -7252,19 +7241,6 @@
"object.getownpropertydescriptors": "^2.0.3"
}
},
"node_modules/html2canvas": {
"version": "1.3.2",
"resolved": "http://npmprivate.quantgroups.com/html2canvas/-/html2canvas-1.3.2.tgz",
"integrity": "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==",
"license": "MIT",
"dependencies": {
"css-line-break": "2.0.1",
"text-segmentation": "^1.0.2"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/htmlparser2": {
"version": "3.10.1",
"resolved": "http://npmprivate.quantgroups.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
......@@ -14201,15 +14177,6 @@
"node": ">=0.10.0"
}
},
"node_modules/text-segmentation": {
"version": "1.0.2",
"resolved": "http://npmprivate.quantgroups.com/text-segmentation/-/text-segmentation-1.0.2.tgz",
"integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
"license": "MIT",
"dependencies": {
"utrie": "^1.0.1"
}
},
"node_modules/text-table": {
"version": "0.2.0",
"resolved": "http://npmprivate.quantgroups.com/text-table/-/text-table-0.2.0.tgz",
......@@ -14833,24 +14800,6 @@
"node": ">= 0.4.0"
}
},
"node_modules/utrie": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/utrie/-/utrie-1.0.1.tgz",
"integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
"license": "MIT",
"dependencies": {
"base64-arraybuffer": "^1.0.1"
}
},
"node_modules/utrie/node_modules/base64-arraybuffer": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
"integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==",
"license": "MIT",
"engines": {
"node": ">= 0.6.0"
}
},
"node_modules/uuid": {
"version": "3.4.0",
"resolved": "http://npmprivate.quantgroups.com/uuid/-/uuid-3.4.0.tgz",
......@@ -18768,6 +18717,11 @@
"vue-video-player": "^5.0.2"
}
},
"@qg/html2canvas": {
"version": "0.0.2",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fhtml2canvas/-/html2canvas-0.0.2.tgz",
"integrity": "sha512-ze54mfp4RiehNCKii/JICOxwZm9ELvScs+GWdlDPSjkYLDtbnDGbxyR3v+a+/FFN6HoWGbqMMrpksqd5CFZxnQ=="
},
"@qg/js-bridge": {
"version": "1.1.11",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fjs-bridge/-/js-bridge-1.1.11.tgz",
......@@ -20157,11 +20111,6 @@
}
}
},
"base64-arraybuffer": {
"version": "0.2.0",
"resolved": "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
"integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
},
"base64-js": {
"version": "1.3.1",
"resolved": "http://npmprivate.quantgroups.com/base64-js/-/base64-js-1.3.1.tgz",
......@@ -21680,14 +21629,6 @@
"timsort": "^0.3.0"
}
},
"css-line-break": {
"version": "2.0.1",
"resolved": "http://npmprivate.quantgroups.com/css-line-break/-/css-line-break-2.0.1.tgz",
"integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
"requires": {
"base64-arraybuffer": "^0.2.0"
}
},
"css-loader": {
"version": "3.6.0",
"resolved": "http://npmprivate.quantgroups.com/css-loader/-/css-loader-3.6.0.tgz",
......@@ -23931,15 +23872,6 @@
}
}
},
"html2canvas": {
"version": "1.3.2",
"resolved": "http://npmprivate.quantgroups.com/html2canvas/-/html2canvas-1.3.2.tgz",
"integrity": "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==",
"requires": {
"css-line-break": "2.0.1",
"text-segmentation": "^1.0.2"
}
},
"htmlparser2": {
"version": "3.10.1",
"resolved": "http://npmprivate.quantgroups.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
......@@ -29695,14 +29627,6 @@
}
}
},
"text-segmentation": {
"version": "1.0.2",
"resolved": "http://npmprivate.quantgroups.com/text-segmentation/-/text-segmentation-1.0.2.tgz",
"integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
"requires": {
"utrie": "^1.0.1"
}
},
"text-table": {
"version": "0.2.0",
"resolved": "http://npmprivate.quantgroups.com/text-table/-/text-table-0.2.0.tgz",
......@@ -30232,21 +30156,6 @@
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
"dev": true
},
"utrie": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/utrie/-/utrie-1.0.1.tgz",
"integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
"requires": {
"base64-arraybuffer": "^1.0.1"
},
"dependencies": {
"base64-arraybuffer": {
"version": "1.0.1",
"resolved": "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
"integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
}
}
},
"uuid": {
"version": "3.4.0",
"resolved": "http://npmprivate.quantgroups.com/uuid/-/uuid-3.4.0.tgz",
public/index.html
View file @ e430b530
......@@ -105,12 +105,12 @@
</script>
</head>
<body>
<!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.9.0/vconsole.min.js"></script>
<script>
// init vConsole
var vConsole = new VConsole();
console.log('Hello world');
</script> -->
</script>
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
......
src/components/sharePic.vue
View file @ e430b530
......@@ -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;
......
src/style/var.less
View file @ e430b530
......@@ -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: ~'>>>';
......
yarn.lock
View file @ e430b530
......@@ -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"
......@@ -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"
......@@ -8734,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"
......@@ -9147,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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment