新首页

5217272d · chenyishuai@singsingenglish.com · 48f3edb9 · 5217272d · 5217272d · 5217272d
Commit 5217272d authored Apr 09, 2019 by chenyishuai@singsingenglish.com
25 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.f826422096a6017a9dbb.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>
+      }</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.cb154c0707a03546cee6.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
--- a/dev/static/img/pic2.4dbd2ce.png
+++ b/dev/static/img/pic2.4dbd2ce.png
--- a/dev/static/img/pic10.26689c8.png
+++ b/dev/static/img/pic10.26689c8.png
--- a/dev/static/js/0.c95ab58c8d2606177bf3.js
+++ b/dev/static/js/0.c95ab58c8d2606177bf3.js
--- a/dev/static/js/0.eac73f0183237a2634d8.js
+++ b/dev/static/js/0.eac73f0183237a2634d8.js
--- a/dev/static/js/13.563037903a9dc0fc406f.js
+++ b/dev/static/js/13.563037903a9dc0fc406f.js
--- a/dev/static/js/15.4b42fec9ca56e3a4f154.js
+++ b/dev/static/js/15.4b42fec9ca56e3a4f154.js
--- a/dev/static/js/21.b85dadddf2e73c961c09.js
+++ b/dev/static/js/21.b85dadddf2e73c961c09.js
--- a/dev/static/js/21.eb3513e6eea7e98e45d8.js
+++ b/dev/static/js/21.eb3513e6eea7e98e45d8.js
--- a/dev/static/js/29.c2aa42991b3f15a25fed.js
+++ b/dev/static/js/29.c2aa42991b3f15a25fed.js
--- a/dev/static/js/6.10cb757ba5f00cf589bd.js
+++ b/dev/static/js/6.10cb757ba5f00cf589bd.js
--- a/dev/static/js/6.d27a58ad0bbfa4b6e90a.js
+++ b/dev/static/js/6.d27a58ad0bbfa4b6e90a.js
--- a/dev/static/js/7.340e4ed28b7ecea413d0.js
+++ b/dev/static/js/7.340e4ed28b7ecea413d0.js
--- a/dev/static/js/7.d47f37926a867be05168.js
+++ b/dev/static/js/7.d47f37926a867be05168.js
--- a/dev/static/js/manifest.cb154c0707a03546cee6.js
+++ b/dev/static/js/manifest.cb154c0707a03546cee6.js
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,f,c){for(var d,o,b,i=0,u=[];i<n.length;i++)o=n[i],r[o]&&u.push(r[o][0]),r[o]=0;for(d in f)Object.prototype.hasOwnProperty.call(f,d)&&(e[d]=f[d]);for(a&&a(n,f,c);u.length;)u.shift()();if(c)for(i=0;i<c.length;i++)b=t(t.s=c[i]);return b};var n={},r={34:0};function t(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,t){a=r[e]=[n,t]});a[2]=n;var f=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,t.nc&&c.setAttribute("nonce",t.nc),c.src=t.p+"static/js/"+e+"."+{0:"c95ab58c8d2606177bf3",1:"6dffa05763f0439bbbe1",2:"ae57d591a1c6e5092b19",3:"8dfb98444be7be3da1f8",4:"74a5ca2992fb50fce87c",5:"aaf704a2afdad27e785d",6:"d27a58ad0bbfa4b6e90a",7:"d47f37926a867be05168",8:"4746f0b53b1c9bc0e8c2",9:"fe6ce3b3bfae6e85d519",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"eb00a8159328d7a369a4",13:"e24d607db1f942e4dcc5",14:"1ea0a9f546093f971664",15:"5d6d7db5d1c5b2783d1e",16:"65a2d4dc3a1aebd80d84",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"f46ab545b8fe0453719c",21:"eb3513e6eea7e98e45d8",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"7065fe8f77b63fb5f5f1",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"9ad884a0dfd0088ca0bd",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var d=setTimeout(o,12e4);function o(){c.onerror=c.onload=null,clearTimeout(d);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return c.onerror=c.onload=o,f.appendChild(c),n},t.m=e,t.c=n,t.d=function(e,a,n){t.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(a,"a",a),a},t.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dev/static/js/manifest.f826422096a6017a9dbb.js
+++ b/dev/static/js/manifest.f826422096a6017a9dbb.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:"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/assets/index/pic10.png
+++ b/src/assets/index/pic10.png
--- a/src/assets/index/pic2.png
+++ b/src/assets/index/pic2.png
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -34,6 +34,7 @@
    </div>
    <div class="btn-block">
      <div class="btn" @click="toPreview">
+        <div v-if="!unlook" class="nolook">1</div>
        <img :src="imgUrl.nindexBtn3">
      </div>
      <div class="btn" v-if="!userCourse.is_start_active" @click="toBaby($event)">
@@ -74,7 +75,7 @@
      </div>
      <div class="content">
        <div class="contentItem" v-for="item in qmList" @click="goLink(item.link)">
-          <img  :src="item.url" alt="">
+          <img  :src="item.url"  alt="">
          <div class="text">
            <div class="title">{{item.title}}</div>
            <div class="line"></div>
@@ -93,7 +94,7 @@
      </div>
      <div class="content">
        <div class="contentItem" v-for="item in mxxyList" @click="goLink(item.link)">
-          <img  :src="item.url" alt="">
+          <img v-lazy="item.url" alt="">
          <div class="text">
            <div class="title">{{item.title}}</div>
            <div class="lookData"><i class="iconfont icon-yanjing"></i>{{item.watch_num}}人</div>
@@ -151,15 +152,18 @@ export default {
        audioIndex:0,
        show:false
      },
+      unlook:false
    };
  },
  created() {
    // console.log(this.imgUrl)
    this.initPage();
  },
