时间推送

src/components/buy/buy.vue

@@ -71,7 +71,7 @@
     </div>
 
     <!-- 支付方式选择 -->
-    <!--<div class="pay-list">
+    <div class="pay-list">
       <div class="pay-choice">支付方式选择</div>
       <ul class="pay">
         <li v-for="item in payList" :key="item.value" @click="payListClick(item.value)">
@@ -82,7 +82,7 @@
           </div>
         </li>
       </ul>
-    </div>-->
+    </div>
 
     <footer>
       <div class="sub-block">
@@ -249,11 +249,13 @@ export default {
     copy(e) {
       if(this.payIndex === 1) {
         Toast("支付宝支付获取成功，请把粘贴到支付宝里");
+      }else if(this.payIndex === 2) {
+        Toast("信用卡支付获取成功");
       }
     },
     onError() {
       if(this.payIndex === 1) {
-        Toast("支付宝支付获取成功，请把粘贴到支付宝里");
+        Toast("信用卡支付获取成功");
       }
     },
     // 支付方式
@@ -376,7 +378,7 @@ export default {
         }
         this.orderFlag = false;
 
-        /* let payTypeArr = ['WX', 'ALI', '卡分期']
+         let payTypeArr = ['WX', 'ALI', 'KFQ']
          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) {
@@ -423,9 +425,8 @@ export default {
              this.payUrl = res.pay_url;
            }
          })
-       return false*/
 
-        payApi(json).then(res => {
+        /*payApi(json).then(res => {
             this.orderNo = res.out_trade_no;
             if (res.out_trade_no && !res.appId) {
               getCourseInfoApi().then(res => {
@@ -469,7 +470,7 @@ export default {
           .catch(res => {
             // alert(res)
             this.orderFlag = true;
-          });
+          });*/
       }
     },
     closeAdd(data) {

src/components/buy/passShop.vue

@@ -911,7 +911,6 @@ video {
     top: 70vw;
     z-index: 6;
     right: 10 * 100 /375vw;
-    /*border-radius: 100px;*/
   }
   .banner {
     background: white;

src/components/map/index.vue

 <template>
   <div>
+    <div class="model-n">
+      <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></div>
+      <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 }}">
+          <div class="zhongbian-kuang">
+            <img class="zhongbian" :src="zhong" alt="">
+          </div>
+        </router-link>
+      </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">
@@ -184,7 +195,7 @@
 </template>
 
 <script>
-  import {getCourseListApi,getLessonDetailApi,getLessonListApi,getCourseInfoApi} from "../../service/api";
+  import {getCourseListApi,getLessonDetailApi,getLessonListApi,getCourseInfoApi, getNotifyApi} 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'
@@ -197,6 +208,7 @@
   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",
@@ -209,7 +221,9 @@
     data() {
       let that = this;
       return {
+        promp: false,
         zhong: zhong,
+        yinyin: yinyin,
         actions: [
         ],
         secActions:{},
@@ -316,6 +330,15 @@
         return arr
       },
     },
+    mounted() {
+      getNotifyApi(this.$route.query.periods_id).then(res => {
+        if(res.time) {
+          this.promp = false
+        }else {
+          this.promp = true
+        }
+      })
+    },
     methods:{
       // 页面初始化
       initPage(){
@@ -756,6 +779,24 @@
 <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;
+    display: none;
+    .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}
@@ -859,7 +900,7 @@
     top: 0;
     left: 0;
     .course_title{
-      font-size: 20px;padding: 10*@toVw 20*@toVw;    border-bottom: 1px solid #eeeeee;
+      font-size: 20px;padding: 10*@toVw 20*@toVw;border-bottom: 1px solid #eeeeee;
       position: relative;
       .zhongbian-kuang {
         width: 70 * @toVw;
@@ -870,8 +911,8 @@
         .zhongbian {
           width: 22 * @toVw;
           height: 22 * @toVw;
-          margin-top: 24 * @toVw;
-
+          margin-top: 15 * @toVw;
+          margin-left: 34 * @toVh;
         }
       }
     }

src/components/map/promptTime.vue

@@ -70,7 +70,7 @@
       },
       preservationClick() {
         if(this.currentTime) {
-          let pushAtData = { time: this.currentTime }
+          let pushAtData = { time: this.currentTime, periods_id: this.$route.query.periods_id }
           postNotifySettingApi(pushAtData).then(res => {
             Toast("时间设定完成");
             this.$router.go(-1);

src/components/public/bottomTab.vue

@@ -36,6 +36,7 @@ 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
@@ -57,7 +58,8 @@ export default {
             this.$router.push({
             name: "map",
             query: {
-              course_type: this.userCourse2.start_periods_course_type
+              course_type: this.userCourse2.start_periods_course_type,
+              periods_id: this.userCourse2.start_periods_id
             }
             });
           }else{
@@ -74,7 +76,7 @@ export default {
           name: "hasaccount"
          });
         }
-        
+
         // this.$router.push({
         //   name: "secMap",
         //   query: {

src/router/index.js

@@ -620,8 +620,9 @@ router.beforeEach((to, from, next) => {
   }
   // extensionV1Shop
   // extensionV1
-  if (to.name === 'extensionV1' || to.name === 'extensionV1Shop' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit' || to.name === 'passShop'|| to.name === 'ybIndex' ) {
+  if (to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit' || to.name === 'passShop'|| to.name === 'ybIndex' ) {
     // 无需登录的页面
+    console.log(488)
     next()
   } else if (window.location.href.indexOf('token') > -1 && to.name === 'index') {
     let token = common.getUrlParam().token || to.query.token;

src/service/api.js

@@ -396,3 +396,8 @@ export const postPayBillApi = function (json) {
   return Vue.prototype.$post(`/api/client/bill/create`, json)
 };
 
+// 获取课程推送设置
+const getNotifyUrl = `${_baseUrl}api/client/user/notify/`
+export const getNotifyApi = function (periods_id) {
+  return Vue.prototype.$fetch(`${getNotifyUrl}${periods_id}`)
+};