625

6191bee3 · chenyishuai@singsingenglish.com · 6a0b6285 · 6191bee3 · 6191bee3 · 6a0b6285
Commit 6191bee3 authored Jun 25, 2019 by chenyishuai@singsingenglish.com
7 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -6,4 +6,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.d890b0e2878ae8d4c868.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.2bff06f5bf8c8044fb3f.js></script></body></html>
\ No newline at end of file
+        }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.43892f8ba3c307cd4085.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.3552990412de88f2f533.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/1.42ff50cee503cf0b21b7.js
+++ b/dev/static/js/1.42ff50cee503cf0b21b7.js
--- a/dev/static/js/app.2bff06f5bf8c8044fb3f.js
+++ b/dev/static/js/app.2bff06f5bf8c8044fb3f.js
--- a/dev/static/js/app.3552990412de88f2f533.js
+++ b/dev/static/js/app.3552990412de88f2f533.js
--- a/dev/static/js/manifest.d890b0e2878ae8d4c868.js
+++ b/dev/static/js/manifest.d890b0e2878ae8d4c868.js
-!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(f&&f(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},a={46:0};function n(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,n){f=a[e]=[c,n]});f[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:"66f30f37970d706e6b17",1:"42ff50cee503cf0b21b7",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"de3e0e9cd5ee98d6c928",11:"68ed40adad67d85c0313",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"9d6cc6367f21cfbac19e",16:"98ce85ad5ab95594e0f7",17:"1b9a9206d8e2f1c882d2",18:"c5d36ed475bb21ff44cf",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"a26ca5bd9e4f0c2c863c",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"3f1e7217c310f4810b2f",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
+!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],a[d]&&u.push(a[d][0]),a[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(f&&f(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},a={46:0};function n(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,n){f=a[e]=[c,n]});f[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:"66f30f37970d706e6b17",1:"6648929b06dd1f7ff647",2:"c82ef8973358b8a94a53",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"de3e0e9cd5ee98d6c928",11:"68ed40adad67d85c0313",12:"569df6356ef277433bf8",13:"80d75851ebf723ba0b00",14:"49e2faaa5a02eff36984",15:"9d6cc6367f21cfbac19e",16:"98ce85ad5ab95594e0f7",17:"1b9a9206d8e2f1c882d2",18:"c5d36ed475bb21ff44cf",19:"489a1a2bd284b566865d",20:"ea0e446648e88f1d76e4",21:"f62dfff013d1ecc467be",22:"0a1864b54026b8c72ef7",23:"52c139bed6992be26830",24:"a26ca5bd9e4f0c2c863c",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"3f1e7217c310f4810b2f",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
@@ -288,12 +288,12 @@
        width: 100px;
        height: 100px;
        // border: 1px solid black;
-        img{width: 90px;height: 90px;}
-      }
+        img{width: 90px;height: 60px;border-radius: 10px;border: 3px solid transparent;}
        .activity{
-        border: 1px solid #40A9FF;
-        // border-color: #40A9FF;
+          border: 3px solid #40A9FF;
+        }
      }
+
    }
  }
  .disShow{display: block;}

--- a/src/service/index.js
+++ b/src/service/index.js
@@ -46,8 +46,8 @@ axios.interceptors.request.use(
      json.sing = "singsingenglish21000";
      if(common.getUrlParam().chang_test_user_id){
        console.log(common.getUrlParam())
-        json.chang_test_user_id = common.getUrlParam().chang_test_user_id
-        json.special_token = 'changchangenglish'
+        // json.chang_test_user_id = common.getUrlParam().chang_test_user_id
+        // json.special_token = 'changchangenglish'
      }
      if(process.env.NODE_ENV === 'development' ){
        config.params.special_token="changchangenglish";
@@ -73,12 +73,13 @@ axios.interceptors.request.use(
      json2.sing = "singsingenglish21000";
      if(common.getUrlParam().chang_test_user_id){
        console.log(common.getUrlParam())
-        json2.chang_test_user_id = common.getUrlParam().chang_test_user_id
-        json2.special_token =  'changchangenglish'
+        // json2.chang_test_user_id = common.getUrlParam().chang_test_user_id
+        // json2.special_token =  'changchangenglish'
      }
      if(process.env.NODE_ENV === 'development' ){
        config.data.special_token="changchangenglish";
      }
+      console.log(json2)
      config.data.param_token = md5(JSON.stringify(json2));
      config.data.v = versiontime
    }