Commit 9c544d4c authored by IvyXia123's avatar IvyXia123

回退

parent c9de9933
<template> <template>
<div> <div>
<div class="model-n" v-if="promp" @click="promp=false">
<div class="model-n-image">
<img :src="yinyin" alt="">
</div>
</div>
<van-actionsheet <van-actionsheet
v-model="actionsheetShow" v-model="actionsheetShow"
:actions="actions" :actions="actions"
...@@ -12,15 +7,9 @@ ...@@ -12,15 +7,9 @@
/> />
<div class="unit-block"> <div class="unit-block">
<div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i> <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i>
{{ secActions }}
<!-- <router-link :to="{path: '/promptTime', query: { periods_id: secActions.id }}">
<div class="zhongbian-kuang"> <div class="zhongbian-kuang">
<div class="zhongbian"> <img class="zhongbian" :src="zhong" alt="">
<img style="width: 100%; height: 100%;" :src="zhong" alt="">
</div>
</div> </div>
</router-link>-->
</div> </div>
<!--竖屏 主题栏--> <!--竖屏 主题栏-->
<swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper"> <swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
...@@ -199,7 +188,7 @@ ...@@ -199,7 +188,7 @@
</template> </template>
<script> <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_act from '../../assets/newLesson/star_act.png'
import star_def from '../../assets/newLesson/star_def.png' import star_def from '../../assets/newLesson/star_def.png'
import diaBGI from '../../assets/newLesson/diaBG.png' import diaBGI from '../../assets/newLesson/diaBG.png'
...@@ -212,7 +201,6 @@ ...@@ -212,7 +201,6 @@
import nextUnitUrl from '../../assets/newLesson/nextUnit.png' import nextUnitUrl from '../../assets/newLesson/nextUnit.png'
import btn_kechegn from '../../assets/btn_kechegn.png' import btn_kechegn from '../../assets/btn_kechegn.png'
import zhong from '../../assets/evaluate/timer.png' import zhong from '../../assets/evaluate/timer.png'
import yinyin from '../../assets/evaluate/yinyin.png'
export default { export default {
name: "mapDefault", name: "mapDefault",
...@@ -225,9 +213,7 @@ ...@@ -225,9 +213,7 @@
data() { data() {
let that = this; let that = this;
return { return {
promp: false,
zhong: zhong, zhong: zhong,
yinyin: yinyin,
actions: [ actions: [
], ],
secActions:{}, secActions:{},
...@@ -334,16 +320,6 @@ ...@@ -334,16 +320,6 @@
return arr return arr
}, },
}, },
mounted() {
console.log(this.secActions)
// let prompStr = localStorage.getItem('promp')
// if(prompStr) {
// this.promp = false
// }else {
// localStorage.setItem('promp', 1)
// this.promp = true
// }
},
methods:{ methods:{
// 页面初始化 // 页面初始化
initPage(){ initPage(){
...@@ -455,7 +431,6 @@ ...@@ -455,7 +431,6 @@
// 进入课程 // 进入课程
goDetail(){ goDetail(){
// 神策埋点 开始课程 // 神策埋点 开始课程
console.log(this.thisLesson)
this.$sa.track('StartCourse',{ this.$sa.track('StartCourse',{
elementID:this.thisLesson.id.toString(), elementID:this.thisLesson.id.toString(),
dayModule:this.thisLesson.domTitle.slice(0,9), dayModule:this.thisLesson.domTitle.slice(0,9),
...@@ -483,7 +458,7 @@ ...@@ -483,7 +458,7 @@
lessonData.classID=this.classID; lessonData.classID=this.classID;
lessonData.nowTime = Date.parse(new Date()); lessonData.nowTime = Date.parse(new Date());
lessonData.course_title =this.secActions.course_title lessonData.course_title =this.secActions.course_title
console.log(lessonData, 8978787) // console.log(lessonData)
localStorage.setItem('lessonDetail',JSON.stringify(lessonData)); localStorage.setItem('lessonDetail',JSON.stringify(lessonData));
// console.log(query) // console.log(query)
// debugger // debugger
...@@ -524,12 +499,8 @@ ...@@ -524,12 +499,8 @@
}, },
// 显示课程弹窗 // 显示课程弹窗
showDia(data,i){ showDia(data,i){
this.popupVisible=true;
fundebug.notify("Test", "1");
if(data.push_time !== '0000-00-00'){ if(data.push_time !== '0000-00-00'){
fundebug.notify("Test", "2");
getLessonDetailApi(this.secActions.id,data.id,data.ele_id).then(res=>{ getLessonDetailApi(this.secActions.id,data.id,data.ele_id).then(res=>{
fundebug.notify("Test", "3");
res.content = JSON.parse(res.content); res.content = JSON.parse(res.content);
this.thisLesson = res; this.thisLesson = res;
this.thisLesson.id = data.ele_id.toString(); this.thisLesson.id = data.ele_id.toString();
...@@ -557,8 +528,8 @@ ...@@ -557,8 +528,8 @@
dayModule:data.name.slice(0,9), dayModule:data.name.slice(0,9),
weekName:data.name.slice(10,data.name.length), weekName:data.name.slice(10,data.name.length),
elementName:data.name.slice(0,9) + '-'+ 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() : '', themeID:this.parent_category_id.toString(),
themeName:this.parent_category_id ? this.parent_category_id.toString() : '', themeName:this.parent_category_id.toString(),
goodsID:this.goodsID, goodsID:this.goodsID,
classID:this.classID, classID:this.classID,
courseID:this.course_id.toString() courseID:this.course_id.toString()
...@@ -779,9 +750,6 @@ ...@@ -779,9 +750,6 @@
this.getLessonList(); this.getLessonList();
} }
} }
},
timerClick() {
alert(999)
} }
} }
} }
...@@ -789,23 +757,6 @@ ...@@ -789,23 +757,6 @@
<style scoped lang="less"> <style scoped lang="less">
@import "../../util/public"; @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;} #app{background: white;}
.child-view{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} .map{background:url('https://static-cdn.changchangenglish.com/new-sing/static/images/map.png') no-repeat;background-size:136*@toVw 207*@toVw}
...@@ -909,26 +860,12 @@ ...@@ -909,26 +860,12 @@
top: 0; top: 0;
left: 0; left: 0;
.course_title{ .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 { .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;
} }
.zhongbian {
} }
} }
.banner2{ .banner2{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment