Merge branch 'test' of http://120.27.146.32:8888/wangfulong/shop-new into test

# Conflicts: # dist/index.html # dist/static/js/app.5355622b.js # dist/static/js/chunk-0e5929e4.5de1510e.js 1112

Merge branch 'test' of http://120.27.146.32:8888/wangfulong/shop-new into test
# Conflicts: # dist/index.html # dist/static/js/app.5355622b.js # dist/static/js/chunk-0e5929e4.5de1510e.js 1112
939ff940 · huaxinzhu · 54b11697 · 588c3aa5 · 939ff940 · 939ff940
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/static/js/app.ebefd0c4.js
+++ b/dist/static/js/app.ebefd0c4.js
--- a/dist/static/js/chunk-0e5929e4.cd51692f.js
+++ b/dist/static/js/chunk-0e5929e4.cd51692f.js
--- a/dist/static/js/chunk-779f4447.d38b8e9c.js
+++ b/dist/static/js/chunk-779f4447.d38b8e9c.js