From 9c544d4ca73671d8048615e6ca7099690b19222c Mon Sep 17 00:00:00 2001
From: IvyXia123 <ivyHsia@126.com>
Date: Tue, 17 Sep 2019 18:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/map/index.vue | 89 ++++++------------------------------
1 file changed, 13 insertions(+), 76 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 4576fde7..3d6eb440 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -1,10 +1,5 @@
<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"
@@ -12,16 +7,10 @@
/>
<div class="unit-block">
<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">
- <img style="width: 100%; height: 100%;" :src="zhong" alt="">
- </div>
-
- </div>
- </router-link>-->
- </div>
+ <div class="zhongbian-kuang">
+ <img class="zhongbian" :src="zhong" alt="">
+ </div>
+ </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">
@@ -199,7 +188,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'
@@ -212,7 +201,6 @@
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",
@@ -225,9 +213,7 @@
data() {
let that = this;
return {
- promp: false,
zhong: zhong,
- yinyin: yinyin,
actions: [
],
secActions:{},
@@ -334,16 +320,6 @@
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:{
// 页é¢åˆå§‹åŒ–
initPage(){
@@ -455,7 +431,6 @@
// 进入课程
goDetail(){
// 神ç–埋点 开始课程
- console.log(this.thisLesson)
this.$sa.track('StartCourse',{
elementID:this.thisLesson.id.toString(),
dayModule:this.thisLesson.domTitle.slice(0,9),
@@ -483,7 +458,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
@@ -524,12 +499,8 @@
},
// 显示课程弹窗
showDia(data,i){
- this.popupVisible=true;
- fundebug.notify("Test", "1");
if(data.push_time !== '0000-00-00'){
- fundebug.notify("Test", "2");
getLessonDetailApi(this.secActions.id,data.id,data.ele_id).then(res=>{
- fundebug.notify("Test", "3");
res.content = JSON.parse(res.content);
this.thisLesson = res;
this.thisLesson.id = data.ele_id.toString();
@@ -557,8 +528,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()
@@ -779,9 +750,6 @@
this.getLessonList();
}
}
- },
- timerClick() {
- alert(999)
}
}
}
@@ -789,23 +757,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}
@@ -909,26 +860,12 @@
top: 0;
left: 0;
.course_title{
- font-size: 20px;padding: 10*@toVw 20*@toVw;border-bottom: 1px solid #eeeeee;
- position: relative;
+ font-size: 20px;padding: 10*@toVw 20*@toVw; border-bottom: 1px solid #eeeeee;
.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{
--
2.21.0