Merge branch 'master' of git@git.beswell.com:loallout/webApp.git

# Conflicts:
#	build/css/chunk-096e9b06.74119d7d.css
#	build/css/chunk-12c87c98.fe78fbf8.css
#	build/css/chunk-1e85c6e0.f86efd39.css
#	build/css/chunk-4f5bd33c.edc8d85c.css
#	build/css/chunk-64ee50de.943614e6.css
#	build/css/chunk-6de618bc.cb6a85ba.css
#	build/css/chunk-6ee75f1b.0337629b.css
#	build/css/chunk-73d2422f.541d75bf.css
#	build/css/chunk-7bc9842e.71eef5dd.css
#	build/css/chunk-7e3ea526.034e4deb.css
#	build/css/chunk-8a193970.eb5b7ee9.css
#	build/css/chunk-939801c2.ca3a4244.css
#	build/index.html
#	build/js/app.0387ad3c.js
#	build/js/app.0387ad3c.js.map
#	build/js/chunk-116932c1.23362c26.js
#	build/js/chunk-116932c1.23362c26.js.map
#	build/js/chunk-8a193970.c3c591bd.js
#	build/js/chunk-8a193970.c3c591bd.js.map

Signed-off-by: Changpeng Duan <838560574@qq.com>

build/css/chunk-157af76e.f0fb2b95.css

