Skip to content

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

5.7

parent a3bc471e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 36 deletions
dev/index.html
View file @ 3b762d8f
...@@ -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.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 src=static/vconsole/vconsole.min.js></script><script>// 初始化</script><script type=text/javascript src=static/js/manifest.e2eef74b0d00d213330b.js></script><script type=text/javascript src=static/js/vendor.39c34140b077dfa96911.js></script><script type=text/javascript src=static/js/app.29b1dbf8b130b620f7ca.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 src=static/vconsole/vconsole.min.js></script><script>// 初始化</script><script type=text/javascript src=static/js/manifest.4c7d3aa681c369d36ee1.js></script><script type=text/javascript src=static/js/vendor.39c34140b077dfa96911.js></script><script type=text/javascript src=static/js/app.60c77e9dbe3dc43b4c9d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/10.6bbf4320d0c70a26a7ff.js 0 → 100644
View file @ 3b762d8f
This diff is collapsed.
dev/static/js/10.672318df60d72910f049.js → dev/static/js/11.fa476b91c365c98dd065.js
View file @ 3b762d8f
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/12.5bb1519d95fb708106bb.js deleted 100644 → 0
View file @ a3bc471e
This diff is collapsed.
dev/static/js/15.0ebfdabe9b177b5bd4bd.js 0 → 100644
View file @ 3b762d8f
This diff is collapsed.
dev/static/js/18.e0bfa9fdb4e894de4361.js deleted 100644 → 0
View file @ a3bc471e
This diff is collapsed.
dev/static/js/6.1dce25d165638d735602.js deleted 100644 → 0
View file @ a3bc471e
This diff is collapsed.
dev/static/js/6.f9520047fa2caa9f276b.js 0 → 100644
View file @ 3b762d8f
This diff is collapsed.
dev/static/js/7.1de5944e0b1d373302fe.js deleted 100644 → 0
View file @ a3bc471e
This diff is collapsed.
dev/static/js/7.9db49b283e6b463c610c.js 0 → 100644
View file @ 3b762d8f
This diff is collapsed.
dev/static/js/manifest.4c7d3aa681c369d36ee1.js 0 → 100644
View file @ 3b762d8f
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var b,o,d,i=0,u=[];i<a.length;i++)o=a[i],n[o]&&u.push(n[o][0]),n[o]=0;for(b in t)Object.prototype.hasOwnProperty.call(t,b)&&(e[b]=t[b]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var a={},n={35: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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"3abd17fbfffe9569f960",1:"ccf7556d7b8aadb08a09",2:"cbb7393025a02e2919e6",3:"a78c8fa1285bb3fc5040",4:"58c15f96e18f3317d0fe",5:"f2aca6a5d1b4ebd8ebc4",6:"f9520047fa2caa9f276b",7:"9db49b283e6b463c610c",8:"f9a426cbeb76d29ab7f4",9:"1d3c5067c2113dbb1585",10:"6bbf4320d0c70a26a7ff",11:"fa476b91c365c98dd065",12:"3a3a373c025c8833863f",13:"f7cc800485a0f7a48051",14:"1a5c976cb0b95a073bb2",15:"0ebfdabe9b177b5bd4bd",16:"111ca071f7b71105441f",17:"03884613461070c0d522",18:"c64d73a608befb9174d1",19:"6788ece3a8027eb36940",20:"2c7c48ad90ebc34d8292",21:"d9a2c323db8018bc908d",22:"d5935b43db80ef4e4832",23:"abd000c2d42590325658",24:"b3b88a83e7f8c9bd7a71",25:"f22447127b82c6e6c1b2",26:"f688ad0a42f7f2456842",27:"231a729f2663a07475ce",28:"467336b1439b438e4f3a",29:"3a9c7f203e985634d6e2",30:"752892f5111a5c585e53",31:"147ceb4e91df31a827bb",32:"f3477b96099c65858b7c"}[e]+".js";var b=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(b);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),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
dev/static/js/manifest.e2eef74b0d00d213330b.js deleted 100644 → 0
View file @ a3bc471e
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,f){for(var o,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=a(a.s=f[i]);return d};var n={},r={35:0};function a(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,a){c=r[e]=[n,a]});c[2]=n;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"3abd17fbfffe9569f960",1:"ccf7556d7b8aadb08a09",2:"cbb7393025a02e2919e6",3:"a78c8fa1285bb3fc5040",4:"58c15f96e18f3317d0fe",5:"f2aca6a5d1b4ebd8ebc4",6:"1dce25d165638d735602",7:"1de5944e0b1d373302fe",8:"f9a426cbeb76d29ab7f4",9:"1d3c5067c2113dbb1585",10:"672318df60d72910f049",11:"ce77bd250e489483340e",12:"5bb1519d95fb708106bb",13:"f7cc800485a0f7a48051",14:"1a5c976cb0b95a073bb2",15:"8ccc8269a20ff93c243a",16:"2c2d39e106624cfd0e1d",17:"9b04f94f4ac242456f1c",18:"e0bfa9fdb4e894de4361",19:"6788ece3a8027eb36940",20:"2c7c48ad90ebc34d8292",21:"d9a2c323db8018bc908d",22:"d5935b43db80ef4e4832",23:"abd000c2d42590325658",24:"b3b88a83e7f8c9bd7a71",25:"f22447127b82c6e6c1b2",26:"f688ad0a42f7f2456842",27:"231a729f2663a07475ce",28:"467336b1439b438e4f3a",29:"3a9c7f203e985634d6e2",30:"752892f5111a5c585e53",31:"147ceb4e91df31a827bb",32:"f3477b96099c65858b7c"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=b,t.appendChild(f),n},a.m=e,a.c=n,a.d=function(e,c,n){a.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(c,"a",c),c},a.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},a.p="",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/assets/newLesson/mok4.png
View replaced file @ a3bc471e View file @ 3b762d8f
src/assets/newLesson/mok4.png

