新首页

d5a6e465 · chenyishuai@singsingenglish.com · f2ee2f3c · d5a6e465 · d5a6e465 · d5a6e465
Commit d5a6e465 authored Apr 08, 2019 by chenyishuai@singsingenglish.com
19 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -3,4 +3,4 @@
      }
      *{
        -webkit-overflow-scrolling: touch
-      }</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.d8451027c7d00085f825.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.740434e08c6a706956f0.js></script></body></html>
+      }</style><link href=static/css/app.36f1a827a9c97142b68b591948be53f1.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.21b8bbb8943bc747b478.js></script><script type=text/javascript src=static/js/vendor.05c910a446ce196f2037.js></script><script type=text/javascript src=static/js/app.293a64c031a1f123f556.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/0.c6fce4759e767d863cb4.js
+++ b/dev/static/js/0.c6fce4759e767d863cb4.js
--- a/dev/static/js/19.07b553dc61841e537338.js
+++ b/dev/static/js/19.07b553dc61841e537338.js
--- a/dev/static/js/20.69a44b9346ca475e8d5d.js
+++ b/dev/static/js/20.69a44b9346ca475e8d5d.js
--- a/dev/static/js/20.9731a2dc3422d0c6fd89.js
+++ b/dev/static/js/20.9731a2dc3422d0c6fd89.js
--- a/dev/static/js/6.1893d4e9348d036a5f64.js
+++ b/dev/static/js/6.1893d4e9348d036a5f64.js
--- a/dev/static/js/6.5bdc46bc024243a26e51.js
+++ b/dev/static/js/6.5bdc46bc024243a26e51.js
--- a/dev/static/js/7.b897af255e9c9fa9f521.js
+++ b/dev/static/js/7.b897af255e9c9fa9f521.js
--- a/dev/static/js/7.c11df7d0e931f58a8d38.js
+++ b/dev/static/js/7.c11df7d0e931f58a8d38.js
--- a/dev/static/js/app.293a64c031a1f123f556.js
+++ b/dev/static/js/app.293a64c031a1f123f556.js
--- a/dev/static/js/app.740434e08c6a706956f0.js
+++ b/dev/static/js/app.740434e08c6a706956f0.js
--- a/dev/static/js/manifest.d8451027c7d00085f825.js
+++ b/dev/static/js/manifest.d8451027c7d00085f825.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;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:"c6fce4759e767d863cb4",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"1893d4e9348d036a5f64",7:"b897af255e9c9fa9f521",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"07b553dc61841e537338",20:"9731a2dc3422d0c6fd89",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;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:"e67c351c437f50f64473",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"5bdc46bc024243a26e51",7:"c11df7d0e931f58a8d38",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"9ff02b5cebcc1ae3d6f5",14:"63dd06736295a7405b75",15:"f189e15d1708d33abfe7",16:"021e3bdb029874a18545",17:"c85de1b79a8bdc7112a8",18:"d68cc621b7ed95b4d916",19:"c207dffd4a17f19c616e",20:"69a44b9346ca475e8d5d",21:"ce4c37cbb478135080a7",22:"b35467abc636b6075196",23:"dc986b0fc5ea6fd33d4a",24:"0b552a73b78c2278d77a",25:"f81fdc8c2a0ca0fc44cc",26:"4a314447d1a8347111fd",27:"788e10f59044c0ca03e2",28:"617cfa8996077c66713d",29:"0d208ecf9fbf872c6d0e",30:"640aaa7e7b99b3485ec9",31:"c7a087b475e48dc06a1b"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/collection/audio.vue
+++ b/src/components/collection/audio.vue
@@ -371,6 +371,8 @@
    z-index: 2002;
    top: 0;
    left: 0;
+    padding: 80px 0 0;
+    box-sizing: border-box;
    // bottom: 80*@toVw;
    overflow: auto;
    margin: auto;

--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -153,7 +153,7 @@ export default {
      },
    };
  },
