Merge branch 'master' into dev

# Conflicts: # src/router/index.js

Merge branch 'master' into dev
# Conflicts: # src/router/index.js
d622b710 · linking2014 · e594f4cb · 65d49375 · d622b710 · d622b710
Commit d622b710 authored Aug 15, 2019 by linking2014
415 changed files
--- a/.postcssrc.js
+++ b/.postcssrc.js
@@ -5,6 +5,6 @@ module.exports = {
    "postcss-import": {},
    "postcss-url": {},
    // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
+    "autoprefixer": {browsers: ['last 3 versions', 'ie >= 8', 'Chrome >= 34', 'Firefox >= 30', 'safari >= 6', 'android >= 4.0', 'ios >= 7']}
  }
 }
--- a/config/dev.env.js
+++ b/config/dev.env.js
 'use strict';
 const merge = require('webpack-merge');
 const prodEnv = require('./prod.env');
+// const ip = 'http://10.1.23.212:8085/'
 const ip = `http://${getIP()}:8085/`;
 function getIP() {

--- a/dev/index.html
+++ b/dev/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.129556e9383a4eca915187bdf43f354e.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.70d36f3b71a6728d7954.js></script><script type=text/javascript src=static/js/vendor.73706c7cc85e5a0dcf64.js></script><script type=text/javascript src=static/js/app.c53e7a3149a8250544bc.js></script></body></html>
+        /* 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.b8b393934e338d92c7dc.js></script><script type=text/javascript src=static/js/vendor.27f02851ee69967777eb.js></script><script type=text/javascript src=static/js/app.8066ab7f2fffe7f421c6.js></script></body></html>
\ No newline at end of file
--- a/dev/static/css/app.129556e9383a4eca915187bdf43f354e.css
+++ b/dev/static/css/app.129556e9383a4eca915187bdf43f354e.css
--- a/dev/static/css/app.f983055a19b69eb54137ee36031e8a72.css
+++ b/dev/static/css/app.f983055a19b69eb54137ee36031e8a72.css
--- a/dev/static/images/wechat/1.png
+++ b/dev/static/images/wechat/1.png
--- a/dev/static/images/wechat/10.png
+++ b/dev/static/images/wechat/10.png
--- a/dev/static/images/wechat/100.png
+++ b/dev/static/images/wechat/100.png
--- a/dev/static/images/wechat/101.png
+++ b/dev/static/images/wechat/101.png
--- a/dev/static/images/wechat/102.png
+++ b/dev/static/images/wechat/102.png
--- a/dev/static/images/wechat/103.png
+++ b/dev/static/images/wechat/103.png
--- a/dev/static/images/wechat/104.png
+++ b/dev/static/images/wechat/104.png
--- a/dev/static/images/wechat/105.png
+++ b/dev/static/images/wechat/105.png
--- a/dev/static/images/wechat/106.png
+++ b/dev/static/images/wechat/106.png
--- a/dev/static/images/wechat/107.png
+++ b/dev/static/images/wechat/107.png
--- a/dev/static/images/wechat/108.png
+++ b/dev/static/images/wechat/108.png
--- a/dev/static/images/wechat/109.png
+++ b/dev/static/images/wechat/109.png
--- a/dev/static/images/wechat/11.png
+++ b/dev/static/images/wechat/11.png
--- a/dev/static/images/wechat/110.png
+++ b/dev/static/images/wechat/110.png
--- a/dev/static/images/wechat/111.png
+++ b/dev/static/images/wechat/111.png
--- a/dev/static/images/wechat/112.png
+++ b/dev/static/images/wechat/112.png
--- a/dev/static/images/wechat/113.png
+++ b/dev/static/images/wechat/113.png
--- a/dev/static/images/wechat/114.png
+++ b/dev/static/images/wechat/114.png
--- a/dev/static/images/wechat/12.png
+++ b/dev/static/images/wechat/12.png
--- a/dev/static/images/wechat/13.png
+++ b/dev/static/images/wechat/13.png
--- a/dev/static/images/wechat/14.png
+++ b/dev/static/images/wechat/14.png
--- a/dev/static/images/wechat/15.png
+++ b/dev/static/images/wechat/15.png
--- a/dev/static/images/wechat/16.png
+++ b/dev/static/images/wechat/16.png
--- a/dev/static/images/wechat/17.png
+++ b/dev/static/images/wechat/17.png
--- a/dev/static/images/wechat/18.png
+++ b/dev/static/images/wechat/18.png
--- a/dev/static/images/wechat/19.png
+++ b/dev/static/images/wechat/19.png
--- a/dev/static/images/wechat/2.png
+++ b/dev/static/images/wechat/2.png
--- a/dev/static/images/wechat/20.png
+++ b/dev/static/images/wechat/20.png
--- a/dev/static/images/wechat/21.png
+++ b/dev/static/images/wechat/21.png
--- a/dev/static/images/wechat/22.png
+++ b/dev/static/images/wechat/22.png
--- a/dev/static/images/wechat/23.png
+++ b/dev/static/images/wechat/23.png
--- a/dev/static/images/wechat/24.png
+++ b/dev/static/images/wechat/24.png
--- a/dev/static/images/wechat/25.png
+++ b/dev/static/images/wechat/25.png
--- a/dev/static/images/wechat/26.png
+++ b/dev/static/images/wechat/26.png
--- a/dev/static/images/wechat/27.png
+++ b/dev/static/images/wechat/27.png
--- a/dev/static/images/wechat/28.png
+++ b/dev/static/images/wechat/28.png
--- a/dev/static/images/wechat/29.png
+++ b/dev/static/images/wechat/29.png
--- a/dev/static/images/wechat/3.png
+++ b/dev/static/images/wechat/3.png
--- a/dev/static/images/wechat/30.png
+++ b/dev/static/images/wechat/30.png
--- a/dev/static/images/wechat/31.png
+++ b/dev/static/images/wechat/31.png
--- a/dev/static/images/wechat/32.png
+++ b/dev/static/images/wechat/32.png
--- a/dev/static/images/wechat/33.png
+++ b/dev/static/images/wechat/33.png
--- a/dev/static/images/wechat/34.png
+++ b/dev/static/images/wechat/34.png
--- a/dev/static/images/wechat/35.png
+++ b/dev/static/images/wechat/35.png
--- a/dev/static/images/wechat/36.png
+++ b/dev/static/images/wechat/36.png
--- a/dev/static/images/wechat/37.png
+++ b/dev/static/images/wechat/37.png
--- a/dev/static/images/wechat/38.png
+++ b/dev/static/images/wechat/38.png
--- a/dev/static/images/wechat/39.png
+++ b/dev/static/images/wechat/39.png
--- a/dev/static/images/wechat/4.png
+++ b/dev/static/images/wechat/4.png
--- a/dev/static/images/wechat/40.png
+++ b/dev/static/images/wechat/40.png
--- a/dev/static/images/wechat/41.png
+++ b/dev/static/images/wechat/41.png
--- a/dev/static/images/wechat/42.png
+++ b/dev/static/images/wechat/42.png
--- a/dev/static/images/wechat/43.png
+++ b/dev/static/images/wechat/43.png
--- a/dev/static/images/wechat/44.png
+++ b/dev/static/images/wechat/44.png
--- a/dev/static/images/wechat/45.png
+++ b/dev/static/images/wechat/45.png
--- a/dev/static/images/wechat/46.png
+++ b/dev/static/images/wechat/46.png
--- a/dev/static/images/wechat/47.png
+++ b/dev/static/images/wechat/47.png
--- a/dev/static/images/wechat/48.png
+++ b/dev/static/images/wechat/48.png
--- a/dev/static/images/wechat/49.png
+++ b/dev/static/images/wechat/49.png
--- a/dev/static/images/wechat/5.png
+++ b/dev/static/images/wechat/5.png
--- a/dev/static/images/wechat/50.png
+++ b/dev/static/images/wechat/50.png
--- a/dev/static/images/wechat/51.png
+++ b/dev/static/images/wechat/51.png
--- a/dev/static/images/wechat/52.png
+++ b/dev/static/images/wechat/52.png
--- a/dev/static/images/wechat/53.png
+++ b/dev/static/images/wechat/53.png
--- a/dev/static/images/wechat/54.png
+++ b/dev/static/images/wechat/54.png
--- a/dev/static/images/wechat/55.png
+++ b/dev/static/images/wechat/55.png
--- a/dev/static/images/wechat/56.png
+++ b/dev/static/images/wechat/56.png
--- a/dev/static/images/wechat/57.png
+++ b/dev/static/images/wechat/57.png
--- a/dev/static/images/wechat/58.png
+++ b/dev/static/images/wechat/58.png
--- a/dev/static/images/wechat/59.png
+++ b/dev/static/images/wechat/59.png
--- a/dev/static/images/wechat/6.png
+++ b/dev/static/images/wechat/6.png
--- a/dev/static/images/wechat/60.png
+++ b/dev/static/images/wechat/60.png
--- a/dev/static/images/wechat/61.png
+++ b/dev/static/images/wechat/61.png
--- a/dev/static/images/wechat/62.png
+++ b/dev/static/images/wechat/62.png
--- a/dev/static/images/wechat/63.png
+++ b/dev/static/images/wechat/63.png
--- a/dev/static/images/wechat/64.png
+++ b/dev/static/images/wechat/64.png
--- a/dev/static/images/wechat/65.png
+++ b/dev/static/images/wechat/65.png
--- a/dev/static/images/wechat/66.png
+++ b/dev/static/images/wechat/66.png
--- a/dev/static/images/wechat/67.png
+++ b/dev/static/images/wechat/67.png
--- a/dev/static/images/wechat/68.png
+++ b/dev/static/images/wechat/68.png
--- a/dev/static/images/wechat/69.png
+++ b/dev/static/images/wechat/69.png
--- a/dev/static/images/wechat/7.png
+++ b/dev/static/images/wechat/7.png
--- a/dev/static/images/wechat/70.png
+++ b/dev/static/images/wechat/70.png
--- a/dev/static/images/wechat/71.png
+++ b/dev/static/images/wechat/71.png
--- a/dev/static/images/wechat/72.png
+++ b/dev/static/images/wechat/72.png
--- a/dev/static/images/wechat/73.png
+++ b/dev/static/images/wechat/73.png
--- a/dev/static/images/wechat/74.png
+++ b/dev/static/images/wechat/74.png
--- a/dev/static/images/wechat/75.png
+++ b/dev/static/images/wechat/75.png
--- a/dev/static/images/wechat/76.png
+++ b/dev/static/images/wechat/76.png
--- a/dev/static/images/wechat/77.png
+++ b/dev/static/images/wechat/77.png
--- a/dev/static/images/wechat/78.png
+++ b/dev/static/images/wechat/78.png
--- a/dev/static/images/wechat/79.png
+++ b/dev/static/images/wechat/79.png
--- a/dev/static/images/wechat/8.png
+++ b/dev/static/images/wechat/8.png
--- a/dev/static/images/wechat/80.png
+++ b/dev/static/images/wechat/80.png
--- a/dev/static/images/wechat/81.png
+++ b/dev/static/images/wechat/81.png
--- a/dev/static/images/wechat/82.png
+++ b/dev/static/images/wechat/82.png
--- a/dev/static/images/wechat/83.png
+++ b/dev/static/images/wechat/83.png
--- a/dev/static/images/wechat/84.png
+++ b/dev/static/images/wechat/84.png
--- a/dev/static/images/wechat/85.png
+++ b/dev/static/images/wechat/85.png
--- a/dev/static/images/wechat/86.png
+++ b/dev/static/images/wechat/86.png
--- a/dev/static/images/wechat/87.png
+++ b/dev/static/images/wechat/87.png
--- a/dev/static/images/wechat/88.png
+++ b/dev/static/images/wechat/88.png
--- a/dev/static/images/wechat/89.png
+++ b/dev/static/images/wechat/89.png
--- a/dev/static/images/wechat/9.png
+++ b/dev/static/images/wechat/9.png
--- a/dev/static/images/wechat/90.png
+++ b/dev/static/images/wechat/90.png
--- a/dev/static/images/wechat/91.png
+++ b/dev/static/images/wechat/91.png
--- a/dev/static/images/wechat/92.png
+++ b/dev/static/images/wechat/92.png
--- a/dev/static/images/wechat/93.png
+++ b/dev/static/images/wechat/93.png
--- a/dev/static/images/wechat/94.png
+++ b/dev/static/images/wechat/94.png
--- a/dev/static/images/wechat/95.png
+++ b/dev/static/images/wechat/95.png
--- a/dev/static/images/wechat/96.png
+++ b/dev/static/images/wechat/96.png
--- a/dev/static/images/wechat/97.png
+++ b/dev/static/images/wechat/97.png
--- a/dev/static/images/wechat/98.png
+++ b/dev/static/images/wechat/98.png
--- a/dev/static/images/wechat/99.png
+++ b/dev/static/images/wechat/99.png
--- a/dev/static/img/3.2707f7b.png
+++ b/dev/static/img/3.2707f7b.png
--- a/dev/static/img/3.4b5ea2d.png
+++ b/dev/static/img/3.4b5ea2d.png
--- a/dev/static/img/img1@2x.82c28a4.png
+++ b/dev/static/img/img1@2x.82c28a4.png
--- a/dev/static/img/img_bg@2x.59affd7.png
+++ b/dev/static/img/img_bg@2x.59affd7.png
--- a/dev/static/img/img_code@2x.1542ef1.png
+++ b/dev/static/img/img_code@2x.1542ef1.png
--- a/dev/static/js/1.174c49e20eb8ba808a0e.js
+++ b/dev/static/js/1.174c49e20eb8ba808a0e.js
--- a/dev/static/js/1.6796c85d4aa12a740758.js
+++ b/dev/static/js/1.6796c85d4aa12a740758.js
--- a/dev/static/js/10.5a734c88d2c8b3eeb9bc.js
+++ b/dev/static/js/10.5a734c88d2c8b3eeb9bc.js
--- a/dev/static/js/10.71f6e9a0f2df08b0c272.js
+++ b/dev/static/js/10.71f6e9a0f2df08b0c272.js
--- a/dev/static/js/11.61eb5c0c9a39c01376b2.js
+++ b/dev/static/js/11.61eb5c0c9a39c01376b2.js
--- a/dev/static/js/11.9aea05a9b3666afbf568.js
+++ b/dev/static/js/11.9aea05a9b3666afbf568.js
--- a/dev/static/js/12.bcab7c66214e4f9c08c4.js
+++ b/dev/static/js/12.bcab7c66214e4f9c08c4.js
--- a/dev/static/js/12.d57e82b1592dec4c9382.js
+++ b/dev/static/js/12.d57e82b1592dec4c9382.js
--- a/dev/static/js/13.34cae2d1adf30c2035de.js
+++ b/dev/static/js/13.34cae2d1adf30c2035de.js
--- a/dev/static/js/13.ceafa63083277625ecd9.js
+++ b/dev/static/js/13.ceafa63083277625ecd9.js
--- a/dev/static/js/14.0dbc59c71380b7cbd527.js
+++ b/dev/static/js/14.0dbc59c71380b7cbd527.js
--- a/dev/static/js/14.528e48bf389395047cb0.js
+++ b/dev/static/js/14.528e48bf389395047cb0.js
--- a/dev/static/js/15.24137f33ac09917e16b7.js
+++ b/dev/static/js/15.24137f33ac09917e16b7.js
--- a/dev/static/js/15.b49d96c63b9f5341c34d.js
+++ b/dev/static/js/15.b49d96c63b9f5341c34d.js
--- a/dev/static/js/16.52104b47fbca730b304a.js
+++ b/dev/static/js/16.52104b47fbca730b304a.js
--- a/dev/static/js/17.240e81ae1a7a304eba76.js
+++ b/dev/static/js/17.240e81ae1a7a304eba76.js
--- a/dev/static/js/17.8f5ece1e6919b9e01005.js
+++ b/dev/static/js/17.8f5ece1e6919b9e01005.js
--- a/dev/static/js/18.bb5a8bacd49acb96fc4f.js
+++ b/dev/static/js/18.bb5a8bacd49acb96fc4f.js
--- a/dev/static/js/18.d4b50a6780356ce0bd5a.js
+++ b/dev/static/js/18.d4b50a6780356ce0bd5a.js
--- a/dev/static/js/19.d25201144269c66aea78.js
+++ b/dev/static/js/19.d25201144269c66aea78.js
--- a/dev/static/js/19.f94848cf956ba783fda7.js
+++ b/dev/static/js/19.f94848cf956ba783fda7.js
--- a/dev/static/js/2.066d6174c3c9a691eaa9.js
+++ b/dev/static/js/2.066d6174c3c9a691eaa9.js
--- a/dev/static/js/2.4136a874b314b8ca9ce4.js
+++ b/dev/static/js/2.4136a874b314b8ca9ce4.js
--- a/dev/static/js/20.9804d31e0736db0fae01.js
+++ b/dev/static/js/20.9804d31e0736db0fae01.js
--- a/dev/static/js/20.d03f48a9610b137b4e0f.js
+++ b/dev/static/js/20.d03f48a9610b137b4e0f.js
--- a/dev/static/js/21.b997ff484fac31c5b224.js
+++ b/dev/static/js/21.b997ff484fac31c5b224.js
--- a/dev/static/js/22.982c17d60fc9e4ef1e06.js
+++ b/dev/static/js/22.982c17d60fc9e4ef1e06.js
--- a/dev/static/js/22.c052a1c5c450bf37d6c8.js
+++ b/dev/static/js/22.c052a1c5c450bf37d6c8.js
--- a/dev/static/js/23.5b5c94111e2f5948175f.js
+++ b/dev/static/js/23.5b5c94111e2f5948175f.js
--- a/dev/static/js/23.ce39f983d60c244e633d.js
+++ b/dev/static/js/23.ce39f983d60c244e633d.js
--- a/dev/static/js/24.62f0cd5963b95494b554.js
+++ b/dev/static/js/24.62f0cd5963b95494b554.js
--- a/dev/static/js/24.79de8a1ac89e75f8e716.js
+++ b/dev/static/js/24.79de8a1ac89e75f8e716.js
--- a/dev/static/js/25.122b608a52a4d0e3a634.js
+++ b/dev/static/js/25.122b608a52a4d0e3a634.js
--- a/dev/static/js/25.d39dc4835d15b0cbccbe.js
+++ b/dev/static/js/25.d39dc4835d15b0cbccbe.js
--- a/dev/static/js/26.06d2254ed26ea90684a7.js
+++ b/dev/static/js/26.06d2254ed26ea90684a7.js
--- a/dev/static/js/26.8824fe67fb3cfc7ce862.js
+++ b/dev/static/js/26.8824fe67fb3cfc7ce862.js
--- a/dev/static/js/27.9ddc1025300bb1c2693c.js
+++ b/dev/static/js/27.9ddc1025300bb1c2693c.js
--- a/dev/static/js/28.7b7736a6c2ac9d5b0532.js
+++ b/dev/static/js/28.7b7736a6c2ac9d5b0532.js
--- a/dev/static/js/28.ccbadb1a6013140d3188.js
+++ b/dev/static/js/28.ccbadb1a6013140d3188.js
--- a/dev/static/js/29.065ac0eb9f1c5854d593.js
+++ b/dev/static/js/29.065ac0eb9f1c5854d593.js
--- a/dev/static/js/29.6102c50c668fddfd78d2.js
+++ b/dev/static/js/29.6102c50c668fddfd78d2.js
--- a/dev/static/js/3.50c12e3bca64ab36825d.js
+++ b/dev/static/js/3.50c12e3bca64ab36825d.js
--- a/dev/static/js/30.3b525f7989dffd04a1fc.js
+++ b/dev/static/js/30.3b525f7989dffd04a1fc.js
--- a/dev/static/js/30.536e00702218e6b382d4.js
+++ b/dev/static/js/30.536e00702218e6b382d4.js
--- a/dev/static/js/31.4ead614db8323dcc2a1f.js
+++ b/dev/static/js/31.4ead614db8323dcc2a1f.js
--- a/dev/static/js/32.1f674625cefdd75ccd14.js
+++ b/dev/static/js/32.1f674625cefdd75ccd14.js
--- a/dev/static/js/32.94ddd814e9b03e928a6d.js
+++ b/dev/static/js/32.94ddd814e9b03e928a6d.js
--- a/dev/static/js/33.8190acb3ee6c8e1303fc.js
+++ b/dev/static/js/33.8190acb3ee6c8e1303fc.js
--- a/dev/static/js/33.90d93b69c2146ab91efa.js
+++ b/dev/static/js/33.90d93b69c2146ab91efa.js
--- a/dev/static/js/34.b9ef4765fd83fb3d7953.js
+++ b/dev/static/js/34.b9ef4765fd83fb3d7953.js
--- a/dev/static/js/35.7ef67142b581f2dc12a6.js
+++ b/dev/static/js/35.7ef67142b581f2dc12a6.js
--- a/dev/static/js/36.8390aabdb4ad1946d91c.js
+++ b/dev/static/js/36.8390aabdb4ad1946d91c.js
--- a/dev/static/js/37.55a8c45ac3c9ff1c9c9b.js
+++ b/dev/static/js/37.55a8c45ac3c9ff1c9c9b.js
--- a/dev/static/js/37.b4162ff2e52bf265d69d.js
+++ b/dev/static/js/37.b4162ff2e52bf265d69d.js
--- a/dev/static/js/38.5f8113bd2d6a3d98d119.js
+++ b/dev/static/js/38.5f8113bd2d6a3d98d119.js
--- a/dev/static/js/38.638f704b595d6a37cf26.js
+++ b/dev/static/js/38.638f704b595d6a37cf26.js
--- a/dev/static/js/39.2a976caba86abbcb8d2a.js
+++ b/dev/static/js/39.2a976caba86abbcb8d2a.js
--- a/dev/static/js/4.893b1912ad4e936038fe.js
+++ b/dev/static/js/4.893b1912ad4e936038fe.js
--- a/dev/static/js/4.e7472ee3fdd30df5c4ab.js
+++ b/dev/static/js/4.e7472ee3fdd30df5c4ab.js
--- a/dev/static/js/40.29e1a633f13f512f41bb.js
+++ b/dev/static/js/40.29e1a633f13f512f41bb.js
--- a/dev/static/js/40.8ca70d8e9be9e16e5248.js
+++ b/dev/static/js/40.8ca70d8e9be9e16e5248.js
--- a/dev/static/js/41.32eb8974d71889809623.js
+++ b/dev/static/js/41.32eb8974d71889809623.js
--- a/dev/static/js/42.1369f8a5d12f0a92e61c.js
+++ b/dev/static/js/42.1369f8a5d12f0a92e61c.js
--- a/dev/static/js/43.a92ffefe67498ec21a24.js
+++ b/dev/static/js/43.a92ffefe67498ec21a24.js
--- a/dev/static/js/43.d8594ec21c4db71e2f2d.js
+++ b/dev/static/js/43.d8594ec21c4db71e2f2d.js
--- a/dev/static/js/44.14f4da810aceafa9112d.js
+++ b/dev/static/js/44.14f4da810aceafa9112d.js
--- a/dev/static/js/44.5072df53495d854fed9e.js
+++ b/dev/static/js/44.5072df53495d854fed9e.js
--- a/dev/static/js/47.2f3f73870935b573d252.js
+++ b/dev/static/js/47.2f3f73870935b573d252.js
--- a/dev/static/js/47.f36a9533549440a78387.js
+++ b/dev/static/js/47.f36a9533549440a78387.js
--- a/dev/static/js/48.8dc41c736916e4f5c6b6.js
+++ b/dev/static/js/48.8dc41c736916e4f5c6b6.js
--- a/dev/static/js/49.8b1e708c45fd912337d1.js
+++ b/dev/static/js/49.8b1e708c45fd912337d1.js
--- a/dev/static/js/49.f3f120bdee8018b98099.js
+++ b/dev/static/js/49.f3f120bdee8018b98099.js
--- a/dev/static/js/5.b6df00df4dcb9e2ec9be.js
+++ b/dev/static/js/5.b6df00df4dcb9e2ec9be.js
--- a/dev/static/js/5.f0afa9ebb8caa72845af.js
+++ b/dev/static/js/5.f0afa9ebb8caa72845af.js
--- a/dev/static/js/50.355843aa8c0752f8e8af.js
+++ b/dev/static/js/50.355843aa8c0752f8e8af.js
--- a/dev/static/js/50.ec7a4852176256e1d07c.js
+++ b/dev/static/js/50.ec7a4852176256e1d07c.js
--- a/dev/static/js/51.72b25239de77d37de87b.js
+++ b/dev/static/js/51.72b25239de77d37de87b.js
--- a/dev/static/js/51.7e0c19eb3979101894b3.js
+++ b/dev/static/js/51.7e0c19eb3979101894b3.js
--- a/dev/static/js/52.40a1f33a814d036e7df7.js
+++ b/dev/static/js/52.40a1f33a814d036e7df7.js
--- a/dev/static/js/52.6f4c35610516f634f4ac.js
+++ b/dev/static/js/52.6f4c35610516f634f4ac.js
--- a/dev/static/js/53.da64e5ebf810234bbdb5.js
+++ b/dev/static/js/53.da64e5ebf810234bbdb5.js
--- a/dev/static/js/54.9d5adfae15a64552635c.js
+++ b/dev/static/js/54.9d5adfae15a64552635c.js
--- a/dev/static/js/54.d800c5652be3fc4d9bda.js
+++ b/dev/static/js/54.d800c5652be3fc4d9bda.js
--- a/dev/static/js/55.ac7b0db38926a5dbe1a4.js
+++ b/dev/static/js/55.ac7b0db38926a5dbe1a4.js
--- a/dev/static/js/56.ca2e696f111a5fec1012.js
+++ b/dev/static/js/56.ca2e696f111a5fec1012.js
--- a/dev/static/js/6.61700a27ce5813cf15df.js
+++ b/dev/static/js/6.61700a27ce5813cf15df.js
--- a/dev/static/js/6.a3fccf7f0cfd0e752d6c.js
+++ b/dev/static/js/6.a3fccf7f0cfd0e752d6c.js
--- a/dev/static/js/7.e693574a01be2e2c06d9.js
+++ b/dev/static/js/7.e693574a01be2e2c06d9.js
--- a/dev/static/js/7.fe52277fcb31738eafb9.js
+++ b/dev/static/js/7.fe52277fcb31738eafb9.js
--- a/dev/static/js/8.42f80e729b6010e2e9b3.js
+++ b/dev/static/js/8.42f80e729b6010e2e9b3.js
--- a/dev/static/js/8.a3b6a5d5b2e0ce0c84e7.js
+++ b/dev/static/js/8.a3b6a5d5b2e0ce0c84e7.js
--- a/dev/static/js/9.08ee562f51a489d20519.js
+++ b/dev/static/js/9.08ee562f51a489d20519.js
--- a/dev/static/js/9.33ee3798236d86d19de3.js
+++ b/dev/static/js/9.33ee3798236d86d19de3.js
--- a/dev/static/js/app.8066ab7f2fffe7f421c6.js
+++ b/dev/static/js/app.8066ab7f2fffe7f421c6.js
--- a/dev/static/js/app.c53e7a3149a8250544bc.js
+++ b/dev/static/js/app.c53e7a3149a8250544bc.js
--- a/dev/static/js/manifest.70d36f3b71a6728d7954.js
+++ b/dev/static/js/manifest.70d36f3b71a6728d7954.js
--- a/dev/static/js/manifest.b8b393934e338d92c7dc.js
+++ b/dev/static/js/manifest.b8b393934e338d92c7dc.js
--- a/dev/static/js/vendor-async.45d33674fbfe0ca5b89c.js
+++ b/dev/static/js/vendor-async.45d33674fbfe0ca5b89c.js
--- a/dev/static/js/vendor.73706c7cc85e5a0dcf64.js
+++ b/dev/static/js/vendor.73706c7cc85e5a0dcf64.js
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/css/app.18e110018c3c85158317e757f9b7e66d.css
+++ b/dist/static/css/app.18e110018c3c85158317e757f9b7e66d.css
--- a/dist/static/css/app.a6a69c6c9a063de70ee8ce3b6c2a5896.css
+++ b/dist/static/css/app.a6a69c6c9a063de70ee8ce3b6c2a5896.css
--- a/dist/static/images/wechat/1.png
+++ b/dist/static/images/wechat/1.png
--- a/dist/static/images/wechat/10.png
+++ b/dist/static/images/wechat/10.png
--- a/dist/static/images/wechat/100.png
+++ b/dist/static/images/wechat/100.png
--- a/dist/static/images/wechat/101.png
+++ b/dist/static/images/wechat/101.png
--- a/dist/static/images/wechat/102.png
+++ b/dist/static/images/wechat/102.png
--- a/dist/static/images/wechat/103.png
+++ b/dist/static/images/wechat/103.png
--- a/dist/static/images/wechat/104.png
+++ b/dist/static/images/wechat/104.png
--- a/dist/static/images/wechat/105.png
+++ b/dist/static/images/wechat/105.png
--- a/dist/static/images/wechat/106.png
+++ b/dist/static/images/wechat/106.png
--- a/dist/static/images/wechat/107.png
+++ b/dist/static/images/wechat/107.png
--- a/dist/static/images/wechat/108.png
+++ b/dist/static/images/wechat/108.png
--- a/dist/static/images/wechat/109.png
+++ b/dist/static/images/wechat/109.png
--- a/dist/static/images/wechat/11.png
+++ b/dist/static/images/wechat/11.png
--- a/dist/static/images/wechat/110.png
+++ b/dist/static/images/wechat/110.png
--- a/dist/static/images/wechat/111.png
+++ b/dist/static/images/wechat/111.png
--- a/dist/static/images/wechat/112.png
+++ b/dist/static/images/wechat/112.png
--- a/dist/static/images/wechat/113.png
+++ b/dist/static/images/wechat/113.png
--- a/dist/static/images/wechat/114.png
+++ b/dist/static/images/wechat/114.png
--- a/dist/static/images/wechat/12.png
+++ b/dist/static/images/wechat/12.png
--- a/dist/static/images/wechat/13.png
+++ b/dist/static/images/wechat/13.png
--- a/dist/static/images/wechat/14.png
+++ b/dist/static/images/wechat/14.png
--- a/dist/static/images/wechat/15.png
+++ b/dist/static/images/wechat/15.png
--- a/dist/static/images/wechat/16.png
+++ b/dist/static/images/wechat/16.png
--- a/dist/static/images/wechat/17.png
+++ b/dist/static/images/wechat/17.png
--- a/dist/static/images/wechat/18.png
+++ b/dist/static/images/wechat/18.png
--- a/dist/static/images/wechat/19.png
+++ b/dist/static/images/wechat/19.png
--- a/dist/static/images/wechat/2.png
+++ b/dist/static/images/wechat/2.png
--- a/dist/static/images/wechat/20.png
+++ b/dist/static/images/wechat/20.png
--- a/dist/static/images/wechat/21.png
+++ b/dist/static/images/wechat/21.png
--- a/dist/static/images/wechat/22.png
+++ b/dist/static/images/wechat/22.png
--- a/dist/static/images/wechat/23.png
+++ b/dist/static/images/wechat/23.png
--- a/dist/static/images/wechat/24.png
+++ b/dist/static/images/wechat/24.png
--- a/dist/static/images/wechat/25.png
+++ b/dist/static/images/wechat/25.png
--- a/dist/static/images/wechat/26.png
+++ b/dist/static/images/wechat/26.png
--- a/dist/static/images/wechat/27.png
+++ b/dist/static/images/wechat/27.png
--- a/dist/static/images/wechat/28.png
+++ b/dist/static/images/wechat/28.png
--- a/dist/static/images/wechat/29.png
+++ b/dist/static/images/wechat/29.png
--- a/dist/static/images/wechat/3.png
+++ b/dist/static/images/wechat/3.png
--- a/dist/static/images/wechat/30.png
+++ b/dist/static/images/wechat/30.png
--- a/dist/static/images/wechat/31.png
+++ b/dist/static/images/wechat/31.png
--- a/dist/static/images/wechat/32.png
+++ b/dist/static/images/wechat/32.png
--- a/dist/static/images/wechat/33.png
+++ b/dist/static/images/wechat/33.png
--- a/dist/static/images/wechat/34.png
+++ b/dist/static/images/wechat/34.png
--- a/dist/static/images/wechat/35.png
+++ b/dist/static/images/wechat/35.png
--- a/dist/static/images/wechat/36.png
+++ b/dist/static/images/wechat/36.png
--- a/dist/static/images/wechat/37.png
+++ b/dist/static/images/wechat/37.png
--- a/dist/static/images/wechat/38.png
+++ b/dist/static/images/wechat/38.png
--- a/dist/static/images/wechat/39.png
+++ b/dist/static/images/wechat/39.png
--- a/dist/static/images/wechat/4.png
+++ b/dist/static/images/wechat/4.png
--- a/dist/static/images/wechat/40.png
+++ b/dist/static/images/wechat/40.png
--- a/dist/static/images/wechat/41.png
+++ b/dist/static/images/wechat/41.png
--- a/dist/static/images/wechat/42.png
+++ b/dist/static/images/wechat/42.png
--- a/dist/static/images/wechat/43.png
+++ b/dist/static/images/wechat/43.png
--- a/dist/static/images/wechat/44.png
+++ b/dist/static/images/wechat/44.png
--- a/dist/static/images/wechat/45.png
+++ b/dist/static/images/wechat/45.png
--- a/dist/static/images/wechat/46.png
+++ b/dist/static/images/wechat/46.png
--- a/dist/static/images/wechat/47.png
+++ b/dist/static/images/wechat/47.png
--- a/dist/static/images/wechat/48.png
+++ b/dist/static/images/wechat/48.png
--- a/dist/static/images/wechat/49.png
+++ b/dist/static/images/wechat/49.png
--- a/dist/static/images/wechat/5.png
+++ b/dist/static/images/wechat/5.png
--- a/dist/static/images/wechat/50.png
+++ b/dist/static/images/wechat/50.png
--- a/dist/static/images/wechat/51.png
+++ b/dist/static/images/wechat/51.png
--- a/dist/static/images/wechat/52.png
+++ b/dist/static/images/wechat/52.png
--- a/dist/static/images/wechat/53.png
+++ b/dist/static/images/wechat/53.png
--- a/dist/static/images/wechat/54.png
+++ b/dist/static/images/wechat/54.png
--- a/dist/static/images/wechat/55.png
+++ b/dist/static/images/wechat/55.png
--- a/dist/static/images/wechat/56.png
+++ b/dist/static/images/wechat/56.png
--- a/dist/static/images/wechat/57.png
+++ b/dist/static/images/wechat/57.png
--- a/dist/static/images/wechat/58.png
+++ b/dist/static/images/wechat/58.png
--- a/dist/static/images/wechat/59.png
+++ b/dist/static/images/wechat/59.png
--- a/dist/static/images/wechat/6.png
+++ b/dist/static/images/wechat/6.png
--- a/dist/static/images/wechat/60.png
+++ b/dist/static/images/wechat/60.png
--- a/dist/static/images/wechat/61.png
+++ b/dist/static/images/wechat/61.png
--- a/dist/static/images/wechat/62.png
+++ b/dist/static/images/wechat/62.png
--- a/dist/static/images/wechat/63.png
+++ b/dist/static/images/wechat/63.png
--- a/dist/static/images/wechat/64.png
+++ b/dist/static/images/wechat/64.png
--- a/dist/static/images/wechat/65.png
+++ b/dist/static/images/wechat/65.png
--- a/dist/static/images/wechat/66.png
+++ b/dist/static/images/wechat/66.png
--- a/dist/static/images/wechat/67.png
+++ b/dist/static/images/wechat/67.png
--- a/dist/static/images/wechat/68.png
+++ b/dist/static/images/wechat/68.png
--- a/dist/static/images/wechat/69.png
+++ b/dist/static/images/wechat/69.png
--- a/dist/static/images/wechat/7.png
+++ b/dist/static/images/wechat/7.png
--- a/dist/static/images/wechat/70.png
+++ b/dist/static/images/wechat/70.png
--- a/dist/static/images/wechat/71.png
+++ b/dist/static/images/wechat/71.png
--- a/dist/static/images/wechat/72.png
+++ b/dist/static/images/wechat/72.png
--- a/dist/static/images/wechat/73.png
+++ b/dist/static/images/wechat/73.png
--- a/dist/static/images/wechat/74.png
+++ b/dist/static/images/wechat/74.png
--- a/dist/static/images/wechat/75.png
+++ b/dist/static/images/wechat/75.png
--- a/dist/static/images/wechat/76.png
+++ b/dist/static/images/wechat/76.png
--- a/dist/static/images/wechat/77.png
+++ b/dist/static/images/wechat/77.png
--- a/dist/static/images/wechat/78.png
+++ b/dist/static/images/wechat/78.png
--- a/dist/static/images/wechat/79.png
+++ b/dist/static/images/wechat/79.png
--- a/dist/static/images/wechat/8.png
+++ b/dist/static/images/wechat/8.png
--- a/dist/static/images/wechat/80.png
+++ b/dist/static/images/wechat/80.png
--- a/dist/static/images/wechat/81.png
+++ b/dist/static/images/wechat/81.png
--- a/dist/static/images/wechat/82.png
+++ b/dist/static/images/wechat/82.png
--- a/dist/static/images/wechat/83.png
+++ b/dist/static/images/wechat/83.png
--- a/dist/static/images/wechat/84.png
+++ b/dist/static/images/wechat/84.png
--- a/dist/static/images/wechat/85.png
+++ b/dist/static/images/wechat/85.png
--- a/dist/static/images/wechat/86.png
+++ b/dist/static/images/wechat/86.png
--- a/dist/static/images/wechat/87.png
+++ b/dist/static/images/wechat/87.png
--- a/dist/static/images/wechat/88.png
+++ b/dist/static/images/wechat/88.png
--- a/dist/static/images/wechat/89.png
+++ b/dist/static/images/wechat/89.png
--- a/dist/static/images/wechat/9.png
+++ b/dist/static/images/wechat/9.png
--- a/dist/static/images/wechat/90.png
+++ b/dist/static/images/wechat/90.png
--- a/dist/static/images/wechat/91.png
+++ b/dist/static/images/wechat/91.png
--- a/dist/static/images/wechat/92.png
+++ b/dist/static/images/wechat/92.png
--- a/dist/static/images/wechat/93.png
+++ b/dist/static/images/wechat/93.png
--- a/dist/static/images/wechat/94.png
+++ b/dist/static/images/wechat/94.png
--- a/dist/static/images/wechat/95.png
+++ b/dist/static/images/wechat/95.png
--- a/dist/static/images/wechat/96.png
+++ b/dist/static/images/wechat/96.png
--- a/dist/static/images/wechat/97.png
+++ b/dist/static/images/wechat/97.png
--- a/dist/static/images/wechat/98.png
+++ b/dist/static/images/wechat/98.png
--- a/dist/static/images/wechat/99.png
+++ b/dist/static/images/wechat/99.png
--- a/dist/static/img/3.2707f7b.png
+++ b/dist/static/img/3.2707f7b.png
--- a/dist/static/img/3.4b5ea2d.png
+++ b/dist/static/img/3.4b5ea2d.png
--- a/dist/static/img/img1@2x.82c28a4.png
+++ b/dist/static/img/img1@2x.82c28a4.png
--- a/dist/static/img/img_bg@2x.59affd7.png
+++ b/dist/static/img/img_bg@2x.59affd7.png
--- a/dist/static/img/img_code@2x.1542ef1.png
+++ b/dist/static/img/img_code@2x.1542ef1.png
--- a/dist/static/js/1.3760e15821ab1143076d.js
+++ b/dist/static/js/1.3760e15821ab1143076d.js
--- a/dist/static/js/1.44109df482beadd586e1.js
+++ b/dist/static/js/1.44109df482beadd586e1.js
--- a/dist/static/js/10.bc4d1a31e6ee7ebd92e8.js
+++ b/dist/static/js/10.bc4d1a31e6ee7ebd92e8.js
--- a/dist/static/js/10.bef6d4e341b775a97f83.js
+++ b/dist/static/js/10.bef6d4e341b775a97f83.js
--- a/dist/static/js/11.b60fd7f41b6c2f54e57c.js
+++ b/dist/static/js/11.b60fd7f41b6c2f54e57c.js
--- a/dist/static/js/11.bb1394074f64d936d665.js
+++ b/dist/static/js/11.bb1394074f64d936d665.js
--- a/dist/static/js/12.3c9d75965ce7e4990046.js
+++ b/dist/static/js/12.3c9d75965ce7e4990046.js
--- a/dist/static/js/12.5ab880c6151c09e0df5c.js
+++ b/dist/static/js/12.5ab880c6151c09e0df5c.js
--- a/dist/static/js/13.e1011f3a9c4b84c54249.js
+++ b/dist/static/js/13.e1011f3a9c4b84c54249.js
--- a/dist/static/js/13.9fef39d684db1848bc8a.js
+++ b/dist/static/js/13.9fef39d684db1848bc8a.js
--- a/dist/static/js/14.75682f8686831c27bf56.js
+++ b/dist/static/js/14.75682f8686831c27bf56.js
--- a/dist/static/js/15.b19505ba4462a5fe7b81.js
+++ b/dist/static/js/15.b19505ba4462a5fe7b81.js
--- a/dist/static/js/18.bfe9edb253850899a895.js
+++ b/dist/static/js/18.bfe9edb253850899a895.js
--- a/dist/static/js/18.6c05a360ca99e3a3daa0.js
+++ b/dist/static/js/18.6c05a360ca99e3a3daa0.js
--- a/dist/static/js/19.1658e82d16ece07c83a0.js
+++ b/dist/static/js/19.1658e82d16ece07c83a0.js
--- a/dist/static/js/20.caf9f0750e9e33d94655.js
+++ b/dist/static/js/20.caf9f0750e9e33d94655.js
--- a/dist/static/js/23.1867061e286ce629342f.js
+++ b/dist/static/js/23.1867061e286ce629342f.js
--- a/dist/static/js/23.1a6de10bb41940d03696.js
+++ b/dist/static/js/23.1a6de10bb41940d03696.js
--- a/dist/static/js/31.24302ba0d33b232de5b3.js
+++ b/dist/static/js/31.24302ba0d33b232de5b3.js
--- a/dist/static/js/31.3975ce159981b05f5da9.js
+++ b/dist/static/js/31.3975ce159981b05f5da9.js
--- a/dist/static/js/5.567f647510f347492927.js
+++ b/dist/static/js/5.567f647510f347492927.js
--- a/dist/static/js/5.769eb36e2ab2f002eb2b.js
+++ b/dist/static/js/5.769eb36e2ab2f002eb2b.js
--- a/dist/static/js/53.95516c99e2fcbd1feb45.js
+++ b/dist/static/js/53.95516c99e2fcbd1feb45.js
--- a/dist/static/js/53.cb1da81cfeb011c2b058.js
+++ b/dist/static/js/53.cb1da81cfeb011c2b058.js
--- a/dist/static/js/54.e0caab6eba1e640cbe06.js
+++ b/dist/static/js/54.e0caab6eba1e640cbe06.js
--- a/dist/static/js/6.15c9f91098c014975049.js
+++ b/dist/static/js/6.15c9f91098c014975049.js
--- a/dist/static/js/6.c3361ad582d55ae7e831.js
+++ b/dist/static/js/6.c3361ad582d55ae7e831.js
--- a/dist/static/js/7.84068345d744c5d57412.js
+++ b/dist/static/js/7.84068345d744c5d57412.js
--- a/dist/static/js/7.96406a46f74446d2f7c1.js
+++ b/dist/static/js/7.96406a46f74446d2f7c1.js
--- a/dist/static/js/8.334e04d2f04b793710fc.js
+++ b/dist/static/js/8.334e04d2f04b793710fc.js
--- a/dist/static/js/8.8686c5e733cc58cf3413.js
+++ b/dist/static/js/8.8686c5e733cc58cf3413.js
--- a/dist/static/js/9.82c3ffb701304943a037.js
+++ b/dist/static/js/9.82c3ffb701304943a037.js
--- a/dist/static/js/9.afa9c4b802067533da15.js
+++ b/dist/static/js/9.afa9c4b802067533da15.js
--- a/dist/static/js/app.92b81baaaf5463c9b7f2.js
+++ b/dist/static/js/app.92b81baaaf5463c9b7f2.js
--- a/dist/static/js/app.9f13e884d6c985f9c55b.js
+++ b/dist/static/js/app.9f13e884d6c985f9c55b.js
--- a/dist/static/js/manifest.4650b641a4fc980c0755.js
+++ b/dist/static/js/manifest.4650b641a4fc980c0755.js
--- a/dist/static/js/manifest.e3c4e1677b522b232b3d.js
+++ b/dist/static/js/manifest.e3c4e1677b522b232b3d.js
--- a/dist/static/js/vendor-async.d3ab6e3d81a7dc8c8d60.js
+++ b/dist/static/js/vendor-async.d3ab6e3d81a7dc8c8d60.js
--- a/dist/static/js/vendor.960c1d7adba1b2bd56d7.js
+++ b/dist/static/js/vendor.960c1d7adba1b2bd56d7.js
--- a/index.html
+++ b/index.html
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/assets/index/3.png
+++ b/src/assets/index/3.png
--- a/src/assets/newLesson/icon_right@2x.png
+++ b/src/assets/newLesson/icon_right@2x.png
--- a/src/assets/newLesson/img_show@2x.png
+++ b/src/assets/newLesson/img_show@2x.png
--- a/src/assets/yb/img_bg@2x.png
+++ b/src/assets/yb/img_bg@2x.png
--- a/src/assets/yb/img_code@2x.png
+++ b/src/assets/yb/img_code@2x.png
--- a/src/assets/yb/share.png
+++ b/src/assets/yb/share.png
--- a/src/components/address-picker/Address.vue
+++ b/src/components/address-picker/Address.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/success.vue
+++ b/src/components/buy/success.vue
--- a/src/components/index.vue
+++ b/src/components/index.vue
--- a/src/components/indexPage/bbda.vue
+++ b/src/components/indexPage/bbda.vue
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
--- a/src/components/mine/index.vue
+++ b/src/components/mine/index.vue
--- a/src/components/newLesson/navShare.vue
+++ b/src/components/newLesson/navShare.vue
--- a/src/components/newLesson/share - 副本 (2).vue
+++ b/src/components/newLesson/share - 副本 (2).vue
--- a/src/components/newLesson/share - 副本 - 副本.vue
+++ b/src/components/newLesson/share - 副本 - 副本.vue
--- a/src/components/newLesson/share - 副本.vue
+++ b/src/components/newLesson/share - 副本.vue
--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
--- a/src/components/youbang/index.vue
+++ b/src/components/youbang/index.vue
--- a/src/components/youbang/nav.vue
+++ b/src/components/youbang/nav.vue
--- a/src/components/youbang/ybOrderRender.vue
+++ b/src/components/youbang/ybOrderRender.vue
--- a/src/components/youbang/ybPaySuccess.vue
+++ b/src/components/youbang/ybPaySuccess.vue
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/service/index.js
+++ b/src/service/index.js
--- a/src/util/public.less
+++ b/src/util/public.less