627

b3c4a880 · chenyishuai@singsingenglish.com · 79f97c9a · 9842fff7 · b3c4a880 · b3c4a880
Commit b3c4a880 authored Jun 27, 2019 by chenyishuai@singsingenglish.com
240 changed files
--- a/build/postcss.config.js
+++ b/build/postcss.config.js
+module.exports = {
+    plugins: [
+        require('autoprefixer')
+    ]
+}
\ No newline at end of file
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -19,7 +19,6 @@ const devWebpackConfig = merge(baseWebpackConfig, {
  },
  // cheap-module-eval-source-map is faster for development
  devtool: config.dev.devtool,
-
  // these devServer options should be customized in /config/index.js
  devServer: {
    clientLogLevel: 'warning',

--- a/config/index.js
+++ b/config/index.js
@@ -24,7 +24,7 @@ module.exports = {
    // host: '192.168.31.185', // can be overwritten by process.env.HOST
    // host: 'localhost', // can be overwritten by process.env.HOST
    port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
+    autoOpenBrowser: true,
    errorOverlay: true,
    notifyOnErrors: true,
    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-

--- a/dev/index.html
+++ b/dev/index.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><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
+<<<<<<< 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><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 {
@@ -6,4 +11,16 @@
          overflow: hidden;
          position: fixed;
          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.e8742ac03569444e6b90.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.1f8c30d70cea6823b3d5.js></script></body></html>
+        }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.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.ab2aeb00416b1e394454.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.f6e5ed6ae64930d49df8.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><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;
+    }</style><link href=static/css/app.bf89c67cb6a818994fcc9e7a2f1754db.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.c6157807a001be171834.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.8aabab9d2e0d5ed8aac0.js></script></body></html>
+>>>>>>> 09aa55d3109bc214f6e8c569c3af02dce62bccd6
--- a/dev/static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css
+++ b/dev/static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css
--- a/dev/static/img/iconfont.6f2ece6.svg
+++ b/dev/static/img/iconfont.6f2ece6.svg
@@ -53,6 +53,9 @@ Created by iconfont
    <glyph glyph-name="pengyouquan" unicode="&#58901;" d="M676.864 848.896S611.328 875.52 510.976 875.52 346.112 844.8 346.112 844.8L675.84 512V848.896zM855.04 732.16c-70.656 69.632-137.216 94.208-137.216 94.208l-2.048-466.944 237.568 238.592s-28.672 65.536-98.304 134.144z m111.616-184.32L634.88 219.13599999999997v-2.048h335.872s26.624 65.536 26.624 165.888-30.72 164.864-30.72 164.864zM718.848-61.440000000000055s65.536 28.672 134.144 98.304c68.608 71.68 94.208 138.24 94.208 138.24l-466.944 2.048L718.848-61.440000000000055zM345.088 256v-335.872s65.536-26.624 165.888-26.624 165.888 30.72 165.888 30.72L346.112 256h-1.024zM169.984 36.86400000000003c71.68-68.608 138.24-94.208 138.24-94.208l2.048 466.944L71.68 172.03200000000004s28.672-65.536 98.304-135.168zM54.272 549.8879999999999S27.648 484.352 27.648 384s30.72-165.888 30.72-165.888L390.144 547.8399999999999l-335.872 2.048zM304.128 830.4639999999999S238.592 803.84 169.984 732.16c-69.632-70.656-94.208-138.24-94.208-138.24l466.944-2.048L304.128 830.4639999999999z m0 0"  horiz-adv-x="1024" />

    
+    <glyph glyph-name="icon_edit" unicode="&#58902;" d="M677.079579-100.190316H346.920421c-175.696842 0-319.488 143.791158-319.488 319.488V552.151579C27.486316 727.848421 171.223579 871.585684 346.920421 871.585684h330.159158c15.952842 0 26.624-10.617263 26.624-26.624 0-15.952842-10.671158-26.624-26.624-26.624H346.920421a266.994526 266.994526 0 0 1-266.24-266.24v-330.105263a266.994526 266.994526 0 0 1 266.24-266.24h330.159158a266.994526 266.994526 0 0 1 266.24 266.24V552.097684c0 16.006737 10.617263 26.624 26.624 26.624 15.952842 0 26.624-10.617263 26.624-26.624v-330.105263c2.694737-178.391579-143.791158-322.182737-319.488-322.182737zM462.255158 363.735579a21.935158 21.935158 0 0 0-16.922947 7.275789 23.390316 23.390316 0 0 0 0 33.792L928.821895 888.293053c9.701053 9.701053 24.198737 9.701053 33.845894 0 9.701053-9.701053 9.701053-24.144842 0-33.845895l-483.435789-483.43579a26.138947 26.138947 0 0 0-16.976842-7.275789z"  horiz-adv-x="1024" />
+
+    
    <glyph glyph-name="yanjing" unicode="&#58921;" d="M511.948323 647.192308c-293.14141 0-448.565249-277.992385-448.565249-277.992385s167.818123-247.090585 448.565249-247.090585c280.767592 0 448.604134 247.090585 448.604134 247.090585S822.670134 647.192308 511.948323 647.192308zM512.223592 226.479407c-89.384773 0-161.849178 70.711482-161.849178 157.924799 0 87.212294 72.464405 157.924799 161.849178 157.924799 89.384773 0 161.849178-70.712505 161.849178-157.924799C674.072771 297.190889 601.607342 226.479407 512.223592 226.479407zM511.967766 448.800865c-39.134299 0-70.857814-31.467689-70.857814-70.273507 0-38.805818 31.723515-70.273507 70.857814-70.273507s70.857814 31.467689 70.857814 70.273507C582.82558 417.333176 551.102065 448.800865 511.967766 448.800865z"  horiz-adv-x="1024" />

    

--- a/dev/static/img/img_0@2x.ec211b6.png
+++ b/dev/static/img/img_0@2x.ec211b6.png
--- a/dev/static/img/img_cc@2x.5d81c14.png
+++ b/dev/static/img/img_cc@2x.5d81c14.png
--- a/dev/static/img/img_lola@3x.6594b90.png
+++ b/dev/static/img/img_lola@3x.6594b90.png
--- a/dev/static/img/popup_img@2x.afca647.png
+++ b/dev/static/img/popup_img@2x.afca647.png
--- a/dev/static/img/prize1.11e8615.png
+++ b/dev/static/img/prize1.11e8615.png
--- a/dev/static/img/prize2.58f05c6.png
+++ b/dev/static/img/prize2.58f05c6.png
--- a/dev/static/img/rankBg.4289b8f.png
+++ b/dev/static/img/rankBg.4289b8f.png
--- a/dev/static/img/rankBg.50157ab.png
+++ b/dev/static/img/rankBg.50157ab.png
--- a/dev/static/js/0.e0a157264831bd2b9901.js
+++ b/dev/static/js/0.e0a157264831bd2b9901.js
--- a/dev/static/js/1.067eb29318c0050830ab.js
+++ b/dev/static/js/1.067eb29318c0050830ab.js
--- a/dev/static/js/1.23fbc292a7349b6e54ad.js
+++ b/dev/static/js/1.23fbc292a7349b6e54ad.js
--- a/dev/static/js/1.2d406400ec3c8d3cf042.js
+++ b/dev/static/js/1.2d406400ec3c8d3cf042.js
--- a/dev/static/js/10.34cdf9432767e3bc8f10.js
+++ b/dev/static/js/10.34cdf9432767e3bc8f10.js
--- a/dev/static/js/10.5f9319e15ee95037acfb.js
+++ b/dev/static/js/10.5f9319e15ee95037acfb.js
--- a/dev/static/js/10.de3e0e9cd5ee98d6c928.js
+++ b/dev/static/js/10.de3e0e9cd5ee98d6c928.js
--- a/dev/static/js/11.63527e5eb89ffdf9ff28.js
+++ b/dev/static/js/11.63527e5eb89ffdf9ff28.js
--- a/dev/static/js/11.999ca58352a66c145dde.js
+++ b/dev/static/js/11.999ca58352a66c145dde.js
--- a/dev/static/js/11.b0902bd724ca4e957e5d.js
+++ b/dev/static/js/11.b0902bd724ca4e957e5d.js
--- a/dev/static/js/12.0205190cf85d4284cdaf.js
+++ b/dev/static/js/12.0205190cf85d4284cdaf.js
--- a/dev/static/js/12.477f60ece425a6f8c08c.js
+++ b/dev/static/js/12.477f60ece425a6f8c08c.js
--- a/dev/static/js/12.569df6356ef277433bf8.js
+++ b/dev/static/js/12.569df6356ef277433bf8.js
--- a/dev/static/js/13.2569f79a79a47b4a391f.js
+++ b/dev/static/js/13.2569f79a79a47b4a391f.js
--- a/dev/static/js/13.80d75851ebf723ba0b00.js
+++ b/dev/static/js/13.80d75851ebf723ba0b00.js
--- a/dev/static/js/13.fd6ca3bcf8f583f1b60c.js
+++ b/dev/static/js/13.fd6ca3bcf8f583f1b60c.js
--- a/dev/static/js/14.49e2faaa5a02eff36984.js
+++ b/dev/static/js/14.49e2faaa5a02eff36984.js
--- a/dev/static/js/14.8bb922f838d25b2abceb.js
+++ b/dev/static/js/14.8bb922f838d25b2abceb.js
--- a/dev/static/js/14.faf8b426fde50aebbf71.js
+++ b/dev/static/js/14.faf8b426fde50aebbf71.js
--- a/dev/static/js/15.9d6cc6367f21cfbac19e.js
+++ b/dev/static/js/15.9d6cc6367f21cfbac19e.js
--- a/dev/static/js/15.ccb1c58cac45d3963513.js
+++ b/dev/static/js/15.ccb1c58cac45d3963513.js
--- a/dev/static/js/16.00e013c2a2f2c1334bbc.js
+++ b/dev/static/js/16.00e013c2a2f2c1334bbc.js
--- a/dev/static/js/16.3b2d791b2189be05aee4.js
+++ b/dev/static/js/16.3b2d791b2189be05aee4.js
--- a/dev/static/js/15.7ed79964df837616767d.js
+++ b/dev/static/js/15.7ed79964df837616767d.js
--- a/dev/static/js/17.37acfb8d41847866afb0.js
+++ b/dev/static/js/17.37acfb8d41847866afb0.js
--- a/dev/static/js/17.8f68cb285149b65813a5.js
+++ b/dev/static/js/17.8f68cb285149b65813a5.js
--- a/dev/static/js/17.fec7400f11507033191b.js
+++ b/dev/static/js/17.fec7400f11507033191b.js
--- a/dev/static/js/18.1278e3d737b392d506cd.js
+++ b/dev/static/js/18.1278e3d737b392d506cd.js
--- a/dev/static/js/18.c5d36ed475bb21ff44cf.js
+++ b/dev/static/js/18.c5d36ed475bb21ff44cf.js
--- a/dev/static/js/18.f6d28946ec7e53987ea1.js
+++ b/dev/static/js/18.f6d28946ec7e53987ea1.js
--- a/dev/static/js/19.54a8798e8eefb0b18908.js
+++ b/dev/static/js/19.54a8798e8eefb0b18908.js
--- a/dev/static/js/19.c45b7d8940bb5405dc89.js
+++ b/dev/static/js/19.c45b7d8940bb5405dc89.js
--- a/dev/static/js/2.a2b6f17abe7cb598878f.js
+++ b/dev/static/js/2.a2b6f17abe7cb598878f.js
--- a/dev/static/js/2.c9e0de699f755ee4b23a.js
+++ b/dev/static/js/2.c9e0de699f755ee4b23a.js
--- a/dev/static/js/20.8b98e80acb1e2b230a38.js
+++ b/dev/static/js/20.8b98e80acb1e2b230a38.js
--- a/dev/static/js/20.ab27e2d0b0129e180716.js
+++ b/dev/static/js/20.ab27e2d0b0129e180716.js
--- a/dev/static/js/20.ea0e446648e88f1d76e4.js
+++ b/dev/static/js/20.ea0e446648e88f1d76e4.js
--- a/dev/static/js/21.49dc1a29463763f360e9.js
+++ b/dev/static/js/21.49dc1a29463763f360e9.js
--- a/dev/static/js/21.f62dfff013d1ecc467be.js
+++ b/dev/static/js/21.f62dfff013d1ecc467be.js
--- a/dev/static/js/19.3268052ca4bd9410680a.js
+++ b/dev/static/js/19.3268052ca4bd9410680a.js
--- a/dev/static/js/22.3c4cab830c67ecf293a5.js
+++ b/dev/static/js/22.3c4cab830c67ecf293a5.js
--- a/dev/static/js/22.3da1fccaeaf2f6373181.js
+++ b/dev/static/js/22.3da1fccaeaf2f6373181.js
--- a/dev/static/js/23.52c139bed6992be26830.js
+++ b/dev/static/js/23.52c139bed6992be26830.js
--- a/dev/static/js/23.a26d3df7389ff86a78d0.js
+++ b/dev/static/js/23.a26d3df7389ff86a78d0.js
--- a/dev/static/js/23.c7a3538c24e84ffbca11.js
+++ b/dev/static/js/23.c7a3538c24e84ffbca11.js
--- a/dev/static/js/24.4062f2405270447a1f29.js
+++ b/dev/static/js/24.4062f2405270447a1f29.js
--- a/dev/static/js/24.8a340b2eb201d4ea6005.js
+++ b/dev/static/js/24.8a340b2eb201d4ea6005.js
--- a/dev/static/js/24.e53eb8364cc245e0d427.js
+++ b/dev/static/js/24.e53eb8364cc245e0d427.js
--- a/dev/static/js/25.188b8b8d61cfc1e2594e.js
+++ b/dev/static/js/25.188b8b8d61cfc1e2594e.js
--- a/dev/static/js/25.62620e9bac18a036b452.js
+++ b/dev/static/js/25.62620e9bac18a036b452.js
--- a/dev/static/js/21.c5b97c20eeab081ca77e.js
+++ b/dev/static/js/21.c5b97c20eeab081ca77e.js
--- a/dev/static/js/26.e7edfe93285816532cc7.js
+++ b/dev/static/js/26.e7edfe93285816532cc7.js
--- a/dev/static/js/27.31c1e69da4f897ae4765.js
+++ b/dev/static/js/27.31c1e69da4f897ae4765.js
--- a/dev/static/js/27.fe4fde9d82a47889aa68.js
+++ b/dev/static/js/27.fe4fde9d82a47889aa68.js
--- a/dev/static/js/28.99da3828c1999d40671a.js
+++ b/dev/static/js/28.99da3828c1999d40671a.js
--- a/dev/static/js/28.c5d1b95b751fac943e16.js
+++ b/dev/static/js/28.c5d1b95b751fac943e16.js
--- a/dev/static/js/29.fa14b41d7c77e07c8120.js
+++ b/dev/static/js/29.fa14b41d7c77e07c8120.js
--- a/dev/static/js/3.2107f1b9e184ae98213a.js
+++ b/dev/static/js/3.2107f1b9e184ae98213a.js
--- a/dev/static/js/3.df615b23f17a30912d1b.js
+++ b/dev/static/js/3.df615b23f17a30912d1b.js
--- a/dev/static/js/25.313cea5f48b249877b34.js
+++ b/dev/static/js/25.313cea5f48b249877b34.js
--- a/dev/static/js/31.267ce6de032f1064248f.js
+++ b/dev/static/js/31.267ce6de032f1064248f.js
--- a/dev/static/js/32.832df5bf4f39f1bb1834.js
+++ b/dev/static/js/32.832df5bf4f39f1bb1834.js
--- a/dev/static/js/32.ae3b76d915bb2806347e.js
+++ b/dev/static/js/32.ae3b76d915bb2806347e.js
--- a/dev/static/js/33.2e1b9d5f6820a7d8549a.js
+++ b/dev/static/js/33.2e1b9d5f6820a7d8549a.js
--- a/dev/static/js/33.39cebaea98826b57334e.js
+++ b/dev/static/js/33.39cebaea98826b57334e.js
--- a/dev/static/js/34.2ef07273df25c5998fc7.js
+++ b/dev/static/js/34.2ef07273df25c5998fc7.js
--- a/dev/static/js/34.f2ee32a691908d9a608a.js
+++ b/dev/static/js/34.f2ee32a691908d9a608a.js
--- a/dev/static/js/35.068ee442ab172ea186e8.js
+++ b/dev/static/js/35.068ee442ab172ea186e8.js
--- a/dev/static/js/35.274cdbfff100dfc9a090.js
+++ b/dev/static/js/35.274cdbfff100dfc9a090.js
--- a/dev/static/js/29.e8e761c78046800c6650.js
+++ b/dev/static/js/29.e8e761c78046800c6650.js
--- a/dev/static/js/30.8ebee59adc0d50a69b2a.js
+++ b/dev/static/js/30.8ebee59adc0d50a69b2a.js
--- a/dev/static/js/36.c9ac77f5e6bf5d548349.js
+++ b/dev/static/js/36.c9ac77f5e6bf5d548349.js
--- a/dev/static/js/37.2163df37097ba17a8388.js
+++ b/dev/static/js/37.2163df37097ba17a8388.js
--- a/dev/static/js/31.afcf5da192d3fe4638b8.js
+++ b/dev/static/js/31.afcf5da192d3fe4638b8.js
--- a/dev/static/js/38.39491e7ffa5846071712.js
+++ b/dev/static/js/38.39491e7ffa5846071712.js
--- a/dev/static/js/38.484fb0d46b52bbc4cf54.js
+++ b/dev/static/js/38.484fb0d46b52bbc4cf54.js
--- a/dev/static/js/39.2eebc8580c2465fe6f3e.js
+++ b/dev/static/js/39.2eebc8580c2465fe6f3e.js
--- a/dev/static/js/4.81f114f6d9f17c65242c.js
+++ b/dev/static/js/4.81f114f6d9f17c65242c.js
--- a/dev/static/js/40.3d668485588329ab6b7d.js
+++ b/dev/static/js/40.3d668485588329ab6b7d.js
--- a/dev/static/js/41.333a8bf40e2fefa8f501.js
+++ b/dev/static/js/41.333a8bf40e2fefa8f501.js
--- a/dev/static/js/42.0f9cba645d90bf0157fd.js
+++ b/dev/static/js/42.0f9cba645d90bf0157fd.js
--- a/dev/static/js/43.6d2a78fce59048b83178.js
+++ b/dev/static/js/43.6d2a78fce59048b83178.js
--- a/dev/static/js/5.4b301c8e740a130f1af9.js
+++ b/dev/static/js/5.4b301c8e740a130f1af9.js
--- a/dev/static/js/6.ad1648da69d720d39bfb.js
+++ b/dev/static/js/6.ad1648da69d720d39bfb.js
--- a/dev/static/js/7.11e7e2fc748750ad1dc3.js
+++ b/dev/static/js/7.11e7e2fc748750ad1dc3.js
--- a/dev/static/js/7.444d7b0abf9c5e1daf59.js
+++ b/dev/static/js/7.444d7b0abf9c5e1daf59.js
--- a/dev/static/js/7.d38ff3f7521ea990c842.js
+++ b/dev/static/js/7.d38ff3f7521ea990c842.js
--- a/dev/static/js/8.28436d121bb2eef7b629.js
+++ b/dev/static/js/8.28436d121bb2eef7b629.js
--- a/dev/static/js/8.4c37bd70d65f96539867.js
+++ b/dev/static/js/8.4c37bd70d65f96539867.js
--- a/dev/static/js/9.6c3e0678c0b9a1755e94.js
+++ b/dev/static/js/9.6c3e0678c0b9a1755e94.js
--- a/dev/static/js/9.f556b559f60a57bd98c7.js
+++ b/dev/static/js/9.f556b559f60a57bd98c7.js
--- a/dev/static/js/app.1f8c30d70cea6823b3d5.js
+++ b/dev/static/js/app.1f8c30d70cea6823b3d5.js
--- a/dev/static/js/app.39407b15d4282a93c0e2.js
+++ b/dev/static/js/app.39407b15d4282a93c0e2.js
--- a/dev/static/js/app.8aabab9d2e0d5ed8aac0.js
+++ b/dev/static/js/app.8aabab9d2e0d5ed8aac0.js
--- a/dev/static/js/app.f6e5ed6ae64930d49df8.js
+++ b/dev/static/js/app.f6e5ed6ae64930d49df8.js
--- a/dev/static/js/manifest.aa67a11fb0847f602dd1.js
+++ b/dev/static/js/manifest.aa67a11fb0847f602dd1.js
--- a/dev/static/js/manifest.ab2aeb00416b1e394454.js
+++ b/dev/static/js/manifest.ab2aeb00416b1e394454.js
--- a/dev/static/js/manifest.c6157807a001be171834.js
+++ b/dev/static/js/manifest.c6157807a001be171834.js
--- a/dev/static/js/manifest.e8742ac03569444e6b90.js
+++ b/dev/static/js/manifest.e8742ac03569444e6b90.js
--- a/dev/static/js/vendor.1396ea78033e4259211e.js
+++ b/dev/static/js/vendor.1396ea78033e4259211e.js
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/app.a239ee69eeb12ff8f852f34857de81b2.css
+++ b/dist/static/css/app.a239ee69eeb12ff8f852f34857de81b2.css
--- a/dist/static/css/app.b40fbfa30cda9fcc4d61aa9208a442f4.css
+++ b/dist/static/css/app.b40fbfa30cda9fcc4d61aa9208a442f4.css
--- a/dist/static/img/iconfont.6f2ece6.svg
+++ b/dist/static/img/iconfont.6f2ece6.svg
--- a/dist/static/img/img_0@2x.ec211b6.png
+++ b/dist/static/img/img_0@2x.ec211b6.png
--- a/dist/static/img/img_cc@2x.5d81c14.png
+++ b/dist/static/img/img_cc@2x.5d81c14.png
--- a/dist/static/img/img_lola@3x.6594b90.png
+++ b/dist/static/img/img_lola@3x.6594b90.png
--- a/dist/static/img/prize1.11e8615.png
+++ b/dist/static/img/prize1.11e8615.png
--- a/dist/static/img/prize2.58f05c6.png
+++ b/dist/static/img/prize2.58f05c6.png
--- a/dist/static/img/rankBg.4289b8f.png
+++ b/dist/static/img/rankBg.4289b8f.png
--- a/dist/static/img/rankBg.50157ab.png
+++ b/dist/static/img/rankBg.50157ab.png
--- a/dist/static/js/0.c707a2ece93092d38f0d.js
+++ b/dist/static/js/0.c707a2ece93092d38f0d.js
--- a/dist/static/js/1.9408ce41fe50dc380e68.js
+++ b/dist/static/js/1.9408ce41fe50dc380e68.js
--- a/dist/static/js/1.9a2a96fc2fca75253f80.js
+++ b/dist/static/js/1.9a2a96fc2fca75253f80.js
--- a/dist/static/js/10.473e59e09a4aafcb4b03.js
+++ b/dist/static/js/10.473e59e09a4aafcb4b03.js
--- a/dist/static/js/11.6ce178bd0ea92598774c.js
+++ b/dist/static/js/11.6ce178bd0ea92598774c.js
--- a/dist/static/js/12.bddb064aaa2458ff299a.js
+++ b/dist/static/js/12.bddb064aaa2458ff299a.js
--- a/dist/static/js/12.3980f7aaa64326fce133.js
+++ b/dist/static/js/12.3980f7aaa64326fce133.js
--- a/dist/static/js/14.18b6e0da5c359c7f0704.js
+++ b/dist/static/js/14.18b6e0da5c359c7f0704.js
--- a/dist/static/js/14.4a7ce925bade1b7d216b.js
+++ b/dist/static/js/14.4a7ce925bade1b7d216b.js
--- a/dist/static/js/13.77bff8cf6268c3769aee.js
+++ b/dist/static/js/13.77bff8cf6268c3769aee.js
--- a/dist/static/js/15.452af7972d070f1e44b3.js
+++ b/dist/static/js/15.452af7972d070f1e44b3.js
--- a/dist/static/js/16.bb81b665d3e0497baebd.js
+++ b/dist/static/js/16.bb81b665d3e0497baebd.js
--- a/dist/static/js/17.4ad5a65f399c597027b1.js
+++ b/dist/static/js/17.4ad5a65f399c597027b1.js
--- a/dist/static/js/17.59ef88cfb8f91f67f11e.js
+++ b/dist/static/js/17.59ef88cfb8f91f67f11e.js
--- a/dist/static/js/18.05f9c35721eac07bb4ec.js
+++ b/dist/static/js/18.05f9c35721eac07bb4ec.js
--- a/dist/static/js/18.9a2cfa781176d1e63088.js
+++ b/dist/static/js/18.9a2cfa781176d1e63088.js
--- a/dist/static/js/16.91b72814d74187289e93.js
+++ b/dist/static/js/16.91b72814d74187289e93.js
--- a/dist/static/js/2.af17926d4188a47fa559.js
+++ b/dist/static/js/2.af17926d4188a47fa559.js
--- a/dist/static/js/20.c7ebb7c3f16d687632b6.js
+++ b/dist/static/js/20.c7ebb7c3f16d687632b6.js
--- a/dist/static/js/21.7115727a86936ce708bd.js
+++ b/dist/static/js/21.7115727a86936ce708bd.js
--- a/dist/static/js/19.ef5a0b2e9424a3974612.js
+++ b/dist/static/js/19.ef5a0b2e9424a3974612.js
--- a/dist/static/js/26.c60caa8590616bacdebe.js
+++ b/dist/static/js/26.c60caa8590616bacdebe.js
--- a/dist/static/js/22.dc1d325d11010271f72a.js
+++ b/dist/static/js/22.dc1d325d11010271f72a.js
--- a/dist/static/js/20.5a1de49161ec541bd1da.js
+++ b/dist/static/js/20.5a1de49161ec541bd1da.js
--- a/dist/static/js/24.f9336aecd154b9b853d4.js
+++ b/dist/static/js/24.f9336aecd154b9b853d4.js
--- a/dist/static/js/25.4d7321c49896b7590f3a.js
+++ b/dist/static/js/25.4d7321c49896b7590f3a.js
--- a/dist/static/js/26.3ed2129ad5cf17be2ea5.js
+++ b/dist/static/js/26.3ed2129ad5cf17be2ea5.js
--- a/dist/static/js/27.adbc70efbda5aa406712.js
+++ b/dist/static/js/27.adbc70efbda5aa406712.js
--- a/dist/static/js/28.bc0d8a114c3bd64b8040.js
+++ b/dist/static/js/28.bc0d8a114c3bd64b8040.js
--- a/dist/static/js/28.fbd23c9638afecf97cd3.js
+++ b/dist/static/js/28.fbd23c9638afecf97cd3.js
--- a/dist/static/js/29.c46083f05f42e18f8401.js
+++ b/dist/static/js/29.c46083f05f42e18f8401.js
--- a/dist/static/js/3.afb608b727d7fd83fcab.js
+++ b/dist/static/js/3.afb608b727d7fd83fcab.js
--- a/dist/static/js/3.c0badb91192ec0249035.js
+++ b/dist/static/js/3.c0badb91192ec0249035.js
--- a/dist/static/js/30.29dc91233bd41a01136c.js
+++ b/dist/static/js/30.29dc91233bd41a01136c.js
--- a/dist/static/js/24.6d91acfdf39f7cab0226.js
+++ b/dist/static/js/24.6d91acfdf39f7cab0226.js
--- a/dist/static/js/25.38260e12fa5d686b07df.js
+++ b/dist/static/js/25.38260e12fa5d686b07df.js
--- a/dist/static/js/23.5e23d7dba7291cb0a268.js
+++ b/dist/static/js/23.5e23d7dba7291cb0a268.js
--- a/dist/static/js/27.d72694b7df42ac915833.js
+++ b/dist/static/js/27.d72694b7df42ac915833.js
--- a/dist/static/js/34.368bae3e6533ecddfd32.js
+++ b/dist/static/js/34.368bae3e6533ecddfd32.js
--- a/dist/static/js/29.66fdea08a0e5ae2743d2.js
+++ b/dist/static/js/29.66fdea08a0e5ae2743d2.js
--- a/dist/static/js/36.ce921a4b267c5bb10666.js
+++ b/dist/static/js/36.ce921a4b267c5bb10666.js
--- a/dist/static/js/37.6a9f99b7a47685df6501.js
+++ b/dist/static/js/37.6a9f99b7a47685df6501.js
--- a/dist/static/js/31.0d51e02a6dd77a82fd9e.js
+++ b/dist/static/js/31.0d51e02a6dd77a82fd9e.js
--- a/dist/static/js/32.a1211beacb031ed7d290.js
+++ b/dist/static/js/32.a1211beacb031ed7d290.js
--- a/dist/static/js/33.858434b6272d11836a53.js
+++ b/dist/static/js/33.858434b6272d11836a53.js
--- a/dist/static/js/4.6db1cf9aec288936a1fc.js
+++ b/dist/static/js/4.6db1cf9aec288936a1fc.js
--- a/dist/static/js/4.dfe445151430ef96373f.js
+++ b/dist/static/js/4.dfe445151430ef96373f.js
--- a/dist/static/js/34.3fd6b1b3773f09245c6e.js
+++ b/dist/static/js/34.3fd6b1b3773f09245c6e.js
--- a/dist/static/js/35.66a9731a65c88e7e24bc.js
+++ b/dist/static/js/35.66a9731a65c88e7e24bc.js
--- a/dist/static/js/36.022901d702932e43693b.js
+++ b/dist/static/js/36.022901d702932e43693b.js
--- a/dist/static/js/38.87e59dcccccc42f06865.js
+++ b/dist/static/js/38.87e59dcccccc42f06865.js
--- a/dist/static/js/5.926e573781a34a32b162.js
+++ b/dist/static/js/5.926e573781a34a32b162.js
--- a/dist/static/js/5.b11365e2be402c950778.js
+++ b/dist/static/js/5.b11365e2be402c950778.js
--- a/dist/static/js/6.31f496261e6faed40ff7.js
+++ b/dist/static/js/6.31f496261e6faed40ff7.js
--- a/dist/static/js/6.d5b1ae301836079f854c.js
+++ b/dist/static/js/6.d5b1ae301836079f854c.js
--- a/dist/static/js/7.ec4262182be7b7b65fb3.js
+++ b/dist/static/js/7.ec4262182be7b7b65fb3.js
--- a/dist/static/js/7.ff4bf11f2f7c6e077f98.js
+++ b/dist/static/js/7.ff4bf11f2f7c6e077f98.js
--- a/dist/static/js/8.93477714342846a912bc.js
+++ b/dist/static/js/8.93477714342846a912bc.js
--- a/dist/static/js/8.a37a9717f7fb0f8a5d77.js
+++ b/dist/static/js/8.a37a9717f7fb0f8a5d77.js
--- a/dist/static/js/9.88603fcaebd02a150de9.js
+++ b/dist/static/js/9.88603fcaebd02a150de9.js
--- a/dist/static/js/9.8ad33759ab632c2ffba8.js
+++ b/dist/static/js/9.8ad33759ab632c2ffba8.js
--- a/dist/static/js/app.0ae14211e1d5172a42e2.js
+++ b/dist/static/js/app.0ae14211e1d5172a42e2.js
--- a/dist/static/js/app.baf8eb0059f678b5090d.js
+++ b/dist/static/js/app.baf8eb0059f678b5090d.js
--- a/dist/static/js/manifest.1b7dcfd1df66902ce6e6.js
+++ b/dist/static/js/manifest.1b7dcfd1df66902ce6e6.js
--- a/dist/static/js/manifest.8ca59cec8b7c0675d8be.js
+++ b/dist/static/js/manifest.8ca59cec8b7c0675d8be.js
--- a/dist/static/js/vendor.0c05adfd96a1d8f3b647.js
+++ b/dist/static/js/vendor.0c05adfd96a1d8f3b647.js
--- a/dist/static/js/vendor.97cf94cdc128b0912fff.js
+++ b/dist/static/js/vendor.97cf94cdc128b0912fff.js
--- a/index.html
+++ b/index.html
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/App.vue
+++ b/src/App.vue
--- a/src/assets/img_cc@2x.png
+++ b/src/assets/img_cc@2x.png
--- a/src/assets/img_lola@3x.png
+++ b/src/assets/img_lola@3x.png
--- a/src/assets/rankBg.png
+++ b/src/assets/rankBg.png
--- a/src/assets/reflash2.png
+++ b/src/assets/reflash2.png
--- a/src/assets/shop/popup_img@2x.png
+++ b/src/assets/shop/popup_img@2x.png
--- a/src/assets/star/img_0@2x.png
+++ b/src/assets/star/img_0@2x.png
--- a/src/assets/star/img_bg_lose@2x.png
+++ b/src/assets/star/img_bg_lose@2x.png
--- a/src/assets/star/img_bg_win@2x.png
+++ b/src/assets/star/img_bg_win@2x.png
--- a/src/assets/star/img_title@2x.png
+++ b/src/assets/star/img_title@2x.png
--- a/src/assets/star/img_xingxing@2x.png
+++ b/src/assets/star/img_xingxing@2x.png
--- a/src/assets/star/prize1.png
+++ b/src/assets/star/prize1.png
--- a/src/assets/star/prize2.png
+++ b/src/assets/star/prize2.png
--- a/src/assets/yujiBg2.png
+++ b/src/assets/yujiBg2.png
--- a/src/base/scroll/scroll.vue
+++ b/src/base/scroll/scroll.vue
--- a/src/components/address-picker/addr.js
+++ b/src/components/address-picker/addr.js
--- a/src/components/buy/activity.vue
+++ b/src/components/buy/activity.vue
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
--- a/src/components/buy/login.vue
+++ b/src/components/buy/login.vue
--- a/src/components/collection/audio.vue
+++ b/src/components/collection/audio.vue
--- a/src/components/exChange.vue
+++ b/src/components/exChange.vue
--- a/src/components/index.vue
+++ b/src/components/index.vue
--- a/src/components/inspector/inspectorActivit.vue
+++ b/src/components/inspector/inspectorActivit.vue
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
--- a/src/components/mine/activityAddr.vue
+++ b/src/components/mine/activityAddr.vue
--- a/src/components/mine/address.vue
+++ b/src/components/mine/address.vue
--- a/src/components/mine/addressEdit.vue
+++ b/src/components/mine/addressEdit.vue
--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
--- a/src/components/newLesson/index.vue
+++ b/src/components/newLesson/index.vue
--- a/src/components/newLesson/shareGoods.vue
+++ b/src/components/newLesson/shareGoods.vue
--- a/src/components/newLesson/star.vue
+++ b/src/components/newLesson/star.vue
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
--- a/src/components/orderTrans/index.vue
+++ b/src/components/orderTrans/index.vue
--- a/src/components/star/detail.vue
+++ b/src/components/star/detail.vue
--- a/src/components/star/result.vue
+++ b/src/components/star/result.vue
--- a/src/components/star/starRank.vue
+++ b/src/components/star/starRank.vue
--- a/src/main.js
+++ b/src/main.js
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/service/api.js
+++ b/src/service/api.js
--- a/src/service/index.js
+++ b/src/service/index.js
--- a/src/util/common.js
+++ b/src/util/common.js
--- a/src/util/imgUrl.js
+++ b/src/util/imgUrl.js
--- a/src/util/public.less
+++ b/src/util/public.less