@@ -0,0 +1 @@
+.mu-primary-color[data-v-73f86bcb]{line-height:60px;height:60px;background:url(../img/headerBg.25652345.png) top no-repeat;background-size:100%}[data-v-73f86bcb] .mu-appbar-left{padding-top:15px}[data-v-73f86bcb] .material-icons{color:#fff}[data-v-73f86bcb] .mu-appbar-title{text-align:center}#app[data-v-73f86bcb]{background:#6495ed}.container[data-v-73f86bcb]{height:100%;background:#6495ed;background-image:url(../img/man.02b8c4e1.png);background-position:top;background-repeat:no-repeat;background-size:100%;text-align:center;color:#fff;font-size:36px}.container[data-v-73f86bcb],.content[data-v-73f86bcb]{display:block;width:100%;overflow:hidden;margin:0 auto}.content[data-v-73f86bcb]{margin-top:27%}

build/css/chunk-1e52fb1a.b5bb3b28.css

@@ -1 +0,0 @@
-#pages[data-v-349f3e8a]{position:absolute;top:0;bottom:0;left:0;right:0;width:100%;overflow:hidden;display:block;margin:0 auto;background:#2c2e2f}h5[data-v-349f3e8a]{width:100%;font-size:160px;font-weight:400}h5[data-v-349f3e8a],span[data-v-349f3e8a]{overflow:hidden;display:block;margin:0 auto;text-align:center;margin-top:10%;color:#fff}span[data-v-349f3e8a]{width:200px;height:45px;background:#ffa200;font-size:18px;border-radius:250px;line-height:45px;cursor:pointer}span[data-v-349f3e8a]:hover{background:#ffa200}

build/css/chunk-489ef5c6.4ad87880.css

@@ -0,0 +1 @@
+.demo-loadmore-wrap[data-v-d377731a]{position:absolute;width:100%;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;overflow-y:scroll;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.mu-appbar[data-v-d377731a]{width:100%}.demo-loadmore-content[data-v-d377731a]{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}li[data-v-d377731a]{width:100%;overflow:hidden;display:block;margin:0 auto;height:160px;line-height:160px;border:1px solid #ccc;text-align:center}

build/css/chunk-5ab4bda0.bed7fd12.css

@@ -1 +0,0 @@
-.mu-primary-color[data-v-33cae3b0]{line-height:60px;height:60px;background:url(../img/headerBg.25652345.png) top no-repeat;background-size:100%}[data-v-33cae3b0] .mu-appbar-left{padding-top:15px}[data-v-33cae3b0] .material-icons{color:#fff}[data-v-33cae3b0] .mu-appbar-title{text-align:center}#app[data-v-33cae3b0]{background:#6495ed}.container[data-v-33cae3b0]{height:100%;background:#6495ed;background-image:url(../img/man.02b8c4e1.png);background-position:top;background-repeat:no-repeat;background-size:100%;text-align:center;color:#fff;font-size:36px}.container[data-v-33cae3b0],.content[data-v-33cae3b0]{display:block;width:100%;overflow:hidden;margin:0 auto}.content[data-v-33cae3b0]{margin-top:27%}

build/css/chunk-7a7b9a0e.6d744a23.css

@@ -1 +0,0 @@
-.demo-loadmore-wrap[data-v-7472e10b]{position:absolute;width:100%;height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;overflow-y:scroll;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.mu-appbar[data-v-7472e10b]{width:100%}.demo-loadmore-content[data-v-7472e10b]{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow:auto;-webkit-overflow-scrolling:touch}li[data-v-7472e10b]{width:100%;overflow:hidden;display:block;margin:0 auto;height:160px;line-height:160px;border:1px solid #ccc;text-align:center}

build/css/chunk-da2c1192.792d0732.css

@@ -0,0 +1 @@
+#pages[data-v-5a721d19]{position:absolute;top:0;bottom:0;left:0;right:0;width:100%;overflow:hidden;display:block;margin:0 auto;background:#2c2e2f}h5[data-v-5a721d19]{width:100%;font-size:160px;font-weight:400}h5[data-v-5a721d19],span[data-v-5a721d19]{overflow:hidden;display:block;margin:0 auto;text-align:center;margin-top:10%;color:#fff}span[data-v-5a721d19]{width:200px;height:45px;background:#ffa200;font-size:18px;border-radius:250px;line-height:45px;cursor:pointer}span[data-v-5a721d19]:hover{background:#ffa200}

build/js/chunk-119f266c.664252b7.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-119f266c"],{"09a0":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{attrs:{id:"index"}},[t("keep-alive",[t("router-view")],1)],1)},u=[],i={data:function(){return{}}},a=i,r=(t("5982"),t("c701")),o=Object(r["a"])(a,c,u,!1,null,null,null);n["default"]=o.exports},5982:function(e,n,t){"use strict";t("aec6")},aec6:function(e,n,t){}}]);
-//# sourceMappingURL=chunk-119f266c.664252b7.js.map

build/js/chunk-157af76e.d7fdf63e.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-157af76e"],{"07b6":function(t,n,e){"use strict";var c=e("fbfc"),a=e.n(c);a.a},e1f8:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement;t._self._c;return t._m(0)},a=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"container"},[e("p",{staticClass:"content"},[t._v("系统升级中 "),e("br"),t._v(" 敬请期待")])])}],s=(e("82ae"),e("379d"),e("fed1"),{data:function(){return{lists:[]}},mounted:function(){},methods:{}}),f=s,i=(e("07b6"),e("9ca4")),r=Object(i["a"])(f,c,a,!1,null,"73f86bcb",null);n["default"]=r.exports},fbfc:function(t,n,e){}}]);
+//# sourceMappingURL=chunk-157af76e.d7fdf63e.js.map

build/js/chunk-1e52fb1a.e68126db.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1e52fb1a"],{"530b":function(t,n,e){"use strict";e("b00a")},b00a:function(t,n,e){},cb28:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{attrs:{id:"pages"}},[e("h5",[t._v("404")]),e("span",{on:{click:function(n){return t.$router.back(-1)}}},[t._v(t._s(t.$t("Back to previous page")))])])},u=[],a={data:function(){return{msg:"Welcome to Your Vue.js App"}}},o=a,r=(e("530b"),e("c701")),s=Object(r["a"])(o,c,u,!1,null,"349f3e8a",null);n["default"]=s.exports}}]);
-//# sourceMappingURL=chunk-1e52fb1a.e68126db.js.map

build/js/chunk-5ab4bda0.6a463a1b.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-5ab4bda0"],{"79b3":function(t,n,e){},"8d13":function(t,n,e){"use strict";e("79b3")},e1f8:function(t,n,e){"use strict";e.r(n);var c=function(){var t=this,n=t.$createElement;t._self._c;return t._m(0)},s=[function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"container"},[e("p",{staticClass:"content"},[t._v("系统升级中 "),e("br"),t._v(" 敬请期待")])])}],a=(e("82ae"),e("379d"),e("fed1"),{data:function(){return{lists:[]}},mounted:function(){},methods:{}}),i=a,u=(e("8d13"),e("c701")),r=Object(u["a"])(i,c,s,!1,null,"33cae3b0",null);n["default"]=r.exports}}]);
-//# sourceMappingURL=chunk-5ab4bda0.6a463a1b.js.map

build/js/chunk-6fb6d38c.48d64d19.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6fb6d38c"],{"09a0":function(n,t,e){"use strict";e.r(t);var u=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{attrs:{id:"index"}},[e("keep-alive",[e("router-view")],1)],1)},a=[],c={data:function(){return{}}},i=c,r=(e("5982"),e("9ca4")),f=Object(r["a"])(i,u,a,!1,null,null,null);t["default"]=f.exports},5982:function(n,t,e){"use strict";var u=e("5f0f"),a=e.n(u);a.a},"5f0f":function(n,t,e){}}]);
+//# sourceMappingURL=chunk-6fb6d38c.48d64d19.js.map

build/js/chunk-da2c1192.42b58533.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-da2c1192"],{be5f:function(e,n,t){"use strict";var a=t("eae0"),c=t.n(a);c.a},cb28:function(e,n,t){"use strict";t.r(n);var a=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div",{attrs:{id:"pages"}},[t("h5",[e._v("404")]),t("span",{on:{click:function(n){return e.$router.back(-1)}}},[e._v(e._s(e.$t("Back to previous page")))])])},c=[],u={data:function(){return{msg:"Welcome to Your Vue.js App"}}},r=u,o=(t("be5f"),t("9ca4")),s=Object(o["a"])(r,a,c,!1,null,"5a721d19",null);n["default"]=s.exports},eae0:function(e,n,t){}}]);
+//# sourceMappingURL=chunk-da2c1192.42b58533.js.map