4.25

6b63c7ad · chenyishuai@singsingenglish.com · 216c2fe5 · 6b63c7ad · 216c2fe5 · 6b63c7ad
Commit 6b63c7ad authored Apr 25, 2019 by chenyishuai@singsingenglish.com
35 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -6,4 +6,6 @@
          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 type=text/javascript src=static/js/manifest.b30ec0e2fc6b689f05ae.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.489b6fc96dcec28933c7.js></script></body></html>
+        }</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>// 初始化
\ No newline at end of file
+      var vConsole = new VConsole();
+      console.log('VConsole is cool');</script><script type=text/javascript src=static/js/manifest.9a77f1226393c02dd4b9.js></script><script type=text/javascript src=static/js/vendor.17e5a2aa52ade559a92c.js></script><script type=text/javascript src=static/js/app.489b6fc96dcec28933c7.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.5533e0794cc2eda1affe.js
+++ b/dev/static/js/0.5533e0794cc2eda1affe.js
--- a/dev/static/js/0.5fbb27f851e2802b5792.js
+++ b/dev/static/js/0.5fbb27f851e2802b5792.js
--- a/dev/static/js/1.364caa61e365ae5e4eb9.js
+++ b/dev/static/js/1.364caa61e365ae5e4eb9.js
--- a/dev/static/js/1.e9308bf1be87929bbf7b.js
+++ b/dev/static/js/1.e9308bf1be87929bbf7b.js
--- a/dev/static/js/16.0f93ba40ed4f2010d284.js
+++ b/dev/static/js/16.0f93ba40ed4f2010d284.js
--- a/dev/static/js/16.2bcfa933cc4e68a4b9cb.js
+++ b/dev/static/js/16.2bcfa933cc4e68a4b9cb.js
--- a/dev/static/js/3.cb0e919d300a9a3004be.js
+++ b/dev/static/js/3.cb0e919d300a9a3004be.js
--- a/dev/static/js/4.40ccdf99fbcc9c94ba7d.js
+++ b/dev/static/js/4.40ccdf99fbcc9c94ba7d.js
--- a/dev/static/js/5.35c21a9a684a2d8d4534.js
+++ b/dev/static/js/5.35c21a9a684a2d8d4534.js
--- a/dev/static/js/6.1b18b4e55d97e81a491b.js
+++ b/dev/static/js/6.1b18b4e55d97e81a491b.js
--- a/dev/static/js/6.ef72d98fd486b3708fb9.js
+++ b/dev/static/js/6.ef72d98fd486b3708fb9.js
--- a/dev/static/js/manifest.b30ec0e2fc6b689f05ae.js
+++ b/dev/static/js/manifest.b30ec0e2fc6b689f05ae.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var b,o,d,i=0,u=[];i<c.length;i++)o=c[i],n[o]&&u.push(n[o][0]),n[o]=0;for(b in t)Object.prototype.hasOwnProperty.call(t,b)&&(e[b]=t[b]);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:"5533e0794cc2eda1affe",1:"e9308bf1be87929bbf7b",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"ef72d98fd486b3708fb9",7:"34a7e511a1b50588f9ca",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"2bcfa933cc4e68a4b9cb",17:"03884613461070c0d522",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b644a689bc2d4448de66",22:"745c1006843f340293d6",23:"86d0c93bb0fbf0ba3de4",24:"afb3e5a1f610d054d5c9",25:"e812e07cad278df1a1b8",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"8cc4eeaaf96c01468092",29:"ad4b46fab1994ed7162c",30:"9c8059c86b001e208880",31:"ba8fdeff65da8bae41c1",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var b=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(b);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,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}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,c,f){for(var b,o,d,i=0,u=[];i<n.length;i++)o=n[i],r[o]&&u.push(r[o][0]),r[o]=0;for(b in c)Object.prototype.hasOwnProperty.call(c,b)&&(e[b]=c[b]);for(a&&a(n,c,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var n={},r={35:0};function t(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,t){a=r[e]=[n,t]});a[2]=n;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"5fbb27f851e2802b5792",1:"364caa61e365ae5e4eb9",2:"16245f5bcb88b5b640bf",3:"351aaeee7ed0befa3be9",4:"d75c32c679fe3bff20e2",5:"16e1a14f59a0ac65a693",6:"1b18b4e55d97e81a491b",7:"34a7e511a1b50588f9ca",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"0f93ba40ed4f2010d284",17:"03884613461070c0d522",18:"c64d73a608befb9174d1",19:"19c2c1ab5f332872664e",20:"4d03512be3a553567e4a",21:"b644a689bc2d4448de66",22:"745c1006843f340293d6",23:"86d0c93bb0fbf0ba3de4",24:"afb3e5a1f610d054d5c9",25:"e812e07cad278df1a1b8",26:"b4406470b13f68492997",27:"583040ea68d3ff135d64",28:"8cc4eeaaf96c01468092",29:"ad4b46fab1994ed7162c",30:"9c8059c86b001e208880",31:"ba8fdeff65da8bae41c1",32:"1a9d2b3e922c1bb2c4a9"}[e]+".js";var b=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(b);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=o,c.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,a,n){t.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(a,"a",a),a},t.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.d8c821c2e93ec4c15c8ea3508569e1e5.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.4faf7c50479e11a34397.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.47e0ad0c3f0de448dc49.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.40d7aa4c143545384215.js></script></body></html>
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.7bd248ea491ea1f3665c91d50b6215d9.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.7fc05f100417a3f31fd8.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.47e0ad0c3f0de448dc49.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.2837127b18871188f310.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.d8c821c2e93ec4c15c8ea3508569e1e5.css
+++ b/dist/static/css/app.d8c821c2e93ec4c15c8ea3508569e1e5.css
--- a/dist/static/js/0.0a5e1b6cb3bac8d348c9.js
+++ b/dist/static/js/0.0a5e1b6cb3bac8d348c9.js
--- a/dist/static/js/0.6d257736a76bfaef3fd1.js
+++ b/dist/static/js/0.6d257736a76bfaef3fd1.js
--- a/dist/static/js/1.d3ce010d76f657b4d1b5.js
+++ b/dist/static/js/1.d3ce010d76f657b4d1b5.js
--- a/dist/static/js/1.dd6ae228d70847b0154b.js
+++ b/dist/static/js/1.dd6ae228d70847b0154b.js
--- a/dist/static/js/2.98e78476b2bf208770ca.js
+++ b/dist/static/js/2.98e78476b2bf208770ca.js
--- a/dist/static/js/3.de9003ad0cd58d4933e6.js
+++ b/dist/static/js/3.de9003ad0cd58d4933e6.js
--- a/dist/static/js/32.e4146760976652405136.js
+++ b/dist/static/js/32.e4146760976652405136.js
--- a/dist/static/js/31.c5c605006b10fe90cf0c.js
+++ b/dist/static/js/31.c5c605006b10fe90cf0c.js
--- a/dist/static/js/32.576d287f1974794ba0c3.js
+++ b/dist/static/js/32.576d287f1974794ba0c3.js
--- a/dist/static/js/6.fb90de44b5c1f1f2e762.js
+++ b/dist/static/js/6.fb90de44b5c1f1f2e762.js
--- a/dist/static/js/7.83fc9932263c5b565ced.js
+++ b/dist/static/js/7.83fc9932263c5b565ced.js
--- a/dist/static/js/app.40d7aa4c143545384215.js
+++ b/dist/static/js/app.40d7aa4c143545384215.js
--- a/dist/static/js/manifest.4faf7c50479e11a34397.js
+++ b/dist/static/js/manifest.4faf7c50479e11a34397.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,r){for(var d,o,b,i=0,u=[];i<n.length;i++)o=n[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(c&&c(n,a,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=t(t.s=r[i]);return b};var n={},f={35:0};function t(c){if(n[c])return n[c].exports;var f=n[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,t),f.l=!0,f.exports}t.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=f[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,t.nc&&r.setAttribute("nonce",t.nc),r.src=t.p+"static/js/"+e+"."+{0:"6d257736a76bfaef3fd1",1:"d3ce010d76f657b4d1b5",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"c90470f4adee7dd01ce2",6:"fb90de44b5c1f1f2e762",7:"83fc9932263c5b565ced",8:"bfa832d63f77d0d127ee",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"984684a7f02744037054",17:"19b25a1d0d45b4615402",18:"8fdc15c78d35f18205ff",19:"a55a285dc45a3f867e89",20:"98917db55f67fdea7e67",21:"3f31027b2bc9b31c23ef",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"d37b4f618cff8640d548",27:"776139f253dd23ce2dad",28:"301bc88b7a29858e77ae",29:"b592a072a8ae796cf8c2",30:"4202878b9ec667c575e2",31:"c5c605006b10fe90cf0c",32:"e4146760976652405136"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,a.appendChild(r),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var a={},n={35:0};function f(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,f),n.l=!0,n.exports}f.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=n[e]=[a,f]});c[2]=a;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+e+"."+{0:"0a5e1b6cb3bac8d348c9",1:"dd6ae228d70847b0154b",2:"343a64f6172d0682ad8d",3:"ee3195f02e2a7f136ecf",4:"9e8aa6a3c22b79f2c73a",5:"c90470f4adee7dd01ce2",6:"5c43406d49c7196158ca",7:"63a7c74490efa71f413c",8:"bfa832d63f77d0d127ee",9:"245ee811d4a3ba944f78",10:"f8fb30dbb5264e6f2d22",11:"746a87de7ea3f73b88d5",12:"50545fc8db8a460df1a4",13:"4f7e7350f0ebcb13a353",14:"ef760d2a9b835c95953e",15:"f9fabe9d7c33c807d49f",16:"984684a7f02744037054",17:"19b25a1d0d45b4615402",18:"8fdc15c78d35f18205ff",19:"a55a285dc45a3f867e89",20:"98917db55f67fdea7e67",21:"3f31027b2bc9b31c23ef",22:"d0a6cb8b6a3d435048d8",23:"433fe98378cc42391942",24:"1198e7fee7b6e7141dc3",25:"e5861d8c07fc8bedff04",26:"d37b4f618cff8640d548",27:"776139f253dd23ce2dad",28:"301bc88b7a29858e77ae",29:"b592a072a8ae796cf8c2",30:"4202878b9ec667c575e2",31:"18b0f89153e4d4f91de2",32:"576d287f1974794ba0c3"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="https://static-cdn.changchangenglish.com/new-sing/",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/index.html
+++ b/index.html
@@ -24,11 +24,11 @@
    <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="static/vconsole/vconsole.min.js"></script>
+    <script src="static/vconsole/vconsole.min.js"></script>
    <script>
      // 初始化
      var vConsole = new VConsole();
      console.log('VConsole is cool');
-    </script> -->
+    </script>
  </body>
 </html>
--- a/package-lock.json
+++ b/package-lock.json
@@ -3774,14 +3774,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -3796,20 +3794,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -3926,8 +3921,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -3939,7 +3933,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -3954,7 +3947,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -3962,14 +3954,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -3988,7 +3978,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -4069,8 +4058,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -4082,7 +4070,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -4204,7 +4191,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -4644,9 +4630,9 @@
      }
    },
    "html2canvas": {
-      "version": "1.0.0-alpha.12",
+      "version": "1.0.0-rc.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.1.tgz",
-      "integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=",
+      "integrity": "sha512-ImguLJ3goQnY0P6z7n6VqBZ+ViS77Hv6J7iYXBxvdb3NWz3s8/mqr4/Lj0OlMUb3ID+qCQ1BPLIBuRMqhgqvYg==",
      "requires": {
        "css-line-break": "1.0.1"
      }

--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
  "dependencies": {
    "axios": "^0.18.0",
    "better-scroll": "^1.15.2",
-    "html2canvas": "^1.0.0-alpha.12",
+    "html2canvas": "^1.0.0-rc.1",
    "js-md5": "^0.7.3",
    "mint-ui": "^2.2.13",
    "qrcodejs2": "0.0.2",

--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -24,7 +24,7 @@
            </div>
          </div>
        </div>
-        <div class="Banner" id="capture33" v-if="userCourse.start_periods_id!=null&&userCourse.start_periods_id>-1">
+        <div class="Banner" id="capture33" v-if="userCourse.start_periods_id!=null">
          <img class="bgimg" :src="imgUrl.indexBanener2" alt="">
          <div class="content" >
            <img class="qr" :src="bannerData.qr" alt="">
@@ -156,7 +156,7 @@ export default {
      qmList:[],
      mxxyList:[],
      userCourse:{
-        start_periods_id:'-1'
+        // start_periods_id:'-1'
      },
      bannerData:{
        qr:"",
@@ -256,7 +256,7 @@ export default {
        if(res.goods_id&&!res.automation_id){
          // 无课
            this.userCourse = Object.assign({},res)
-            this.userCourse.start_periods_id='-1'
+            // this.userCourse.start_periods_id='-1'
            localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
            this.bannerData = res
            this.$refs.bottomTab.setBtn()

--- a/src/components/map/secMap.vue
+++ b/src/components/map/secMap.vue
@@ -19,7 +19,7 @@
            <div class="title">{{item.name | substr10}}</div>
            <div class="tips" >
              <span v-if="item.open">快去听课吧~</span>
-              <span v-if="!item.open">学完第1课得2颗星后即可解锁~</span>
+              <span v-if="!item.open">学完上节课得2颗星后即可解锁~</span>
            </div>
          </div>
          <div class="star-block" >
@@ -69,7 +69,7 @@
          </div>
        </div>
      </div>
-      <div v-if="lessonList2.length>0&&card2" class="card-block">
+      <div v-if="lessonList2.length>0&&card2" class="card-block card2">
        <img  :src="lessonList2[0].cover+'?imageslim'">
        <div class="shadowbox" @click="goToBuyPage" v-if="!lessonList2[0].open&&oneGoodinfo.goods_desc" >
          <div class="shadow"></div>
@@ -266,7 +266,7 @@ export default {
  },
  filters: {
    substr10(value) {
-      return value.substr(0, 10);
+      return value.substr(5, 4);
    }
  },
  computed: {
@@ -344,7 +344,13 @@ export default {
        getAutomationApi("goods", this.userCourse.can_buy_goods_id[0]).then(
          res => {
            this.lessonList2 = res.can_watch_list;
-            console.log(this.lessonList2);
+            setTimeout(()=>{
+            let moneyDom = document.getElementsByClassName('card2');
+            if(moneyDom.length>0){
+                  // this.scroll_to(moneyDom[0].offsetParent.offsetTop)
+              window.scrollTo(0,moneyDom[0].offsetTop-220);
+            }
+          },500)
            // debugger
          });
        getGoodsDetailApi(this.userCourse.can_buy_goods_id).then(res=>{
@@ -380,7 +386,7 @@ export default {
                  if(index==0){
                    el.open=true
                  }
-                  if(el.star_num==2&&this.lessonList1[index+1]){
+                  if(el.star_num>=2&&this.lessonList1[index+1]){
                    this.lessonList1[index+1].open=true
                  }
                })
@@ -543,7 +549,7 @@ export default {
          }
        );
      } else {
-        Toast("课程还未开始哦");
+        Toast("课程还未解锁哦");
      }
    },
@@ -564,7 +570,9 @@ export default {
      if(this.couponInfo.coupon_list.length){
        this.deadline = this.couponInfo.coupon_list[0].deadline_at
      }
+      // console.log(this.deadline)
        let leftTime = (new Date(this.deadline.replace(/\-/g, '/'))) - (new Date()); //计算剩余的毫秒数
+        console.log(leftTime)
        let hours = parseInt(leftTime / 1000 / 60 / 60 % 24 , 10); //计算剩余的小时
        let minutes = parseInt(leftTime / 1000 / 60 % 60, 10);//计算剩余的分钟
        let seconds = parseInt(leftTime / 1000 % 60, 10);//计算剩余的秒数
@@ -641,12 +649,6 @@ export default {
            if (res.err_msg === 'get_brand_wcpay_request:ok') {
              //  支付成功后处理
                Toast('支付成功');
-                // that.initPage();
-                // console.log(that);
-                // console.log('645')
-                // console.log(this);
-                // console.log('647')
-                // alert(1)
                setTimeout(function () {
                  getCourseInfoApi().then(res => {
                    localStorage.setItem("userCourse", "");
@@ -657,8 +659,6 @@ export default {
                },1000)
                // alert(2)
            }
-            // alert(res.errMsg)
-            // alert(res.err_msg)
            if (res.err_msg === 'get_brand_wcpay_request:fail') {
            }
@@ -728,7 +728,7 @@ export default {
       .logo{width: 70*@toVw;height: 70*@toVw;  }
       .center{
         width: 135*@toVw;
-         p{width: 135*@toVw;overflow: hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+         p{width: 155*@toVw;overflow: hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
         .tip{font-size: 12*@toVw;line-height: 24*@toVw;}
         .price{font-size:12*@toVw;margin-top: 6*@toVw;
         .now{font-size: 15*@toVw;}

--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
@@ -264,9 +264,7 @@
        getShortApi({url:URL}).then(res=>{
          this.qrcode(res.url);
          this.$nextTick(()=>{
-            let {
+            let {width} = document.getElementById('capture').getClientRects()[0];
-              width,
-            } = document.getElementById('capture').getClientRects()[0];
            document.getElementById('capture').style.width = width + 'px';
            let {
              height1,
@@ -283,7 +281,8 @@
              height: height1,
              letterRendering: true,
            }).then((canvas) => {
-              let dataURL = canvas.toDataURL("image/jpg");
+              // debugger
+              let dataURL = canvas.toDataURL("image/png",0.9);
              this.dataURL = dataURL;
            }).catch(res=>{alert(res);console.log()});},500)

--- a/src/components/public/bottomTab.vue
+++ b/src/components/public/bottomTab.vue
@@ -29,7 +29,6 @@ export default {
    return {
      imgurl: IndexImage,
      userCourse2:{
-        start_periods_id:-1,
      }
    };
  },