9.55 KB | W: | H:

src/assets/newLesson/mok4.png

61.6 KB | W: | H:

src/assets/newLesson/mok4.png
src/assets/newLesson/mok4.png
src/assets/newLesson/mok4.png
src/assets/newLesson/mok4.png
  • 2-up
  • Swipe
  • Onion skin
src/components/collection/index.vue
View file @ 3b762d8f
...@@ -26,7 +26,12 @@ ...@@ -26,7 +26,12 @@
</li> </li>
</ul> </ul>
</div> </div>
<div v-if="noOne" class="noOne"> <div v-if="noOne" class="unStart">
<img :src="errorUrl" alt="">
<p>还没有收藏哦~</p>
<div @click="toList()">快去收藏添加吧~</div>
</div>
<!-- <div v-if="noOne" class="noOne">
<img :src="errorUrl"> <img :src="errorUrl">
<div class="text"> <div class="text">
还没有收藏哦 还没有收藏哦
...@@ -36,7 +41,7 @@ ...@@ -36,7 +41,7 @@
<div class="btn" @click="toList()"> <div class="btn" @click="toList()">
去添加 去添加
</div> </div>
</div> </div> -->
<foot-page/> <foot-page/>
<audio-page ref="audioPage" v-if="showObj.audio.length>0" sc="0" v-show="showObj.show" :showObj="showObj"/> <audio-page ref="audioPage" v-if="showObj.audio.length>0" sc="0" v-show="showObj.show" :showObj="showObj"/>
...@@ -46,7 +51,7 @@ ...@@ -46,7 +51,7 @@
<script> <script>
import {getUserCollectApi} from "../../service/api"; import {getUserCollectApi} from "../../service/api";
import errorUrl from '../../assets/error.png' import errorUrl from '../../assets/collectionless.png'
import playAllUrl from '../../assets/newLesson/audio-play-all.png' import playAllUrl from '../../assets/newLesson/audio-play-all.png'
import playDefaultUrl from '../../assets/newLesson/zDefaultIcon.png' import playDefaultUrl from '../../assets/newLesson/zDefaultIcon.png'
import playActiveUrl from '../../assets/newLesson/zIcon.png' import playActiveUrl from '../../assets/newLesson/zIcon.png'
...@@ -222,6 +227,12 @@ ...@@ -222,6 +227,12 @@
._27377740323539322{height:14*@toVw;width:16*@toVw;background-position:0 0;} ._27377740323539322{height:14*@toVw;width:16*@toVw;background-position:0 0;}
.zIcon{height:18*@toVw;width:18*@toVw;background-position:0 -14*@toVw;} .zIcon{height:18*@toVw;width:18*@toVw;background-position:0 -14*@toVw;}
.zDefaultIcon{height:18*@toVw;width:18*@toVw;background-position:0 -32*@toVw;} .zDefaultIcon{height:18*@toVw;width:18*@toVw;background-position:0 -32*@toVw;}
.unStart{
text-align: center;
img{width:300*@toVw; }
p{line-height: 22px;font-size: 16px;color: #666666;}
div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #40A9FF;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw }
}
.collection-page{ .collection-page{
background: #eeeeee; background: #eeeeee;
.collection-content{ .collection-content{
......
src/components/map/index.vue
View file @ 3b762d8f
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
<div class="tips-title">{{thisLesson.content.tips.title2}}</div> <div class="tips-title">{{thisLesson.content.tips.title2}}</div>
<div class="title-content">{{thisLesson.content.tips.title2_content}}</div> <div class="title-content">{{thisLesson.content.tips.title2_content}}</div>
</div> </div>
<div class="content" v-if="!thisLesson.content.tips"> <div class="content" v-if="!thisLesson.content.tips">
<div style="color: #cccccc;padding: 21.3333vw 0;font-size: 5.3333vw;">快去开始课程吧!</div> <div style="color: #cccccc;padding: 21.3333vw 0;font-size: 5.3333vw;">快去开始课程吧!</div>
</div> </div>
...@@ -689,9 +688,9 @@ ...@@ -689,9 +688,9 @@
} }
.unStart{ .unStart{
text-align: center; text-align: center;
img{width:140*@toVw;height: 177*@toVw;margin: 66*@toVw 0 18*@toVw; } img{width:300*@toVw; }
p{line-height: 22px;font-size: 16px;} p{line-height: 22px;font-size: 16px;color: #666666;}
div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #4A90E2;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw } div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #40A9FF;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw }
} }
// 主题列表 // 主题列表
.noLesson{ .noLesson{
......
src/components/map/secMap.vue
View file @ 3b762d8f
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<div class="center"> <div class="center">
<p class="title">{{couponInfo.goods_desc.course_title}}</p> <p class="title">{{couponInfo.goods_desc.course_title}}</p>
<p class="tip">{{couponInfo.goods_desc.tips}}</p> <p class="tip">{{couponInfo.goods_desc.tips}}</p>
<div class="price">券后价<span class="now">￥{{(couponInfo.current_price-couponInfo.coupon_list[0].money)/100}}</span><span class="old">￥{{couponInfo.current_price/100}}</span> </div> <div class="price">券后价<span class="now">￥{{(couponInfo.current_price-couponInfo.coupon_list[0].money)/100}}</span>&nbsp;&nbsp;<span class="old">￥{{couponInfo.current_price/100}}</span> </div>
</div> </div>
<div class="btn">去报名</div> <div class="btn">去报名</div>
</div> </div>
...@@ -368,6 +368,7 @@ export default { ...@@ -368,6 +368,7 @@ export default {
if (this.userCourse.automation_id) { if (this.userCourse.automation_id) {
this.userCourse.automation_id.forEach((el, index) => { this.userCourse.automation_id.forEach((el, index) => {
getAutomationApi("automation", el).then(res => { getAutomationApi("automation", el).then(res => {
Toast.clear()
// debugger // debugger
if (index == 1) { if (index == 1) {
// 解锁01元课的情况 // 解锁01元课的情况
...@@ -385,6 +386,16 @@ export default { ...@@ -385,6 +386,16 @@ export default {
el.open=true el.open=true
}) })
}else{ }else{
// if(res.can_watch_list.length==6){
res.can_watch_list.forEach((el,index)=>{
el.open=true
if(index<3){
this.lessonList1.push(el)
}else{
this.lessonList2.push(el)
}
})
// }else{
// this.lessonList1 = res.can_watch_list; // this.lessonList1 = res.can_watch_list;
// this.lessonList1.forEach((el,index)=>{ // this.lessonList1.forEach((el,index)=>{
// if(index==0){ // if(index==0){
...@@ -394,15 +405,7 @@ export default { ...@@ -394,15 +405,7 @@ export default {
// this.lessonList1[index+1].open=true // this.lessonList1[index+1].open=true
// } // }
// }) // })
res.can_watch_list.forEach((el,index)=>{ // }
el.open=true
if(index<3){
this.lessonList1.push(el)
}else{
this.lessonList2.push(el)
}
}
)
} }
} }
// debugger // debugger
...@@ -758,9 +761,9 @@ export default { ...@@ -758,9 +761,9 @@ export default {
} }
.unStart{ .unStart{
text-align: center; text-align: center;
img{width:140*@toVw;height: 177*@toVw;margin: 66*@toVw 0 18*@toVw; } img{width:300*@toVw; }
p{line-height: 22px;font-size: 16px;} p{line-height: 22px;font-size: 16px;color: #666666;}
div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #4A90E2;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw } div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #40A9FF;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw }
} }
// 主题列表 // 主题列表
.noLesson{ .noLesson{
......
src/components/order.vue
View file @ 3b762d8f
<template> <template>
<div> <div>
<van-popup class="refer-share" position="top" v-model="showShare"><img :src="shareTipsUrl"></van-popup> <van-popup class="refer-share" position="top" v-model="showShare"><img :src="shareTipsUrl"></van-popup>
<div class="tips" v-if="orderList.length < 1"> <!-- <div class="tips" v-if="orderList.length < 1">
暂无订单 暂无订单
</div> -->
<div v-if="orderList.length < 1" class="unStart">
<img :src="mok4" alt="">
<p>还没有订单哦~</p>
<div @click="goIndex">去逛逛吧</div>
</div> </div>
<div v-for="data in orderList" class="list"> <div v-for="data in orderList" class="list">
<div class="head"> <div class="head">
...@@ -29,6 +34,7 @@ ...@@ -29,6 +34,7 @@
import {getOrderListApi,getwechatParam} from "../service/api"; import {getOrderListApi,getwechatParam} from "../service/api";
import {ORDERTYPE} from "../util/wordbook"; import {ORDERTYPE} from "../util/wordbook";
import shareUrl from '../assets/share.png' import shareUrl from '../assets/share.png'
import mok4 from '../assets/orderless.png'
import { Toast } from 'vant'; import { Toast } from 'vant';
import shareTipsUrl from '../assets/Bitmap@2x.png' import shareTipsUrl from '../assets/Bitmap@2x.png'
export default { export default {
...@@ -39,6 +45,7 @@ ...@@ -39,6 +45,7 @@
showShare:false, showShare:false,
shareTipsUrl:shareTipsUrl, shareTipsUrl:shareTipsUrl,
shareUrl:shareUrl, shareUrl:shareUrl,
mok4:mok4
} }
}, },
filters:{ filters:{
...@@ -50,6 +57,11 @@ ...@@ -50,6 +57,11 @@
this.initPage() this.initPage()
}, },
methods:{ methods:{
goIndex(){
this.$router.push({
name: "index"
});
},
initPage(){ initPage(){
getwechatParam({ getwechatParam({
api_list:'onMenuShareAppMessage,onMenuShareTimeline', api_list:'onMenuShareAppMessage,onMenuShareTimeline',
...@@ -119,6 +131,12 @@ ...@@ -119,6 +131,12 @@
<style scoped lang="less"> <style scoped lang="less">
@import "../util/public"; @import "../util/public";
.unStart{
text-align: center;
img{width:300*@toVw; }
p{line-height: 22px;font-size: 16px;color: #666666;}
div{width:250*@toVw;height: 40*@toVw;line-height:40*@toVw;background: #40A9FF;color: white;border-radius: 20*@toVw;margin-top: 72*@toVw }
}
.refer-share { .refer-share {
width: 100%;overflow-y:visible; width: 100%;overflow-y:visible;
} }
......
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