Skip to content

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

618

parent 7ebfc23c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 116 deletions
build/webpack.dev.conf.js
View file @ c5c3bd18
......@@ -19,7 +19,6 @@ const devWebpackConfig = merge(baseWebpackConfig, {
},
// cheap-module-eval-source-map is faster for development
devtool: config.dev.devtool,
// these devServer options should be customized in /config/index.js
devServer: {
clientLogLevel: 'warning',
......
dev/index.html
View file @ c5c3bd18
......@@ -6,4 +6,4 @@
overflow: hidden;
position: fixed;
background: #f4f4f4;
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.0ba7808d8f50addf60ab.js></script><script type=text/javascript src=static/js/vendor.67557998227df7e95200.js></script><script type=text/javascript src=static/js/app.b5e6ad71aa49c13f29d5.js></script></body></html>
\ No newline at end of file
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.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.11b42a70d1ee0c3f53ee.js></script><script type=text/javascript src=static/js/vendor.67557998227df7e95200.js></script><script type=text/javascript src=static/js/app.77a04f4db1e3f186e631.js></script></body></html>
\ No newline at end of file
dev/static/js/1.b1cfe5d0d99fc11efd21.js 0 → 100644
View file @ c5c3bd18
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.f17ae3475da69e33ed3c.js deleted 100644 → 0
View file @ 7ebfc23c
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/14.036eda0e4a575ecd0635.js deleted 100644 → 0
View file @ 7ebfc23c
This diff is collapsed.
dev/static/js/14.a3dd74598cca9210c87b.js 0 → 100644
View file @ c5c3bd18
This diff is collapsed.
dev/static/js/app.b5e6ad71aa49c13f29d5.js → dev/static/js/app.77a04f4db1e3f186e631.js
View file @ c5c3bd18
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.0ba7808d8f50addf60ab.js → dev/static/js/manifest.11b42a70d1ee0c3f53ee.js
View file @ c5c3bd18
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){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 r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={42: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 r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"7a0a0d088fa3293773e4",1:"f17ae3475da69e33ed3c",2:"3480e89e177929e0e092",3:"48f0de846e6ce52fda5a",4:"e0e2f883f76d78f28122",5:"e0a6a403e3ada07926b2",6:"c6ea61099a4a2c21e41e",7:"071f9895c1ca3f5b22a5",8:"17b5dee9411a58b64eb8",9:"6b21b01facf38dc18532",10:"aa09fd3470e0fed86271",11:"b414f8bc70807458330b",12:"fc3a3caaa06755878f03",13:"aec72b0e84b7db4b75a5",14:"036eda0e4a575ecd0635",15:"8c526c387c28b957dc7f",16:"fdf8eca9e1a2110a4ef1",17:"c8bfd07f0deb24c8006c",18:"1c4bde4aae9444be9316",19:"5637cca2c4438812cf5b",20:"b4839fec18e0d551b1fb",21:"e70aae60c5b399d61104",22:"16a3985393de88e09f52",23:"79d64d46f87a7594223c",24:"7157073eeccbe0f0be6e",25:"c5752e7d8cca9ae7fae3",26:"4984774ab189eee97f72",27:"2c58791802148decb397",28:"3ea3a2c328b729e948f7",29:"4bf51e792924c3a5130c",30:"a05692f1b7030b7c6dd9",31:"a9765e0b6fdcd95aa498",32:"3cbcf038785e803249d0",33:"6455804c94a9c2e46fd3",34:"31345ac77a963ca8a8ae",35:"0268526fb4af5fd83634",36:"0dfcfa91821b40ca7f36",37:"d9fb4c81ec56e9663dd8",38:"9c4d5093f285b54f6078",39:"2fb56e4a184c3d60b1a9"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),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 console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){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 r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={42: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 r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"7a0a0d088fa3293773e4",1:"b1cfe5d0d99fc11efd21",2:"3480e89e177929e0e092",3:"48f0de846e6ce52fda5a",4:"e0e2f883f76d78f28122",5:"e0a6a403e3ada07926b2",6:"c6ea61099a4a2c21e41e",7:"071f9895c1ca3f5b22a5",8:"17b5dee9411a58b64eb8",9:"6b21b01facf38dc18532",10:"aa09fd3470e0fed86271",11:"b414f8bc70807458330b",12:"fc3a3caaa06755878f03",13:"aec72b0e84b7db4b75a5",14:"a3dd74598cca9210c87b",15:"8c526c387c28b957dc7f",16:"fdf8eca9e1a2110a4ef1",17:"c8bfd07f0deb24c8006c",18:"1c4bde4aae9444be9316",19:"5637cca2c4438812cf5b",20:"b4839fec18e0d551b1fb",21:"e70aae60c5b399d61104",22:"16a3985393de88e09f52",23:"79d64d46f87a7594223c",24:"7157073eeccbe0f0be6e",25:"c5752e7d8cca9ae7fae3",26:"4984774ab189eee97f72",27:"53caf949cc72899deb1e",28:"3ea3a2c328b729e948f7",29:"4bf51e792924c3a5130c",30:"a05692f1b7030b7c6dd9",31:"a9765e0b6fdcd95aa498",32:"3cbcf038785e803249d0",33:"6455804c94a9c2e46fd3",34:"31345ac77a963ca8a8ae",35:"0268526fb4af5fd83634",36:"0dfcfa91821b40ca7f36",37:"d9fb4c81ec56e9663dd8",38:"9c4d5093f285b54f6078",39:"2fb56e4a184c3d60b1a9"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),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 console.error(e),e}}([]);
\ No newline at end of file
src/App.vue
View file @ c5c3bd18
......@@ -43,7 +43,7 @@ export default {
padding: auto;
}
.child-view {
/* position: relative; */
/* position: absolute; */
min-height: 100vh;
width: 100%;
transition: all .5s;
......
src/components/index.vue
View file @ c5c3bd18
......@@ -1295,7 +1295,6 @@ export default {
.canvas{width: 716 * @toVw;z-index: 2;}
}
}
.contentBox{
padding: 20 * @toVw 42 * @toVw 20 * @toVw;
background: white;
......
src/components/inspector/inspectorActivit.vue
View file @ c5c3bd18
......@@ -68,6 +68,14 @@
// }
this.getPhone = 0
})
window.onresize=()=>{
// console.log(document.body.clientHeight,'body')
if(originClientHeight>document.documentElement.clientHeight){
}else{
document.documentElement.scrollTop = 0
document.body.scrollTop = 0
}
}
},
data(){
return {
......
src/components/newLesson/video.vue
View file @ c5c3bd18
......@@ -31,7 +31,7 @@
<div class="age-change-block video" v-if="showObj.video.length > 1 && videoShow&&!orientationchange">
<div @click="videoIndex= index;videoShow=false;sendConsole('多视频选择视频')" v-for="(item,index) in showObj.video">视频({{index+1}})<i :class="{'playImage _282918034425091245':index === videoIndex}" v-if="contentData.age === 1"></i></div>
</div>
<scroll class="scroll" :data="showObj.video" ref="scrollDom" :scrollX="true" :bounce="true" >
<scroll class="scroll" v-if="0" :data="showObj.video" ref="scrollDom" :scrollX="true" :bounce="true" >
<div class="itemBox" ref="itembox">
<div class="item" v-for="(i,index) in testCount" @click="scrollFn(index)" >
{{index}}
......@@ -238,8 +238,10 @@
change:this.contentData.content.change
}
}
if(this.$refs.itembox){
this.$refs.itembox.style.width = this.testCount*100+'px'
}
}
},
watch:{
'contentData':{
......
src/components/orderTrans/index.vue
View file @ c5c3bd18
......@@ -2,10 +2,11 @@
<div>
<div class="banner-block">
<img :src="logoUrl">
<img class="topimg" :src="topUrl" alt="">
</div>
<img v-if="sizeChange" class="bottomimg" :src="bottomUrl" alt="">
<div class="form-block" v-if="getPhone==0">
<img class="topimg" :src="topUrl" alt="">
<div class="bgblock">
<div class="title">课程激活</div>
<div class="input-block">
<input placeholder="请输入订单号" autofocus="autofocus" v-model="order_id"/>
......@@ -20,7 +21,7 @@
</div>
<div class="input-block">
<input placeholder="请输入短信验证码" oninput="if(value.length>4)value=value.slice(0,4)" type="number" maxlength="4" pattern="[0-9]*" v-model="msgCode"/>
<button class="codeMsg right-btn" @click="sendMobileCode" v-if="time===0">验证码</button>
<button class="codeMsg right-btn" @click="sendMobileCode" v-if="time===0">发送验证码</button>
<button class="codeMsg disabled right-btn" v-if="time>0">{{time}}s</button>
</div>
<div class="btn-block">
......@@ -31,17 +32,6 @@
</div>
</div>
</div>
<div class="form-block" v-if="getPhone==1">
<div class="input-block">
<input v-model="userDesc.mobile"/>
<button class="codeMsg right-btn" @click="changeMoblie" >更换手机号</button>
</div>
<p class="tip">* 如果您的订单手机号为上述手机号直接点下方确定按钮即可</p>
<div class="btn-block">
<div class="btn" ref="btn" style="margin-top:100px;" @click="goList">
确定
</div>
</div>
</div>
</div>
</template>
......@@ -62,15 +52,17 @@
this.getPhone = 0
})
let originClientHeight = document.documentElement.clientHeight
console.log(document.documentElement.clientHeight)
console.log(document.documentElement.clientWidth)
window.onresize=()=>{
// console.log(document.body.clientHeight,'body')
if(originClientHeight>document.documentElement.clientHeight){
this.sizeChange = false
console.log(80)
}else{
document.documentElement.scrollTop = 0
document.body.scrollTop = 0
this.sizeChange = true
}
// console.log(document.documentElement.clientHeight,'documentElement')
}
},
data(){
......@@ -190,23 +182,26 @@
img{
width: 100%;
}
.topimg{position: absolute;top: 10*@toVw;right: 0;width: 105*@toVw;z-index: 11;}
}
.bottomimg{position: fixed;bottom: 0;width: 133*@toVw;left: 0;z-index: 11;}
.bottomimg{position: fixed;bottom: 0;width: 110*@toVw;left: 0;z-index: 11;}
.child-view{background: #FFCAC7;}
.form-block{
position: absolute;
z-index: 10;
background: white;
top: 77*@toVw;
top: 50vh;
transform: translateY(-50%);
left: 29*@toVw;
padding: 20 * @toVw 34 * @toVw 30 * @toVw;
.topimg{position: absolute;top: -70*@toVw;right: -30*@toVw;width: 105*@toVw;z-index: 11;}
.bgblock{
background: white;
border-radius:20*@toVw;
.tip{font-size: 10*@toVw;color: #FF7875;position: relative;top: -5* @toVw;font-weight: bold;}
.title{text-align: center;font-size: 20*@toVw;margin: 16* @toVw 0 20* @toVw;}
padding: 20 * @toVw 34 * @toVw 30 * @toVw;
}
.tip{font-size: 11*@toVw;color: #FF7875;position: relative;top: -5* @toVw;font-weight: bold;}
.title{text-align: center;font-size: 21*@toVw;margin: 16* @toVw 0 20* @toVw;}
.input-block{
width: 249*@toVw;height: 47*@toVw;
line-height:47*@toVw;
width: 249*@toVw;height: 45*@toVw;
line-height:45*@toVw;
border-bottom: 1*@toVw solid #FFCFCD;
margin-bottom: 8 * @toVw;
position: relative;
......@@ -223,17 +218,17 @@
position: absolute;
right:4*@toVw;
padding: 0;
width: 58*@toVw;
width: 78*@toVw;
top: 10*@toVw;
height: 25*@toVw;
line-height: 27*@toVw;
font-size: 12*@toVw;
}
input{
padding: 10 * @toVw 0;
font-size:15*@toVw;
padding: 9 * @toVw 0;
font-size:16*@toVw;
background: transparent;
font-family:PingFangSC-Semibold;
// font-family:PingFangSC-Semibold;
// font-weight:500;
text-indent: 5*@toVw;
color: #333333;
......@@ -241,29 +236,17 @@
outline: none;
border: none;
&::-webkit-input-placeholder{
font-size:14*@toVw;
font-family:PingFangSC-Semibold;
font-size:16*@toVw;
// font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
} /* 使用webkit内核的浏览器 */
&:-moz-placeholder{
font-size:14*@toVw;
font-family:PingFangSC-Semibold;
font-size:16*@toVw;
// font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
} /* Firefox版本4-18 */
&::-moz-placeholder{
font-size:14*@toVw;
font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
} /* Firefox版本19+ */
&:-ms-input-placeholder{
font-size:14*@toVw;
font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
}
}
}
.btn-block{
......@@ -273,8 +256,8 @@
position: relative;
font-weight: bold;
}
.origin{border:2px solid white;}
.border{position: relative;top: -39*@toVw;z-index:-1;}
.origin{border:2px solid white;z-index:1;font-size: 15*@toVw}
.border{position: relative;top: -37*@toVw;z-index:0;}
}
}
......@@ -300,20 +283,86 @@
bottom: 0;
width: 375 * @toVw;
}
@media screen and (min-aspect-ratio:"9/16"){
.banner-block{
.topimg{position: absolute;top: 6vh;}
@media screen and (min-width: 600px) {
@toVw:100/520vw;
.child-view{
height: 100vh;
overflow: hidden;
}
.form-block{
top: 16vh;
position: absolute;
z-index: 10;
top: 50vh;
transform: translateY(-50%);
left: 103*@toVw;
.topimg{position: absolute;top: -100*@toVw;right: -100*@toVw;width: 109*@toVw;z-index: 11;}
.bgblock{
background: white;
border-radius:20*@toVw;
padding: 20 * @toVw 34 * @toVw 30 * @toVw;
}
.tip{font-size: 11*@toVw;color: #FF7875;position: relative;top: -5* @toVw;font-weight: bold;}
.title{text-align: center;font-size: 21*@toVw;margin: 16* @toVw 0 20* @toVw;}
.input-block{
width: 249*@toVw;height: 45*@toVw;
line-height:45*@toVw;
border-bottom: 1*@toVw solid #FFCFCD;
margin-bottom: 8 * @toVw;
position: relative;
.yzm{
border: 1px solid #FFCA68;
position: absolute;
right:4*@toVw;
width: 72*@toVw;
height: 28*@toVw;
top: 10*@toVw;
font-size: 12*@toVw;
}
.right-btn{
position: absolute;
right:4*@toVw;
padding: 0;
width: 78*@toVw;
top: 10*@toVw;
height: 25*@toVw;
line-height: 27*@toVw;
font-size: 12*@toVw;
}
input{
padding: 9 * @toVw 0;
font-size:16*@toVw;
background: transparent;
// font-family:PingFangSC-Semibold;
// font-weight:500;
text-indent: 5*@toVw;
color: #333333;
line-height:20*@toVw;
outline: none;
border: none;
&::-webkit-input-placeholder{
font-size:16*@toVw;
// font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
} /* 使用webkit内核的浏览器 */
&:-moz-placeholder{
font-size:16*@toVw;
// font-family:PingFangSC-Semibold;
color:rgba(204,204,204,1);
line-height:20*@toVw;
} /* Firefox版本4-18 */
}
}
.btn-block{
text-align: center;margin-top: 20*@toVw;
.btn{
width: 195*@toVw;height: 41*@toVw;background:#FF7D77;color: white;line-height:41*@toVw; border-radius: 99*@toVw;
position: relative;
font-weight: bold;
}
.origin{border:2px solid white;z-index:1;font-size: 15*@toVw}
.border{position: relative;top: -37*@toVw;z-index:0;}
}
}
}
// @media screen and (aspect-ratio:"9/16"){
// .banner-block{
// .topimg{position: absolute;top: 10*@toVw;}
// }
// .form-block{
// top: 16vh;
// }
// }
</style>
src/main.js
View file @ c5c3bd18
......@@ -41,19 +41,19 @@ Vue.component('scroll', scroll);
/* eslint-disable no-new */
if(process.env.NODE_ENV != 'production'){
var vConsole = new VConsole();
}
// if(process.env.NODE_ENV != 'production'){
// var vConsole = new VConsole();
// }
router.beforeEach((to, from, next) => {
next()
// chrome
console.log(document.body.hasOwnProperty('scrollTop'))
if (document.body.scrollTop!==null){
console.log(document.body.hasOwnProperty('scrollTop'))
if (document.body.scrollTop!==null){
document.body.scrollTop = 0
}
// firefox
if (document.documentElement!==null){
if (document.documentElement!==null){
document.documentElement.scrollTop = 0
}
// // safari
......
src/service/index.js
View file @ c5c3bd18
......@@ -14,7 +14,7 @@ axios.interceptors.request.use(
config => {
// 获取token
// process.env.versionTime
let versiontime = '06131639'
let versiontime = '06181200'
const token = localStorage.getItem('cc_token');
// 设置参数格式
if(!config.headers['Content-Type']){
......
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