Skip to content

H
h5-base
Commit 98f1efa4 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

4.12

parent ebdf1a46
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 52 deletions
dev/index.html
View file @ 98f1efa4
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
} }
*{ *{
-webkit-overflow-scrolling: touch -webkit-overflow-scrolling: touch
}</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.bd8bc81679c396c01ec0.js></script><script type=text/javascript src=static/js/vendor.e044f3dac63d7cdf4e43.js></script><script type=text/javascript src=static/js/app.da2ac93e264f217c2fdc.js></script></body></html> }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.ca54307bd4b62297f07c.js></script><script type=text/javascript src=static/js/vendor.e044f3dac63d7cdf4e43.js></script><script type=text/javascript src=static/js/app.da2ac93e264f217c2fdc.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/2.464b2060fde3671dbe10.js deleted 100644 → 0
View file @ ebdf1a46
This diff is collapsed.
dev/static/js/2.cfe1a249882acdc6e116.js 0 → 100644
View file @ 98f1efa4
This diff is collapsed.
dev/static/js/7.16b3f1bcbe2e2a671f41.js 0 → 100644
View file @ 98f1efa4
This diff is collapsed.
dev/static/js/7.b789f9d7f40a25a182b9.js deleted 100644 → 0
View file @ ebdf1a46
This diff is collapsed.
dev/static/js/manifest.bd8bc81679c396c01ec0.js → dev/static/js/manifest.ca54307bd4b62297f07c.js
View file @ 98f1efa4
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=r(r.s=o[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"3af8a831fb54f7b61b28",1:"6dffa05763f0439bbbe1",2:"464b2060fde3671dbe10",3:"c66ff095a1ccd435880e",4:"8d19764b7b091d80c1ec",5:"15e6321f83659388b49c",6:"780c5175e45975601a4a",7:"b789f9d7f40a25a182b9",8:"4746f0b53b1c9bc0e8c2",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"fe6c491cbe031da388aa",14:"0c5e62e6b434c95d03ae",15:"721e5dd812c11289ca18",16:"65a2d4dc3a1aebd80d84",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"cd791a949ce33569be3e",21:"e6473da59850e11e24e0",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"c4f8aca721402d7c94c6",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"f11c8ca06a5b47020cee",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=r(r.s=o[i]);return b};var a={},n={34:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"3af8a831fb54f7b61b28",1:"6dffa05763f0439bbbe1",2:"cfe1a249882acdc6e116",3:"c66ff095a1ccd435880e",4:"8d19764b7b091d80c1ec",5:"15e6321f83659388b49c",6:"780c5175e45975601a4a",7:"16b3f1bcbe2e2a671f41",8:"4746f0b53b1c9bc0e8c2",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"fe6c491cbe031da388aa",14:"0c5e62e6b434c95d03ae",15:"721e5dd812c11289ca18",16:"65a2d4dc3a1aebd80d84",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"cd791a949ce33569be3e",21:"e6473da59850e11e24e0",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"c4f8aca721402d7c94c6",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"f11c8ca06a5b47020cee",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/index.vue
View file @ 98f1efa4
<template> <template>
<div class="index"> <div class="index">
<div class="banner-block" > <div class="padTop">
<div class="unBanner" ref="toShopD" @click="toShop()" v-if="userCourse.goods_id>0"> <div class="banner-block" >
<img class="bgimg" :src="imgUrl.indexBanener1" alt=""> <div class="unBanner" ref="toShopD" @click="toShop()" v-if="userCourse.goods_id>0">
<div class="content"> <img class="bgimg" :src="imgUrl.indexBanener1" alt="">
<div class="title"> <div class="content">
<p style="font-size:20 * @toVw;">唱唱启蒙英语</p> <div class="title">
<p style="font-size:36 * @toVw;">{{bannerData.course_title}}</p> <p class="title1" >唱唱启蒙英语</p>
<p class="title2" >{{bannerData.course_title}}</p>
</div>
<div class="date" >
<p class="date1" style="text-decoration:line-through;">原价：{{bannerData.original_price/100}}元</p>
<p class="date2" >限时{{bannerData.current_price/100}}元领取</p>
</div>
<div class="triangle">
<span >专属福利</span>
</div>
</div> </div>
<div class="date" > </div>
<p style="font-size:12 * @toVw;text-decoration:line-through;">原价：{{bannerData.original_price/100}}元</p> <div class="Banner" id="capture33" v-if="userCourse.start_periods_id>-1">
<p style="font-size:18 * @toVw;">限时{{bannerData.current_price/100}}元领取</p> <img class="bgimg" :src="imgUrl.indexBanener2" alt="">
<div class="content" >
<img v-if="bannerData.qr" class="qr" :src="bannerData.qr" alt="">
<div class="date">
<p>开课时间：{{bannerData.start_at}}</p>
<p v-if="bannerData.active_start_at">全勤打卡活动开始时间：{{bannerData.active_start_at}}</p>
</div>
</div> </div>
<div class="triangle"> <div class="triangle">
<span >专属福利</span> <span v-if="bannerData.is_start_active==1">已开课</span>
</div> <span v-if="bannerData.is_start_active==0">待开课</span>
</div>
<img class="bgimg canvas" v-if="canvasData" :src="canvasData" alt="">
</div> </div>
</div> </div>
<div class="Banner" id="capture33" v-if="userCourse.start_periods_id>-1"> <div class="btn-block">
<img class="bgimg" :src="imgUrl.indexBanener2" alt=""> <div class="btn toPreview" ref="preview" @click="toPreview">
<div class="content" > <div v-if="!unlook" class="nolook">1</div>
<img v-if="bannerData.qr" class="qr" :src="bannerData.qr" alt=""> <img alt="课前预习" :src="imgUrl.nindexBtn3">
<div class="date">
<p>开课时间：{{bannerData.start_at}}</p>
<p v-if="bannerData.active_start_at">全勤打卡活动开始时间：{{bannerData.active_start_at}}</p>
</div>
</div> </div>
<div class="triangle"> <div class="btn toBbda" ref="bbda" v-if="!userCourse.is_start_active" @click="toBbda($event)">
<span v-if="bannerData.is_start_active==1">已开课</span> <img alt="宝宝档案" :src="imgUrl.nindexBtn2">
<span v-if="bannerData.is_start_active==0">待开课</span> </div>
</div> <div class="btn toCollection" ref="collection" v-if="userCourse.is_start_active==1" @click="toCollection">
<img class="bgimg" style="z-index:2;width: 89.7vw;" v-if="canvasData" :src="canvasData" alt=""> <img alt="收藏夹" :src="imgUrl.nindexBtn1">
</div> </div>
</div> <div class="btn toTeacher" ref="teacher" @click="toTeacher">
<div class="btn-block"> <img alt="名师介绍" :src="imgUrl.nindexBtn4">
<div class="btn toPreview" ref="preview" @click="toPreview"> </div>
<div v-if="!unlook" class="nolook">1</div>
<img alt="课前预习" :src="imgUrl.nindexBtn3">
</div>
<div class="btn toBbda" ref="bbda" v-if="!userCourse.is_start_active" @click="toBbda($event)">
<img alt="宝宝档案" :src="imgUrl.nindexBtn2">
</div>
<div class="btn toCollection" ref="collection" v-if="userCourse.is_start_active==1" @click="toCollection">
<img alt="收藏夹" :src="imgUrl.nindexBtn1">
</div> </div>
<div class="btn toTeacher" ref="teacher" @click="toTeacher">
<img alt="名师介绍" :src="imgUrl.nindexBtn4">
</div>
</div> </div>
<div class="contentBox med" v-if="medList.length>0"> <div class="contentBox med" v-if="medList.length>0">
<div class="commonTitle"> <div class="commonTitle">
...@@ -164,9 +166,7 @@ export default { ...@@ -164,9 +166,7 @@ export default {
this.initPage(); this.initPage();
}, },
mounted() { mounted() {
// document.documentElement.scrollTop = 0
window.scrollTo(0,0); window.scrollTo(0,0);
// window.pageYOffset = 0
this.unlook = localStorage.getItem('unlook'); this.unlook = localStorage.getItem('unlook');
}, },
methods: { methods: {
...@@ -387,6 +387,7 @@ export default { ...@@ -387,6 +387,7 @@ export default {
width: 335 * @toVw; width: 335 * @toVw;
z-index: 0; z-index: 0;
} }
.canvas{width: 336 * @toVw;z-index: 2;}
.content { .content {
position: absolute; position: absolute;
z-index: 1; z-index: 1;
...@@ -418,10 +419,16 @@ export default { ...@@ -418,10 +419,16 @@ export default {
width:335 * @toVw; width:335 * @toVw;
position: relative; position: relative;
box-shadow: 1 * @toVw 2 * @toVw 5 * @toVw 0 * @toVw rgba(0,0,0,0.2); box-shadow: 1 * @toVw 2 * @toVw 5 * @toVw 0 * @toVw rgba(0,0,0,0.2);
.title{position: absolute;color: white;top: 35* @toVw;left: 20* @toVw;} .title{
position: absolute;color: white;top: 35* @toVw;left: 20* @toVw;
.title1{font-size:20 * @toVw;}
.title2{font-size:36 * @toVw;}
}
.date{color: white;text-align: center;position: absolute;bottom: 30*@toVw;padding-top: 10* @toVw;border-radius:28 * @toVw; .date{color: white;text-align: center;position: absolute;bottom: 30*@toVw;padding-top: 10* @toVw;border-radius:28 * @toVw;
box-sizing: border-box;background:#FFC53D; animation:myfirst 3s linear infinite; box-sizing: border-box;background:#FFC53D; animation:myfirst 3s linear infinite;
left: 20* @toVw;font-size: 14 * @toVw;width: 152* @toVw;height:56* @toVw ; left: 20* @toVw;font-size: 14 * @toVw;width: 152* @toVw;height:56* @toVw ;
.date1{font-size:12 * @toVw;}
.date2{font-size:16 * @toVw;}
@keyframes myfirst @keyframes myfirst
{ {
0% {transform:scale(1)} 0% {transform:scale(1)}
...@@ -662,6 +669,71 @@ export default { ...@@ -662,6 +669,71 @@ export default {
} }
} }
} }
// @media screen and (min-width: 600px) {
// @toVw:100/1024vw;
// .padTop{display: flex;}
// .banner-block{
// width:714* @toVw;
// height: 525 * @toVw;
// position: relative;
// background: white;
// padding:14*@toVw 42*@toVw 20*@toVw;
// margin: 0;
// // box-sizing: border-box;
// .bgimg {
// position: absolute;
// width: 714 * @toVw;
// z-index: 0;
// }
// .content {
// position: absolute;
// z-index: 1;
// height: 525 * @toVw;
// width:714 * @toVw;
// border-radius: 30 * @toVw;
// overflow: hidden;
// }
// .Banner{
// border-radius: 30 * @toVw;
// overflow: hidden;
// position: relative;
// // background: white;
// height: 525 * @toVw;
// width:714 * @toVw;
// box-shadow: 1 * @toVw 2 * @toVw 5 * @toVw 0 * @toVw rgba(0,0,0,0.2);
// .qr{width: 257 * @toVw;
// position: absolute;left: 230* @toVw;top:60* @toVw ;z-index: 2;
// }
// .date{color: white;text-align: center;position: absolute;bottom: 30*@toVw;width: 100%;font-size: 12 * @toVw;}
// .triangle{background: #FFC53D;width:144* @toVw ;height: 144* @toVw;position: absolute;right: -78* @toVw; top: -64* @toVw; transform:rotate(-41deg);z-index: 3;
// span{color: white;font-size: 18 px;transform:rotate(91deg);position: absolute;top: 62* @toVw;font-size: 13 * @toVw; }
// }
// }
// .unBanner{
// border-radius: 30 * @toVw;
// overflow: hidden;
// height: 525 * @toVw;
// width:714 * @toVw;
// position: relative;
// box-shadow: 1 * @toVw 2 * @toVw 5 * @toVw 0 * @toVw rgba(0,0,0,0.2);
// .title{position: absolute;color: white;top: 35* @toVw;left: 20* @toVw;}
// .date{color: white;text-align: center;position: absolute;bottom: 30*@toVw;padding-top: 10* @toVw;border-radius:28 * @toVw;
// box-sizing: border-box;background:#FFC53D; animation:myfirst 3s linear infinite;
// left: 20* @toVw;font-size: 14 * @toVw;width: 152* @toVw;height:56* @toVw ;
// @keyframes myfirst
// {
// 0% {transform:scale(1)}
// 50% {transform:scale(1.1)}
// 100% {transform:scale(1)}
// }
// }
// .triangle{background: #FFC53D;width:144* @toVw ;height: 144* @toVw;position: absolute;right: -78* @toVw; top: -64* @toVw; transform:rotate(-41deg);z-index: 3;
// span{color: white;font-size: 18 px;transform:rotate(91deg);position: absolute;top: 62* @toVw;font-size: 13 * @toVw; }
// }
// }
// }
// }
*{margin: 0;} *{margin: 0;}
</style> </style>
src/components/map/index.vue
View file @ 98f1efa4
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</swiper> </swiper>
</div> </div>
<!--竖屏 课程--> <!--竖屏 课程-->
<div :class="{'lesson-block':shopType==0, 'lesson-block nounit':shopType==1}" v-if="lessonList.length>0"> <div :class="{'lesson-block':shopType==0, 'lesson-block nounit':shopType==1}" v-if="secActions.is_start_course">
<div v-if="noLesson" class="noLesson"> <div v-if="noLesson" class="noLesson">
<img :src="errorURL" /> <img :src="errorURL" />
<div> <div>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<img :src="mok4" alt=""> <img :src="mok4" alt="">
<p>您的课程尚未开始</p> <p>您的课程尚未开始</p>
<div>课程开始时间：{{secActions.start_at}}</div> <div>课程开始时间：{{secActions.start_at}}</div>
</div> </div>
<mt-popup <mt-popup
v-model="popupVisible" style="background: transparent"> v-model="popupVisible" style="background: transparent">
<div v-if="thisLesson" class="popup-block"> <div v-if="thisLesson" class="popup-block">
...@@ -317,11 +317,10 @@ ...@@ -317,11 +317,10 @@
el.name = el.course_title el.name = el.course_title
this.actions.push(el) this.actions.push(el)
if(this.userCourse.start_periods_id==0){ if(this.userCourse.start_periods_id==0){
this.secActions = el this.secActions = this.userCourse.periods_list[0]
}else if(el.id==this.userCourse.start_periods_id){ }else if(el.id==this.userCourse.start_periods_id){
this.secActions = el this.secActions = el
} }
}) })
// 高亮 // 高亮
this.actions.forEach(el=>{ this.actions.forEach(el=>{
...@@ -332,6 +331,7 @@ ...@@ -332,6 +331,7 @@
}) })
// this.periods_id = this.secActions.id // this.periods_id = this.secActions.id
console.log(this.shopType) console.log(this.shopType)
this.shopType = this.secActions.course_type
if (this.secActions.course_type == 0){ if (this.secActions.course_type == 0){
this.getUnitList() this.getUnitList()
}else{ }else{
......
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