-  mounted() {
+  created() {
    // console.log(this.imgUrl)
    this.initPage();
  },
@@ -201,7 +201,6 @@ export default {
        localStorage.setItem('userCourse','');
        console.log(res)
        // debugger
-        // debugger
        if(res.goods_id){
            this.getBannerListApi()
            this.userCourse = Object.assign({},res)
@@ -216,10 +215,6 @@ 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.userCourse = {
-            //      periods_id : res.start_periods_id,
-            //      periods_course_type : res.start_periods_course_type
-            //   }
            this.userCourse = Object.assign({},res)
             localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
            //  debugger
@@ -233,6 +228,16 @@ export default {
                  }
                });
             }
+          }else if(res.is_start_active==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.userCourse = Object.assign({},res)
+             localStorage.setItem('userCourse',JSON.stringify(this.userCourse));
+            //  debugger
          }
        }
        // console.log(res)

--- a/src/components/inspector/inspectorActivit.vue
+++ b/src/components/inspector/inspectorActivit.vue
@@ -13,7 +13,7 @@
        <img src="/api/public/img/verify" class="img" ref="imgCode" @click="refImgCode"/>
      </div>
      <div class="input-block">
-        <input placeholder="请输入短信验证码" v-model="msgCode"/>
+        <input placeholder="请输入短信验证码" maxlength="4" v-model="msgCode"/>
        <button class="codeMsg right-btn" @click="sendMobileCode" v-if="time===0">发送验证码</button>
        <button class="codeMsg disabled right-btn" v-if="time>0">{{time}}s后重新发送</button>
      </div>

--- a/src/components/inspector/inspectorList.vue
+++ b/src/components/inspector/inspectorList.vue
@@ -124,7 +124,7 @@
      postYujiList(){
        postYujiListApi(this.secItems.periods_id).then(res=>{
          this.$masseges
-          Toast("提交成功")
+          // Toast("提交成功")
          this.$router.push({ name: "index" });
          console.log(res)
        })
@@ -155,6 +155,10 @@
      .title1{color: #999999;line-height: 25*@toVw;}
      .title2{color: #999999;line-height: 25*@toVw;}
      }
+      .imgbox{
+      margin-right: 10*@toVw;
+      img{width:50*@toVw ; height: 50*@toVw;}
+    } 
   }
  }
  .fix{

--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -293,11 +293,16 @@
      initPage(){
        // this.getLessonList();
        this.userCourse = JSON.parse(localStorage.getItem("userCourse"));
+        console.log(this.userCourse)
+        console.log(this.$route.query.course_type)
+        // debugger
        this.userCourse.periods_list.forEach(el =>{
          el.name = el.course_title
          this.actions.push(el)
+          if(el.id==this.userCourse.start_periods_id){
+            this.secActions = el
+          }
        })
-        this.secActions = this.actions[0]
        this.actions.forEach(el=>{
          el.className=""
          if(el.id==this.secActions.id){
@@ -306,7 +311,7 @@
        })
        // this.periods_id = this.secActions.id
        console.log(this.shopType)
-        if (this.shopType == 0){
+        if (this.secActions.course_type == 0){
          this.getUnitList()
        }else{
          this.getLessonList();
@@ -492,14 +497,16 @@
              }
            });
            console.log(this.parent_category_id)
-            this.swiper.slideTo(index, 800, false);
+            // this.swiper.slideTo(index, 800, false);
-            this.swiper2.slideTo(index2, 800, false)
+            // this.swiper2.slideTo(index2, 800, false)
          })
        })
      },
      // 获取课程
      getLessonList(data){
        console.log(this.parent_category_id)
+        console.log(this.secActions.id)
+        // debugger
        getLessonListApi(this.secActions.id+'/v2',{category_id:this.parent_category_id}).then(res=>{
          if(this.course_id !== res.periods_info.course_id){
            this.course_id = res.periods_info.course_id;

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

--- a/src/service/index.js
+++ b/src/service/index.js
@@ -216,7 +216,7 @@ export function post(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          // Toast(response.data.msg)
+          Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -250,7 +250,7 @@ export function patch(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          // Toast(response.data.msg)
+          Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -284,7 +284,7 @@ export function put(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          // Toast(response.data.msg)
+          Toast(response.data.msg)
        }
      },err => {
        reject(err);
@@ -311,7 +311,7 @@ export function del(url,data = {}){
          reject(response.data);
        }else{
          reject(response.data);
-          // Toast(response.data.msg)
+          Toast(response.data.msg)
        }
      },err => {
        reject(err);