+  mounted() {
+    this.unlook = localStorage.getItem('unlook');
+  },
  methods: {
    toShop(){
-      console.log(this.bannerData.goods_id)
      this.$router.push({name:'buyDetail', query: {
         shopId: this.bannerData.goods_id,
        }},
@@ -171,7 +175,6 @@ export default {
    goMed(index){
      this.showObj.audioIndex = index;
      this.showObj.show = true
-      console.log()
      this.$refs.audioPage.onPlay()
    },
    goLink(link){
@@ -186,12 +189,10 @@ export default {
        this.medList = res.list
        this.showObj.audio = res.list
        bannerListApi(4,json).then(res=>{
-          console.log(res)
        this.mxxyList = res.list
       })
      })
      bannerListApi(3,{limit:2,page:1}).then(res=>{
-         console.log(res)
        this.qmList = res.list
      })
    },
@@ -199,7 +200,6 @@ export default {
      this.getBannerListApi()
      getCourseInfoApi().then(res =>{
        localStorage.setItem('userCourse','');
-        console.log(res)
        // debugger
        if(res.goods_id){
            this.getBannerListApi()
@@ -243,10 +243,6 @@ export default {
            //  debugger
          }
        }
-        // console.log(res)
-        // console.log(this.userCourse)
-        // console.log(126)
      })
    },
    dateParse(dateString) {
@@ -311,6 +307,7 @@ export default {
      window.location.href = "https://www.changchangenglish.com/m-home.html"
    },
    toPreview(){
+      localStorage.setItem('unlook','1');
       this.$router.push({ name: "preview" });
    }
  }
@@ -368,7 +365,16 @@ export default {
    position: relative;
    box-shadow: 1px 2px 5px 0px rgba(0,0,0,0.2);
    .title{position: absolute;color: white;top: 35* @toVw;left: 20* @toVw;}
-    .date{color: white;text-align: center;position: absolute;bottom: 34*@toVw;left: 20* @toVw;width: 100%;font-size: 14px;width: 152* @toVw;}
+    .date{color: white;text-align: center;position: absolute;bottom: 30*@toVw;padding-top: 10* @toVw;border-radius:28 * @toVw;
+    box-sizing: border-box;background:#FFC53D; animation:myfirst 3s linear infinite;
+    left: 20* @toVw;font-size: 14px;width: 152* @toVw;height:56* @toVw ;
+    @keyframes myfirst
+    {
+        0%   {transform:scale(1)}
+        50% {transform:scale(1.1)}
+        100% {transform:scale(1)}
+    }
+    }
    .triangle{background: #FFC53D;width:104* @toVw ;height: 104* @toVw;position: absolute;right: -46* @toVw; top: -62* @toVw; transform:rotate(-50deg);
      span{color: white;font-size: 14px;transform:rotate(85deg);position: absolute;top: 54* @toVw;font-size: 13px;bottom: 74* @toVw;}
     }
@@ -549,6 +555,8 @@ export default {
    height:44 * @toVw;
    border-radius: 12px;
    box-shadow: 1px 2px 5px 0px rgba(0,0,0,0.2);
+    position: relative;
+    .nolook{position: absolute;top: -5px;left: -5px; background: #ff4d4f;width: 16px;height: 16px;color: white;border-radius: 8px;text-align: center;font-size: 12px;line-height: 16px;}
    img {
      width: 105* @toVw;
      height: 44* @toVw;

--- a/src/components/indexPage/bbda.vue
+++ b/src/components/indexPage/bbda.vue
@@ -6,7 +6,7 @@
        <span class="subName">宝宝昵称</span><input type="text" v-model='baby_name' placeholder="请输入宝宝昵称" >
      </div>
      <div class="inputBox">
-        <span class="subName">宝宝生日</span><date @click="dateShow=true">{{birthday}}</date>
+        <span class="subName">宝宝生日</span><span @click="dateShow=true">{{birthday}}</span>
      </div>
      <div class="inputBox" >
        <span class="subName">宝宝性别</span>
@@ -39,7 +39,7 @@ import imgUrl from "../../assets/bbda.png";
 import { DatetimePicker,Popup,RadioGroup, Radio, Toast } from 'vant';
  export default {
    name: "bbda",
-    components: {
+    components:{
      [DatetimePicker.name]:DatetimePicker,
      [Popup.name]:Popup,
      [RadioGroup.name]:RadioGroup,

--- a/src/components/indexPage/med.vue
+++ b/src/components/indexPage/med.vue
@@ -2,9 +2,10 @@
 <div>
    <div class="contentBox med" v-if="medList.length>0">
      <div class="commonTitle">
-        <!-- <span class="line"></span> -->
+        <span class="line"></span>
        <span class="title">磨耳朵</span>
        <span class="tip">每天10分钟 成长看得见</span> 
+        <div  class="more"></div>
      </div>
      <div class="content">
        <div class="contentItem"  v-for="(item,index) in medList"  @click="goMed(index)">

--- a/src/components/indexPage/preview.vue
+++ b/src/components/indexPage/preview.vue
 <template>
  <div class="nofinish-block" >
-    <img class="bg" :src="previewImg2.preview1" alt="">
+    <img class="bg" v-lazy="previewImg2.preview1" alt="">
-    <img class="bg" :src="previewImg2.preview2" alt="">
+    <img class="bg" v-lazy="previewImg2.preview2" alt="">
-    <img class="bg" :src="previewImg2.preview3" alt="">
+    <img class="bg" v-lazy="previewImg2.preview3" alt="">
-    <img class="bg" :src="previewImg2.preview4" alt="">
+    <img class="bg" v-lazy="previewImg2.preview4" alt="">
-    <img class="pic pic1" :src="previewImg2.previewpic1" alt="">
+    <div class="pic pic1" @click="ImagePreviewF(0)"></div>
+    <div class="pic pic2" @click="ImagePreviewF(1)"></div>
+    <div class="pic pic3" @click="ImagePreviewF(2)"></div>
+    <div class="pic pic4" @click="ImagePreviewF(3)"></div>
+    <div class="pic pic5" @click="ImagePreviewF(4)"></div>
+    <div class="pic pic6" @click="ImagePreviewF(5)"></div>
+    <div class="pic pic7" @click="ImagePreviewF(6)"></div>
+    <div class="pic pic8" @click="ImagePreviewF(7)"></div>
+    <!-- <img class="pic pic1" :src="previewImg2.previewpic1" alt=""> -->
    <div class="btn" @click="toLink">
      <p>更多关于英语启蒙知识查看</p>
      <p>《萝拉老师启蒙理论课》</p>
@@ -20,7 +28,8 @@
    mounted(){
      // this.previewImg2 = previewImg
      // console.log(this.previewImg2)
-    },
+      // this.ImagePreviewF()
+      },
    data(){
      return{
        previewImg2:previewImg
@@ -30,16 +39,20 @@
      toLink(){
        window.location.href="https://appanqlfkth3717.h5.xiaoeknow.com/content_page/eyJ0eXBlIjozLCJyZXNvdXJjZV90eXBlIjowLCJyZXNvdXJjZV9pZCI6IiIsInByb2R1Y3RfaWQiOiJwXzViNGEyNDFjOTQ4NGVfZzg3ZVhOMUgiLCJhcHBfaWQiOiJhcHBhTlFMZmt0SDM3MTcifQ"
      },
-      ImagePreviewF(){
+      ImagePreviewF(index){
        ImagePreview({
-          images: [
+        images: [
-            'https://img.yzcdn.cn/1.jpg',
+          this.previewImg2.previewpic1,
-            'https://img.yzcdn.cn/2.jpg'
+          this.previewImg2.previewpic2,
+          this.previewImg2.previewpic3,
+          this.previewImg2.previewpic6,
+          this.previewImg2.previewpic5,
+          this.previewImg2.previewpic7,
+          this.previewImg2.previewpic8,
+          this.previewImg2.previewpic9
          ],
-          startPosition: 1,
+          lazyLoad:true,
-          onClose() {
+          startPosition:index
-            // do something
-          }
        });
      }
    }
@@ -51,7 +64,14 @@
  .nofinish-block{
    .bg{width: 100%;vertical-align:top;}
    .pic{position: absolute;left: 30*@toVw;width:315 *@toVw ;}
-    .pic1{top: 445 *@toVw;}
+    .pic1{top: 445 *@toVw;height:115 *@toVw ;}
+    .pic2{top: 735 *@toVw;height:200 *@toVw ;}
+    .pic3{top: 1095 *@toVw;height:200 *@toVw ;}
+    .pic4{top: 1565 *@toVw;height:200 *@toVw ;}
+    .pic5{top: 2035 *@toVw;height:200 *@toVw ;}
+    .pic6{top: 2495 *@toVw;height:180 *@toVw ;}
+    .pic7{top: 2795 *@toVw;height:160 *@toVw ;}
+    .pic8{top: 3065 *@toVw;height:160 *@toVw ;}
    .btn{position: absolute;bottom: 50 *@toVw;background: #00569c;color: white;text-align: center;left: 49 *@toVw;
    font-size: 12px;border: 1px solid white;border-radius:25*@toVw;width: 280*@toVw;height:50 *@toVw;padding-top: 8 *@toVw;box-sizing: border-box;}
  }

--- a/src/components/inspector/inspectorList.vue
+++ b/src/components/inspector/inspectorList.vue
@@ -82,9 +82,12 @@
      getCourseStatusApi().then(res => {
        if(res.status==1||res.status==2){
          this.$router.push({ name: "index" });
-           debugger
+          //  debugger
        }else if(res.status==3){
          this.msg = res.msg
+          Toast(this.msg)
+        }else if(res.status==4){
+          this.$router.push({ name: "inspectorActivit" });
        }
        console.log(res)
@@ -151,7 +154,7 @@
      img{width:44*@toVw ; height: 55*@toVw;}
    } 
   }
-   .sec{border:2px solid #6637ED;}
+   .sec{border:2px solid #FF7875;}
   .full{
     .text{
      .title1{color: #999999;line-height: 25*@toVw;}
@@ -165,7 +168,7 @@
  }
  .fix{
    position: fixed;text-align: center;width: 100%;bottom: 0;padding:10px 0;background: white;
-    .btn{width: 273*@toVw;height: 47*@toVw;background:#6637ED;color: white;line-height:47*@toVw; border-radius: 4px; }
+    .btn{width: 273*@toVw;height: 47*@toVw;background:#FF7875;color: white;line-height:47*@toVw; border-radius: 4px; }
    .tip{
      color:rgba(153,153,153,1);font-size: 12px;line-height: 30px;
      .iconfont{font-size: 12px;}

--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -300,8 +300,8 @@
      initPage(){
        // this.getLessonList();
        this.userCourse = JSON.parse(localStorage.getItem("userCourse"));
-        console.log(this.userCourse)
+        // console.log(this.userCourse)
-        console.log(this.$route.query.course_type)
+        // console.log(this.$route.query.course_type)
        // debugger
        this.userCourse.periods_list.forEach(el =>{
          el.name = el.course_title
@@ -342,7 +342,11 @@
          }
        })
        if(item.is_start_course){
-          this.getUnitList();
+          if (this.secActions.course_type == 0){
+          this.getUnitList()
+          }else{
+            this.getLessonList();
+          }
        }else{
          this.unitList = [];
          this.lessonList=[]
@@ -482,10 +486,11 @@
            }
          });
          this.getLessonList();
-          console.log(this.parent_category_id)
+          // console.log(this.parent_category_id)
          if(res.find(i=>{return i.status === 0})){
            this.more = true
          }
+          console.log(493)
          this.$nextTick(()=>{
            let index=null;
            let index2 = null;
@@ -513,16 +518,16 @@
                }
              }
            });
-            console.log(this.parent_category_id)
+            // debugger
+            // console.log(this.parent_category_id)
            this.swiper.slideTo(index, 800, false);
            this.swiper2.slideTo(index2, 800, false)
+            console.log(525)
          })
        })
      },
      // 获取课程
      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){

--- a/src/components/public/bottomTab.vue
+++ b/src/components/public/bottomTab.vue
@@ -37,11 +37,11 @@ export default {
    // debugger
    let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
      this.userCourse2 = userCourse2
-      console.log(this.userCourse2)
+      // console.log(this.userCourse2)
  },
  methods: {
    toUrl(data) {
-      console.log(this.$route.name)
+      // console.log(this.$route.name)
      // debugger
      this.$sa.track("buttonClick", {
        tabTitle: "底部导航",
@@ -64,7 +64,7 @@ export default {
    setBtn(){
      let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
      this.userCourse2 = userCourse2
-      console.log(this.userCourse2)
+      // console.log(this.userCourse2)
    }
  }
 };