分销

bf5259a5 · wangwei · f8db1c0b · bf5259a5 · bf5259a5 · bf5259a5
Commit bf5259a5 authored Nov 02, 2018 by wangwei
7 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -4,4 +4,4 @@
        hm.src = "https://hm.baidu.com/hm.js?3d48322170d471164729cba5dfa4195f";
        var s = document.getElementsByTagName("script")[0];
        s.parentNode.insertBefore(hm, s);
-      })();</script><style></style><link href=/static/css/app.9f631d4069047acf4ee994f5d9f958c3.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js></script><script>var vConsole = new VConsole();</script><script type=text/javascript src=/static/js/manifest.07bb077972497bf4d0b0.js></script><script type=text/javascript src=/static/js/vendor.5ef5caa2a3de36ad6489.js></script><script type=text/javascript src=/static/js/app.e94cd6cc856296391cc2.js></script></body></html>
\ No newline at end of file
+      })();</script><style></style><link href=/static/css/app.9f631d4069047acf4ee994f5d9f958c3.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script>// var vConsole = new VConsole();</script><script type=text/javascript src=/static/js/manifest.be911c0db8dcf686e6d4.js></script><script type=text/javascript src=/static/js/vendor.5ef5caa2a3de36ad6489.js></script><script type=text/javascript src=/static/js/app.e94cd6cc856296391cc2.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/2.90e02ac5e4f6b0dec592.js
+++ b/dev/static/js/2.90e02ac5e4f6b0dec592.js
--- a/dev/static/js/2.90e02ac5e4f6b0dec592.js.map
+++ b/dev/static/js/2.90e02ac5e4f6b0dec592.js.map
--- a/dev/static/js/manifest.be911c0db8dcf686e6d4.js
+++ b/dev/static/js/manifest.be911c0db8dcf686e6d4.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"57611af9b0ae57c65214",1:"d2a22cd803a736fb3585",2:"90e02ac5e4f6b0dec592",3:"9e1c9b6265408a14ad8f",4:"5d58b8bd9caace16e193",5:"80537092bc4d33c0426b",6:"64aa64e3a0a3bf5244f8",7:"a936c5672c7c62e66d9b",8:"e6d116e1cd19a76b7ffd",9:"ba9447be974dd2cddb03",10:"ba01ae1bae8fdcdf438f",11:"8b0e54a06f96fd83cc66",12:"db599e876dde29001712"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.be911c0db8dcf686e6d4.js.map
\ No newline at end of file
--- a/dev/static/js/manifest.be911c0db8dcf686e6d4.js.map
+++ b/dev/static/js/manifest.be911c0db8dcf686e6d4.js.map
+{"version":3,"sources":["webpack:///webpack/bootstrap f3bd851871ba95d4f815"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","15","exports","module","l","e","installedChunkData","Promise","resolve","promise","reject","head","document","getElementsByTagName","script","createElement","type","charset","async","timeout","nc","setAttribute","src","p","0","1","2","3","4","5","6","7","8","9","10","11","12","setTimeout","onScriptComplete","onerror","onload","clearTimeout","chunk","Error","undefined","appendChild","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,GAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAA,SAAApB,GACA,IAAAqB,EAAAhB,EAAAL,GACA,OAAAqB,EACA,WAAAC,QAAA,SAAAC,GAA0CA,MAI1C,GAAAF,EACA,OAAAA,EAAA,GAIA,IAAAG,EAAA,IAAAF,QAAA,SAAAC,EAAAE,GACAJ,EAAAhB,EAAAL,IAAAuB,EAAAE,KAEAJ,EAAA,GAAAG,EAGA,IAAAE,EAAAC,SAAAC,qBAAA,WACAC,EAAAF,SAAAG,cAAA,UACAD,EAAAE,KAAA,kBACAF,EAAAG,QAAA,QACAH,EAAAI,OAAA,EACAJ,EAAAK,QAAA,KAEArB,EAAAsB,IACAN,EAAAO,aAAA,QAAAvB,EAAAsB,IAEAN,EAAAQ,IAAAxB,EAAAyB,EAAA,aAAAtC,EAAA,KAAwEuC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,EAAA,uBAAAC,GAAA,uBAAAC,GAAA,uBAAAC,GAAA,wBAAkWnD,GAAA,MAC1a,IAAAkC,EAAAkB,WAAAC,EAAA,MAEA,SAAAA,IAEAxB,EAAAyB,QAAAzB,EAAA0B,OAAA,KACAC,aAAAtB,GACA,IAAAuB,EAAApD,EAAAL,GACA,IAAAyD,IACAA,GACAA,EAAA,OAAAC,MAAA,iBAAA1D,EAAA,aAEAK,EAAAL,QAAA2D,GAKA,OAfA9B,EAAAyB,QAAAzB,EAAA0B,OAAAF,EAaA3B,EAAAkC,YAAA/B,GAEAL,GAIAX,EAAAgD,EAAAlD,EAGAE,EAAAiD,EAAA/C,EAGAF,EAAAkD,EAAA,SAAA9C,EAAA+C,EAAAC,GACApD,EAAAqD,EAAAjD,EAAA+C,IACAzD,OAAA4D,eAAAlD,EAAA+C,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMApD,EAAA0D,EAAA,SAAArD,GACA,IAAA+C,EAAA/C,KAAAsD,WACA,WAA2B,OAAAtD,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAkD,EAAAE,EAAA,IAAAA,GACAA,GAIApD,EAAAqD,EAAA,SAAAO,EAAAC,GAAsD,OAAAnE,OAAAC,UAAAC,eAAAC,KAAA+D,EAAAC,IAGtD7D,EAAAyB,EAAA,IAGAzB,EAAA8D,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.be911c0db8dcf686e6d4.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t15: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n \t// This file contains only the entry chunk.\n \t// The chunk loading function for additional chunks\n \t__webpack_require__.e = function requireEnsure(chunkId) {\n \t\tvar installedChunkData = installedChunks[chunkId];\n \t\tif(installedChunkData === 0) {\n \t\t\treturn new Promise(function(resolve) { resolve(); });\n \t\t}\n\n \t\t// a Promise means \"currently loading\".\n \t\tif(installedChunkData) {\n \t\t\treturn installedChunkData[2];\n \t\t}\n\n \t\t// setup Promise in chunk cache\n \t\tvar promise = new Promise(function(resolve, reject) {\n \t\t\tinstalledChunkData = installedChunks[chunkId] = [resolve, reject];\n \t\t});\n \t\tinstalledChunkData[2] = promise;\n\n \t\t// start chunk loading\n \t\tvar head = document.getElementsByTagName('head')[0];\n \t\tvar script = document.createElement('script');\n \t\tscript.type = \"text/javascript\";\n \t\tscript.charset = 'utf-8';\n \t\tscript.async = true;\n \t\tscript.timeout = 120000;\n\n \t\tif (__webpack_require__.nc) {\n \t\t\tscript.setAttribute(\"nonce\", __webpack_require__.nc);\n \t\t}\n \t\tscript.src = __webpack_require__.p + \"static/js/\" + chunkId + \".\" + {\"0\":\"57611af9b0ae57c65214\",\"1\":\"d2a22cd803a736fb3585\",\"2\":\"90e02ac5e4f6b0dec592\",\"3\":\"9e1c9b6265408a14ad8f\",\"4\":\"5d58b8bd9caace16e193\",\"5\":\"80537092bc4d33c0426b\",\"6\":\"64aa64e3a0a3bf5244f8\",\"7\":\"a936c5672c7c62e66d9b\",\"8\":\"e6d116e1cd19a76b7ffd\",\"9\":\"ba9447be974dd2cddb03\",\"10\":\"ba01ae1bae8fdcdf438f\",\"11\":\"8b0e54a06f96fd83cc66\",\"12\":\"db599e876dde29001712\"}[chunkId] + \".js\";\n \t\tvar timeout = setTimeout(onScriptComplete, 120000);\n \t\tscript.onerror = script.onload = onScriptComplete;\n \t\tfunction onScriptComplete() {\n \t\t\t// avoid mem leaks in IE.\n \t\t\tscript.onerror = script.onload = null;\n \t\t\tclearTimeout(timeout);\n \t\t\tvar chunk = installedChunks[chunkId];\n \t\t\tif(chunk !== 0) {\n \t\t\t\tif(chunk) {\n \t\t\t\t\tchunk[1](new Error('Loading chunk ' + chunkId + ' failed.'));\n \t\t\t\t}\n \t\t\t\tinstalledChunks[chunkId] = undefined;\n \t\t\t}\n \t\t};\n \t\thead.appendChild(script);\n\n \t\treturn promise;\n \t};\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap f3bd851871ba95d4f815"],"sourceRoot":""}
\ No newline at end of file
--- a/index.html
+++ b/index.html
@@ -24,9 +24,9 @@
    <div id="app"></div>
    <!-- built files will be auto injected -->
    <script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
-    <script src="https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js"></script>
+    <!--<script src="https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js"></script>-->
  <script>
-    var vConsole = new VConsole();
+    // var vConsole = new VConsole();
  </script>
  </body>
 </html>
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
@@ -174,21 +174,11 @@
          this.$nextTick(()=>{
            if(!this.dataURL){
              setTimeout(()=>{
-                let {
-                  height,
-                  width
-                } = document.getElementById('capture').getClientRects()[0];
-                document.getElementById('capture').style.width = width + 'px';
+                let o = this.getOffsetRect(this.$refs.imageWrapper);
                html2canvas(this.$refs.imageWrapper,{
-                  timeout: 500,
-                  useCORS:true,
-                  async: false,
-                  allowTaint: true,
-                  tainttest: true,
-                  scale: 2,
-                  width: width,
-                  height: height,
-                  logging:true,
+                  logging:false,
+                  y:o.top,
+                  x:o.left,
                  letterRendering: true,
                  backgroundColor: null
                }).then((canvas) => {
@@ -206,6 +196,23 @@
        }

      },
+      getOffsetRect(ele){
+        var box=ele.getBoundingClientRect();
+        var body=document.body,
+          docElem=document.documentElement;
+        //获取页面的scrollTop,scrollLeft(兼容性写法)
+        var scrollTop=window.pageYOffset||docElem.scrollTop||body.scrollTop,
+          scrollLeft=window.pageXOffset||docElem.scrollLeft||body.scrollLeft;
+        var clientTop=docElem.clientTop||body.clientTop,
+          clientLeft=docElem.clientLeft||body.clientLeft;
+        var top=box.top+scrollTop-clientTop,
+          left=box.left+scrollLeft-clientLeft;
+        return {
+          //Math.round 兼容火狐浏览器bug
+          top:Math.round(top),
+          left:Math.round(left)
+        }
+      },
      qrcode(data){
        if(this.QRCodeB){
          this.QRCodeB.makeCode(data)