Skip to content

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

528

parent e04a0fdf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 459 additions and 301 deletions
dev/index.html
View file @ 2632c675
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
}</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.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.eafc6c025b5169d223e1.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.2c2323b9c57064009e04.js></script></body></html> }</style><link href=static/css/app.a33637a3392be2fde512aa6031b6e4df.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.3f899bed608b785bc757.js></script><script type=text/javascript src=static/js/vendor.08bb4c1de1fdf5bf85a2.js></script><script type=text/javascript src=static/js/app.2c2323b9c57064009e04.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/16.40ce532f38950b924e5c.js 0 → 100644
View file @ 2632c675
This diff is collapsed.
dev/static/js/16.eb101d8a5b4d2f20d66b.js deleted 100644 → 0
View file @ e04a0fdf
This diff is collapsed.
dev/static/js/19.5a62a749b9ba8977df27.js 0 → 100644
View file @ 2632c675
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/19.ab24f3be1bfcd5f1b5ce.js deleted 100644 → 0
View file @ e04a0fdf
This diff is collapsed.
dev/static/js/6.31b7a0b8c7417a15445f.js 0 → 100644
View file @ 2632c675
This diff is collapsed.
dev/static/js/6.7fc1a5f33e93020cfa6d.js deleted 100644 → 0
View file @ e04a0fdf
This diff is collapsed.
dev/static/js/manifest.eafc6c025b5169d223e1.js → dev/static/js/manifest.3f899bed608b785bc757.js
View file @ 2632c675
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,r){for(var d,o,b,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(c&&c(a,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var a={},f={37:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"7fc1a5f33e93020cfa6d",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"6dc965f957595f755035",16:"eb101d8a5b4d2f20d66b",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"ab24f3be1bfcd5f1b5ce",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var d=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,t.appendChild(r),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="",n.oe=function(e){throw e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,r){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=n(n.s=r[i]);return b};var c={},f={37:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var t=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,n.nc&&r.setAttribute("nonce",n.nc),r.src=n.p+"static/js/"+e+"."+{0:"b8d329232924c52f21f9",1:"2af48a38a0a5ba4de8d7",2:"320fe507d344efb0c388",3:"fb9eacc4cab1241045b3",4:"498fdae1cf375720d0fd",5:"665e1536f07d3a98174d",6:"31b7a0b8c7417a15445f",7:"f1db37c6902f5aa481c6",8:"131627a8ab119649a31a",9:"e9c88acab2565bf7629c",10:"fd3d73f3ae4cf823f641",11:"824d4ca021e7d0fc13e1",12:"40360dcce0a769c5019c",13:"a49a6fe121412551f160",14:"a0a3bf1f6c6d07ebc4bd",15:"6dc965f957595f755035",16:"40ce532f38950b924e5c",17:"9498402cbdfb14710ef2",18:"9d8477aa7d6551b11988",19:"5a62a749b9ba8977df27",20:"efc022c1cddf26b4e76e",21:"b5fbe416a6ed0a351765",22:"5711cb64898166468a42",23:"c4f7239d893424072548",24:"74105ee90759eb3a1c0c",25:"710a83363e346f356722",26:"0dcd222d813e24c1c38a",27:"adcf10f7b58e924a2943",28:"06b0ca68e1b4e7a0be92",29:"5cbdfdcf0859e7be0f3e",30:"089b631d6b1ef3203f55",31:"5add3cb58a0305fc7b52",32:"b5826e79a4bff96ab34e",33:"d9c1dd5f78efa0809ec7",34:"8b89d32c134f24882103"}[e]+".js";var o=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,t.appendChild(r),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/buy/buy.vue
View file @ 2632c675
...@@ -190,7 +190,6 @@ ...@@ -190,7 +190,6 @@
that.$router.push({name:'buySuccess',query:{out_trade_no:that.orderNo,invite_code:that.invite_code}}); that.$router.push({name:'buySuccess',query:{out_trade_no:that.orderNo,invite_code:that.invite_code}});
},1000) },1000)
} }
} }
// alert(res.errMsg) // alert(res.errMsg)
// alert(res.err_msg) // alert(res.err_msg)
......
src/components/buy/index.vue
View file @ 2632c675
...@@ -194,7 +194,8 @@ import { ...@@ -194,7 +194,8 @@ import {
getGroupDetailApi, getGroupDetailApi,
getStatusWechatApi, getStatusWechatApi,
payApi, payApi,
getCouponListApi getCouponListApi,
getAutomationCouponApi
} from "../../service/api"; } from "../../service/api";
import refBg from "../../assets/refBg.png"; import refBg from "../../assets/refBg.png";
import moreUrl from "../../assets/moreIcon.png"; import moreUrl from "../../assets/moreIcon.png";
...@@ -520,9 +521,13 @@ export default { ...@@ -520,9 +521,13 @@ export default {
if (!userCourse.periods_list) { if (!userCourse.periods_list) {
// 优惠券 // 优惠券
getCouponListApi().then(res => { getAutomationCouponApi().then(res => {
this.couponInfo = res[res.length - 1]; if(res.coupon_list.length){
this.couponShadow = true; this.couponInfo = res.coupon_list[0]
this.couponShadow = true;
}
// this.couponInfo = res[res.length - 1];
// if(!localStorage.getItem('activity')){ // if(!localStorage.getItem('activity')){
// localStorage.setItem('activity'); // localStorage.setItem('activity');
// } // }
...@@ -756,10 +761,10 @@ video { ...@@ -756,10 +761,10 @@ video {
position: fixed; position: fixed;
width: 100%; width: 100%;
height: 25 * @toVw; height: 25 * @toVw;
background: #ec5e5f; background: #FFE83C;
bottom: 70 * @toVw; bottom: 70 * @toVw;
text-align: center; text-align: center;
color: white; color: #FF4D4F;
line-height: 25 * @toVw; line-height: 25 * @toVw;
font-size: 12px; font-size: 12px;
} }
......
src/components/index.vue
View file @ 2632c675
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<img class="bgimg canvas" v-if="canvasData" :src="canvasData" alt=""> <img class="bgimg canvas" v-if="canvasData" :src="canvasData" alt="">
</div> </div>
</div> </div>
<div class="couponActivity" v-if="couponInfo.money"> <div class="couponActivity" v-if="couponInfo.money&&!orientationchange">
<div class="textBox"> <div class="textBox">
<div> <div>
<span class="line"></span> <span class="line"></span>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div class="bottom"> <div class="bottom">
{{couponInfo.desc}} 适用于购买21天训练营
</div> </div>
</div> </div>
</div> </div>
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<div class="btn toTeacher" ref="teacher" @click="toTeacher"> <div class="btn toTeacher" ref="teacher" @click="toTeacher">
</div> </div>
</div> </div>
<div class="orderBox" v-if="orderList&&orderList.length" > <div class="orderBox" v-if="orderList&&orderList.length" >
<div class="item groupItem" ref="groupItem" v-for="(data,index) in orderList" :key="index" @click="goDetail(index)"> <div class="item groupItem" ref="groupItem" v-for="(data,index) in orderList" :key="index" @click="goDetail(index)">
<div class="top"> <div class="top">
...@@ -124,6 +125,41 @@ ...@@ -124,6 +125,41 @@
</div> </div>
</div> </div>
</div> </div>
<div class="couponActivity" v-if="couponInfo.money&&orientationchange">
<div class="textBox">
<div>
<span class="line"></span>
<img :src="icon_point" alt="">
<span class="textcontent">真幸运！您有课程代金券，使用立减 <span class="price">{{couponInfo.money/100}}</span> 元!</span>
<span class="line"></span>
</div>
</div>
<div @click="toShop()" :class="{couponItem:true,shaBox:couponShadow}">
<div class="left">
<img :src="imgUrl.coupon" alt="">
<div>￥<span>{{couponInfo.money/100}}</span></div>
</div>
<div class="content">
<div class="top">
<div class="left">
<p>课程代金券</p>
<p class="date">{{couponInfo.deadline_at}}前失效</p>
</div>
<div class="btn">
立即使用
</div>
</div>
<div class="bottom">
适用于购买21天训练营
</div>
</div>
</div>
<div class="shadow" @click="couponShadow=false" v-if="couponShadow&&!orderList.length"></div>
<div class="toptext" v-if="couponShadow&&!orderList.length">
<img :src="icon_point2" alt="">
<span class="textcontent">真幸运！您有课程代金券，使用立减 <span class="price">{{couponInfo.money/100}}</span> 元!</span>
</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">
<span class="line"></span> <span class="line"></span>
...@@ -227,7 +263,8 @@ import { ...@@ -227,7 +263,8 @@ import {
getTeacherApi, getTeacherApi,
getCourseInfoApi, getCourseInfoApi,
getOrderListApi, getOrderListApi,
getCouponListApi getCouponListApi,
getAutomationCouponApi
} from "../service/api"; } from "../service/api";
import { IndexImage } from "../util/imgUrl"; import { IndexImage } from "../util/imgUrl";
import cookie from "../util/cookie"; import cookie from "../util/cookie";
...@@ -282,9 +319,11 @@ export default { ...@@ -282,9 +319,11 @@ export default {
unlook:false, unlook:false,
canvasData:'1', canvasData:'1',
coupon:true, coupon:true,
couponInfo:{}, couponInfo:{
},
liuyuActivity:true, liuyuActivity:true,
liuyucoolie:false liuyucoolie:false,
orientationchange:false
}; };
}, },
created() { created() {
...@@ -300,9 +339,28 @@ export default { ...@@ -300,9 +339,28 @@ export default {
let that = this let that = this
this.unlook = localStorage.getItem('unlook'); this.unlook = localStorage.getItem('unlook');
this.pt = sessionStorage.getItem('pt'); this.pt = sessionStorage.getItem('pt');
console.log(document.body.clientWidth)
if(document.body.clientWidth>700){
that.orientationchange=true
}
// window.addEventListener('orientationchange',function(){
// setTimeout(function(){
// let width = document.documentElement.clientWidth
// let height = document.documentElement.clientHeight
// if(width>height){
// that.orientationchange=true
// }else{
// that.orientationchange=false
// }
// },300)
// },false);
}, },
methods: { methods: {
toActivity(){ toActivity(){
this.$router.push({
name: 'liuyi',
query:{}
});
}, },
liuyiBtn(){ liuyiBtn(){
// this.lyshow = true // this.lyshow = true
...@@ -383,6 +441,8 @@ export default { ...@@ -383,6 +441,8 @@ export default {
}, },
initPage() { initPage() {
// sessionStorage. // sessionStorage.
// console.log(this.couponInfo.money)
// debugger
let that = this let that = this
getCourseInfoApi().then(res =>{ getCourseInfoApi().then(res =>{
localStorage.setItem('userCourse',''); localStorage.setItem('userCourse','');
...@@ -399,12 +459,17 @@ export default { ...@@ -399,12 +459,17 @@ export default {
}); });
// debugger // debugger
this.getBannerListApi() this.getBannerListApi()
let course = res
// 无老师带用户 // 无老师带用户
if(!res.periods_list){ if(!res.periods_list){
// 优惠券 // 优惠券
getCouponListApi().then(res =>{ getAutomationCouponApi().then(res =>{
this.couponInfo = res[res.length-1] if(res.coupon_list.length){
console.log(this.$store.couponShadow) this.couponInfo = res.coupon_list[0]
}
// debugger
// console.log(this.$store.couponShadow)
if(this.$store.state.couponShadow){ if(this.$store.state.couponShadow){
// debugger // debugger
this.couponShadow=true this.couponShadow=true
...@@ -414,7 +479,7 @@ export default { ...@@ -414,7 +479,7 @@ export default {
// localStorage.setItem('activity'); // localStorage.setItem('activity');
// } // }
console.log(this.couponInfo) console.log(this.couponInfo)
if(!res.length&&Date.parse(new Date())<Date.parse(new Date('2019-6-4 00:00:00'))){ if(!res.length&&Date.parse(new Date())<Date.parse(new Date('2019-6-4 00:00:00'))&&!course.automation_id.length){
console.log(cookie.get('liuyi')) console.log(cookie.get('liuyi'))
if(!cookie.get('liuyi')){ if(!cookie.get('liuyi')){
this.liuyucoolie = true this.liuyucoolie = true
...@@ -664,7 +729,6 @@ export default { ...@@ -664,7 +729,6 @@ export default {
height: 89* @toVw; height: 89* @toVw;
position: relative; position: relative;
z-index: 1002; z-index: 1002;
.left{ .left{
img{width: 93* @toVw;position: absolute;z-index: 0;} img{width: 93* @toVw;position: absolute;z-index: 0;}
div{ div{
...@@ -1007,7 +1071,7 @@ export default { ...@@ -1007,7 +1071,7 @@ export default {
position: relative; position: relative;
padding: 0 20 * @toVw 12 * @toVw; padding: 0 20 * @toVw 12 * @toVw;
background: white; background: white;
.item:first-child{position: relative;z-index: 1000;background: white; } .item:first-child{position: relative;z-index: 2000;background: white; }
.item{ .item{
box-shadow:1px 2px 7px 0px rgba(255,210,207,1); box-shadow:1px 2px 7px 0px rgba(255,210,207,1);
border-radius: 16* @toVw; border-radius: 16* @toVw;
...@@ -1034,8 +1098,8 @@ export default { ...@@ -1034,8 +1098,8 @@ export default {
} }
.imgbox{img{width:261*@toVw;} .imgbox{img{width:261*@toVw;}
.text{color: white;position: absolute;top: 30* @toVw;left: 10* @toVw;font-size: 17* @toVw;} .text{color: white;position: absolute;top: 30* @toVw;left: 10* @toVw;font-size: 17* @toVw;}
position: absolute;z-index: 1000;top: -94* @toVw;left: 70* @toVw;} position: absolute;z-index: 2000;top: -94* @toVw;left: 70* @toVw;}
.shadow{position: fixed;bottom: 0;top: 0;left: 0;top: 0;background: black;opacity: 0.6;width: 100%;z-index: 999;} .shadow{position: fixed;bottom: 0;top: 0;left: 0;top: 0;background: black;opacity: 0.6;width: 100%;z-index: 1999;}
} }
.lesson-block { .lesson-block {
padding-bottom: 20 * @toVw; padding-bottom: 20 * @toVw;
......
src/components/map/secMap.vue
View file @ 2632c675
This diff is collapsed.
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