Skip to content

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

625

parent 3be63437
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 20 deletions
dev/index.html
View file @ 2669df5b
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #f4f4f4; 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.9e1b40bcf442eb1c679a.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.ce97be89683cd91247e9.js></script></body></html> }</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.e142bc86d4bb248bff26.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.ce97be89683cd91247e9.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/1.1eeb14484390314e9ff1.js → dev/static/js/1.2d6c5d7bf10502505d84.js
View file @ 2669df5b
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/12.03191418f5558dcf03c8.js 0 → 100644
View file @ 2669df5b
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/12.912ffd8743cdeceafc28.js deleted 100644 → 0
View file @ 3be63437
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/20.41d4020d70f1d8af0945.js deleted 100644 → 0
View file @ 3be63437
This diff is collapsed.
dev/static/js/20.5bc5f503eb5c6ff0910d.js 0 → 100644
View file @ 2669df5b
This diff is collapsed.
dev/static/js/manifest.9e1b40bcf442eb1c679a.js → dev/static/js/manifest.e142bc86d4bb248bff26.js
View file @ 2669df5b
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,r,b){for(var t,d,o,i=0,u=[];i<f.length;i++)d=f[i],c[d]&&u.push(c[d][0]),c[d]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(f,r,b);u.length;)u.shift()();if(b)for(i=0;i<b.length;i++)o=n(n.s=b[i]);return o};var f={},c={46:0};function n(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,n){a=c[e]=[f,n]});a[2]=f;var r=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.timeout=12e4,n.nc&&b.setAttribute("nonce",n.nc),b.src=n.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"1eeb14484390314e9ff1",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"468c0b84f73e90bad1e7",11:"92efb865b84db68417b7",12:"912ffd8743cdeceafc28",13:"bb677dc9e2d9aba1532f",14:"1eed8453bb8930f088ba",15:"3f1ba28cfdb73106ab72",16:"63a8eda77e6a90bde78c",17:"3b059c1297c2878cf360",18:"2a86dae3846ad0c55ede",19:"648c99c8e8fe2819fb13",20:"41d4020d70f1d8af0945",21:"d24a865b728397e73fae",22:"060e3341da0fa1a38cd1",23:"81a6e57c470e55803cb3",24:"9fd47715beb050e00ea1",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"31c1e69da4f897ae4765",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(d,12e4);function d(){b.onerror=b.onload=null,clearTimeout(t);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return b.onerror=b.onload=d,r.appendChild(b),f},n.m=e,n.c=f,n.d=function(e,a,f){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},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}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,d,o,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},f={46:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"6abe927f66853d202f08",1:"2d6c5d7bf10502505d84",2:"c9e0de699f755ee4b23a",3:"2107f1b9e184ae98213a",4:"f2bf790adbbeb12829e1",5:"3b0b1393953737345836",6:"25de7942591869c92d4e",7:"8fb9cb12b685b1628a99",8:"4c37bd70d65f96539867",9:"f556b559f60a57bd98c7",10:"557bc3874b533f9c39d3",11:"92efb865b84db68417b7",12:"03191418f5558dcf03c8",13:"bb677dc9e2d9aba1532f",14:"1eed8453bb8930f088ba",15:"3f1ba28cfdb73106ab72",16:"63a8eda77e6a90bde78c",17:"3b059c1297c2878cf360",18:"2a86dae3846ad0c55ede",19:"648c99c8e8fe2819fb13",20:"5bc5f503eb5c6ff0910d",21:"d24a865b728397e73fae",22:"060e3341da0fa1a38cd1",23:"81a6e57c470e55803cb3",24:"9fd47715beb050e00ea1",25:"62620e9bac18a036b452",26:"74f2b27848334b451d54",27:"31c1e69da4f897ae4765",28:"99da3828c1999d40671a",29:"fa14b41d7c77e07c8120",30:"8415ee1bca5daa87c09e",31:"267ce6de032f1064248f",32:"832df5bf4f39f1bb1834",33:"39cebaea98826b57334e",34:"2ef07273df25c5998fc7",35:"4cc5c8808f6ddc45f715",36:"521b496293b7bc33814e",37:"5561b87aa887f3a9c76d",38:"39491e7ffa5846071712",39:"2eebc8580c2465fe6f3e",40:"3d668485588329ab6b7d",41:"333a8bf40e2fefa8f501",42:"0f9cba645d90bf0157fd",43:"6d2a78fce59048b83178"}[e]+".js";var t=setTimeout(d,12e4);function d(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=d,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/mine/addressEdit.vue
View file @ 2669df5b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div> <div>
<!-- <van-cell title="单元格" value="内容" /> --> <!-- <van-cell title="单元格" value="内容" /> -->
<mt-field label="收货人" v-model="receiveName" placeholder="请填写收货人"></mt-field> <mt-field label="收货人" v-model="receiveName" placeholder="请填写收货人"></mt-field>
<mt-field label="手机号" type="tel" v-model="receiveMobile" placeholder="请填写手机号"></mt-field> <mt-field label="手机号" type="tel" v-model="receiveMobile" placeholder="请填写手机号" :attr='{maxlength: 13}'></mt-field>
<!-- <mt-field label="所在地区" id="mtcell" placeholder="请选择地区" :value="addressArea" @click.native="showPicker" is-link> <!-- <mt-field label="所在地区" id="mtcell" placeholder="请选择地区" :value="addressArea" @click.native="showPicker" is-link>
<i class="iconfont icon-youjiantou"></i> <i class="iconfont icon-youjiantou"></i>
</mt-field>--> </mt-field>-->
...@@ -91,10 +91,13 @@ export default { ...@@ -91,10 +91,13 @@ export default {
} else if (!this.receiveMobile) { } else if (!this.receiveMobile) {
Toast("手机号不能为空"); Toast("手机号不能为空");
return false; return false;
} else if (!/^1\d{10}$/.test(this.receiveMobile)) { } else if (!/^1\d{10,12}$/.test(this.receiveMobile)) {
Toast("手机号格式不正确"); Toast("手机号格式不正确");
return false; return false;
} else if (!this.address) { } else if (!this.addressArea) {
Toast("所在地区不能为空");
return false;
}else if (!this.address) {
Toast("详细地址不能为空"); Toast("详细地址不能为空");
return false; return false;
} }
......
src/components/mine/index.vue
View file @ 2669df5b
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
</van-cell> </van-cell>
</div> </div>
</div> </div>
<div class="outBox addr" v-if="addressInfo&&addressInfo.receive_name" style="margin-top:10px;"> <div class="outBox addr" style="margin-top:10px;margin-bottom: 50px;">
<div class="list"> <div class="list">
<van-cell title="收货地址" ref="address" to="/address" is-link> <van-cell title="收货地址" ref="address" to="/address" is-link v-if="addressInfo&&addressInfo.receive_name">
<img slot="icon" :src="image.mine_address"> <img slot="icon" :src="image.mine_address">
</van-cell> </van-cell>
<van-cell title="清除缓存" is-link @click="clearBoth()"> <van-cell title="清除缓存" is-link @click="clearBoth()">
...@@ -144,6 +144,7 @@ export default { ...@@ -144,6 +144,7 @@ export default {
background: white; background: white;
overflow: auto; overflow: auto;
.head { .head {
position: relative;
.contentBox { .contentBox {
width: 335 * @toVw; width: 335 * @toVw;
height: 104 * @toVw; height: 104 * @toVw;
......
src/components/newLesson/star.vue
View file @ 2669df5b
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
@import "../../util/public"; @import "../../util/public";
.img_btn{ .img_btn{
position: fixed; position: fixed;
bottom: 20*@toVw; bottom: 4*@toVw;
right: 20*@toVw; right: 20*@toVw;
width: 50*@toVw; width: 50*@toVw;
} }
......
src/components/newLesson/video.vue
View file @ 2669df5b
...@@ -322,25 +322,33 @@ ...@@ -322,25 +322,33 @@
border-radius: 8*@toVw; border-radius: 8*@toVw;
padding: 10*@toVw; padding: 10*@toVw;
.header{ .header{
// text-align: center;
padding-top: 8*@toVw; padding-top: 8*@toVw;
height: auto;
// display: flex;
.text{ .text{
width:100% ; width:96% ;
margin-bottom: 0;
display: block;
// border: none;
} }
} }
.video-block{ .video-block{
margin-bottom: 16*@toVw; margin-bottom: 16*@toVw;
// border: 1*@toVw solid #666; // border: 1*@toVw solid #666;
border-radius: 12*@toVw; border-radius: 12*@toVw;
padding: 8*@toVw; // padding: 8*@toVw;
background:#69C0FF ; background:#69C0FF;
border: 4px solid #69C0FF;
overflow: hidden;
video{ video{
// width: 100%; width: 100%;
height: 171*@toVw; // height: 171*@toVw;
margin: 0; margin: 0;
display: block; display: block;
padding: 0; padding: 0;
background:rgba(0,0,0,0.4); background:rgba(0,0,0,0.4);
border-radius:8*@toVw; border-radius:10*@toVw;
} }
} }
.age-block{ .age-block{
...@@ -443,7 +451,7 @@ ...@@ -443,7 +451,7 @@
} }
.parent-finish{ .parent-finish{
position: fixed; position: fixed;
bottom: 10 * @toVw; bottom: 2 * @toVw;
width: 100%; width: 100%;
left: 0; left: 0;
top: 500*@toVw; top: 500*@toVw;
......
src/components/star/starRank.vue
View file @ 2669df5b
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
@change="swipeChange" @change="swipeChange"
> >
<van-swipe-item> <van-swipe-item>
<scroll v-if="starNum!=0&&tabIndex==1" ref="scrollItem" :data="starList" :bounce="false"> <scroll :style="{maxHeight: height +'px'}" v-if="starNum!=0&&tabIndex==1" ref="scrollItem" :data="starList" :bounce="false">
<div class="container"> <div class="container">
<div class="stageBox" v-if="starInfo.code!=2001"> <div class="stageBox" v-if="starInfo.code!=2001">
<div <div
......
src/main.js
View file @ 2669df5b
...@@ -40,7 +40,6 @@ Vue.component('scroll', scroll); ...@@ -40,7 +40,6 @@ Vue.component('scroll', scroll);
// Vue.prototype.$throw = (error)=> errorHandler(error,this); // Vue.prototype.$throw = (error)=> errorHandler(error,this);
/* eslint-disable no-new */ /* eslint-disable no-new */
if(process.env.NODE_ENV != 'production'){ if(process.env.NODE_ENV != 'production'){
var vConsole = new VConsole(); var vConsole = new VConsole();
} }
......
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