627

deca76de · chenyishuai@singsingenglish.com · 9842fff7 · deca76de · 9842fff7 · 9842fff7
Commit deca76de authored Jun 27, 2019 by chenyishuai@singsingenglish.com
22 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<<<<<<< HEAD
 <!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><script>// setSize();
    //   addEventListener('resize',setSize);
    //   function setSize() {
@@ -11,16 +10,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.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.ab2aeb00416b1e394454.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.f6e5ed6ae64930d49df8.js></script></body></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
-    }
-
-    .wrapper {
-      height: 100vh;
-      overflow: hidden;
-      position: fixed;
-      background: #f4f4f4;
-    }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.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.c6157807a001be171834.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.8aabab9d2e0d5ed8aac0.js></script></body></html>
->>>>>>> 09aa55d3109bc214f6e8c569c3af02dce62bccd6
+        }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.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.ab2aeb00416b1e394454.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.1fb8456c4f2c17f7ad56.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/1.23fbc292a7349b6e54ad.js
+++ b/dev/static/js/1.23fbc292a7349b6e54ad.js
--- a/dev/static/js/10.5f9319e15ee95037acfb.js
+++ b/dev/static/js/10.5f9319e15ee95037acfb.js
--- a/dev/static/js/11.999ca58352a66c145dde.js
+++ b/dev/static/js/11.999ca58352a66c145dde.js
--- a/dev/static/js/12.0205190cf85d4284cdaf.js
+++ b/dev/static/js/12.0205190cf85d4284cdaf.js
--- a/dev/static/js/13.fd6ca3bcf8f583f1b60c.js
+++ b/dev/static/js/13.fd6ca3bcf8f583f1b60c.js
--- a/dev/static/js/14.8bb922f838d25b2abceb.js
+++ b/dev/static/js/14.8bb922f838d25b2abceb.js
--- a/dev/static/js/15.ccb1c58cac45d3963513.js
+++ b/dev/static/js/15.ccb1c58cac45d3963513.js
--- a/dev/static/js/16.00e013c2a2f2c1334bbc.js
+++ b/dev/static/js/16.00e013c2a2f2c1334bbc.js
--- a/dev/static/js/17.8f68cb285149b65813a5.js
+++ b/dev/static/js/17.8f68cb285149b65813a5.js
--- a/dev/static/js/18.1278e3d737b392d506cd.js
+++ b/dev/static/js/18.1278e3d737b392d506cd.js
--- a/dev/static/js/19.c45b7d8940bb5405dc89.js
+++ b/dev/static/js/19.c45b7d8940bb5405dc89.js
--- a/dev/static/js/20.ab27e2d0b0129e180716.js
+++ b/dev/static/js/20.ab27e2d0b0129e180716.js
--- a/dev/static/js/21.49dc1a29463763f360e9.js
+++ b/dev/static/js/21.49dc1a29463763f360e9.js
--- a/dev/static/js/22.3c4cab830c67ecf293a5.js
+++ b/dev/static/js/22.3c4cab830c67ecf293a5.js
--- a/dev/static/js/23.c7a3538c24e84ffbca11.js
+++ b/dev/static/js/23.c7a3538c24e84ffbca11.js
--- a/dev/static/js/24.4062f2405270447a1f29.js
+++ b/dev/static/js/24.4062f2405270447a1f29.js
--- a/dev/static/js/7.11e7e2fc748750ad1dc3.js
+++ b/dev/static/js/7.11e7e2fc748750ad1dc3.js
--- a/dev/static/js/app.f6e5ed6ae64930d49df8.js
+++ b/dev/static/js/app.f6e5ed6ae64930d49df8.js
--- a/dev/static/js/app.8aabab9d2e0d5ed8aac0.js
+++ b/dev/static/js/app.8aabab9d2e0d5ed8aac0.js
--- a/dev/static/js/manifest.c6157807a001be171834.js
+++ b/dev/static/js/manifest.c6157807a001be171834.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,b){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(c&&c(a,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var a={},f={46:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"19d8d7442db97f3077b3",1:"23fbc292a7349b6e54ad",2:"647c31ceea486f0c6369",3:"c0acae9a6a94d328531a",4:"b6d09dbccad22ece1b92",5:"85d49b4a7a8c0b11a83e",6:"fa8951a8ac877c52644a",7:"11e7e2fc748750ad1dc3",8:"4c90b8b421f643af906d",9:"7e2422607c032c81b513",10:"5f9319e15ee95037acfb",11:"999ca58352a66c145dde",12:"0205190cf85d4284cdaf",13:"fd6ca3bcf8f583f1b60c",14:"8bb922f838d25b2abceb",15:"ccb1c58cac45d3963513",16:"00e013c2a2f2c1334bbc",17:"8f68cb285149b65813a5",18:"1278e3d737b392d506cd",19:"c45b7d8940bb5405dc89",20:"ab27e2d0b0129e180716",21:"49dc1a29463763f360e9",22:"3c4cab830c67ecf293a5",23:"c7a3538c24e84ffbca11",24:"4062f2405270447a1f29",25:"961a0bbde4e5abd1c4f0",26:"d635ab661335c2c53989",27:"7d07c633b4f051546446",28:"97cf270c016aaae30556",29:"6b46f4bdff7e24f2e6a8",30:"e8e294bfe44189f1c2c5",31:"e4163b6fae6304bd89de",32:"277a4c602d2dd15bf934",33:"6e5948d7366ed0cdf97a",34:"bb1b567a8ba98dcb94a9",35:"b21b5ba36df3e0a6b162",36:"cb8ee327149dfc09e47a",37:"c8f8f2f4f458cc11b68f",38:"e7e01570addf525b0363",39:"8e2503af9ffcae65dd97",40:"b8354650f463fb373740",41:"c78170c1f23a4690b425",42:"a3567e55eb79aa427528",43:"d06da678467be8eb1894"}[e]+".js";var t=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return b.onerror=b.onload=d,r.appendChild(b),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -15,7 +15,7 @@ axios.interceptors.request.use(
  config => {
    // 获取token
    // process.env.versionTime
-    let versiontime = '06241700'
+    let versiontime = '06271500'
    const token = localStorage.getItem('cc_token');
    // 设置参数格式
    if(!config.headers['Content-Type']){