From 94caabfe335acb3e0889d89d2cdcbc312fabcf08 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei1>
Date: Thu, 3 Jan 2019 17:42:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E6=98=9F=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/newLesson/finishStudy.png | Bin 0 -> 3595 bytes
src/assets/newLesson/star_act.png | Bin 0 -> 650 bytes
src/assets/newLesson/star_def.png | Bin 0 -> 533 bytes
src/components/map/index.vue | 39 ++++++++++++++++++++++++---
src/components/newLesson/index.vue | 5 ++++
src/components/newLesson/video.vue | 17 ++++++++++++
src/router/index.js | 2 +-
7 files changed, 58 insertions(+), 5 deletions(-)
create mode 100644 src/assets/newLesson/finishStudy.png
create mode 100644 src/assets/newLesson/star_act.png
create mode 100644 src/assets/newLesson/star_def.png
diff --git a/src/assets/newLesson/finishStudy.png b/src/assets/newLesson/finishStudy.png
new file mode 100644
index 0000000000000000000000000000000000000000..89e09f3a902e4ea5abc0f83e1b2be31d663cfd42
GIT binary patch
literal 3595
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
RrgZ=S002ovPDHLkV1gVq&42&^
literal 0
HcmV?d00001
diff --git a/src/assets/newLesson/star_act.png b/src/assets/newLesson/star_act.png
new file mode 100644
index 0000000000000000000000000000000000000000..78ccad446d847fe4be00d3719415b57973934b9a
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001Ze001Zm0{{R3yC6tk0001HP)t-sM{rF4
z#}5C<4*$mw|Hume#}5C;4*$vx|H>Z!%p?ED692{z|HTmh#1Q`DX8z@K{^Mi+*#-aP
z0sqhn{^)}L%nbkD1pn0t{_Bta?VSJHUH|d3{_m&%$PNF{HUHO4{@pwN;Z5v<L$3e;
z01b3fPE!Clq$LW1Rc++`#?-V!DA`y500G8HL_t(I%e~Xxnt~t@24H_uKm#>X2?g=~
zZ*pfqX^VE(qx}xd?0p7iq$K%=<W-fQaTmHQ^l}1{W}X{zrr-=YQ4$I+%ZZY>Ln%+}
zl8EIY<zo@#uY!*~f0QH&%(B3x{k<fW;N}^m{Iw)e&<KtP8d5)&yrd<S&<Hw!l9Kci
zi6X10SygktL&pm&E${bcvzAp^QF@<eAXWjy2WJC2l*ji*tgE3}p44mGiYCNK=bq1m
zXxBQSOtlc<)40l54u8kskF8=fA)MPbqJcSRIfoGxoU`?t6#H_a-o`X9upN+`S=fLG
zcE5Agrhd?c9}h~j+Y|b1cI+mA#W6@PIoHfsySZ3vZ@1excHPt$&yjnnhoSGMZX9n%
zMy&YqD#<PpcCYa5m6M|+!XRPg=xC4w;@V><7$2b$;jy-(BeqgTu;9;<o&xKpB7#>Q
zN}}|crYwRr4-%-uaP8~pcpo!&!*q0l&tAX7G(c^XGQH0*==?*|F2FEmaM8N_)HGyO
zYGn+ssPulo-katOS(fJ+QaFZ?_qM5D7Mc6YU4a^WR)1*PD059ica`xnhRjsy%OEPl
kB8YpeqxV|ETe$A`U%BTx$XoBm>Hq)$07*qoM6N<$g2o|3-~a#s
literal 0
HcmV?d00001
diff --git a/src/assets/newLesson/star_def.png b/src/assets/newLesson/star_def.png
new file mode 100644
index 0000000000000000000000000000000000000000..d791cd6518ef0963e6a0cd5155bdfd073d632ee0
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq001Ze001Zi0{{R3e$b^}0000jP)t-sM{rE$
z=H}()<>=_><>lq)=jY_)<mBY!=jZ3<=H}++=I-w9>FMe0?Cj#=;<TvdPXGV_3v^OW
zQvm+%Mv7qC7!7#3G;0%=0004uNkl<ZD9@FWze~eV5XXZx)^0v4;t-08s6z>HP&X05
zRa$WF(oIx~?jqviCb)DGCr1a@@P<^~E`wD&_;N$~2fV+*yCg5wX7YwoKDi&?@7=Sk
z|HoFl$fn(4rvN9l-Yvj0t=9_hK*w|Atn6yh>l9kX5R5my(gMQuF?g>XfY))AF(CFY
z|G)}WV+6mOmN)leCq%@RyG+3O;iIcLkpe{RXn&jbpgCd(LWLm&LdUvoQI-}W0IF7$
z8i<-6TBppMgh>n|01)$5i>yFI{gjdtsRIO6%VsOcqkW%ek+6nkwP-LGE8pi-4BtqS
z&0bLYNf3@a7P>>am7fLTOQOES!ZRxI-Ag@fu*DQAtY+3rOJI89vu7641e1v$`Ieeg
zpTV!uB}ecxhffAd{LY~(43zzR@tUAw@8rjvsl-q!UZ{+`{A$U8(j7JO*THab!e1hD
z&?$xk&pw7QQV$uNpw}^=GP@24iy6F#MK5VpsRJzJk88G@{=2CMGiLf~*GRrzzNOzE
XuEHOXw$pK_00000NkvXXu0mjfN^%2u
literal 0
HcmV?d00001
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 6e62c4eb..8153f15e 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -1,6 +1,7 @@
<template>
<div>
<div class="unit-block">
+ <!--ç«–å± ä¸»é¢˜æ -->
<swiper :options="swiperOption" class="banner" v-if="$route.query.course_type==0" ref="mySwiper">
<swiper-slide v-for="(data,index) in unitList" :key="index">
<div class="line"></div>
@@ -27,6 +28,7 @@
</div>
</swiper-slide>
</swiper>
+ <!--横å±ä¸»é¢˜æ -->
<div class="btn-conntent banner-left">
<img :src="nextToURL" class="">
</div>
@@ -58,6 +60,7 @@
</swiper-slide>
</swiper>
</div>
+ <!--ç«–å± è¯¾ç¨‹-->
<div class="lesson-block">
<div v-if="noLesson" class="noLesson">
<img :src="errorURL" />
@@ -77,7 +80,9 @@
<span v-if="item.push_time === '0000-00-00'">课程还未开始哦</span>
</div>
</div>
- <div>
+ <div class="star-block">
+ <img class="star-img" :src="star_act" v-for="s in item.star_num">
+ <img class="star-img" :src="star_def" v-for="s in 3-item.star_num">
</div>
<div class="icon-block">
<i
@@ -91,6 +96,7 @@
</div>
</div>
</div>
+ <!--æ¨ªå± è¯¾ç¨‹-->
<div class="lesson-block-hp">
<swiper :options="swiperOptionLesson" class="lesson-sw" ref="mySwiperLesson">
<swiper-slide v-for="(item,x) in hpLessonList" :key="x" style="width: 50vh">
@@ -103,6 +109,10 @@
<div class="lesson-name-hp">
{{item.sub_title}}
</div>
+ <div class="star-block">
+ <img class="star-img" :src="star_act" v-for="s in item.star_num">
+ <img class="star-img" :src="star_def" v-for="s in 3-item.star_num">
+ </div>
<i class="map money" v-if="item.push_time !== '0000-00-00' && ((hpLessonList[x+1] && hpLessonList[x+1].push_time === '0000-00-00' || ($route.query.course_type == 0 && findUnit(parent_category_id) && findUnit(parent_category_id).status === 2 || $route.query.course_type ==1 ) && x===hpLessonList.length-1 ))"></i>
</div>
</swiper-slide>
@@ -150,6 +160,8 @@
<script>
import {getCourseListApi,getLessonDetailApi,getLessonListApi} from "../../service/api";
+ import star_act from '../../assets/newLesson/star_act.png'
+ import star_def from '../../assets/newLesson/star_def.png'
import guidePage from '../guide/map'
import guideContent from '../guide/content'
import diaBGI from '../../assets/newLesson/diaBG.png'
@@ -172,6 +184,8 @@
data() {
let that = this;
return {
+ star_act:star_act,
+ star_def:star_def,
shopType:this.$route.query.course_type,
diaBGI:diaBGI,
nextUnitUrl:nextUnitUrl,
@@ -361,7 +375,7 @@
let index2 = null;
this.unitList.forEach((i,x)=>{
if(i.category_id ==this.parent_category_id){
- if(x>3){
+ if(x>=3){
index=x-3
}else{
index = x
@@ -553,9 +567,19 @@
border-bottom: 1 * @toVw solid #EEEEEE;
.text-block{
margin-left: 0;
+ width: 150*@toVw;
+ }
+ .star-block{
+ img{
+ width: 20*@toVw;
+ height: 20*@toVw;
+ margin-left: 3*@toVw;
+ }
}
.icon-block{
margin: auto 0;
+ width: 30*@toVw;
+ text-align: center;
}
.clock-block{
@@ -780,7 +804,14 @@
.money{
position: absolute;
right: 0;
- top: calc(88vh - 17.99550225vw);
+ top: calc(88vh - 20.99550225vw);
+ }
+ .star-block{
+ img{
+ width: 20*@toVw;
+ height: 20*@toVw;
+ margin-left: 3*@toVw;
+ }
}
display: inline-block;
width: 100%;
@@ -817,7 +848,7 @@
color:rgba(0,0,0,1);
}
.lesson-img-hp{
- margin: calc((100vh - 20.99550225vw) / 2 - 12vh) auto;
+ margin: calc((100vh - 23.99550225vw) / 2 - 12vh) auto;
width: 20vh;
height: 20vh;
border-radius: 100*@toVw;
diff --git a/src/components/newLesson/index.vue b/src/components/newLesson/index.vue
index 90659ae8..4ab6f17e 100644
--- a/src/components/newLesson/index.vue
+++ b/src/components/newLesson/index.vue
@@ -96,6 +96,7 @@
this.page_id = 1;
this.nowLesson = {
type:'text',
+ title:1,
content:this.lesson.content.look,
age:this.nowLesson.age
};
@@ -105,12 +106,14 @@
if(this.lesson.content.play.type){
this.nowLesson = {
type:'audio',
+ title:2,
content:this.lesson.content.play,
age:this.nowLesson.age
};
}else{
this.nowLesson = {
type:'video',
+ title:2,
content:this.lesson.content.play,
age:this.nowLesson.age
};
@@ -121,12 +124,14 @@
if(this.lesson.content.fun.type){
this.nowLesson = {
type:'audio',
+ title:3,
content:this.lesson.content.fun,
age:this.nowLesson.age
};
}else{
this.nowLesson = {
type:'video',
+ title:3,
content:this.lesson.content.fun,
age:this.nowLesson.age
};
diff --git a/src/components/newLesson/video.vue b/src/components/newLesson/video.vue
index e29797c9..21add193 100644
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
@@ -33,6 +33,9 @@
<div @click="changeAudio()">音频教å¦</div>
</div>
</div>
+ <div class="finish-block">
+ <img :src="finishStuat">
+ </div>
</div>
<guide-block/>
</div>
@@ -44,6 +47,7 @@
import luolalaila from '../../assets/newLesson/luolalaila.png'
import guideBlock from '../guide/video'
import tapToAudio from '../../assets/tapToAudio.png'
+ import finishStuat from '../../assets/newLesson/finishStudy.png'
export default {
name: "play",
components:{
@@ -51,6 +55,7 @@
},
data(){
return{
+ finishStuat:finishStuat,
ageShow:false,
showObj:{
video:[],
@@ -212,6 +217,18 @@
}
}
}
+ .finish-block{
+ position: absolute;
+ width: 100%;
+ left: 0;
+ padding: 0;
+ margin: 0;
+ text-align: center;
+ bottom: 10*@toVw;
+ img{
+ width: 202*@toVw;
+ }
+ }
}
}
.change-block-HP{
diff --git a/src/router/index.js b/src/router/index.js
index 43c8c7d4..8d2b20a3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -171,7 +171,7 @@ router.beforeEach((to,from,next)=> {
next({name:'index'});
}
}else{
- if(to.name !== 'noWechat') {
+ if(to.name !== 'noWechat' && process.env.NODE_ENV === 'production') {
next({name:'noWechat'});
}
}
--
2.21.0