Skip to content

H
h5-base
Commit 8f203f2b authored by IvyXia123's avatar IvyXia123
Browse files
Options

Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre

parents c6d12ed0 9fddeb6d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 493 additions and 57 deletions
dist/index.html
View file @ 8f203f2b
......@@ -11,4 +11,4 @@
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.6b96feddb085a4e571f4.js></script><script type=text/javascript src=static/js/vendor.c6fbc888f93ccac33136.js></script><script type=text/javascript src=static/js/app.15eed2f70a20194faf90.js></script></body></html>
\ No newline at end of file
/* 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>
\ No newline at end of file
dist/static/js/12.3b4cd03528e061c10fe8.js 0 → 100644
View file @ 8f203f2b
This diff is collapsed.
dist/static/js/12.bb15d3646ad06af5433b.js deleted 100644 → 0
View file @ c6d12ed0
This diff is collapsed.
dist/static/js/13.5e0ffd777f1f45690e71.js 0 → 100644
View file @ 8f203f2b
This diff is collapsed.
dist/static/js/13.b02930589a633523d0a9.js → dist/static/js/14.5fab46d1539e8d8e9959.js
View file @ 8f203f2b
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.937fb2936f4011e0ecdb.js → dist/static/js/19.8aea9d608af5e12b6142.js
View file @ 8f203f2b
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.726b2eb0846f8a8cae74.js → dist/static/js/20.6762620ad2ff94b2955d.js
View file @ 8f203f2b
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/22.7a4db8f5f0aad9831416.js 0 → 100644
View file @ 8f203f2b
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/21.959dc648ef4c09104245.js → dist/static/js/23.c9ca476f161685cfc1db.js
View file @ 8f203f2b
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/49.d862226dfc8aa085cc6b.js → dist/static/js/51.f7c2e1f7805ae37942ae.js
View file @ 8f203f2b
webpackJsonp([49],{RYpB:function(r,n,e){(r.exports=e("FZ+f")(!0)).push([r.i,"\n.error-page[data-v-ea0f4bb0] {\n text-align: center;\n padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n width: 50%;\n margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n font-size: 24px;\n color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n font-size: 14px;\n display: inline-block;\n border: 1px solid #53b4ca;\n color: #53b4ca;\n padding: 5px;\n border-radius: 4px;\n margin-top: 20px;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/h5/wechat/src/components/error.vue"],names:[],mappings:";AACA;EACE,mBAAmB;EACnB,mBAAmB;CACpB;AACD;EACE,WAAW;EACX,oBAAoB;CACrB;AACD;EACE,gBAAgB;EAChB,YAAY;CACb;AACD;EACE,gBAAgB;EAChB,sBAAsB;EACtB,0BAA0B;EAC1B,eAAe;EACf,aAAa;EACb,mBAAmB;EACnB,iBAAiB;CAClB",file:"error.vue",sourcesContent:["\n.error-page[data-v-ea0f4bb0] {\n text-align: center;\n padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n width: 50%;\n margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n font-size: 24px;\n color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n font-size: 14px;\n display: inline-block;\n border: 1px solid #53b4ca;\n color: #53b4ca;\n padding: 5px;\n border-radius: 4px;\n margin-top: 20px;\n}\n"],sourceRoot:""}])},Zazt:function(r,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var t=e("3xxH"),a=e.n(t),o={name:"error",data:function(){return{errorImageUrl:a.a}}},i=function(){var r=this,n=r.$createElement,e=r._self._c||n;return e("div",{staticClass:"error-page"},[e("img",{attrs:{src:r.errorImageUrl}}),r._v(" "),e("div",{staticClass:"error-text"},[r._v("\n 404! 很抱歉，页面未找到\n "),e("br"),r._v(" "),e("div",{staticClass:"button",on:{click:function(n){r.$router.push({name:"index"})}}},[r._v("返回首页")])])])};i._withStripped=!0;var s={render:i,staticRenderFns:[]},p=s;var A=!1;var c=e("VU/8")(o,p,!1,function(r){A||e("zqTw")},"data-v-ea0f4bb0",null);c.options.__file="src/components/error.vue";n.default=c.exports},zqTw:function(r,n,e){var t=e("RYpB");"string"==typeof t&&(t=[[r.i,t,""]]),t.locals&&(r.exports=t.locals);e("rjj0")("7406b040",t,!1,{})}});
\ No newline at end of file
webpackJsonp([51],{RYpB:function(r,n,e){(r.exports=e("FZ+f")(!0)).push([r.i,"\n.error-page[data-v-ea0f4bb0] {\n text-align: center;\n padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n width: 50%;\n margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n font-size: 24px;\n color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n font-size: 14px;\n display: inline-block;\n border: 1px solid #53b4ca;\n color: #53b4ca;\n padding: 5px;\n border-radius: 4px;\n margin-top: 20px;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/h5/wechat/src/components/error.vue"],names:[],mappings:";AACA;EACE,mBAAmB;EACnB,mBAAmB;CACpB;AACD;EACE,WAAW;EACX,oBAAoB;CACrB;AACD;EACE,gBAAgB;EAChB,YAAY;CACb;AACD;EACE,gBAAgB;EAChB,sBAAsB;EACtB,0BAA0B;EAC1B,eAAe;EACf,aAAa;EACb,mBAAmB;EACnB,iBAAiB;CAClB",file:"error.vue",sourcesContent:["\n.error-page[data-v-ea0f4bb0] {\n text-align: center;\n padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n width: 50%;\n margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n font-size: 24px;\n color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n font-size: 14px;\n display: inline-block;\n border: 1px solid #53b4ca;\n color: #53b4ca;\n padding: 5px;\n border-radius: 4px;\n margin-top: 20px;\n}\n"],sourceRoot:""}])},Zazt:function(r,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var t=e("3xxH"),a=e.n(t),o={name:"error",data:function(){return{errorImageUrl:a.a}}},i=function(){var r=this,n=r.$createElement,e=r._self._c||n;return e("div",{staticClass:"error-page"},[e("img",{attrs:{src:r.errorImageUrl}}),r._v(" "),e("div",{staticClass:"error-text"},[r._v("\n 404! 很抱歉，页面未找到\n "),e("br"),r._v(" "),e("div",{staticClass:"button",on:{click:function(n){r.$router.push({name:"index"})}}},[r._v("返回首页")])])])};i._withStripped=!0;var s={render:i,staticRenderFns:[]},p=s;var A=!1;var c=e("VU/8")(o,p,!1,function(r){A||e("zqTw")},"data-v-ea0f4bb0",null);c.options.__file="src/components/error.vue";n.default=c.exports},zqTw:function(r,n,e){var t=e("RYpB");"string"==typeof t&&(t=[[r.i,t,""]]),t.locals&&(r.exports=t.locals);e("rjj0")("7406b040",t,!1,{})}});
\ No newline at end of file
dist/static/js/manifest.6b96feddb085a4e571f4.js deleted 100644 → 0
View file @ c6d12ed0
This diff is collapsed.
dist/static/js/manifest.77c162b6c73c5338490c.js 0 → 100644
View file @ 8f203f2b
This diff is collapsed.
src/components/activity/extensionV1.vue 0 → 100644
View file @ 8f203f2b
This diff is collapsed.
src/components/activity/extensionV1Shop.vue 0 → 100644
View file @ 8f203f2b
This diff is collapsed.
src/components/buy/spcShop.vue
View file @ 8f203f2b
......@@ -72,7 +72,6 @@ import {sendMobileCodeApi,getUserDetailApi,bindMobileApi,getGoodsDetailApi} from
},
bindMobile(){
this.$sa.quick('trackHeatMap',this.$refs.btn)
if(this.msgCode===''||!this.msgCode) {
Toast('请填写手机验证码');
return false;
......
src/components/map/index.vue
View file @ 8f203f2b
......@@ -541,10 +541,10 @@
this.parent_category_id = i.category_id
}
}
if(res.length>0 && i.status !== 1 && i.status !== 2){
this.parent_category_id = i.category_id
this.unitList.push(i)
}
// if(res.length>0 && i.status !== 1 && i.status !== 2){
// this.parent_category_id = i.category_id
// this.unitList.push(i)
// }
});
// 跳回上次看课主题
if(this.$route.query.parent_category_id&&res.length!=1){
......
src/components/youbang/ybPaySuccess.vue
View file @ 8f203f2b
This diff is collapsed.
src/router/index.js
View file @ 8f203f2b
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