支付调式

src/components/buy/buy.vue

@@ -382,6 +382,7 @@ export default {
          let data = { pay_type: payTypeArr[this.payIndex], return_url: window.location.href, goods_id: json.goods_id, buy_type: this.groupDetail.goods_type, group_order_id: json.group_order_id, order_coupon_id:json.order_coupon_id }
          postPayBillApi(data).then(res => {
            if(this.payIndex === 0) {
+             console.log(9999)
              this.orderNo = res.out_trade_no;
              if (res.out_trade_no && !res.appId) {
                getCourseInfoApi().then(res => {
@@ -393,6 +394,7 @@ export default {
                  this.navPage(res);
                });
              } else {
+               console.log(8888)
                let that = this;
                this.orderNo = res.out_trade_no;
                this.jsApiParameters = res;
@@ -423,11 +425,14 @@ export default {
              }
            }else if(this.payIndex === 1){
              this.payUrl = res.pay_url;
+           }else if(this.payIndex === 2) {
+             this.payUrl = res.pay_url;
            }
          })
 
         /*payApi(json).then(res => {
             this.orderNo = res.out_trade_no;
+            console.log(res)
             if (res.out_trade_no && !res.appId) {
               getCourseInfoApi().then(res => {
                 this.userCourse = res;

src/components/map/index.vue

 <template>
   <div>
-    <div class="model-n">
+    <div class="model-n" v-if="promp" @click="promp=false">
       <div class="model-n-image">
         <img :src="yinyin" alt="">
       </div>
@@ -12,7 +12,7 @@
       />
     <div class="unit-block">
       <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i>
-        <router-link v-show="promp" :to="{path: '/promptTime', query: { periods_id: secActions.id }}">
+        <router-link :to="{path: '/promptTime', query: { periods_id: secActions.id }}">
           <div class="zhongbian-kuang">
             <img class="zhongbian" :src="zhong" alt="">
           </div>
@@ -787,7 +787,6 @@
     left: 0;
     top: 0;
     z-index: 5000;
-    display: none;
     .model-n-image {
       width: 100%;
       img{

src/components/map/promptTime.vue

@@ -30,7 +30,7 @@
     name: "promptTime",
     data() {
       return {
-        currentTime: '',
+        currentTime: '07:00',
         dateVal: '',
         dateShow: false,
         selectedValue: '',
@@ -69,16 +69,11 @@
         }
       },
       preservationClick() {
-        if(this.currentTime) {
-          let pushAtData = { time: this.currentTime, periods_id: this.$route.query.periods_id }
-          postNotifySettingApi(pushAtData).then(res => {
-            Toast("时间设定完成");
-            this.$router.go(-1);
-          })
-        }else {
-          Toast("请先设定时间");
-          this.$refs.timeSetting.style.borderBottom = '1px solid red'
-        }
+        let pushAtData = { time: this.currentTime, periods_id: this.$route.query.periods_id }
+        postNotifySettingApi(pushAtData).then(res => {
+          Toast("时间设定完成");
+          this.$router.go(-1);
+        })
       }
     }
   }

src/components/newLesson/audio.vue

 <template>
   <div class="audio-page">
+    {{ showObj.audio[index].image }}
     <div class="content" v-if="showObj.audio">
       <audio
         ref="audio"
@@ -217,10 +218,9 @@
       };
     },
     mounted() {
-      if(this.$route.params.evaluate === 1)
-        this.finishStudy()
       this.changeAge(this.contentData.age);
       this.userCourse = JSON.parse(localStorage.getItem("userCourse"));
+      console.log(this.userCourse, 897896)
       if (this.userCourse.periods_list) {
         this.checkCollect();
       }
@@ -756,6 +756,8 @@
         this.playFlag = false;
         this.startTime = "00:00";
         this.overTime = "00:00";
+        console.log(this.contentData)
+        console.log(this.showObj, 12345)
       },
       finishStudy() {
         this.sendConsole("完成今日学习");

src/components/newLesson/index.vue

@@ -98,6 +98,7 @@
       sharePage
     },
     mounted() {
+      console.log(this.lesson, 9876546);
       this.initPage();
     },
     /**
@@ -223,6 +224,7 @@
           lessonDetail.total_watch_time = res.total_watch_time;
           lessonDetail.nowTime = nowTime;
           lessonDetail.star_num = res.total_star_num;
+          console.log(res, 'asdfasfsaf')
           localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
 
           let query = {
@@ -336,6 +338,7 @@
                 age: this.nowLesson.age
               };
             }
+            console.log(this.nowLesson, 87654)
             break;
           case 3:
             this.$sa.track("learnPart", {

src/components/newLesson/video.vue

@@ -9,47 +9,47 @@
         </div>
         <div
           v-if="showObj.video.length > 1&&orientationchange"
-          class="age-block video"
-          @click="videoShow = !videoShow"
+               class="age-block video"
+               @click="videoShow = !videoShow"
         >
           <div>
             视频({{videoIndex+1}})
             <i class="playImage _154722344142123489"></i>
           </div>
-        </div>
+      </div>
+      <div
+        class="age-change-block video"
+        v-if="showObj.video.length > 1 && videoShow&&orientationchange"
+      >
         <div
-          class="age-change-block video"
-          v-if="showObj.video.length > 1 && videoShow&&orientationchange"
+          @click="videoIndex= index;videoShow=false;sendConsole('多视频选择视频')"
+          v-for="(item,index) in showObj.video"
         >
-          <div
-            @click="videoIndex= index;videoShow=false;sendConsole('多视频选择视频')"
-            v-for="(item,index) in showObj.video"
-          >
-            视频({{index+1}})
-            <i
-              :class="{'playImage _282918034425091245':index === videoIndex}"
-              v-if="contentData.age === 1"
-            ></i>
-          </div>
-        </div>
-        <div v-if="showObj.change" class="change-block">
-          <div class="active">视频教学</div>
-          <div @click="changeAudio(true)">音频教学</div>
+          视频({{index+1}})
+          <i
+            :class="{'playImage _282918034425091245':index === videoIndex}"
+            v-if="contentData.age === 1"
+          ></i>
         </div>
       </div>
-      <div class="header">
-        <img :src="imgURL.luolacoming" class="text" v-if="nowShow === 3" />
-        <img :src="imgURL.luolalaila" class="text" v-if="nowShow === 2" />
+      <div v-if="showObj.change" class="change-block">
+        <div class="active">视频教学</div>
+        <div @click="changeAudio(true)">音频教学</div>
       </div>
-      <div
-        class="video-block hp-video"
-        v-if="showObj.video[videoIndex]"
-        v-show="!share_show && !popupVisible"
-      >
-        <!-- :src="showObj.video[videoIndex].url" -->
-        <video v-show="!star"
-               ref="videoDom"
-               style="object-fit:fill"
+    </div>
+    <div class="header">
+      <img :src="imgURL.luolacoming" class="text" v-if="nowShow === 3" />
+      <img :src="imgURL.luolalaila" class="text" v-if="nowShow === 2" />
+    </div>
+    <div
+      class="video-block hp-video"
+      v-if="showObj.video[videoIndex]"
+      v-show="!share_show && !popupVisible"
+    >
+      <!-- :src="showObj.video[videoIndex].url" -->
+      <video v-show="!star"
+             ref="videoDom"
+             style="object-fit:fill"
                :src="showObj.video[videoIndex].url"
                @ended="videoEnd"
                @error="errorLog"
@@ -196,6 +196,7 @@
       this.videoWidth = Number(document.documentElement.clientWidth) / 3.8;
     },
     mounted() {
+      console.log(this.contentData, 86876)
       this.changeAge(this.contentData.age);
       let that = this;
       // console.log(document.documentElement.clientWidth)

src/components/public/bottomTab.vue

@@ -36,7 +36,6 @@ export default {
   mounted() {
     // debugger
     let userCourse2 = JSON.parse(localStorage.getItem("userCourse"));
-    console.log(userCourse2)
     this.ownDetail = JSON.parse(localStorage.getItem("userDesc"));
     if(userCourse2){
       this.userCourse2 = userCourse2