Skip to content

H
h5-base
Commit 561e13af authored by IvyXia123's avatar IvyXia123
Browse files
Options

Merge branch 'pre' 

# Conflicts:
#	dist/index.html
#	dist/static/js/14.5fab46d1539e8d8e9959.js
#	dist/static/js/15.f83fd7b1ec3a97f7bd66.js
#	dist/static/js/16.e3ef0f940227e40197fc.js
#	dist/static/js/17.bc2c51f05e5d345f3c7e.js
#	dist/static/js/18.a336f5a7427aea7acb7c.js
#	dist/static/js/19.8aea9d608af5e12b6142.js
#	dist/static/js/20.6762620ad2ff94b2955d.js
#	dist/static/js/21.fd833b8ab6cb1e0d074f.js
#	dist/static/js/23.c9ca476f161685cfc1db.js
#	dist/static/js/24.d28f421254641ee6240c.js
#	dist/static/js/25.2aec44292ca8a7f4d773.js
#	dist/static/js/26.90f95355f4999c507466.js
#	dist/static/js/27.14417f0a63a4de5fdc1b.js
#	dist/static/js/28.6f7b7f5155c4787a2851.js
#	dist/static/js/29.e166012c7d68e0230f85.js
#	dist/static/js/30.d6949b6a407c6f77564a.js
#	dist/static/js/31.1e3c8e63235db66879e5.js
#	dist/static/js/32.d494177aad804ca9e139.js
#	dist/static/js/33.40a36e635ab23245496b.js
#	dist/static/js/34.481cee4e3407f0772555.js
#	dist/static/js/35.049b75b06f616c4d7687.js
#	dist/static/js/36.33fd9443eca7186bd78a.js
#	dist/static/js/37.387a0f6c39e912c0e844.js
#	dist/static/js/38.bcde7803bd7201b82e1b.js
#	dist/static/js/39.4d13253138f0ad098b23.js
#	dist/static/js/40.df490584d5524e769a1f.js
#	dist/static/js/41.2d0949e14872f28dcdd9.js
#	dist/static/js/42.2c8c1187fc4f234be6da.js
#	dist/static/js/42.ced1113ce62871b6d809.js
#	dist/static/js/42.d9cca35f41769b84c3ae.js
#	dist/static/js/43.acc88e80cd881d00f5a3.js
#	dist/static/js/44.71781ad4238c7f66d5db.js
#	dist/static/js/45.ae23788a3abfa30255f3.js
#	dist/static/js/46.97d0384734961e580fad.js
#	dist/static/js/47.092b718b5a8211aee269.js
#	dist/static/js/48.01e4fa38155cee98daeb.js
#	dist/static/js/49.83d3afab7e4d587b2b18.js
#	dist/static/js/50.9b341aa6e1175956090e.js
#	dist/static/js/51.f7c2e1f7805ae37942ae.js
#	dist/static/js/52.1a2b44ddfb618e210c13.js
#	dist/static/js/53.34f568545237bd327f17.js
#	dist/static/js/54.1f1351d3e2eb66870bc5.js
#	dist/static/js/55.3c9b49aa5f568bd28272.js
#	dist/static/js/56.850a2a72f5cac7b39e5b.js
#	dist/static/js/57.2c739f835f434ed8e5fd.js
#	dist/static/js/58.1988cd306d0e500569a0.js
#	dist/static/js/59.3c45272d31ebf496d04e.js
#	dist/static/js/60.97ba1fb09d6b41ec9fd2.js
#	dist/static/js/61.626a3506faee124c08d4.js
#	dist/static/js/vendor.eb2fd737d78619d0ba95.js
parents 5c974f52 8f203f2b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 557 additions and 8 deletions
dist/index.html
View file @ 561e13af
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.2ab063c9c51522490b813e753650c860.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.a3dd8c1b484457bf7a3f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.dd8b305110cebf76c234.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.6f3e91da8a60c38eb301.js></script></body></html>
\ No newline at end of file
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.2ab063c9c51522490b813e753650c860.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></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.a3dd8c1b484457bf7a3f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.dd8b305110cebf76c234.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.6f3e91da8a60c38eb301.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><script>// setSize();
// addEventListener('resize',setSize);
// function setSize() {
// document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
// }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling: touch
}
.wrapper {
height: 100vh;
overflow: hidden;
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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></script><script type=text/javascript src=static/js/manifest.77c162b6c73c5338490c.js></script><script type=text/javascript src=static/js/vendor.eb2fd737d78619d0ba95.js></script><script type=text/javascript src=static/js/app.fb6e7ff70a0c81e7ef11.js></script></body></html>
>>>>>>> pre
dist/static/js/12.3b4cd03528e061c10fe8.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/13.5e0ffd777f1f45690e71.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/14.5fab46d1539e8d8e9959.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/15.f83fd7b1ec3a97f7bd66.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/16.e3ef0f940227e40197fc.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/17.bc2c51f05e5d345f3c7e.js 0 → 100644
View file @ 561e13af
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.a336f5a7427aea7acb7c.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/19.8aea9d608af5e12b6142.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/20.6762620ad2ff94b2955d.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/21.fd833b8ab6cb1e0d074f.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/22.7a4db8f5f0aad9831416.js 0 → 100644
View file @ 561e13af
webpackJsonp([22],{FgGf:function(n,t,a){var i=a("ZeCN");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);a("rjj0")("6ea11318",i,!1,{})},"M+++":function(n,t,a){n.exports=a.p+"static/img/11@2x.487a6bf.png"},VTuM:function(n,t,a){n.exports=a.p+"static/img/12@2x.c0e275d.png"},ZeCN:function(n,t,a){(n.exports=a("FZ+f")(!0)).push([n.i,"\n.fl-r[data-v-bd6001ac] {\n float: right;\n}\n.fr[data-v-bd6001ac] {\n float: right;\n}\n.fl[data-v-bd6001ac] {\n float: left;\n}\n.main-block[data-v-bd6001ac] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-bd6001ac]:after {\n content: '';\n display: block;\n clear: both;\n}\n@-webkit-keyframes myfirst-data-v-bd6001ac {\n0% {\n -webkit-transform: scale(1);\n}\n50% {\n -webkit-transform: scale(1.1);\n}\n100% {\n -webkit-transform: scale(1);\n}\n}\n.van-button--info[data-v-bd6001ac] {\n background: #40A9FF;\n border: 1px solid #40A9FF;\n}\n.van-popup[data-v-bd6001ac] {\n background: transparent;\n}\n.ellipsisCss[data-v-bd6001ac] {\n overflow: hidden;\n -o-text-overflow: ellipsis;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n.transparentBtn[data-v-bd6001ac] {\n width: 32vw;\n height: 10.13333333vw;\n border: 1px solid white;\n color: white;\n text-align: center;\n line-height: 10.13333333vw;\n font-size: 4vw;\n border-radius: 5.33333333vw;\n}\ni[data-v-bd6001ac] {\n font-style: normal;\n}\n.ly-activity-page[data-v-bd6001ac] {\n position: relative;\n}\n.ly-activity-page img[data-v-bd6001ac] {\n width: 100%;\n}\n.ly-activity-page .btn[data-v-bd6001ac] {\n position: absolute;\n width: 56vw;\n height: 13.33333333vw;\n background: transparent;\n z-index: 10;\n top: 0;\n left: 24vw;\n}\n.ly-activity-page .btn1[data-v-bd6001ac] {\n top: 70.4vw;\n}\n.ly-activity-page .btn2[data-v-bd6001ac] {\n top: 166.4vw;\n}\n.ly-activity-page .btn3[data-v-bd6001ac] {\n top: 326.4vw;\n}\n.ly-activity-page .btn4[data-v-bd6001ac] {\n top: 467.73333333vw;\n}\n.ly-activity-page .btn5[data-v-bd6001ac] {\n top: 622.4vw;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/h5/wechat/src/components/activity/extensionV1.vue"],names:[],mappings:";AACA;EACE,aAAa;CACd;AACD;EACE,aAAa;CACd;AACD;EACE,YAAY;CACb;AACD;EACE,YAAY;EACZ,kBAAkB;EAClB,aAAa;CACd;AACD;EACE,YAAY;EACZ,eAAe;EACf,YAAY;CACb;AACD;AACA;IACI,4BAA4B;CAC/B;AACD;IACI,8BAA8B;CACjC;AACD;IACI,4BAA4B;CAC/B;CACA;AACD;EACE,oBAAoB;EACpB,0BAA0B;CAC3B;AACD;EACE,wBAAwB;CACzB;AACD;EACE,iBAAiB;EACjB,2BAA2B;KACxB,wBAAwB;EAC3B,oBAAoB;CACrB;AACD;EACE,YAAY;EACZ,sBAAsB;EACtB,wBAAwB;EACxB,aAAa;EACb,mBAAmB;EACnB,2BAA2B;EAC3B,eAAe;EACf,4BAA4B;CAC7B;AACD;EACE,mBAAmB;CACpB;AACD;EACE,mBAAmB;CACpB;AACD;EACE,YAAY;CACb;AACD;EACE,mBAAmB;EACnB,YAAY;EACZ,sBAAsB;EACtB,wBAAwB;EACxB,YAAY;EACZ,OAAO;EACP,WAAW;CACZ;AACD;EACE,YAAY;CACb;AACD;EACE,aAAa;CACd;AACD;EACE,aAAa;CACd;AACD;EACE,oBAAoB;CACrB;AACD;EACE,aAAa;CACd",file:"extensionV1.vue",sourcesContent:["\n.fl-r[data-v-bd6001ac] {\n float: right;\n}\n.fr[data-v-bd6001ac] {\n float: right;\n}\n.fl[data-v-bd6001ac] {\n float: left;\n}\n.main-block[data-v-bd6001ac] {\n margin: 5px;\n background: white;\n padding: 5px;\n}\n.clear-both[data-v-bd6001ac]:after {\n content: '';\n display: block;\n clear: both;\n}\n@-webkit-keyframes myfirst-data-v-bd6001ac {\n0% {\n -webkit-transform: scale(1);\n}\n50% {\n -webkit-transform: scale(1.1);\n}\n100% {\n -webkit-transform: scale(1);\n}\n}\n.van-button--info[data-v-bd6001ac] {\n background: #40A9FF;\n border: 1px solid #40A9FF;\n}\n.van-popup[data-v-bd6001ac] {\n background: transparent;\n}\n.ellipsisCss[data-v-bd6001ac] {\n overflow: hidden;\n -o-text-overflow: ellipsis;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n.transparentBtn[data-v-bd6001ac] {\n width: 32vw;\n height: 10.13333333vw;\n border: 1px solid white;\n color: white;\n text-align: center;\n line-height: 10.13333333vw;\n font-size: 4vw;\n border-radius: 5.33333333vw;\n}\ni[data-v-bd6001ac] {\n font-style: normal;\n}\n.ly-activity-page[data-v-bd6001ac] {\n position: relative;\n}\n.ly-activity-page img[data-v-bd6001ac] {\n width: 100%;\n}\n.ly-activity-page .btn[data-v-bd6001ac] {\n position: absolute;\n width: 56vw;\n height: 13.33333333vw;\n background: transparent;\n z-index: 10;\n top: 0;\n left: 24vw;\n}\n.ly-activity-page .btn1[data-v-bd6001ac] {\n top: 70.4vw;\n}\n.ly-activity-page .btn2[data-v-bd6001ac] {\n top: 166.4vw;\n}\n.ly-activity-page .btn3[data-v-bd6001ac] {\n top: 326.4vw;\n}\n.ly-activity-page .btn4[data-v-bd6001ac] {\n top: 467.73333333vw;\n}\n.ly-activity-page .btn5[data-v-bd6001ac] {\n top: 622.4vw;\n}\n"],sourceRoot:""}])},f1wB:function(n,t,a){n.exports=a.p+"static/img/13@2x.557f316.png"},"gm/f":function(n,t,a){n.exports=a.p+"static/img/14@2x.7f5b342.png"},it1F:function(n,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=a("M+++"),A=a.n(i),e=a("VTuM"),o=a.n(e),c=a("f1wB"),d=a.n(c),s=a("gm/f"),r=a.n(s),v=(a("CCn6"),{name:"extensionV1",data:function(){return{img1:A.a,img2:o.a,img3:d.a,img4:r.a}},components:{},methods:{initPage:function(){},nav:function(){this.$router.push({name:"extensionV1Shop",query:{shopId:2}})}},mounted:function(){this.initPage()}}),C=function(){var n=this,t=n.$createElement,a=n._self._c||t;return a("div",{staticClass:"ly-activity-page"},[a("img",{attrs:{src:n.img1,alt:""}}),n._v(" "),a("img",{attrs:{src:n.img2,alt:""}}),n._v(" "),a("img",{attrs:{src:n.img3,alt:""}}),n._v(" "),a("img",{attrs:{src:n.img4,alt:""}}),n._v(" "),a("div",{staticClass:"btn1 btn",on:{click:n.nav}}),n._v(" "),a("div",{staticClass:"btn2 btn",on:{click:n.nav}}),n._v(" "),a("div",{staticClass:"btn3 btn",on:{click:n.nav}}),n._v(" "),a("div",{staticClass:"btn4 btn",on:{click:n.nav}}),n._v(" "),a("div",{staticClass:"btn5 btn",on:{click:n.nav}})])};C._withStripped=!0;var l={render:C,staticRenderFns:[]},b=l;var p=!1;var f=a("VU/8")(v,b,!1,function(n){p||a("FgGf")},"data-v-bd6001ac",null);f.options.__file="src/components/activity/extensionV1.vue";t.default=f.exports}});
\ No newline at end of file
dist/static/js/23.c9ca476f161685cfc1db.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/24.d28f421254641ee6240c.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/25.2aec44292ca8a7f4d773.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/26.90f95355f4999c507466.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/27.14417f0a63a4de5fdc1b.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/28.6f7b7f5155c4787a2851.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/29.e166012c7d68e0230f85.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/30.d6949b6a407c6f77564a.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/31.1e3c8e63235db66879e5.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/32.d494177aad804ca9e139.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/33.40a36e635ab23245496b.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/34.481cee4e3407f0772555.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/35.049b75b06f616c4d7687.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/36.33fd9443eca7186bd78a.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/37.387a0f6c39e912c0e844.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/38.bcde7803bd7201b82e1b.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/39.4d13253138f0ad098b23.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/40.df490584d5524e769a1f.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/41.2d0949e14872f28dcdd9.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/42.ced1113ce62871b6d809.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/43.acc88e80cd881d00f5a3.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/44.71781ad4238c7f66d5db.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/45.ae23788a3abfa30255f3.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/46.97d0384734961e580fad.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/47.092b718b5a8211aee269.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/48.01e4fa38155cee98daeb.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/49.83d3afab7e4d587b2b18.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/50.9b341aa6e1175956090e.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/51.f7c2e1f7805ae37942ae.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/52.1a2b44ddfb618e210c13.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/53.34f568545237bd327f17.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/54.1f1351d3e2eb66870bc5.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/55.3c9b49aa5f568bd28272.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/56.850a2a72f5cac7b39e5b.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/57.2c739f835f434ed8e5fd.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/58.1988cd306d0e500569a0.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/59.3c45272d31ebf496d04e.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/60.97ba1fb09d6b41ec9fd2.js 0 → 100644
View file @ 561e13af
webpackJsonp([60],{"+N17":function(e,n,t){(e.exports=t("FZ+f")(!0)).push([e.i,"","",{version:3,sources:[],names:[],mappings:"",file:"navShare.vue",sourceRoot:""}])},oB2U:function(e,n,t){var o=t("+N17");"string"==typeof o&&(o=[[e.i,o,""]]),o.locals&&(e.exports=o.locals);t("rjj0")("c0a18e0e",o,!1,{})},w9jd:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var o=t("CCn6"),r={name:"navShare",mounted:function(){var e=this;Object(o.I)().then(function(n){e.shopId=n.id,e.$router.push({name:"buyDetail",query:{invite_code:e.$route.query.invite_code,shopId:e.shopId}})})},data:function(){return{}}},s=function(){var e=this.$createElement;return(this._self._c||e)("div",{staticClass:"nofinish-block"})};s._withStripped=!0;var a={render:s,staticRenderFns:[]},i=a;var u=!1;var c=t("VU/8")(r,i,!1,function(e){u||t("oB2U")},"data-v-18aa337a",null);c.options.__file="src/components/newLesson/navShare.vue";n.default=c.exports}});
\ No newline at end of file
dist/static/js/61.626a3506faee124c08d4.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/app.fb6e7ff70a0c81e7ef11.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/manifest.77c162b6c73c5338490c.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
dist/static/js/vendor.eb2fd737d78619d0ba95.js 0 → 100644
View file @ 561e13af
This diff is collapsed.
src/components/activity/extensionV1.vue 0 → 100644
View file @ 561e13af
This diff is collapsed.
src/components/activity/extensionV1Shop.vue 0 → 100644
View file @ 561e13af
This diff is collapsed.
src/components/buy/spcShop.vue
View file @ 561e13af
This diff is collapsed.
src/components/map/index.vue
View file @ 561e13af
This diff is collapsed.
src/components/newLesson/video.vue
View file @ 561e13af
......@@ -203,7 +203,6 @@ export default {
} else {
this.orientationchange = false;
}
// console.log(this.orientationchange);
window.addEventListener(
"orientationchange",
() => {
......
src/components/youbang/ybPaySuccess.vue
View file @ 561e13af
This diff is collapsed.
src/router/index.js
View file @ 561e13af
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