新首页

ebf4c127 · chenyishuai@singsingenglish.com · e5697169 · ebf4c127 · e5697169 · ebf4c127
Commit ebf4c127 authored Apr 09, 2019 by chenyishuai@singsingenglish.com
15 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -3,4 +3,4 @@
      }
      *{
        -webkit-overflow-scrolling: touch
-      }</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.a146744842d306c3bbe2.js></script><script type=text/javascript src=static/js/vendor.e044f3dac63d7cdf4e43.js></script><script type=text/javascript src=static/js/app.940baa529401b9992fab.js></script></body></html>
\ No newline at end of file
+      }</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.f826422096a6017a9dbb.js></script><script type=text/javascript src=static/js/vendor.e044f3dac63d7cdf4e43.js></script><script type=text/javascript src=static/js/app.b0228843360b363739d2.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.4b1a7061cbd37a3f497e.js
+++ b/dev/static/js/0.4b1a7061cbd37a3f497e.js
--- a/dev/static/js/0.eac73f0183237a2634d8.js
+++ b/dev/static/js/0.eac73f0183237a2634d8.js
--- a/dev/static/js/21.c62d4408098bc668e571.js
+++ b/dev/static/js/21.c62d4408098bc668e571.js
--- a/dev/static/js/6.10cb757ba5f00cf589bd.js
+++ b/dev/static/js/6.10cb757ba5f00cf589bd.js
--- a/dev/static/js/6.7cbdc18f166382325a15.js
+++ b/dev/static/js/6.7cbdc18f166382325a15.js
--- a/dev/static/js/7.340e4ed28b7ecea413d0.js
+++ b/dev/static/js/7.340e4ed28b7ecea413d0.js
--- a/dev/static/js/7.a06ae595b9794f52ac32.js
+++ b/dev/static/js/7.a06ae595b9794f52ac32.js
--- a/dev/static/js/app.940baa529401b9992fab.js
+++ b/dev/static/js/app.940baa529401b9992fab.js
--- a/dev/static/js/manifest.a146744842d306c3bbe2.js
+++ b/dev/static/js/manifest.a146744842d306c3bbe2.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,c,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(a&&a(f,c,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var f={},n={34:0};function r(a){if(f[a])return f[a].exports;var n=f[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 f=new Promise(function(f,r){a=n[e]=[f,r]});a[2]=f;var c=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"4b1a7061cbd37a3f497e",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"7cbdc18f166382325a15",7:"a06ae595b9794f52ac32",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"563037903a9dc0fc406f",14:"1ea0a9f546093f971664",15:"4b42fec9ca56e3a4f154",16:"65a2d4dc3a1aebd80d84",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"f46ab545b8fe0453719c",21:"c62d4408098bc668e571",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"7065fe8f77b63fb5f5f1",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"c2aa42991b3f15a25fed",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,c.appendChild(t),f},r.m=e,r.c=f,r.d=function(e,a,f){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,c,t){for(var o,d,b,i=0,u=[];i<f.length;i++)d=f[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in c)Object.prototype.hasOwnProperty.call(c,o)&&(e[o]=c[o]);for(a&&a(f,c,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var f={},n={34:0};function r(a){if(f[a])return f[a].exports;var n=f[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 f=new Promise(function(f,r){a=n[e]=[f,r]});a[2]=f;var c=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"eac73f0183237a2634d8",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"10cb757ba5f00cf589bd",7:"340e4ed28b7ecea413d0",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"563037903a9dc0fc406f",14:"1ea0a9f546093f971664",15:"4b42fec9ca56e3a4f154",16:"65a2d4dc3a1aebd80d84",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"f46ab545b8fe0453719c",21:"b85dadddf2e73c961c09",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"7065fe8f77b63fb5f5f1",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"c2aa42991b3f15a25fed",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,c.appendChild(t),f},r.m=e,r.c=f,r.d=function(e,a,f){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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/src/components/index.vue
+++ b/src/components/index.vue
@@ -102,7 +102,7 @@
        </div>
      </div>
    </div>
-    <bottom-tab></bottom-tab>
+    <bottom-tab ref="bottomTab"></bottom-tab>
    <audio-page ref="audioPage" v-if="showObj.audio.length>0" sc="1" v-show="showObj.show" :showObj="showObj"/>
  </div>
 </template>
@@ -207,6 +207,7 @@ export default {
            this.userCourse.start_periods_id='-1'
            localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
            this.bannerData = res
+            this.$refs.bottomTab.setBtn()
        }else{
          if(res.is_start_active==1){
            if(res.teacher_qr){
@@ -217,6 +218,7 @@ export default {
              this.bannerData.is_start_active = res.is_start_active
            this.userCourse = Object.assign({},res)
             localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
+              this.$refs.bottomTab.setBtn()
            //  debugger
             if(!sessionStorage.getItem('frist')){
               sessionStorage.setItem('frist',true)
@@ -237,12 +239,14 @@ export default {
              this.bannerData.is_start_active = res.is_start_active
            this.userCourse = Object.assign({},res)
             localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
+              this.$refs.bottomTab.setBtn()
            //  debugger
          }
        }
        // console.log(res)
        // console.log(this.userCourse)
        // console.log(126)
+
      })
    },
    dateParse(dateString) {

--- a/src/components/inspector/inspectorList.vue
+++ b/src/components/inspector/inspectorList.vue
@@ -82,10 +82,12 @@
      getCourseStatusApi().then(res => {
        if(res.status==1||res.status==2){
          this.$router.push({ name: "index" });
+           debugger
        }else if(res.status==3){
          this.msg = res.msg
        }
        console.log(res)
+       
      })
      this.getYuji()
    },

--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -306,9 +306,12 @@
        this.userCourse.periods_list.forEach(el =>{
          el.name = el.course_title
          this.actions.push(el)
-          if(el.id==this.userCourse.start_periods_id){
+          if(this.userCourse.start_periods_id==0){
+            this.secActions = el
+          }else if(el.id==this.userCourse.start_periods_id){
            this.secActions = el
          }
+          
        })
        // 高亮
        this.actions.forEach(el=>{

--- a/src/components/public/bottomTab.vue
+++ b/src/components/public/bottomTab.vue
@@ -34,10 +34,10 @@ export default {
    };
  },
  mounted() {
-    let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
-    this.userCourse2 = userCourse2
-    console.log(this.userCourse2)
    // debugger
+    let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
+      this.userCourse2 = userCourse2
+      console.log(this.userCourse2)
  },
  methods: {
    toUrl(data) {
@@ -60,6 +60,11 @@ export default {
      } else {
        this.$router.push({ name: data });
      }
+    },
+    setBtn(){
+      let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
+      this.userCourse2 = userCourse2
+      console.log(this.userCourse2)
    }
  }
 };

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -326,7 +326,7 @@ router.beforeEach((to,from,next)=> {
    // debugger
    store.dispatch('setToken',token);
    getUserDetailApi().then(res=>{
-      // debugger
+      debugger
      localStorage.setItem('userDesc',JSON.stringify(res));
      sa.login(res.user_id);
      goOn()