816

bce7c02d · chenyishuai@singsingenglish.com · 52a8a983 · bce7c02d · 52a8a983 · bce7c02d
Commit bce7c02d authored Aug 16, 2019 by chenyishuai@singsingenglish.com
8 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.8f7b433a41e096682110.js></script><script type=text/javascript src=static/js/vendor.0ef71eb4855840152163.js></script><script type=text/javascript src=static/js/app.0f0585daae20787b38db.js></script></body></html>
+        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.37918b53f71d8c7dcaa5.js></script><script type=text/javascript src=static/js/vendor.0ef71eb4855840152163.js></script><script type=text/javascript src=static/js/app.0f0585daae20787b38db.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/34.aa2dcff8837dc126d93a.js
+++ b/dev/static/js/34.aa2dcff8837dc126d93a.js
--- a/dev/static/js/34.b0c492bd4a81a786482d.js
+++ b/dev/static/js/34.b0c492bd4a81a786482d.js
--- a/dev/static/js/9.94b054788f551435e7c9.js
+++ b/dev/static/js/9.94b054788f551435e7c9.js
--- a/dev/static/js/9.da50096f288086caeba3.js
+++ b/dev/static/js/9.da50096f288086caeba3.js
--- a/dev/static/js/manifest.8f7b433a41e096682110.js
+++ b/dev/static/js/manifest.8f7b433a41e096682110.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={60:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"8e4730509c56bcd8d6fa",1:"52aa76d509ffd80aac1d",2:"620a706ba15ed543a42c",3:"f316574bd8b83a5f0c80",4:"94e2f3b9baba457933c3",5:"b5ec33e6f4985d076756",6:"66603cf5d5759b3789ff",7:"66737a29e2c8720196b4",8:"8fe3981a0711e5f7be55",9:"da50096f288086caeba3",10:"787c9ec05fcbc49d5254",11:"07d8416a524a18a11a94",12:"d1978e00cec0e17a0b33",13:"cc95ec7f6284caa85ee3",14:"50a2cb2a472ac9e39cbf",15:"efd95522e386ce3b8e32",16:"23b9483461299fe5935e",17:"19c30f59bd7daeb31fcf",18:"e4fab1bc8d5e5a3b59ce",19:"a9679bbd15c6c99695dd",20:"f5c3493971a6b24f2fe6",21:"39e2276099413d90e461",22:"f03ccd7cde0af220b590",23:"5208ad03a1802e221a80",24:"62f0cd5963b95494b554",25:"c2027dc25dbdf0b16a28",26:"d5d066930bd342221b62",27:"8d45a9f6d9d38e11bb2c",28:"de335182d23126954034",29:"d1a323f2a16ae157e3ac",30:"155f927287dd42e6325c",31:"8b54d5f641ce7f03d363",32:"94ddd814e9b03e928a6d",33:"ccfd7b3155e3bd335d4f",34:"aa2dcff8837dc126d93a",35:"0abeca0b9f67a1740ea1",36:"3ceda9b062fcdff499d0",37:"43dfa0ea95bfaf76b095",38:"fe00fa09f39149ac5590",39:"1728d9e464604c4975d5",40:"4e8da523fd689ca99b90",41:"6846c948cc2c0e4ad4c7",42:"08223042fade5116d628",43:"ce90b1dd00dac09e4f48",44:"1ff16a73fffac9bc85b9",45:"a88a61aac9bc46402f20",46:"b0245efe48b82cacd135",47:"e8d26a3f687410e3ac75",48:"bb6233b7e3b05406f476",49:"a4eb1fd7cdd23a1966cf",50:"5f2077cfdd5d8d7563c3",51:"dd9597df505ecd936336",52:"6d53c81923b6a35cdded",53:"1450a91c82ec749a3eec",54:"d9dbc4fcb15204e4b418",55:"137151751abbce84668b",56:"2b56d022fc34cfb59614",57:"23e5894de17786a16993"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),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="",f.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={60:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"8e4730509c56bcd8d6fa",1:"52aa76d509ffd80aac1d",2:"620a706ba15ed543a42c",3:"f316574bd8b83a5f0c80",4:"94e2f3b9baba457933c3",5:"b5ec33e6f4985d076756",6:"66603cf5d5759b3789ff",7:"66737a29e2c8720196b4",8:"8fe3981a0711e5f7be55",9:"94b054788f551435e7c9",10:"787c9ec05fcbc49d5254",11:"07d8416a524a18a11a94",12:"d1978e00cec0e17a0b33",13:"cc95ec7f6284caa85ee3",14:"50a2cb2a472ac9e39cbf",15:"efd95522e386ce3b8e32",16:"23b9483461299fe5935e",17:"19c30f59bd7daeb31fcf",18:"e4fab1bc8d5e5a3b59ce",19:"a9679bbd15c6c99695dd",20:"f5c3493971a6b24f2fe6",21:"39e2276099413d90e461",22:"f03ccd7cde0af220b590",23:"5208ad03a1802e221a80",24:"62f0cd5963b95494b554",25:"c2027dc25dbdf0b16a28",26:"d5d066930bd342221b62",27:"8d45a9f6d9d38e11bb2c",28:"de335182d23126954034",29:"d1a323f2a16ae157e3ac",30:"155f927287dd42e6325c",31:"8b54d5f641ce7f03d363",32:"94ddd814e9b03e928a6d",33:"ccfd7b3155e3bd335d4f",34:"b0c492bd4a81a786482d",35:"0abeca0b9f67a1740ea1",36:"3ceda9b062fcdff499d0",37:"43dfa0ea95bfaf76b095",38:"fe00fa09f39149ac5590",39:"1728d9e464604c4975d5",40:"4e8da523fd689ca99b90",41:"6846c948cc2c0e4ad4c7",42:"08223042fade5116d628",43:"ce90b1dd00dac09e4f48",44:"1ff16a73fffac9bc85b9",45:"a88a61aac9bc46402f20",46:"b0245efe48b82cacd135",47:"e8d26a3f687410e3ac75",48:"bb6233b7e3b05406f476",49:"a4eb1fd7cdd23a1966cf",50:"5f2077cfdd5d8d7563c3",51:"dd9597df505ecd936336",52:"6d53c81923b6a35cdded",53:"1450a91c82ec749a3eec",54:"d9dbc4fcb15204e4b418",55:"137151751abbce84668b",56:"2b56d022fc34cfb59614",57:"23e5894de17786a16993"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),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="",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -520,19 +520,24 @@
      getUnitList(){
        // 获取主题
        getCourseListApi(this.secActions.id).then(res=>{
-          // console.log(res)
+          console.log(res)
          // debugger
          this.unitList = [];
          res.forEach(i=>{
            if(i.status === 1 || i.status === 2 ){
              this.unitList.push(i)
+              // 在推的主题2
              if(i.status === 2){
                this.parent_category_id = i.category_id
              }
            }
+            if(res.length==1){
+              this.parent_category_id = i.category_id
+              // debugger
+            }
          });
          // 跳回上次看课主题
-          if(this.$route.query.parent_category_id){
+          if(this.$route.query.parent_category_id&&res.length!=1){
            this.parent_category_id = this.$route.query.parent_category_id
          }
          this.getLessonList();
@@ -727,6 +732,7 @@
        if(this.secActions.is_start_course){
          if (this.secActions.course_type==0){
            // 月课
+            // debugger
            this.getUnitList()
          }else{
            this.getLessonList();

--- a/src/components/subAccount/index.vue
+++ b/src/components/subAccount/index.vue
@@ -137,7 +137,10 @@ export default {
      })
    },
    initPage() {
-      this.userDetail = JSON.parse(localStorage.getItem("userDesc"));
+      getUserDetailApi().then(res=>{
+        localStorage.setItem('userDesc',JSON.stringify(res));
+        this.userDetail = JSON.parse(localStorage.getItem("userDesc"));
+      })
      if(this.userDetail.family_user==1){
        subAccountinfoApi().then(res => {
          this.subDetail = res