Skip to content

H
h5-base
Commit 8c77eb04 authored by wangwei's avatar wangwei
Browse files
Options

Merge branch 'master' into new

parents 3def6194 e88c41e2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 50 deletions
dev/index.html
View file @ 8c77eb04
<!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></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.b2fc15b1008752346a14.js></script><script type=text/javascript src=static/js/vendor.f7071ab144d47917b1ae.js></script><script type=text/javascript src=static/js/app.b59094f7d69db8479d7e.js></script></body></html>
\ No newline at end of file
<!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></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.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 type=text/javascript src=static/js/manifest.17798a42ba8a43e1549d.js></script><script type=text/javascript src=static/js/vendor.f7071ab144d47917b1ae.js></script><script type=text/javascript src=static/js/app.65f1429e84ea66349da6.js></script></body></html>
\ No newline at end of file
dev/static/js/10.160d9afa22d8cc96b7a9.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dev/static/js/10.160d9afa22d8cc96b7a9.js.map 0 → 100644
View file @ 8c77eb04
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/10.97d5151894388f749eea.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dev/static/js/10.97d5151894388f749eea.js.map deleted 100644 → 0
View file @ 3def6194
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/12.9a5b81b0796e1ae76bd3.js → dev/static/js/12.e1d40279d195b0a3be2e.js
View file @ 8c77eb04
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/4.73e616ca42780c81bd91.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dev/static/js/4.73e616ca42780c81bd91.js.map 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dev/static/js/4.c41af7b10db43aa02c9d.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dev/static/js/4.c41af7b10db43aa02c9d.js.map deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dev/static/js/7.5be2961de2524f891b02.js.map
View file @ 8c77eb04
This diff is collapsed.
dev/static/js/manifest.b2fc15b1008752346a14.js → dev/static/js/manifest.17798a42ba8a43e1549d.js
View file @ 8c77eb04
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],a[f]&&u.push(a[f][0]),a[f]=0;for(d in c)Object.prototype.hasOwnProperty.call(c,d)&&(e[d]=c[d]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},a={27:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"b2eb1ec9d8299221df56",2:"fa22829657cbd48b57a2",3:"8467dbe01952d4a92d84",4:"c41af7b10db43aa02c9d",5:"a37b9ee5517eca783c3e",6:"d0a37c7d8cb37b5a174b",7:"5be2961de2524f891b02",8:"d7a2992973a909e2ce31",9:"48c80f053ed95d5b6f1f",10:"97d5151894388f749eea",11:"bc6a12683f541a273039",12:"9a5b81b0796e1ae76bd3",13:"6d70586cdd12c8eeaed6",14:"1148391e7d226d6066c6",15:"0ba19a6db1bf129f5208",16:"51999ddf6c7a6d54de89",17:"df3e2da1a421c147caa2",18:"01e443c19e4b3a3b7a9e",19:"dc2614b3ca5a489beffa",20:"dcf6fb4d43664f468070",21:"611f6b0e632e903d111b",22:"fd1d479796f391b122b0",23:"5339ec0eda272fc1180d",24:"63c6299b0fb80ca9398d"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=f,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.b2fc15b1008752346a14.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],a[f]&&u.push(a[f][0]),a[f]=0;for(d in c)Object.prototype.hasOwnProperty.call(c,d)&&(e[d]=c[d]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},a={27:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"dd7a4a4d6f66f918b161",1:"b2eb1ec9d8299221df56",2:"fa22829657cbd48b57a2",3:"8467dbe01952d4a92d84",4:"73e616ca42780c81bd91",5:"a37b9ee5517eca783c3e",6:"d0a37c7d8cb37b5a174b",7:"5be2961de2524f891b02",8:"d7a2992973a909e2ce31",9:"48c80f053ed95d5b6f1f",10:"160d9afa22d8cc96b7a9",11:"bc6a12683f541a273039",12:"e1d40279d195b0a3be2e",13:"6d70586cdd12c8eeaed6",14:"1148391e7d226d6066c6",15:"0ba19a6db1bf129f5208",16:"51999ddf6c7a6d54de89",17:"df3e2da1a421c147caa2",18:"01e443c19e4b3a3b7a9e",19:"dc2614b3ca5a489beffa",20:"dcf6fb4d43664f468070",21:"611f6b0e632e903d111b",22:"fd1d479796f391b122b0",23:"5339ec0eda272fc1180d",24:"63c6299b0fb80ca9398d"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=f,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.17798a42ba8a43e1549d.js.map
\ No newline at end of file
dist/index.html
View file @ 8c77eb04
<!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.b4b210af267b265ed4ba03ae9aae9644.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.a84066e1edcaeb8e965a.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.5aef421a70d4d5e6a4f6.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.ac28b1ee4ccabab906b4.js></script></body></html>
\ No newline at end of file
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.8ba0bd5638d57175e6a9434b57551ec7.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.95aeb4426055898a9b24.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.5aef421a70d4d5e6a4f6.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.64751acb4e444fb4cfdd.js></script></body></html>
\ No newline at end of file
dist/static/js/10.1d09a81ebfd0ee5dc760.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/10.1d09a81ebfd0ee5dc760.js.map deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/10.909a6b8490f86d09f501.js 0 → 100644
View file @ 8c77eb04
webpackJsonp([10],{"54Ry":function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var a=s("RjZ4"),o=s.n(a),n=s("LyMh"),i=s.n(n),c=s("CCn6"),l={name:"shareGoods",data:function(){return{shareGoodsBg:o.a,title_share_goods:i.a,userDetail:null,shopId:null,goodsDetail:null}},methods:{initPage:function(){var t=this;this.$sa.track("ViewInvitation",{salesID:this.$route.query.userID}),Object(c.s)(this.$route.query.userID).then(function(e){e.user_info.avatar=e.user_info.avatar.replace("http://","https://"),t.userDetail=e}),Object(c.u)().then(function(e){t.shopId=e[0].value,Object(c.h)(t.shopId).then(function(e){e.desc=JSON.parse(e.desc),t.goodsDetail=e})})},toBuy:function(t){1===t?this.$sa.track("buttonClick",{tabTitle:"打卡商品页",moduleTitle:"功能按钮",buttonType:"购买",buttonName:"马上报名1"}):this.$sa.track("buttonClick",{tabTitle:"打卡商品页",moduleTitle:"功能按钮",buttonType:"购买",buttonName:"马上报名2"}),window.location.href="https://wechat.changchangenglish.com/#/buy?shopId="+this.shopId+"&invite_code=CC-UDK-"+this.$route.query.userID}},mounted:function(){var t=this;this.initPage(),window.onscroll=function(){var e=document.documentElement.scrollTop||document.body.scrollTop;t.$refs.btn_block.style.opacity=e>500?1:0}}},u={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[t.userDetail?s("div",{staticClass:"share-good-head",style:{backgroundImage:"url('"+t.shareGoodsBg+"')"}},[s("img",{staticClass:"head",attrs:{src:t.userDetail.user_info.avatar}}),t._v(" "),s("div",{staticClass:"title",style:{backgroundImage:"url('"+t.title_share_goods+"')"}},[t._v("\n "+t._s(t.userDetail.user_info.nickname)+"\n ")]),t._v(" "),s("div",{staticClass:"day"},[t._v("\n "+t._s(t.userDetail.total_day)+"\n "),s("span",[t._v("\n Days\n ")])]),t._v(" "),s("div",{staticClass:"iknow",on:{click:function(e){t.toBuy(1)}}})]):t._e(),t._v(" "),t.goodsDetail?s("div",{staticClass:"good-content"},[s("div",{staticClass:"content",domProps:{innerHTML:t._s(t.goodsDetail.desc.detail)}}),t._v(" "),s("div",{ref:"btn_block",staticClass:"btn-block"},[s("div",{staticClass:"btn",on:{click:function(e){t.toBuy(2)}}},[t._v("\n 快去报名\n ")])])]):t._e()])},staticRenderFns:[]};var r=s("VU/8")(l,u,!1,function(t){s("bcjA"),s("s57c")},"data-v-27c832b3",null);e.default=r.exports},LyMh:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcIAAABsBAMAAAALV69cAAAAIVBMVEVHcEwAYkwFl3cFlnYFi2wFl3cFl3cFmHcAYUwGl3cDgWVH8oeMAAAACXRSTlMA/sJIJ+KQaa8h3je6AAACZElEQVR42u2cPUsDQRCGFz0/UooWJlUgUUh3ChbpoiCaLqgp0omNXJdChHQK/oDcp2y6lOZX6iYEIniTmxSy8+69/cE+zM7szOzcKpUr7/VkoCUovXvuqA203dJyFPl8QE8S4A8i34oXWpbu2XtUSxN3n16LI3xgErbEEUbom5S7TbcEEtZZhF2BhAmLcCSQ8JNFGAgkzMBDKTeYDgQSpiXhL2mJKglLwpLQasKbp77GU//0ZQl4rlHVWABeaVw1DeCeRtZQaJLNSsexTWiMuANO2FNtcMJYZDXPq/wDcMKsJAQgxPdD/FjaBSdMVAWccCzyhoKjugN56TY4oS+z+VtcqQv1IfhxYS4VsQvEnhN9GgVNKPa+lxNoFHTunYidLCmes0mdDmJkNFLHEoppObyA64ix4BEvjhsiO6IveT6I44a4jhiLnrXkuCGuI/rCRy8Kpt3IoSYSPk5atLCQOxK8XqtDw5jHRewUIf4uxSfEj6X45yF8ToPaFB46VFvg14fwNT5+nwa/19aGJYyVIz1v/HsL/LunLjBh4sgdsEaWG//MYA8n1p2YiQqgCTPlwGyip7HVUbvghI8OzHlXwAnHDvxREoATZsDlryuEKfiBbwg1uhwgzN+l4exLCMRkViV2aX6kmRzMtdHzrv8mb7HIfFtE1Hk4Nd8eK7v1bhZZo04LIqcJzceHlhOemUVWqZyGyrzNx2+WE+6bRZKZN9XxDq13w4UjEiY0Xe+RpmLNkbJdl1ScmU+cUEacWm9CY8QabULyFaXwQ9mvW2KTNte9hNVQElRg/X+/ZrbyGpjlItf/DUICuUSCELZjAAAAAElFTkSuQmCC"},RjZ4:function(t,e,s){t.exports=s.p+"static/img/shareGoodsBg.812a62b.png"},bcjA:function(t,e){},s57c:function(t,e){}});
//# sourceMappingURL=10.909a6b8490f86d09f501.js.map
\ No newline at end of file
dist/static/js/10.909a6b8490f86d09f501.js.map 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/12.640bd1b1e0d5a7804ab0.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/12.640bd1b1e0d5a7804ab0.js.map deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/15.6610d0f15c7615f8d221.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/15.6610d0f15c7615f8d221.js.map 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/4.2e6c66402167fefd8c86.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/4.2e6c66402167fefd8c86.js.map deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/4.da07f897f7959f3aab20.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/4.da07f897f7959f3aab20.js.map 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/7.35d283e202918628be0a.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/7.3c45ed9e6a8e30e386c7.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/9.2ed8bf2480c5191ac92a.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/9.2ed8bf2480c5191ac92a.js.map 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/9.3d038548b83100ba984a.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/9.3d038548b83100ba984a.js.map deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
dist/static/js/manifest.95aeb4426055898a9b24.js 0 → 100644
View file @ 8c77eb04
This diff is collapsed.
dist/static/js/manifest.a84066e1edcaeb8e965a.js deleted 100644 → 0
View file @ 3def6194
This diff is collapsed.
src/components/star/index.vue
View file @ 8c77eb04
......@@ -10,8 +10,8 @@
<img class="bg" :src="starbg_4"/>
</div>
<div class="btn-block" ref="btn_block">
<div class="btn" @click="refshow">
生成赠课海报
<div class="btn">
活动已结束
</div>
</div>
......@@ -346,7 +346,7 @@
width: 287*@toVw;
height: 44*@toVw;
margin: auto;
background: #FFAE17;
background: #ccc;
border-radius: 100*@toVw;
color: white;
line-height: 44*@toVw;
......
src/router/index.js
View file @ 8c77eb04
......@@ -211,7 +211,8 @@ const router =new Router({
name: 'mpShop',
component: e=>require(['@/components/buy/mpShop'],e),
meta:{
skip_login:false
skip_login:false,
noNew:true,
}
},
{
......
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