Commit 4caffd56 authored by IvyXia123's avatar IvyXia123

huodong

parent 86823cb8
...@@ -571,7 +571,7 @@ export default { ...@@ -571,7 +571,7 @@ export default {
}, },
handleInviteCode() { handleInviteCode() {
if (!this.invite_code) { if (!this.invite_code) {
// this.this_code = "CC-USER-" + this.user_id; this.this_code = "CC-USER-" + this.user_id;
} else { } else {
let invite_code = this.invite_code.split("-"); let invite_code = this.invite_code.split("-");
if ( if (
...@@ -581,7 +581,7 @@ export default { ...@@ -581,7 +581,7 @@ export default {
invite_code[1] = "USER"; invite_code[1] = "USER";
} }
let code = `${invite_code[0]}-${invite_code[1]}`; let code = `${invite_code[0]}-${invite_code[1]}`;
// this.this_code = `${code}-${this.user_id}`; this.this_code = `${code}-${this.user_id}`;
} }
}, },
onShare: function(type) { onShare: function(type) {
......
<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"
@select="onSelect" @select="onSelect"
/> />
<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> </div>
<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>
<!--竖屏 主题栏--> <!--竖屏 主题栏-->
<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">
<swiper-slide v-for="(data,index) in unitList" :key="index"> <swiper-slide v-for="(data,index) in unitList" :key="index">
...@@ -90,7 +76,7 @@ ...@@ -90,7 +76,7 @@
</div> </div>
<div class="card-block" v-for="(data,index) in lessonList" > <div class="card-block" v-for="(data,index) in lessonList" >
<img :src="data[0].cover+'?imageslim'"/> <img :src="data[0].cover+'?imageslim'"/>
<div :class="'card-li cid'+item.id" v-for="(item,x) in data" @click="showDia(item,x+1)"> <!-- showDia(item,x+1) --> <div :class="'card-li cid'+item.id" v-for="(item,x) in data" @click="showDia(item,x+1)">
<div class="text-block"> <div class="text-block">
<div class="title"> <div class="title">
{{item.name | substr10}} {{item.name | substr10}}
...@@ -198,7 +184,7 @@ ...@@ -198,7 +184,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'
...@@ -210,9 +196,6 @@ ...@@ -210,9 +196,6 @@
import errorURL from '../../assets/error.png' import errorURL from '../../assets/error.png'
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 yinyin from '../../assets/evaluate/yinyin.png'
export default { export default {
name: "mapDefault", name: "mapDefault",
components:{ components:{
...@@ -224,9 +207,6 @@ ...@@ -224,9 +207,6 @@
data() { data() {
let that = this; let that = this;
return { return {
promp: false,
zhong: zhong,
yinyin: yinyin,
actions: [ actions: [
], ],
secActions:{}, secActions:{},
...@@ -333,15 +313,6 @@ ...@@ -333,15 +313,6 @@
return arr return arr
}, },
}, },
mounted() {
let prompStr = localStorage.getItem('promp')
if(prompStr) {
this.promp = false
}else {
localStorage.setItem('promp', 1)
this.promp = true
}
},
methods:{ methods:{
// 页面初始化 // 页面初始化
initPage(){ initPage(){
...@@ -556,8 +527,6 @@ ...@@ -556,8 +527,6 @@
classID:this.classID, classID:this.classID,
courseID:this.course_id.toString() courseID:this.course_id.toString()
}); });
}).catch(error => {
Toast('获取数据失败')
}) })
}else{ }else{
Toast('课程还未开始哦') Toast('课程还未开始哦')
...@@ -781,23 +750,6 @@ ...@@ -781,23 +750,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}
...@@ -807,7 +759,7 @@ ...@@ -807,7 +759,7 @@
.actStar{height:20*@toVw;width:20*@toVw;background-position:0 -60*@toVw;display: inline-block} .actStar{height:20*@toVw;width:20*@toVw;background-position:0 -60*@toVw;display: inline-block}
.clock{height:28*@toVw;width:28*@toVw;background-position:0 -80*@toVw;display: inline-block} .clock{height:28*@toVw;width:28*@toVw;background-position:0 -80*@toVw;display: inline-block}
.money{height:40*@toVw;width:40*@toVw;background-position:0 -108*@toVw;display: inline-block;animation: dodge 1s infinite;} .money{height:40*@toVw;width:40*@toVw;background-position:0 -108*@toVw;display: inline-block;animation: dodge 1s infinite;}
.goLesson{height:57*@toVw;width:169*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw } .goLesson{height:59*@toVw;width:136*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw }
.van-actionsheet{ .van-actionsheet{
.activit{color: yellowgreen;} .activit{color: yellowgreen;}
} }
...@@ -900,29 +852,7 @@ ...@@ -900,29 +852,7 @@
z-index: 2; z-index: 2;
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 {
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: -15 * @toVw;
bottom: 0;
margin: auto;
}
}
}
.banner2{ .banner2{
display: none; display: none;
} }
......
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