Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre

build/webpack.base.conf.js

@@ -17,6 +17,7 @@ module.exports = {
   },
   output: {
     path: config.build.assetsRoot,
+    crossOriginLoading: "anonymous",
     filename: '[name].js',
     publicPath: process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'testing'
       ? config.build.assetsPublicPath

config/prod.env.js

@@ -2,7 +2,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
-  API_URL: '"https://wechat.changchangenglish.com/"',
+  API_URL: '"https://wechat-pre.changchangenglish.com/"',
   MAX_FILESIZE:'1024*1024*10',
   versionTime: '2019061315',
   BUY_URL:'"https://wechat.changchangenglish.com/#/buyDetail?"',

src/components/map/index.vue

 <template>
   <div>
-    <div class="model-n" v-if="promp" @click="promp=false">
-      <div class="model-n-image">
-        <img :src="yinyin" alt="">
-      </div>
-    </div>
     <van-actionsheet
         v-model="actionsheetShow"
         :actions="actions"
         @select="onSelect"
       />
     <div class="unit-block">
-      <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i>
-        <router-link :to="{path: '/promptTime', query: { periods_id: secActions.id }}">
-          <div class="zhongbian-kuang">
-            <div class="zhongbian">
-              <img style="width: 100%; height: 100%;" :src="zhong" alt="">
-            </div>
-
-          </div>
-        </router-link>
-      </div>
+      <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i> </div>
       <!--竖屏 主题栏-->
       <swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
         <swiper-slide v-for="(data,index) in unitList" :key="index">
@@ -198,7 +184,7 @@
 </template>
 
 <script>
-  import {getCourseListApi,getLessonDetailApi,getLessonListApi,getCourseInfoApi, getNotifyApi} from "../../service/api";
+  import {getCourseListApi,getLessonDetailApi,getLessonListApi,getCourseInfoApi} from "../../service/api";
   import star_act from '../../assets/newLesson/star_act.png'
   import star_def from '../../assets/newLesson/star_def.png'
   import diaBGI from '../../assets/newLesson/diaBG.png'
@@ -210,9 +196,6 @@
   import errorURL from '../../assets/error.png'
   import nextUnitUrl from '../../assets/newLesson/nextUnit.png'
   import btn_kechegn from '../../assets/btn_kechegn.png'
-  import zhong from '../../assets/evaluate/timer.png'
-  import yinyin from '../../assets/evaluate/yinyin.png'
-
   export default {
     name: "mapDefault",
     components:{
@@ -224,9 +207,6 @@
     data() {
       let that = this;
       return {
-        promp: false,
-        zhong: zhong,
-        yinyin: yinyin,
         actions: [
         ],
         secActions:{},
@@ -333,15 +313,6 @@
         return arr
       },
     },
-    mounted() {
-      let prompStr = localStorage.getItem('promp')
-      if(prompStr) {
-        this.promp = false
-      }else {
-        localStorage.setItem('promp', 1)
-        this.promp = true
-      }
-    },
     methods:{
       // 页面初始化
       initPage(){
@@ -453,7 +424,6 @@
       // 进入课程
       goDetail(){
         // 神策埋点 开始课程
-        console.log(this.thisLesson)
         this.$sa.track('StartCourse',{
           elementID:this.thisLesson.id.toString(),
           dayModule:this.thisLesson.domTitle.slice(0,9),
@@ -481,7 +451,7 @@
           lessonData.classID=this.classID;
           lessonData.nowTime = Date.parse(new Date());
           lessonData.course_title =this.secActions.course_title
-          console.log(lessonData, 8978787)
+          // console.log(lessonData)
           localStorage.setItem('lessonDetail',JSON.stringify(lessonData));
           // console.log(query)
           // debugger
@@ -522,7 +492,6 @@
       },
       // 显示课程弹窗
       showDia(data,i){
-
         if(data.push_time !== '0000-00-00'){
           getLessonDetailApi(this.secActions.id,data.id,data.ele_id).then(res=>{
             res.content = JSON.parse(res.content);
@@ -552,8 +521,8 @@
               dayModule:data.name.slice(0,9),
               weekName:data.name.slice(10,data.name.length),
               elementName:data.name.slice(0,9) + '-'+ data.name.slice(10,data.name.length),
-              themeID:this.parent_category_id ? this.parent_category_id.toString() : '',
-              themeName:this.parent_category_id ? this.parent_category_id.toString() : '',
+              themeID:this.parent_category_id.toString(),
+              themeName:this.parent_category_id.toString(),
               goodsID:this.goodsID,
               classID:this.classID,
               courseID:this.course_id.toString()
@@ -774,9 +743,6 @@
             this.getLessonList();
           }
         }
-      },
-      timerClick() {
-        alert(999)
       }
     }
   }
@@ -784,23 +750,6 @@
 <style scoped lang="less">
   @import "../../util/public";
   // 精灵图
-  .model-n {
-    width: 100%;
-    height: 100%;
-    background: rgba(0,0,0,.5);
-    position: fixed;
-    left: 0;
-    top: 0;
-    z-index: 5000;
-    .model-n-image {
-      width: 100%;
-      img{
-        width: 90%;
-        margin-left: 7%;
-        margin-top: 9 * @toVw;
-      }
-    }
-  }
   #app{background: white;}
   .child-view{background: white;}
   .map{background:url('https://static-cdn.changchangenglish.com/new-sing/static/images/map.png')  no-repeat;background-size:136*@toVw 207*@toVw}
@@ -903,29 +852,7 @@
     z-index: 2;
     top: 0;
     left: 0;
-    .course_title{
-      font-size: 20px;padding: 10*@toVw 20*@toVw;border-bottom: 1px solid #eeeeee;
-      position: relative;
-      .zhongbian-kuang {
-        width: 70 * @toVw;
-        height: 100%;
-        position: absolute;
-        top: 0;
-        right: 10 * @toVw;
-        .zhongbian {
-          width: 22 * @toVw;
-          height: 22 * @toVw;
-          //margin-top: 15 * @toVw;
-          //margin-left: 34 * @toVh;
-          position: absolute;
-          top: 0;
-          left: 0;
-          right: -18 * @toVw;
-          bottom: 0;
-          margin: auto;
-        }
-      }
-    }
+    .course_title{font-size: 20px;padding: 10*@toVw 20*@toVw;    border-bottom: 1px solid #eeeeee;}
     .banner2{
       display: none;
     }

src/components/newLesson/evaluate.vue

@@ -174,6 +174,7 @@
         });
       },
       audioFn(){
+        let _that= this
         setTimeout(() => {
           if (this.$store.state.lookStatus == 0) {
             this.audioPoint = audioGood;
@@ -183,9 +184,10 @@
             this.audioPoint = audioPerfect;
           }
           this.$refs.audioDom.load();
-          setTimeout(() => {
-            this.$refs.audioDom.play();
-          }, 100);
+
+         /* setTimeout(() => {
+            this.$refs.audioDom.play()
+          }, 100);*/
         }, 300);
       },
       /**