4.29

c9c62e7e · chenyishuai@singsingenglish.com · 5ed21498 · c9c62e7e · c9c62e7e · c9c62e7e
Commit c9c62e7e authored Apr 29, 2019 by chenyishuai@singsingenglish.com
10 changed files
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -27,6 +27,7 @@ module.exports = {
    alias: {
      'vue$': 'vue/dist/vue.esm.js',
      '@': resolve('src'),
+      '~': resolve(__dirname, 'src')
    }
  },
  module: {

--- a/dev/index.html
+++ b/dev/index.html
@@ -6,4 +6,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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=static/vconsole/vconsole.min.js></script><script>// 初始化</script><script type=text/javascript src=static/js/manifest.d8a180527918737a9c88.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.23d47d9da1936681466a.js></script></body></html>
\ No newline at end of file
+        }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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=static/vconsole/vconsole.min.js></script><script>// 初始化</script><script type=text/javascript src=static/js/manifest.89e631dae68496645cbb.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.23d47d9da1936681466a.js></script></body></html>
\ No newline at end of file
--- a/dev/static/images/lessonHeader2.png
+++ b/dev/static/images/lessonHeader2.png
--- a/dev/static/js/1.d1df70684b9f6abcbae0.js
+++ b/dev/static/js/1.d1df70684b9f6abcbae0.js
--- a/dev/static/js/5.07adbe82ab7c98628c5c.js
+++ b/dev/static/js/5.07adbe82ab7c98628c5c.js
--- a/dev/static/js/5.53dfe06ae1187a3f7e01.js
+++ b/dev/static/js/5.53dfe06ae1187a3f7e01.js
--- a/dev/static/js/manifest.d8a180527918737a9c88.js
+++ b/dev/static/js/manifest.d8a180527918737a9c88.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={35:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"cbc1c8ae3fe820c92a15",1:"d1df70684b9f6abcbae0",2:"498f2f09be6aec42934b",3:"351aaeee7ed0befa3be9",4:"0faa6f24e0ee47c34699",5:"53dfe06ae1187a3f7e01",6:"ada1fe405222ff9e92ff",7:"35f4f564b7f8381ea482",8:"b45aaab7c735cf8b979d",9:"968b340c31a95b414d9e",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"2c2d39e106624cfd0e1d",17:"9b04f94f4ac242456f1c",18:"e0bfa9fdb4e894de4361",19:"6788ece3a8027eb36940",20:"c8417e1afa9252e6c8ad",21:"d9a2c323db8018bc908d",22:"d5935b43db80ef4e4832",23:"abd000c2d42590325658",24:"b3b88a83e7f8c9bd7a71",25:"b31312e1d7a565236a43",26:"f688ad0a42f7f2456842",27:"05685291a76423616c48",28:"e57c58a265ac4dfb2e68",29:"3a9c7f203e985634d6e2",30:"2ba513eae8a52f6c2dbb",31:"d60112dd9c242f540a5d",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,b,d,i=0,u=[];i<c.length;i++)b=c[i],n[b]&&u.push(n[b][0]),n[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var c={},n={35:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"cbc1c8ae3fe820c92a15",1:"b68e830b36321be72874",2:"498f2f09be6aec42934b",3:"351aaeee7ed0befa3be9",4:"0faa6f24e0ee47c34699",5:"07adbe82ab7c98628c5c",6:"ada1fe405222ff9e92ff",7:"35f4f564b7f8381ea482",8:"b45aaab7c735cf8b979d",9:"968b340c31a95b414d9e",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"2c2d39e106624cfd0e1d",17:"9b04f94f4ac242456f1c",18:"e0bfa9fdb4e894de4361",19:"6788ece3a8027eb36940",20:"c8417e1afa9252e6c8ad",21:"d9a2c323db8018bc908d",22:"d5935b43db80ef4e4832",23:"abd000c2d42590325658",24:"b3b88a83e7f8c9bd7a71",25:"b31312e1d7a565236a43",26:"f688ad0a42f7f2456842",27:"05685291a76423616c48",28:"e57c58a265ac4dfb2e68",29:"3a9c7f203e985634d6e2",30:"2ba513eae8a52f6c2dbb",31:"d60112dd9c242f540a5d",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=b,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/buy/activityInvite.vue
+++ b/src/components/buy/activityInvite.vue
@@ -193,13 +193,14 @@
                        html2canvas(document.getElementById('capture'),{
                        async: true,
                        timeout: 500,
+                        useCORS:true,
                        scrollX:1,
                        scale: 2,
                        width: width,
                        height: height,
                        letterRendering: true,
                      }).then((canvas) => {
-                        let dataURL = canvas.toDataURL("image/jpg");
+                        let dataURL = canvas.toDataURL("image/png",0.9);
                        this.dataURL = dataURL;
                        Indicator.close();
                      }).catch(res=>{alert(res);console.log()});

--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
@@ -509,12 +509,13 @@ import {Toast} from 'vant'
      right: 13*@toVw;
    }
    .tips{
-      background: rgba(0,0,0,0.5);
+      background: rgba(0,0,0,0.8);
      position: fixed;
      top: 0;
      left: 0;
      right: 0;
      bottom: 0;
+      padding-right: 19*@toVw;
      z-index: 99999999;
      text-align: right;
      img{

--- a/static/images/lessonHeader2.png
+++ b/static/images/lessonHeader2.png