78

7b2dabed · chenyishuai@singsingenglish.com · ebf921fb · 7b2dabed · 7b2dabed · 7b2dabed
Commit 7b2dabed authored Jul 08, 2019 by chenyishuai@singsingenglish.com
116 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -11,8 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-<<<<<<< HEAD
+        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.68760f0a93cecf32940c.js></script><script type=text/javascript src=static/js/vendor.c8abe0aedd89f4f261ec.js></script><script type=text/javascript src=static/js/app.0ec21df9d091dfee8dbb.js></script></body></html>
-        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.b2755506590cb147be34.js></script><script type=text/javascript src=static/js/vendor.c8abe0aedd89f4f261ec.js></script><script type=text/javascript src=static/js/app.0ec21df9d091dfee8dbb.js></script></body></html>
\ No newline at end of file
-=======
-        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.b242a52a2222499a7e4f.js></script><script type=text/javascript src=static/js/vendor.a46051d06c394744be78.js></script><script type=text/javascript src=static/js/app.9f665e3c2b50295c5386.js></script></body></html>
->>>>>>> fefe1c22748b9baff52570d5f739f92afc655ea7
--- a/dev/static/ckplayer/ckplayer.js.gz
+++ b/dev/static/ckplayer/ckplayer.js.gz
--- a/dev/static/ckplayer/ckplayer.min.js.gz
+++ b/dev/static/ckplayer/ckplayer.min.js.gz
--- a/dev/static/ckplayer/hls/hls.js.gz
+++ b/dev/static/ckplayer/hls/hls.js.gz
--- a/dev/static/ckplayer/hls/hls.min.js.gz
+++ b/dev/static/ckplayer/hls/hls.min.js.gz
--- a/dev/static/css/app.91d2eea1dfca80994de99748f577fac4.css.gz
+++ b/dev/static/css/app.91d2eea1dfca80994de99748f577fac4.css.gz
--- a/dev/static/img/iconfont.86f5af5.svg
+++ b/dev/static/img/iconfont.86f5af5.svg
--- a/dev/static/js/0.68065f908bef79d1fed1.js
+++ b/dev/static/js/0.68065f908bef79d1fed1.js
--- a/dev/static/js/0.68065f908bef79d1fed1.js.gz
+++ b/dev/static/js/0.68065f908bef79d1fed1.js.gz
--- a/dev/static/js/1.ad3bd0a808e9237b7ec8.js
+++ b/dev/static/js/1.ad3bd0a808e9237b7ec8.js
--- a/dev/static/js/1.ad3bd0a808e9237b7ec8.js.gz
+++ b/dev/static/js/1.ad3bd0a808e9237b7ec8.js.gz
--- a/dev/static/js/10.e0a60e37b7bbfb9eee11.js
+++ b/dev/static/js/10.e0a60e37b7bbfb9eee11.js
--- a/dev/static/js/10.e0a60e37b7bbfb9eee11.js.gz
+++ b/dev/static/js/10.e0a60e37b7bbfb9eee11.js.gz
--- a/dev/static/js/11.564cff1ad445a3ad316b.js
+++ b/dev/static/js/11.564cff1ad445a3ad316b.js
--- a/dev/static/js/11.1835e6f969deb8107713.js.gz
+++ b/dev/static/js/11.1835e6f969deb8107713.js.gz
--- a/dev/static/js/11.564cff1ad445a3ad316b.js.gz
+++ b/dev/static/js/11.564cff1ad445a3ad316b.js.gz
--- a/dev/static/js/11.a1c9fab8800ed0a654ba.js
+++ b/dev/static/js/11.a1c9fab8800ed0a654ba.js
--- a/dev/static/js/11.a1c9fab8800ed0a654ba.js.gz
+++ b/dev/static/js/11.a1c9fab8800ed0a654ba.js.gz
--- a/dev/static/js/12.11deb5c7b1f79a85f273.js
+++ b/dev/static/js/12.11deb5c7b1f79a85f273.js
--- a/dev/static/js/12.11deb5c7b1f79a85f273.js.gz
+++ b/dev/static/js/12.11deb5c7b1f79a85f273.js.gz
--- a/dev/static/js/13.09a4716a1cf91d1b6901.js
+++ b/dev/static/js/13.09a4716a1cf91d1b6901.js
--- a/dev/static/js/13.09a4716a1cf91d1b6901.js.gz
+++ b/dev/static/js/13.09a4716a1cf91d1b6901.js.gz
--- a/dev/static/js/14.c1671446b1e33bd4fcb3.js
+++ b/dev/static/js/14.c1671446b1e33bd4fcb3.js
--- a/dev/static/js/14.c1671446b1e33bd4fcb3.js.gz
+++ b/dev/static/js/14.c1671446b1e33bd4fcb3.js.gz
--- a/dev/static/js/15.0d738e3913b1b444ff64.js
+++ b/dev/static/js/15.0d738e3913b1b444ff64.js
--- a/dev/static/js/15.0d738e3913b1b444ff64.js.gz
+++ b/dev/static/js/15.0d738e3913b1b444ff64.js.gz
--- a/dev/static/js/16.f1b967df9a296877b62c.js
+++ b/dev/static/js/16.f1b967df9a296877b62c.js
--- a/dev/static/js/16.f1b967df9a296877b62c.js.gz
+++ b/dev/static/js/16.f1b967df9a296877b62c.js.gz
--- a/dev/static/js/17.ed2ce05d1ea4f02d2dac.js
+++ b/dev/static/js/17.ed2ce05d1ea4f02d2dac.js
--- a/dev/static/js/17.ed2ce05d1ea4f02d2dac.js.gz
+++ b/dev/static/js/17.ed2ce05d1ea4f02d2dac.js.gz
--- a/dev/static/js/18.7f42c4ab5a08b757d07d.js
+++ b/dev/static/js/18.7f42c4ab5a08b757d07d.js
--- a/dev/static/js/18.7f42c4ab5a08b757d07d.js.gz
+++ b/dev/static/js/18.7f42c4ab5a08b757d07d.js.gz
--- a/dev/static/js/19.febc3dfafa2c06bdccdb.js
+++ b/dev/static/js/19.febc3dfafa2c06bdccdb.js
--- a/dev/static/js/19.febc3dfafa2c06bdccdb.js.gz
+++ b/dev/static/js/19.febc3dfafa2c06bdccdb.js.gz
--- a/dev/static/js/2.24a9fd35be48939d422d.js
+++ b/dev/static/js/2.24a9fd35be48939d422d.js
--- a/dev/static/js/2.24a9fd35be48939d422d.js.gz
+++ b/dev/static/js/2.24a9fd35be48939d422d.js.gz
--- a/dev/static/js/2.2d873c4bb5f72c134f43.js
+++ b/dev/static/js/2.2d873c4bb5f72c134f43.js
--- a/dev/static/js/2.2d873c4bb5f72c134f43.js.gz
+++ b/dev/static/js/2.2d873c4bb5f72c134f43.js.gz
--- a/dev/static/js/20.725d6270a95170e83cf6.js
+++ b/dev/static/js/20.725d6270a95170e83cf6.js
--- a/dev/static/js/20.725d6270a95170e83cf6.js.gz
+++ b/dev/static/js/20.725d6270a95170e83cf6.js.gz
--- a/dev/static/js/21.7e2b0bc68541860a2c30.js
+++ b/dev/static/js/21.7e2b0bc68541860a2c30.js
--- a/dev/static/js/21.7e2b0bc68541860a2c30.js.gz
+++ b/dev/static/js/21.7e2b0bc68541860a2c30.js.gz
--- a/dev/static/js/22.e5fc50b9330ab0a0d87d.js
+++ b/dev/static/js/22.e5fc50b9330ab0a0d87d.js
--- a/dev/static/js/22.e5fc50b9330ab0a0d87d.js.gz
+++ b/dev/static/js/22.e5fc50b9330ab0a0d87d.js.gz
--- a/dev/static/js/23.d9bd67bd126ac0c6904a.js
+++ b/dev/static/js/23.d9bd67bd126ac0c6904a.js
--- a/dev/static/js/23.d9bd67bd126ac0c6904a.js.gz
+++ b/dev/static/js/23.d9bd67bd126ac0c6904a.js.gz
--- a/dev/static/js/24.17c03ccc17fbe882a01f.js
+++ b/dev/static/js/24.17c03ccc17fbe882a01f.js
--- a/dev/static/js/24.17c03ccc17fbe882a01f.js.gz
+++ b/dev/static/js/24.17c03ccc17fbe882a01f.js.gz
--- a/dev/static/js/25.46c7d8eb74f1ab7faad5.js
+++ b/dev/static/js/25.46c7d8eb74f1ab7faad5.js
--- a/dev/static/js/25.46c7d8eb74f1ab7faad5.js.gz
+++ b/dev/static/js/25.46c7d8eb74f1ab7faad5.js.gz
--- a/dev/static/js/26.6b620ceed86fb783c95a.js
+++ b/dev/static/js/26.6b620ceed86fb783c95a.js
--- a/dev/static/js/26.6b620ceed86fb783c95a.js.gz
+++ b/dev/static/js/26.6b620ceed86fb783c95a.js.gz
--- a/dev/static/js/27.57117c35894b16b7b95c.js
+++ b/dev/static/js/27.57117c35894b16b7b95c.js
--- a/dev/static/js/27.57117c35894b16b7b95c.js.gz
+++ b/dev/static/js/27.57117c35894b16b7b95c.js.gz
--- a/dev/static/js/28.c12e610c9a121f8dfa4e.js
+++ b/dev/static/js/28.c12e610c9a121f8dfa4e.js
--- a/dev/static/js/28.c12e610c9a121f8dfa4e.js.gz
+++ b/dev/static/js/28.c12e610c9a121f8dfa4e.js.gz
--- a/dev/static/js/29.75632c1bf2488675dd8b.js
+++ b/dev/static/js/29.75632c1bf2488675dd8b.js
--- a/dev/static/js/29.75632c1bf2488675dd8b.js.gz
+++ b/dev/static/js/29.75632c1bf2488675dd8b.js.gz
--- a/dev/static/js/3.d7451b6cc2365128bfc5.js
+++ b/dev/static/js/3.d7451b6cc2365128bfc5.js
--- a/dev/static/js/3.d7451b6cc2365128bfc5.js.gz
+++ b/dev/static/js/3.d7451b6cc2365128bfc5.js.gz
--- a/dev/static/js/30.057bf2d50da287b7045b.js
+++ b/dev/static/js/30.057bf2d50da287b7045b.js
--- a/dev/static/js/30.057bf2d50da287b7045b.js.gz
+++ b/dev/static/js/30.057bf2d50da287b7045b.js.gz
--- a/dev/static/js/31.affd0c3b220c003c52a5.js
+++ b/dev/static/js/31.affd0c3b220c003c52a5.js
--- a/dev/static/js/32.ec1a639492057fdeb7e1.js
+++ b/dev/static/js/32.ec1a639492057fdeb7e1.js
--- a/dev/static/js/33.1b824b768e4541d2cb63.js
+++ b/dev/static/js/33.1b824b768e4541d2cb63.js
--- a/dev/static/js/33.1b824b768e4541d2cb63.js.gz
+++ b/dev/static/js/33.1b824b768e4541d2cb63.js.gz
--- a/dev/static/js/34.a1a201033760b3bd39d1.js
+++ b/dev/static/js/34.a1a201033760b3bd39d1.js
--- a/dev/static/js/34.a1a201033760b3bd39d1.js.gz
+++ b/dev/static/js/34.a1a201033760b3bd39d1.js.gz
--- a/dev/static/js/35.f600d42abe3abc4770c9.js
+++ b/dev/static/js/35.f600d42abe3abc4770c9.js
--- a/dev/static/js/35.f600d42abe3abc4770c9.js.gz
+++ b/dev/static/js/35.f600d42abe3abc4770c9.js.gz
--- a/dev/static/js/36.bf872966b60fbdc2a64a.js
+++ b/dev/static/js/36.bf872966b60fbdc2a64a.js
--- a/dev/static/js/37.36b9b127d88604b66350.js
+++ b/dev/static/js/37.36b9b127d88604b66350.js
--- a/dev/static/js/37.36b9b127d88604b66350.js.gz
+++ b/dev/static/js/37.36b9b127d88604b66350.js.gz
--- a/dev/static/js/38.f9fe5f2f50d3cf27331d.js
+++ b/dev/static/js/38.f9fe5f2f50d3cf27331d.js
--- a/dev/static/js/39.51a119c597a0b4b2fb06.js
+++ b/dev/static/js/39.51a119c597a0b4b2fb06.js
--- a/dev/static/js/4.735b6b61d1379b8eedf3.js
+++ b/dev/static/js/4.735b6b61d1379b8eedf3.js
--- a/dev/static/js/4.735b6b61d1379b8eedf3.js.gz
+++ b/dev/static/js/4.735b6b61d1379b8eedf3.js.gz
--- a/dev/static/js/40.f693c6fc06ea7c1d5635.js
+++ b/dev/static/js/40.f693c6fc06ea7c1d5635.js
-webpackJsonp([40],{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:["/Users/bory/Desktop/说唱教育/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 a=e("3xxH"),t=e.n(a),o={name:"error",data:function(){return{errorImageUrl:t.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 p={render:i,staticRenderFns:[]},s=p;var A=!1;var c=e("VU/8")(o,s,!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 a=e("RYpB");"string"==typeof a&&(a=[[r.i,a,""]]),a.locals&&(r.exports=a.locals);e("rjj0")("0cf4c8e0",a,!1,{})}});
\ No newline at end of file
--- a/dev/static/js/41.c11b3e66ca8d58b10505.js
+++ b/dev/static/js/41.c11b3e66ca8d58b10505.js
--- a/dev/static/js/42.858ee601470d6a7cd0a1.js
+++ b/dev/static/js/42.858ee601470d6a7cd0a1.js
--- a/dev/static/js/43.ef80c43f87b6f600c733.js
+++ b/dev/static/js/43.ef80c43f87b6f600c733.js
--- a/dev/static/js/43.ef80c43f87b6f600c733.js.gz
+++ b/dev/static/js/43.ef80c43f87b6f600c733.js.gz
--- a/dev/static/js/44.f95fd0a14398283d5dbb.js
+++ b/dev/static/js/44.f95fd0a14398283d5dbb.js
--- a/dev/static/js/45.3e86fb3318275c3c8cba.js
+++ b/dev/static/js/45.3e86fb3318275c3c8cba.js
--- a/dev/static/js/45.3e86fb3318275c3c8cba.js.gz
+++ b/dev/static/js/45.3e86fb3318275c3c8cba.js.gz
--- a/dev/static/js/46.e355d22a6b217b797afa.js
+++ b/dev/static/js/46.e355d22a6b217b797afa.js
--- a/dev/static/js/46.28cb2a74f3b688fd439e.js
+++ b/dev/static/js/46.28cb2a74f3b688fd439e.js
--- a/dev/static/js/5.4d2f99266e7ce6fec8fd.js
+++ b/dev/static/js/5.4d2f99266e7ce6fec8fd.js
--- a/dev/static/js/5.4d2f99266e7ce6fec8fd.js.gz
+++ b/dev/static/js/5.4d2f99266e7ce6fec8fd.js.gz
--- a/dev/static/js/5.d2e921278ae0380e03c1.js
+++ b/dev/static/js/5.d2e921278ae0380e03c1.js
--- a/dev/static/js/5.d2e921278ae0380e03c1.js.gz
+++ b/dev/static/js/5.d2e921278ae0380e03c1.js.gz
--- a/dev/static/js/6.61198bae9c6aade016ab.js
+++ b/dev/static/js/6.61198bae9c6aade016ab.js
--- a/dev/static/js/6.61198bae9c6aade016ab.js.gz
+++ b/dev/static/js/6.61198bae9c6aade016ab.js.gz
--- a/dev/static/js/7.894a0c2c74d5c3fe042a.js
+++ b/dev/static/js/7.894a0c2c74d5c3fe042a.js
--- a/dev/static/js/7.894a0c2c74d5c3fe042a.js.gz
+++ b/dev/static/js/7.894a0c2c74d5c3fe042a.js.gz
--- a/dev/static/js/7.b3556b89ed7cd8dcf025.js
+++ b/dev/static/js/7.b3556b89ed7cd8dcf025.js
--- a/dev/static/js/7.b3556b89ed7cd8dcf025.js.gz
+++ b/dev/static/js/7.b3556b89ed7cd8dcf025.js.gz
--- a/dev/static/js/7.fbbf2c751c6940b1d0fe.js
+++ b/dev/static/js/7.fbbf2c751c6940b1d0fe.js
--- a/dev/static/js/7.fbbf2c751c6940b1d0fe.js.gz
+++ b/dev/static/js/7.fbbf2c751c6940b1d0fe.js.gz
--- a/dev/static/js/8.ea64eb4e835888921a4e.js
+++ b/dev/static/js/8.ea64eb4e835888921a4e.js
--- a/dev/static/js/8.1d9849293682f67c2bc7.js.gz
+++ b/dev/static/js/8.1d9849293682f67c2bc7.js.gz
--- a/dev/static/js/8.68316dacaf4a07f65cbb.js
+++ b/dev/static/js/8.68316dacaf4a07f65cbb.js
--- a/dev/static/js/8.68316dacaf4a07f65cbb.js.gz
+++ b/dev/static/js/8.68316dacaf4a07f65cbb.js.gz
--- a/dev/static/js/8.ea64eb4e835888921a4e.js.gz
+++ b/dev/static/js/8.ea64eb4e835888921a4e.js.gz
--- a/dev/static/js/9.0785a94bb4c19f547d42.js.gz
+++ b/dev/static/js/9.0785a94bb4c19f547d42.js.gz
--- a/dev/static/js/9.669fe7514a360ae97844.js
+++ b/dev/static/js/9.669fe7514a360ae97844.js
--- a/dev/static/js/9.669fe7514a360ae97844.js.gz
+++ b/dev/static/js/9.669fe7514a360ae97844.js.gz
--- a/dev/static/js/9.0785a94bb4c19f547d42.js
+++ b/dev/static/js/9.0785a94bb4c19f547d42.js
--- a/dev/static/js/9.d1007dfea9c9c561273d.js.gz
+++ b/dev/static/js/9.d1007dfea9c9c561273d.js.gz
--- a/dev/static/js/app.9f665e3c2b50295c5386.js
+++ b/dev/static/js/app.9f665e3c2b50295c5386.js
--- a/dev/static/js/app.9f665e3c2b50295c5386.js.gz
+++ b/dev/static/js/app.9f665e3c2b50295c5386.js.gz
--- a/dev/static/js/manifest.b2755506590cb147be34.js
+++ b/dev/static/js/manifest.b2755506590cb147be34.js
--- a/dev/static/js/manifest.b242a52a2222499a7e4f.js
+++ b/dev/static/js/manifest.b242a52a2222499a7e4f.js
--- a/dev/static/js/vendor.a46051d06c394744be78.js.gz
+++ b/dev/static/js/vendor.a46051d06c394744be78.js.gz
--- a/dev/static/vconsole/vconsole.min.js.gz
+++ b/dev/static/vconsole/vconsole.min.js.gz
--- a/src/components/buy/inviteFriends.vue
+++ b/src/components/buy/inviteFriends.vue