4.25

8d98425a · chenyishuai@singsingenglish.com · c9f94b68 · 8d98425a · c9f94b68 · 8d98425a
Commit 8d98425a authored Apr 25, 2019 by chenyishuai@singsingenglish.com
29 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -6,6 +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>// 初始化
+        }</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.416055222e671b28d812.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>
-      var vConsole = new VConsole();
\ No newline at end of file
-      console.log('VConsole is cool');</script><script type=text/javascript src=static/js/manifest.a7edbe04a308fa43da58.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.c742c3834b87982a00ff.js
+++ b/dev/static/js/0.c742c3834b87982a00ff.js
--- a/dev/static/js/0.e2595d6a8fe09f9f6511.js
+++ b/dev/static/js/0.e2595d6a8fe09f9f6511.js
--- a/dev/static/js/1.5957001eea30fb7dfb71.js
+++ b/dev/static/js/1.5957001eea30fb7dfb71.js
--- a/dev/static/js/1.e9308bf1be87929bbf7b.js
+++ b/dev/static/js/1.e9308bf1be87929bbf7b.js
--- a/dev/static/js/16.1f661b91d4c9d1500961.js
+++ b/dev/static/js/16.1f661b91d4c9d1500961.js
--- a/dev/static/js/16.ed5384504484bbcabd12.js
+++ b/dev/static/js/16.ed5384504484bbcabd12.js
--- a/dev/static/js/7.078dcc048e072f594d95.js
+++ b/dev/static/js/7.078dcc048e072f594d95.js
--- a/dev/static/js/7.9968e4191ae5944cd33c.js
+++ b/dev/static/js/7.9968e4191ae5944cd33c.js
--- a/dev/static/js/manifest.a7edbe04a308fa43da58.js
+++ b/dev/static/js/manifest.a7edbe04a308fa43da58.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:"c742c3834b87982a00ff",1:"5957001eea30fb7dfb71",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"ef72d98fd486b3708fb9",7:"078dcc048e072f594d95",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"ed5384504484bbcabd12",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(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:"e2595d6a8fe09f9f6511",1:"e9308bf1be87929bbf7b",2:"16245f5bcb88b5b640bf",3:"cb0e919d300a9a3004be",4:"40ccdf99fbcc9c94ba7d",5:"35c21a9a684a2d8d4534",6:"ef72d98fd486b3708fb9",7:"9968e4191ae5944cd33c",8:"171ad2d0bb154c78ab7f",9:"1c9fa255f310bb8b4e6a",10:"7ee33d51aede03d926f0",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"43f421c3eb64a990eab2",14:"e918345baacdc3d391bf",15:"e89ab9ff03d59f4e5f9f",16:"1f661b91d4c9d1500961",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}}([]);
\ 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.2f3da84a3109567a6e0afe04990004cd.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.6e07647678ae98bcbcfe.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>
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.73dfcd8dc4a6bc9bbbeb06d5c6528948.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.6144bddfd9f324b3dc79.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.2f3da84a3109567a6e0afe04990004cd.css
+++ b/dist/static/css/app.2f3da84a3109567a6e0afe04990004cd.css
--- a/dist/static/js/0.68e149a93b64e6209f7f.js
+++ b/dist/static/js/0.68e149a93b64e6209f7f.js
--- a/dist/static/js/0.d6cea5fa24694bf979ef.js
+++ b/dist/static/js/0.d6cea5fa24694bf979ef.js
--- a/dist/static/js/1.bb2a302a4beab9344041.js
+++ b/dist/static/js/1.bb2a302a4beab9344041.js
--- a/dist/static/js/1.d3ce010d76f657b4d1b5.js
+++ b/dist/static/js/1.d3ce010d76f657b4d1b5.js
--- a/dist/static/js/32.64367acd6ad207037ae0.js
+++ b/dist/static/js/32.64367acd6ad207037ae0.js
--- a/dist/static/js/32.e565a1ad0432d8c1ec31.js
+++ b/dist/static/js/32.e565a1ad0432d8c1ec31.js
--- a/dist/static/js/5.20136d46814edbd02935.js
+++ b/dist/static/js/5.20136d46814edbd02935.js
--- a/dist/static/js/6.3207c76dd3d7557d9407.js
+++ b/dist/static/js/6.3207c76dd3d7557d9407.js
--- a/dist/static/js/manifest.6144bddfd9f324b3dc79.js
+++ b/dist/static/js/manifest.6144bddfd9f324b3dc79.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,r){for(var d,o,b,i=0,u=[];i<n.length;i++)o=n[i],a[o]&&u.push(a[o][0]),a[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(n,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var n={},a={35:0};function f(c){if(n[c])return n[c].exports;var a=n[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,f),a.l=!0,a.exports}f.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,f){c=a[e]=[n,f]});c[2]=n;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:"d6cea5fa24694bf979ef",1:"d3ce010d76f657b4d1b5",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"200082e7927c54ad47e3",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:"18b0f89153e4d4f91de2",32:"64367acd6ad207037ae0"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),n},f.m=e,f.c=n,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},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/dist/static/js/manifest.6e07647678ae98bcbcfe.js
+++ b/dist/static/js/manifest.6e07647678ae98bcbcfe.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(c,r,f){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],a[o]&&u.push(a[o][0]),a[o]=0;for(d in r)Object.prototype.hasOwnProperty.call(r,d)&&(e[d]=r[d]);for(n&&n(c,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=t(t.s=f[i]);return b};var c={},a={35:0};function t(n){if(c[n])return c[n].exports;var a=c[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var c=new Promise(function(c,t){n=a[e]=[c,t]});n[2]=c;var r=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:"68e149a93b64e6209f7f",1:"bb2a302a4beab9344041",2:"98e78476b2bf208770ca",3:"de9003ad0cd58d4933e6",4:"9e8aa6a3c22b79f2c73a",5:"20136d46814edbd02935",6:"3207c76dd3d7557d9407",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:"18b0f89153e4d4f91de2",32:"e565a1ad0432d8c1ec31"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return f.onerror=f.onload=o,r.appendChild(f),c},t.m=e,t.c=c,t.d=function(e,n,c){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:c})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.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/src/components/index.vue
+++ b/src/components/index.vue
@@ -30,7 +30,7 @@
            <img class="qr" :src="bannerData.qr" alt="">
            <div class="text">
              <p>请扫码添加客服班主任</p>
-              <p>领取学习资料</p>
+              <p>领取学习资料{{bannerData.start_periods_id}}</p>
            </div>
            <div class="date">
              <p>开课时间：{{bannerData.start_at}}</p>
@@ -38,8 +38,8 @@
            </div>
          </div>
          <div class="triangle">
-              <span v-if="bannerData.is_start_active==1">已开课</span>
+              <span v-if="bannerData.start_periods_id>0">已开课</span>
-              <span v-if="bannerData.is_start_active==0">待开课</span>
+              <span v-if="bannerData.start_periods_id==0">待开课</span>
          </div>
          <img class="bgimg canvas"  v-if="canvasData" :src="canvasData" alt="">
        </div>
@@ -261,7 +261,7 @@ export default {
            this.bannerData = res
            this.$refs.bottomTab.setBtn()
        }else{
-          if(res.is_start_active!=undefined&&res.is_start_active==1){
+          if(res.start_periods_id!=undefined&&res.start_periods_id>0){
            // debugger
            // 已开课
            if(res.teacher_qr){
@@ -270,11 +270,12 @@ export default {
            this.bannerData.start_at = res.periods_list[0].start_at
            this.bannerData.active_start_at = res.periods_list[0].active_start_at
            this.bannerData.is_start_active = res.is_start_active
+            this.bannerData.start_periods_id = res.start_periods_id
            this.userCourse = Object.assign({},res)
            localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
            this.$refs.bottomTab.setBtn()
            //  debugger
-             if(!sessionStorage.getItem('frist')){
+             if(!sessionStorage.getItem('frist')&&this.bannerData.is_start_active){
               sessionStorage.setItem('frist',true)
               this.$router.push({
                name: "map",
@@ -297,17 +298,19 @@ export default {
                  this.canvasData = dataURL
                }).catch(res=>{alert(res);console.log()});
              })
-          }else if(res.is_start_active!=undefined&&res.is_start_active==0){
+          }else if(res.start_periods_id!=undefined&&res.start_periods_id==0){
+            // 没开课
             if(res.teacher_qr){
              this.bannerData.qr = res.teacher_qr
            }
              this.bannerData.start_at = res.periods_list[0].start_at
              this.bannerData.active_start_at = res.periods_list[0].active_start_at
              this.bannerData.is_start_active = res.is_start_active
+              this.bannerData.start_periods_id = res.start_periods_id
            this.userCourse = Object.assign({},res)
             localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
+             console.log(this.userCourse)
              this.$refs.bottomTab.setBtn()
          }else if(res.automation_id.length){
            //  debugger
            this.bannerData = res

--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -316,6 +316,7 @@
          this.actions.push(item)
        }
        if(this.userCourse.periods_list){
+          // 有其他课
          // debugger
            this.userCourse.periods_list.forEach(el =>{
            el.name = el.course_title
@@ -323,9 +324,10 @@
            if(this.$route.query.item){
              this.secActions = this.$route.query.item
            }else{
-              if(this.userCourse.start_periods_id&&this.userCourse.start_periods_id==0){
+              console.log(this.userCourse.start_periods_id)
+              if(this.userCourse.start_periods_id!=null&&this.userCourse.start_periods_id==0){
              this.secActions = this.userCourse.periods_list[0]
-              }else if(el.id==this.userCourse.start_periods_id){
+              }else if(this.userCourse.start_periods_id!=null&&el.id==this.userCourse.start_periods_id){
              this.secActions = el
              }
            }

--- a/src/components/newLesson/index.vue
+++ b/src/components/newLesson/index.vue
@@ -212,6 +212,7 @@
              content:this.lesson.content.look,
              age:this.nowLesson.age
            };
+            // debugger
            break;
          case 2:
            // 神策埋点 板块切换
@@ -291,6 +292,8 @@
          document.title =`${this.lesson.domTitle}`;
          this.nowLesson = {
            type:'text',
+            partName:'爸妈看一看',
+            title:1,
            content:this.lesson.content.look,
            age:this.nowLesson.age
          };

--- a/src/components/newLesson/look.vue
+++ b/src/components/newLesson/look.vue
@@ -7,7 +7,7 @@
      </div>
    </div>
    <div v-if="share_show">
-      <share-page @backList="backList()" @closeShare="closeShare()"/>
+      <share-page @backList="backList()" @closeShare="closeShare()" :contentData="contentData"/>
    </div>
    <star-block @showShare="share_show = true" @changeShow="changeStar" :contentData="contentData"/>
  </div>
@@ -32,6 +32,9 @@
      sharePage,
      starBlock
    },
+    mounted(){
+      console.log(this.contentData)
+    },
    methods:{
      changeStar(data){
        this.star = data

--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
@@ -76,7 +76,11 @@
        share_code_bg:share_code_bg
      }
    },
+    props:[
+      'contentData'
+    ],
    mounted(){
+      // console.log(this.contentData)
      this.initPage()
    },
    methods:{
@@ -103,6 +107,7 @@
      initPage(){
          this.userDetail = JSON.parse(localStorage.getItem('userDesc'));
          this.toDataURLBase64(this.userDetail.avatar.replace('http://','https://'),  (avatar) =>{
+            console.log(this.shareConBg)
            this.toDataURLBase64(this.shareConBg,(cal)=>{
              this.shareConBg = cal;
              this.userDetail.avatar = avatar;
@@ -115,6 +120,8 @@
              })
            })
          });
+          // console.log(this.contentData)
+          // debugger
      },
      enableShare: function(option) {
        let that = this;
@@ -312,10 +319,8 @@
          });
        }
      },
-    },
+    }
-    props:[
-      'contentData'
-    ]
  }
 </script>
 <style scoped lang="less">

--- a/src/components/public/bottomTab.vue
+++ b/src/components/public/bottomTab.vue
@@ -35,9 +35,9 @@ export default {
  },
  mounted() {
    // debugger
-    // let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
+    let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
-    // this.userCourse2 = userCourse2
+    this.userCourse2 = userCourse2
-      // console.log(this.userCourse2)
+      console.log(this.userCourse2)
  },
  methods: {
    toUrl(data) {