From 6227c4ca4320c68bde32670739c1003c88a8b158 Mon Sep 17 00:00:00 2001
From: taylor <709161610@qq.com>
Date: Tue, 14 Feb 2017 22:46:02 +0800
Subject: [PATCH] add sass

---
 package.json                 |   2 +
 src/App.vue                  |  11 +--
 src/assets/logo1.png         | Bin 4038 -> 0 bytes
 src/assets/logo2.png         | Bin 5910 -> 0 bytes
 src/assets/logo3.png         | Bin 4553 -> 0 bytes
 src/assets/logo5.png         | Bin 2108 -> 0 bytes
 src/assets/logout_16.png     | Bin 1080 -> 0 bytes
 src/assets/logout_24.png     | Bin 1348 -> 0 bytes
 src/assets/logout_36.png     | Bin 1867 -> 0 bytes
 src/common/{ => js}/util.js  |   0
 src/main.js                  |   2 +-
 src/pages/404.vue            |  12 ++-
 src/pages/Home.vue           | 171 +++++++++++++++++------------------
 src/pages/Login.vue          |  38 ++++----
 src/pages/Main.vue           |   5 +-
 src/pages/charts/echarts.vue |  77 ++++++++--------
 src/pages/nav1/Form.vue      |  43 ++++-----
 src/pages/nav1/Table.vue     |   2 +-
 src/pages/nav1/user.vue      |  33 +++----
 src/pages/nav2/Page4.vue     |  35 +++----
 20 files changed, 217 insertions(+), 214 deletions(-)
 delete mode 100644 src/assets/logo1.png
 delete mode 100644 src/assets/logo2.png
 delete mode 100644 src/assets/logo3.png
 delete mode 100644 src/assets/logo5.png
 delete mode 100644 src/assets/logout_16.png
 delete mode 100644 src/assets/logout_24.png
 delete mode 100644 src/assets/logout_36.png
 rename src/common/{ => js}/util.js (100%)

diff --git a/package.json b/package.json
index 9478869..6b03a7a 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,10 @@
     "http-proxy-middleware": "^0.17.3",
     "json-loader": "^0.5.4",
     "mockjs": "^1.0.1-beta3",
+    "node-sass": "^4.5.0",
     "opn": "^4.0.2",
     "ora": "^1.0.0",
+    "sass-loader": "^6.0.0",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
     "url-loader": "^0.5.7",
diff --git a/src/App.vue b/src/App.vue
index d906024..22cc457 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,16 +13,14 @@
 
 </script>
 
-<style>
+<style lang="scss">
 	body {
-		/*background-color: #324057;*/
 		margin: 0px;
 		padding: 0px;
 		/*background: url(assets/bg1.jpg) center !important;
 		background-size: cover;*/
 		background: #1F2D3D;
 		font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
-		/*font-weight: 400;*/
 		font-size: 14px;
 		-webkit-font-smoothing: antialiased;
 	}
@@ -44,12 +42,11 @@
 		margin-right: 10px;
 	}
 	
-	.toolbar .el-form-item {
-		margin-bottom: 10px;
-	}
-	
 	.toolbar {
 		background: #fff;
 		padding: 10px 10px 0px 10px;
+		.el-form-item {
+			margin-bottom: 10px;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/src/assets/logo1.png b/src/assets/logo1.png
deleted file mode 100644
index 22a30fffc1d6fca0ca9e9a0ff8328da03093fb62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4038
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
W*tMd15*^s70JM>rVfi`d>;D74W=~T9

diff --git a/src/assets/logo2.png b/src/assets/logo2.png
deleted file mode 100644
index f7fcb2f88b90a89dad39284ec938fdfb6860a191..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5910
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

diff --git a/src/assets/logo3.png b/src/assets/logo3.png
deleted file mode 100644
index 16a25b2bdee24a617cab8d0a4d674076c718a40d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4553
zcmZ8l2UJtb);@tCRY~ZGK!`{aNJ5n!AT*^z0HuSJP!gnwl&cX?15(8+RY5?3AWfu+
z^m?U<NE7KD6%eEgdBJzzfA9LwS~L61?C;y(-gD-xb>>8y8ta{AI?DtAz-a@0j5*b!
zPa4B1YEQ=9n4}u8ho+Gx0F);%|8l0Ij$y9)=0*SzDgpq+C;&L1P7#*@AP5Nnt4;u*
zoC*NkewlC0RH=?rE?4w0R7<_~wd?Ls4Wpm_)c^o6_;}Jl1v)W%)Jgh410x;!aWMZG
zN#Mf`aW4Qk^TYt7X?g4OciStm?jvT$<i1);5oJnEO?Ki3t;%3}dEEE-PVi$OUbQPZ
zslJEiuLu%d8A#}g8JEzbtBE?o7h8NHBzYq^gri=O7^3K6dU$MZadw&sYj~&<5<I@$
zKAxZ)P6m)|zI0M<Z@&?YcpUU{{my#rlGPvEm#{&lcPUGlmF9}6!?pb0ZqdtA$HTJr
zfcebBd+_w)#nOV+BXTH@>G2z0H6FNLlob4SX(A&01EUHr!(%2B%w5tiM(EMiLd&=L
ziHLa;h0ukV^cMXV)$6`RCLf=crJ%9eKpD`~Gha{1wUgfcc3$*O@tdk0<mGlaiQxbj
za0kfC@vOGpnFv@{-KZFGJS;NKXGd=BVzE8e{h9Yks-Cg?<5LH{Q|bqQ>IrHKITA_q
z*|6y+y0O`P@|K*bm-5!DFNgOp3&ChEzhH~!x1~cjZ?jH1vL|Ih2JX`VP^F;xu7Nti
z;}(Nk>mPg+vdOR<{NpdIo2Gdpc^2+F0;`f+*~IvY562;7bpBvRix!=uO&AZM{%Fyj
zkMFCaOvgK4Xk9ZwQd&C4Mlxr}OA9;Td2h6^au*T)a-a8k`rwF2|GI-PP5c)tjJikV
z1b$GfHuiF@A(hMuf-w_8k7@Y;Sb;<;17+&~t4itDpp~5&{x+R0#_4qyVLxM$cs!dR
z*q$QrF4>X}tOc0|rXhf<UWq0;mtQDWwc$sYW5-PUtWDcW1+f>9WFkhF)sDCAI)<PA
z9=|@PIFm-a&b?gUX#K&?sXTNSnpxw`Xei*!0S_{Fm5lw%xs+FPv2x0U1_GD#8HU)b
zX?r9Nme8?yJ_4fp<|cN7%U{1C`a75wt&1>=#q6{BheQTXmgaCC^hYJL(3F*1=!sqq
z;VTwa!9nRDx&q`Ftp>n5rNY}VHr^tt?|kgJmxqg@r_n8k#EnQhV=%yUX<dlSkPE5Q
zm8whZ=WKdO>SAosSC=i%W(Jx=cw_8y?VKdPl4H6UF|(P(Xz2PH7*4}M%G8@zRrkhV
z7#-CVvU#*%%n`Y!ra%&Vfdma-wt0h8T}O{+5V(&~Yj-Rb)MxMnsWp)6_5OI}#@zup
zW>TADIf~!XTZK2GT?^{N1=)9Ic6upZbkl$X^`Ks2xqSR+4S|X3>i!gx9GNX)H%n6s
zd(gi5d@ZgchreAKqN_gU$jJJoA}Y*EBAITz)~5KuUVFRIo7@u4pantXRH2_RU-;`0
z6$EWC%hVKoQ?{Vz?A%9NyPw45xBBy{=qP`oChaVZ*!nZiKL=V2Wywad2lKa7ZY!4*
zk5nvqZ~A?AzW%A!fem{rnsZTS`khnJ=cp~2L50yy@{XiHNEW!2A#8iXr_lU4gCAob
zbEY-XWs$@{a3D<2hVrR`0PJ*CPV@JNAQFQE2L|oLyWjNF7R|lgBjPe;6_wOE?7&{P
zt#Iur!%!&Sc%{NSZj9ONGxoi*NW<-=j}!K=tnRrka}$B4*wF6wf`>HV8VqSF#0i=(
zX`7ZQS`?9H%5ur}ydbh+^8<g)*JZ6NwvJU3kSI-xjriTN^6@rD%5r{9RfFQ2j_ZKu
z{J{+tQ=NIOZ$ot<Xd!Drjulb90_r+`vUMswt2kr6UQ4b)vFuc^fcQ+@S1G&kHR6(?
zG}q>-{58jxiEd82BTvH1u!G3y=`BlkZqh^M*32}RZ0nVtnyvCh9U0oEMepK{6vv<d
zk9L>svx~Lnbmsle?vVR$>2qHn-Q~$XD!*{rztWwgn-AX5s?uL(q~3RV&o+V)hvQY2
zpi&foi9!gL_Dl$NHE~2IE4Y*NtBz}QuegKen&LC3HExIU)@EhYXn&IBK<9pct3_I4
z25FwtxaRz=+wgFTLI>PnY1)8WR5d?eF-RQqjRM3RZUJC-<9K=5nUKP<n>FP_=og+9
zm;5ibwJ`#NBdZTB?X$j$^iFm{KNo2|BBrE!pM4iT+v*UA?-eK3yGL1xMSlC1alj!9
z>xaeZ-%D0gsBMpK$=8erT!`4ZPH>x1#VE~=1v^AG7KOaen)i}qPt5K~?J#qMoO_)r
zSGRe?Nyr@u2!SlvaN=Cg(4O}MRJI|1nj-@sMb-Rg`B}YBkEYVDl)re#X7q~g)Whe7
zi)*Mvx6n4AFhXAXX4I^!Gu`<~k*~fF1nWaNyC2@Op<R9pLEnf!vs(1ttC&Hth#x%M
zv{7seTzH|(u1R{Cp7*pWdn=}k*@p3koim9kRcWvxhq){6DOU-h5~hZis|m}4<q5oR
zL*93aP3!3U#+4Y0lS4r-2ZQF=dy68jqNmr&W%Pwn6E!S+UxZQ_F`3_CKQbrjCG<Ib
z_MGehT433)U5x=Ps8Y|7;pYR&11?7DxTGYGN*qMJSR)wE>E2XrVN3j(s_#5{&JZH}
z6NG$Thj#V4`-W*ya>SbElDwCQ-{z|1ZJ1m7qJYsZQ-6<v0F-jU)N%g`NB#(X_U*hU
zqln=i`<bg##Mp4o^mAuC)5Y1JrLm_h4<yonK{sXvV8lfe5(7B;V$$QdLesc25p$dO
z)tiwnEDX<{nNavhtc4wea55*;WZhU(eRawK_PO#x@a~A-5SRL>kMMLK6in|Z6_>k~
zn;)nmcRNf)RbCxhO;fp)3HOh=L)kyY1k$`9-KrxjAYp27=OSiqYfLGwUvV7j)!WzR
z-XjKx-9{-Vvbdc+N7n*AyS4G@5|$GZy}QCvy64r&c+DApT_SvnCs-YSZzbxQi>1H2
zsL_sbnXPZr=i|$XVSi-Y+6$lBhSKVX*YAc*G&nl4z7GBw&VcfYC;dFS+1DD9R`7ZN
zq01qbLh~i$P3D{QUwNVMikKgzdJM9oz2CSL%KRmWymn2%gZL+AU1P$mspaRmu$c$5
zYJ0P#lj`UE+@~G%o@Ry|KNiIi&ZWn3ar<w;%g$Gg9mkvQm?h*qt`_5r*fX0`enby5
zrF^Ep7=HG8r<~q{>gMLBPT^?Y=W`+Gbc>Bz^!r7Vr}^T5Kog$ho+;fcc|ZK>9~NN2
z{-#bwOUkdAT9JL2NQ@RRN;@q@WQZE6s;Z_q<-d)5p?yVGZ8<qdoVOEPc0Za_W<9Q5
zY(-1l0@`SZ&RfY|K}*|r_D2LM2Opnb0Biaozp!pU4|~M))Gt9KYt+c@=JD&llpd_&
zIaP+92K4-zLbK7X#vOz$+}m8o<MH7^0RgV3(YV)QhqW)?R90@;<WDH!i+f{o?Gm*U
zyPMC_LYvptq?y`VimE59)Jv5=34dV~tY69i`cPX}U3<piY_z5hVzf=1u05=e_|E)1
z@9ZsA(ntX{?stq+oMM%3|Ju88PVFst{SQ_6-2`x-lHJ=|bkxtG2Oj;;jt)H<cP9!@
zXDEqZvHlo*O0aurvnQ5M@JriJ(R!;AeZg!eWyj>!=FgGiay#ieM?Gn>VjN61j*fb{
z16^wYeKSvkCpGIGD6KH=UuB8?kz-B^0o^sb4RagEPK}uTo$6;R_{f#rt?JA9CRxU;
zj7`p1DWEAizp(?jJbaDgVY?0gT<)+lcWwXBd5>r@@{rd!H^T1y&P!{DkcB2RkGG3Q
zU*=!$hp$e)ewjz!m|OydTVS)`IsW|%oLHS=tH{cm`nf9ssr&t)UpN{UJuKxR>G)Av
zbt<ok>W{XbcMxbyJ6u6g@yBXWY2O)i<+b*m9R(|E>ok%-h67+Ai9KLMMUYg9qQ#Z{
zuS!a!EhYYJ_^JuX9$bO3XwPqj%x~>~OD8$``kwBq<peGQA65eWe$2Mh+ZGRV$u<&K
zW~K_g3dl)h-M-oa^TOqO%-o9=#DxX7SFc_rk|%}WqSzoKtRP#`A@q(%#$TBX&jgCd
z0!ra~8!an?`DT(_Ve;eoD=1(G_aQ7nEXHr`OD!R$Yn?SP6ni+RE|il2Ou8>tla}LP
z43iv56P1<n;d?U=Dro&yKZ*0W);N@=<cdj<7(kx1qgGh6p+{tCKy3RQJ>a+So)gmU
zyXM*%KhqJ%2N35v6Z(e^N=Clc-1-4e<$YmZ=s)$xE;jV=KIRkHR5V9dW_9?p6$GpV
zCnLAa)w2*;sv-Wn6TwsMV-+4tv}o)YPk>lTH-GPffA@a)ZKbS!L9?OP0VUI!-C^qi
zeM)o5COAt@M8h7uFH0lgN{X~l4BQ8g*TR-pS1WP@ak{j8e0-zh<E`)CGd&Ak6{oK2
zr|Nbd?T*x@Yqn*>E!VswVPX)o7lSLQRz*Whts9ps#@_uHbxnwqt1AaEW?(FKz217r
z6r%;jg{_a1&tlBl`jmDiZI?1{tz$8kSn3OgWVt~t+pg}Wl<n59{ViE$4F=2$bL#HY
z<IoukagDX{uCE-v>YWQ?P}YRJi9_`o=MOTqB4cy9^6_%q0HX1i45Sg?n3nljIENXq
zdbisR_qW8v7p(ek?uxN->)*TC$FE;xi!HCOk4td~EgXqZg?@()oRTeNAGnWlpWvy$
z7u%ccH58J+rkZ|<rJLSd=tg!>x6<RxfUMm~jRNv+Ocx5cg0a-sO(HP?Oph@I?iGyQ
zQe0eIPTz|!1dy4$rOw8kDzUE{<`bsHs=XrXVC}7jo{$xym(RO5U@%LusJ?4qM=SYR
z9b5ex8iK%(7iZ5axH)?gnY>o8T0&MxKJ;4Fb^e+2icGhD)T*MQ(mXpmD+T)CRcTr}
zA_ON4eck3~Aw;f7Ki-+R8SVLyq!8_yk!IVkwrh6{bY@^wZ986Nt*JLd@yFg=0y`8X
z%LjLXyBPM-ehPDhBoQD3BWbl!wlHY4<+eujvdZx1(?ih|S&xst)}`dx`rSBPZGn(^
z=(~*;=JNy|Z;+^QW>dLqXJYq)C05NPD<hp#L`9RfDHt=qj=2sxEVQrtWW2L8ESX%f
zp7Kbt%uYHot^DoVnC=t=YkwnMhpxGa)JFLS&0$buo+H~vBL(&Jk;4w}$$|MoppH%8
zb>~1gWmkVUssUt>C<Q5`k`zkO5+$!JBd08*a1nV)8Hr5uKcF6W|3&a6T*tYGoDfh_
zNI5APB}<f?vYZ?h`d`8XyHg{TAa|l*h;wzr2e<*Afq{O?2*htK+)X!Eg0C+DA0SQe
z_dxjk7ZQNbGc`oWNFxzGUZ)DEe4`V70Kq*l*xBC=Fz|Kua5HlDz`1(E6s3{UC@BS)
z8A<_m>ym<_f*kCh>|uXP1qTO9<4#D_MkSp{O^m%TrUvFd32Z?K@^^Iu^o&i6bYKRq
z1U$^r)6Lhdd0zxag~0xSIAYBW|CheAf1tDnp5W{DJ8_x$q!22W=LBo%8RYAttc)SJ
z2Kl<-1C^CcsmcKWDxXq^_<xw+l_)FgyWu=M0|6O%g_Twe@Bh;JJI>!2Yuxof&l5<f
z49Cfj2;P558R2~00z>@VfZs(T{O}$cudV*CyuafZSyE8|N){=Hlvk3ILwa4S;HSo6
z`&S$bT<8fxTK<aG51rLys@MKsUaYwR;EwZgqdq%?C$(?{by@uhgg`_9F7Wq2+RZs2
z1V>#zX}nt?!u2{{3g_$b&!j6J5#aBNke5Rte|PdIX=<ib#YMYRA;3V#7*nF<6!9N(
C>Mj}p

diff --git a/src/assets/logo5.png b/src/assets/logo5.png
deleted file mode 100644
index c105125e4e276f62ba5bbca46238ef2611c651b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2108
zcmeHIjW?887{9(hr<jOj?U3{#^T9B@(nf<(jeLyQSVrTWk7^9&Wg2N4v7+5-t3&iL
zrP!zxW1=l>5*;E3OVX}RrD$!@rfo}V_6}CIcF);AV4w5c``qWbzvuTn_n!NnHzz32
zA7^M~2mrtZFz6xBE>{nIEjS;kPJaT8HqV>s4M4>nqp?^W=o2`M5GDYr4gkn90T_iL
z*<%2b$p8$p0YLHrut+$3F?cBen%jd`vwR_d6`%UQ{>K{#-LyG)LkiS?!>>);%7_;D
zMRB2ij9JOv=({fNW1Ws<MDwQrQ}HNimR}@yB0d#_3)o2@HxcUe;0J5ibI7>Dc!XG%
zQc#*IKbI;$8!D7WZ^<s{exi8zM$tDq;g;SWQue>Cd^Glt?x~*P^8+g7z&n;u8Y#)#
zbD{Y_U02@KPIX1mmI(1S$Pe{{2A~W3gcmY(F1VQJS*23pU-=z|uTYMK1cpL8DF(*I
z0BF(DPbm}t=q2<+pb7xah}zh6z$xS<oVa5uz=Pv28}(WR$PeL$?!Ixn&Dpo=M72O(
z^TdWeC`028z*}2eTS{Q^grJi&Y7f$B=o{+`VJJ;m-u_Od9H-E1-PQ<qHP)~4r+0l>
z<2egDdRPF{SMRQ|p^28$QfW#Q{H{_1=-#Y|YaF(vgKTe3!B@HVwRJ7^`rWP9Tdy`X
z++2ab*Z<%lo0su;;8CB2i5Y&jt%1Igf#I`}-?qQ_dS}im#>#-^#(mmxMaA~>>l^6l
zx{Xba3l}ds-7?R#WTE4t#f{AxxS+7m?l$`{PksJ|lGCM{xVDa4?Olhiu<svlu$TE7
zS+sQj*wubZ)9RRr&8Lc*I?(3uZ$Ta@@?xBPZ(;hfHo%z`S}Ao5FN?0s(=O-!ekymQ
zWi|7gblv>Oh;=t3tG~Q<ooO%IHTTxJLp)RvJHv%Nl2`Uq)qYSV>{UoRWx-m0I7?Ty
zdXZJB;h8dY=kgBi@-5x1pOCfA2sb_Lf7)BEs`bX#roVmjvbD1Ee1)zRd-&dC>Tuir
zdH#F$g55SAX?*$q6B%A@fM*d-`=f6`pd4Xpx+g!cPn6KYEqKQ?Y~;~*m;F#wU6Ho6
z=JHZ6neMCCdfK`=J2JBh)1PHGmbkD@%;%WyCeF3OTbo(l8`h%|5C=EnGF!@`Ik=*t
z?~0G=WV}#znqfUf^_j0O+|K6*g}Tmjar9h3BYlc9Gn;LGR4e1b@j6Ycr{?FwPtLR$
z^EX~9Ql6<fj>oaWx;y218Fvm2F2;IxK38<$$G(tV9L>6J#BRGC6yqN<Tv+;jac=JU
zvdbq%>@2YqWp#z3s)|Z86)YErOJ>eoBZ^UFu40o5ubexu<K)RprwbTb4k>F6F0pe)
z2bI4ZxXK<?mWI;l4r>PGj3SLPFBk5O8?6Vucthsod{5rXC7<^cxTLPjp~`ao>9buP
zHSK&>-q8%QE!s2;qGj542*K9Gwmo|WBioPR<D+M9Uu3Hbbml)b%3Hsm3m@iu%r^py
zi^WiclY~M8oXHe7C$fhVg~p<|BF+@V+0~Kkj*!WLm5xS#OAw0U1YD^)f$BtYcA}73
z6gPzIf>0+Dw11s(1ST-m6~rPgCW%c#L4YuphcaV%0?tMPjYuX^oZJY(6gR?VcefZf
zD&c)~0w2Q?5E4lukq`yyBsgFaQIy2%?I{j~#FlDe7C%|I9zp0LPO=b<#}Fh4LdAe`
zQgw;+0cN~3f-q14kB<S0v-^rPZyCf`OyilvgbU&@z8ccD%d{6l=1hYy1ws^)CZJ%v
zD^fx{?=!_(bwAU2m@J3_6e`7?;^FS*?3$Om0sd2g$uyo&K`IJpG<ToZ4YhV~FJ{_a
zSV#ci3O1qe{3O0eh^lWPNhHEZVgWYp5Ybq%RKO9%6XQ{g#EFY{5(s(kgPeGhIEh1|
c!1A<-*@H%eoz@K)M8HxYz&DV7)`z|QPu+r4x&QzG

diff --git a/src/assets/logout_16.png b/src/assets/logout_16.png
deleted file mode 100644
index 2458d7864ce5a3f11a0abe293da4394531eb725a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1080
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{Xiaj
ziKnkC`yDn(AqknLgBqR;42)|%T^vI+&WHB-=X4j!w9kM4zBYd5w6Zg+qh0q1zrP``
zb*r^^*>uU%L7h45zJIJAG^}1MoGzrU$oFpYn@0zPgnF9ac%(Y1`abvn?KbP$wJX1V
zTbd}(d;I*fjNHjj(;bWb`x~m1r&nw@yTwp4%UNV5N535FGq?I)!3(<cS8Q$deKyTF
zwdww8#bu3^uh`cLt9%LG>E_vKG~Ic*f8L#^GZ~$`#n{x8W+ul<7yatG;ibNF!bX3?
zFY8(FzKl+naGra){c6^_)7E?;KjhmBlL{vXe>_vSZF2fT#rW%fp=b2>tNY2Tt<6){
zdlaxh?t>HyV?`vlUGhfJ&B3;rPZ*ioLVX<?mc?>0CEY(S@2UEMBY)-YtDktqSEY8g
z-jU5X6|mv@UJVs*qXPxUH#4toP2g0vRht^Ke|o--(&uaMZk^iEwd}*nvXDo<;`(>&
zg)F^WBJWMxnfW&I(roXS6W%0C-2b+y^Tm?Ms)uBZP2NTEud!3^K6{V<uW8i>$)pJq
zqG>Z1ev62GzC49-+soD0D!1QOZ~M^PU!%WWZk4sjLS2PEzuB3S&Gu^iJf!{A!`9rl
z!T!RYDGi%8IBo^TrD}<5L`h0wNvc(HQ7VvPFfuSS(>1WvH8c+~G_^9cure^vHUN><
zk$zGr8glbfGSezS8jN%e%yf-RLx8G{OstG7AR0_8lv02id_gu8=ckpFCl;kLc;+Ui
zr}`$QXC`MWnCltn8S0uT1R9ztR9KkBo0%veY*)xADJihh*Do(G*UJQH0%D*hz5Jr|
zyEm8m0S%S_861*Pnww;0<&vLVnwy$eVr3NoR9ehnxcvWaeV`g~BsE~Gt*ks!Gt)Cl
z7>tcHzWn$CR3e6{Bs?>vBm=18LbOFCP=zFt3g67!)RM}AR0gn{^b7LR?Kg#iT!U<r
zZwOEogQ2mBftjJDg_#9U;rYKnB|=E%1ZP$ORp=R-dpjka)?x?B#v{pw26-~1W#*&;
z{jZ;qpPLE_g`)iY68+-L5->+EHL<udGdVv`FE6!3KRG2&H#0XKA()(}UtE-|Z)jj{
cVgez}jr4$S-SwUQA<!xYPgg&ebxsLQ0P%T^xc~qF

diff --git a/src/assets/logout_24.png b/src/assets/logout_24.png
deleted file mode 100644
index f871bd77b4b831000414f0279aed1b9058bcd1c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1348
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>
z;_2(keuqs`NJ6IRpoS+<ey694V~EA++$*sjcS~iCf4u(xzrCGm_E}>=b??h(AJ4It
z+alCiGV`cjS;U11p}-5wYiBF$l5#Cy{7$K9>n^D)FCJc-ov}FS8-t<s<<!}e0@N(O
zFYp$Z3qHS}`|gdEcH!|q>h9au-9PRyanqHmvx--DJTi7a%OmE>lF~ghe9y|9!*OLt
zZg00{S2bJX;kKT;?aSJ!U#nS`&(Z7tRu#Uu>T%kd1ZED|Z&?fVBKZ6=^=>TVP3BtU
z)o(3zon`aA@AITxA}g*$J34D=O?f(7mD}-_+#GYIuB~n}UtL<dYRBcC7_Sbs^~cMX
z?_Dt0BVtP6-rwex=V~8mwQm*RvI%^#?(>o<WfSW)7jAKFXZ+sr{_C1e7xLJ>7scs%
zXnl=;8??xCe-K{=cj?XGw~CE>*6aS~H_+>6zp}~Mf5!Vb&o@D>h4vBA6ZE^{ivG@-
zzai3kA^YL!@^w-BS=@9u_ZbDU^!%*x<m2R>;Q1zh$IIO*p%yDQaqP${x~g-7>9$bv
z&#9l@PU=t;yRjl?hn*GU!Q91DEQ$i3RYo>uakf^qp5TxW+_=nclc>&trvZJQ+8)~C
z-*=0g>#=&+68Nx3``c9S<g4o^cw0PPxp7jZY1!)!XJdcO;ah$9t9;xxbH8P&8#1Qc
zn0aBt{O3HKp%xmd>o(snO`mJ3E`9xdiHB;NuW_n|S8VX+TgLJx-nSNAT$C-Eottf2
zm_KFRiWgsc<}wBQ%@VD7l`^Hvm;G-2wX@mVJg55kzS|Nxw})9SSi9hAdr?zh{tw;8
z_!<EdzI<Mu8xQ$ncXdS>J{7)SeAv)l$k)R#QTN@9bu$7cgecuv@u!RR{;w03ALH*8
z-nrkry=>Q|hUt&a1)1K;4ezxKKKJ|Zri3Gg^3f?9UT|!wx@hO?>K$nCl>7M8Jh{f`
z*z-=UVRwIR$q@K)*ERmvxz?}SuYcuV&2sIEuuS26V7gW<ag8WRNi0dVN-jzTQVd20
zhGx13mb!-KA%><_h89)^2HFN7(mK*l3PnS1eoAIqB}jvju7R1Zk!c7}wULRHkp)D9
ziG@-MP=hbXhT{CRlJdl&R0hx7#Pn3(#PrPMYz1>Y13g1sGlf7yGldEZvv@NT1%&Mi
z86_nJR{Hwo<>h*rAWc9F)TEbRlz#W-Qa_-<5+H*^GD>rktgKw}lS^|`^Gd9&0)R@3
z84Q>I->nZ+BaWm7Y_*k@M`~tzMhSzlk;a!FUw}%)FqMR7rj%p=Ra}U+s06BzL{j0K
znVVWtS&+&Ac9VWVUb_9JFpz7IZSoBPs$wuSHZd?Ww6rj@;3+)+7pO!C$(-QKDxeBI
zLvwGZq|;jLK-qXC+0Y<QhP2F_RG|O$GxBp&L7`BTpI@S1oLK_q=%pqWS7s*X=jr98
ymgpy^<mqPSrXvKC^Yn|0lJyM@%uP%nq`8qE(5<_^vp)n{#o+1c=d#Wzp$PyA^Ar96

diff --git a/src/assets/logout_36.png b/src/assets/logout_36.png
deleted file mode 100644
index 1a5fee8af671c9167d9811dc840155c173d32cda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1867
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
I%Y&WvUmRBre*gdg

diff --git a/src/common/util.js b/src/common/js/util.js
similarity index 100%
rename from src/common/util.js
rename to src/common/js/util.js
diff --git a/src/main.js b/src/main.js
index 7212b44..0a2af7a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,7 @@ import 'element-ui/lib/theme-default/index.css'
 import VueRouter from 'vue-router'
 import store from './vuex/store'
 import Vuex from 'vuex'
-import NProgress from 'nprogress'//页面顶部进度条
+import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import routes from './routes'
 import Mock from './mock'
diff --git a/src/pages/404.vue b/src/pages/404.vue
index 4269860..940f1dc 100644
--- a/src/pages/404.vue
+++ b/src/pages/404.vue
@@ -1,3 +1,11 @@
 <template>
-    <p style="font-size:20px;text-align: center;color:rgb(192, 204, 218);">404</p>
-</template>
\ No newline at end of file
+    <p class="page-container">404 page not found</p>
+</template>
+
+<style lang="scss" scoped>
+    .page-container {
+        font-size: 20px;
+        text-align: center;
+        color: rgb(192, 204, 218);
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index cd0df47..c596dcb 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -1,14 +1,12 @@
 <template>
-	<el-row class="panel">
-		<el-col :span="24" class="panel-top">
-			<el-col :span="20" style="font-size:22px;">
-				<img src="../assets/logo4.png" class="logo"> <span>VUE<i style="color:#20a0ff">ADMIN</i>
-</span>
+	<el-row class="container">
+		<el-col :span="24" class="header">
+			<el-col :span="20" class="logo">
+				<img src="../assets/logo4.png" /> <span>VUE<i class="txt">ADMIN</i></span>
 			</el-col>
-			<el-col :span="4" class="rightbar">
+			<el-col :span="4" class="userinfo">
 				<el-dropdown trigger="click">
-					<span class="el-dropdown-link" style="color:#c0ccda;cursor: pointer;"><img :src="this.sysUserAvatar" class="head"> {{sysUserName}}
-</span>
+					<span class="el-dropdown-link userinfo-inner"><img :src="this.sysUserAvatar" /> {{sysUserName}}</span>
 					<el-dropdown-menu slot="dropdown">
 						<el-dropdown-item>我的消息</el-dropdown-item>
 						<el-dropdown-item>设置</el-dropdown-item>
@@ -17,9 +15,8 @@
 				</el-dropdown>
 			</el-col>
 		</el-col>
-		<el-col :span="24" class="panel-center">
-			<!--<el-col :span="4">-->
-			<aside style="width:230px;">
+		<el-col :span="24" class="main">
+			<aside>
 				<el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect"
 					theme="dark" unique-opened router>
 					<template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
@@ -31,26 +28,23 @@
 					</template>
 					</el-menu>
 			</aside>
-			<!--</el-col>-->
-			<!--<el-col :span="20" class="panel-c-c">-->
-			<section class="panel-c-c">
+			<section class="content-container">
 				<div class="grid-content bg-purple-light">
-					<el-col :span="24" style="margin-bottom:15px;">
-						<strong style="width:200px;float:left;color: #475669;">{{$route.name}}</strong>
-						<el-breadcrumb separator="/" style="float:right;">
+					<el-col :span="24" class="breadcrumb-container">
+						<strong class="title">{{$route.name}}</strong>
+						<el-breadcrumb separator="/" class="breadcrumb-inner">
 							<el-breadcrumb-item v-for="item in $route.matched">
 								{{ item.name }}
 							</el-breadcrumb-item>
 						</el-breadcrumb>
 					</el-col>
-					<el-col :span="24" style="background-color:#fff;box-sizing: border-box;">
+					<el-col :span="24" class="content-wrapper">
 						<transition>
 							<router-view></router-view>
 						</transition>
 					</el-col>
 				</div>
 			</section>
-			<!--</el-col>-->
 		</el-col>
 	</el-row>
 </template>
@@ -112,79 +106,78 @@
 
 </script>
 
-<style scoped>
-	.panel {
+<style scoped lang="scss">
+	.container {
 		position: absolute;
 		top: 0px;
 		bottom: 0px;
 		width: 100%;
-	}
-	
-	.panel-top {
-		height: 60px;
-		line-height: 60px;
-		background: #1F2D3D;
-		color: #c0ccda;
-	}
-	
-	.panel-top .rightbar {
-		text-align: right;
-		padding-right: 35px;
-	}
-	
-	.panel-top .rightbar .head {
-		width: 40px;
-		height: 40px;
-		border-radius: 20px;
-		margin: 10px 0px 10px 10px;
-		float: right;
-	}
-	
-	.panel-center {
-		background: #324057;
-		position: absolute;
-		top: 60px;
-		bottom: 0px;
-		overflow: hidden;
-	}
-	
-	.panel-c-c {
-		background: #f1f2f7;
-		position: absolute;
-		right: 0px;
-		top: 0px;
-		bottom: 0px;
-		left: 230px;
-		overflow-y: scroll;
-		padding: 20px;
-	}
-	
-	.logout {
-		background: url(../assets/logout_36.png);
-		background-size: contain;
-		width: 20px;
-		height: 20px;
-		float: left;
-	}
-	
-	.logo {
-		width: 40px;
-		float: left;
-		margin: 10px 10px 10px 18px;
-	}
-	
-	.tip-logout {
-		float: right;
-		margin-right: 20px;
-		padding-top: 5px;
-	}
-	
-	.tip-logout i {
-		cursor: pointer;
-	}
-	
-	.admin {
-		color: #c0ccda;
-		text-align: center;
+		.header {
+			height: 60px;
+			line-height: 60px;
+			background: #1F2D3D;
+			color: #c0ccda;
+			.userinfo {
+				text-align: right;
+				padding-right: 35px;
+				.userinfo-inner {
+					color: #c0ccda;
+					cursor: pointer;
+					img {
+						width: 40px;
+						height: 40px;
+						border-radius: 20px;
+						margin: 10px 0px 10px 10px;
+						float: right;
+					}
+				}
+			}
+			.logo {
+				font-size: 22px;
+				img {
+					width: 40px;
+					float: left;
+					margin: 10px 10px 10px 18px;
+				}
+				.txt {
+					color: #20a0ff
+				}
+			}
+		}
+		.main {
+			background: #324057;
+			position: absolute;
+			top: 60px;
+			bottom: 0px;
+			overflow: hidden;
+			aside {
+				width: 230px;
+			}
+			.content-container {
+				background: #f1f2f7;
+				position: absolute;
+				right: 0px;
+				top: 0px;
+				bottom: 0px;
+				left: 230px;
+				overflow-y: scroll;
+				padding: 20px;
+				.breadcrumb-container {
+					margin-bottom: 15px;
+					.title {
+						width: 200px;
+						float: left;
+						color: #475669;
+					}
+					.breadcrumb-inner {
+						float: right;
+					}
+				}
+				.content-wrapper {
+					background-color: #fff;
+					box-sizing: border-box;
+				}
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index 2e288ed..c5a5858 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-position="left" label-width="0px" class="demo-ruleForm card-box loginform">
+  <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-position="left" label-width="0px" class="demo-ruleForm login-container">
     <h3 class="title">系统登录</h3>
     <el-form-item prop="account">
       <el-input type="text" v-model="ruleForm2.account" auto-complete="off" placeholder="账号"></el-input>
@@ -7,12 +7,12 @@
     <el-form-item prop="checkPass">
       <el-input type="password" v-model="ruleForm2.checkPass" auto-complete="off" placeholder="密码"></el-input>
     </el-form-item>
-    <el-checkbox v-model="checked" checked style="margin:0px 0px 35px 0px;">记住密码</el-checkbox>
-<el-form-item style="width:100%;">
-<el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining">登录</el-button>
-<!--<el-button @click.native.prevent="handleReset2">重置</el-button>-->
-</el-form-item>
-</el-form>
+    <el-checkbox v-model="checked" checked class="remember">记住密码</el-checkbox>
+    <el-form-item style="width:100%;">
+      <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining">登录</el-button>
+      <!--<el-button @click.native.prevent="handleReset2">重置</el-button>-->
+    </el-form-item>
+  </el-form>
 </template>
 
 <script>
@@ -74,11 +74,11 @@
       }
     }
   }
+
 </script>
 
-<style scoped>
-  .card-box {
-    padding: 20px;
+<style lang="scss" scoped>
+  .login-container {
     /*box-shadow: 0 0px 8px 0 rgba(0, 0, 0, 0.06), 0 1px 0px 0 rgba(0, 0, 0, 0.02);*/
     -webkit-border-radius: 5px;
     border-radius: 5px;
@@ -87,18 +87,16 @@
     margin-bottom: 20px;
     background-color: #F9FAFC;
     margin: 180px auto;
-    width: 400px;
     border: 2px solid #8492A6;
-  }
-  
-  .title {
-    margin: 0px auto 40px auto;
-    text-align: center;
-    color: #505458;
-  }
-  
-  .loginform {
     width: 350px;
     padding: 35px 35px 15px 35px;
+    .title {
+      margin: 0px auto 40px auto;
+      text-align: center;
+      color: #505458;
+    }
+    .remember {
+      margin: 0px 0px 35px 0px;
+    }
   }
 </style>
\ No newline at end of file
diff --git a/src/pages/Main.vue b/src/pages/Main.vue
index 4c9d238..7ebcfd4 100644
--- a/src/pages/Main.vue
+++ b/src/pages/Main.vue
@@ -5,8 +5,9 @@
 </template>
 
 <script>
-  export default {
-  }
+	export default {
+	}
+
 </script>
 
 <style scoped>
diff --git a/src/pages/charts/echarts.vue b/src/pages/charts/echarts.vue
index ba7f7de..e1c0d1e 100644
--- a/src/pages/charts/echarts.vue
+++ b/src/pages/charts/echarts.vue
@@ -1,5 +1,5 @@
 <template>
-    <section class="chart">
+    <section class="chart-container">
         <el-row>
             <el-col :span="12">
                 <div id="chartColumn" style="width:100%; height:400px;"></div>
@@ -22,29 +22,29 @@
 
 <script>
     import echarts from 'echarts'
-    
-    export default{
-        data (){
+
+    export default {
+        data() {
             return {
-                chartColumn:null,
-                chartBar:null,
-                chartLine:null,
-                chartPie:null
+                chartColumn: null,
+                chartBar: null,
+                chartLine: null,
+                chartPie: null
             }
         },
-        mounted:function(){
-            var _this=this;
+        mounted: function () {
+            var _this = this;
             //基于准备好的dom，初始化echarts实例
             this.chartColumn = echarts.init(document.getElementById('chartColumn'));
             this.chartBar = echarts.init(document.getElementById('chartBar'));
             this.chartLine = echarts.init(document.getElementById('chartLine'));
             this.chartPie = echarts.init(document.getElementById('chartPie'));
-            
+
             this.chartColumn.setOption({
                 title: { text: 'Column Chart' },
                 tooltip: {},
                 xAxis: {
-                    data: ["衬衫","羊毛衫","雪纺衫","裤子","高跟鞋","袜子"]
+                    data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
                 },
                 yAxis: {},
                 series: [{
@@ -53,7 +53,7 @@
                     data: [5, 20, 36, 10, 10, 20]
                 }]
             });
-            
+
             this.chartBar.setOption({
                 title: {
                     text: 'Bar Chart',
@@ -80,7 +80,7 @@
                 },
                 yAxis: {
                     type: 'category',
-                    data: ['巴西','印尼','美国','印度','中国','世界人口(万)']
+                    data: ['巴西', '印尼', '美国', '印度', '中国', '世界人口(万)']
                 },
                 series: [
                     {
@@ -104,7 +104,7 @@
                     trigger: 'axis'
                 },
                 legend: {
-                    data:['邮件营销','联盟广告','搜索引擎']
+                    data: ['邮件营销', '联盟广告', '搜索引擎']
                 },
                 grid: {
                     left: '3%',
@@ -115,60 +115,60 @@
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['周一','周二','周三','周四','周五','周六','周日']
+                    data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
                 },
                 yAxis: {
                     type: 'value'
                 },
                 series: [
                     {
-                        name:'邮件营销',
-                        type:'line',
+                        name: '邮件营销',
+                        type: 'line',
                         stack: '总量',
-                        data:[120, 132, 101, 134, 90, 230, 210]
+                        data: [120, 132, 101, 134, 90, 230, 210]
                     },
                     {
-                        name:'联盟广告',
-                        type:'line',
+                        name: '联盟广告',
+                        type: 'line',
                         stack: '总量',
-                        data:[220, 182, 191, 234, 290, 330, 310]
+                        data: [220, 182, 191, 234, 290, 330, 310]
                     },
                     {
-                        name:'搜索引擎',
-                        type:'line',
+                        name: '搜索引擎',
+                        type: 'line',
                         stack: '总量',
-                        data:[820, 932, 901, 934, 1290, 1330, 1320]
+                        data: [820, 932, 901, 934, 1290, 1330, 1320]
                     }
                 ]
             });
 
             this.chartPie.setOption({
-                title : {
+                title: {
                     text: 'Pie Chart',
                     subtext: '纯属虚构',
-                    x:'center'
+                    x: 'center'
                 },
-                tooltip : {
+                tooltip: {
                     trigger: 'item',
                     formatter: "{a} <br/>{b} : {c} ({d}%)"
                 },
                 legend: {
                     orient: 'vertical',
                     left: 'left',
-                    data: ['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
+                    data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
                 },
-                series : [
+                series: [
                     {
                         name: '访问来源',
                         type: 'pie',
-                        radius : '55%',
+                        radius: '55%',
                         center: ['50%', '60%'],
-                        data:[
-                            {value:335, name:'直接访问'},
-                            {value:310, name:'邮件营销'},
-                            {value:234, name:'联盟广告'},
-                            {value:135, name:'视频广告'},
-                            {value:1548, name:'搜索引擎'}
+                        data: [
+                            { value: 335, name: '直接访问' },
+                            { value: 310, name: '邮件营销' },
+                            { value: 234, name: '联盟广告' },
+                            { value: 135, name: '视频广告' },
+                            { value: 1548, name: '搜索引擎' }
                         ],
                         itemStyle: {
                             emphasis: {
@@ -183,10 +183,11 @@
         }
 
     }
+
 </script>
 
 <style scoped>
-    .chart {
+    .chart-container {
         width: 100%;
         float: left;
     }
diff --git a/src/pages/nav1/Form.vue b/src/pages/nav1/Form.vue
index 3bbc4a6..2fd9e80 100644
--- a/src/pages/nav1/Form.vue
+++ b/src/pages/nav1/Form.vue
@@ -46,25 +46,26 @@
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        form: {
-          name: '',
-          region: '',
-          date1: '',
-          date2: '',
-          delivery: false,
-          type: [],
-          resource: '',
-          desc: ''
-        }
-      }
-    },
-    methods: {
-      onSubmit() {
-        console.log('submit!');
-      }
-    }
-  }
+	export default {
+		data() {
+			return {
+				form: {
+					name: '',
+					region: '',
+					date1: '',
+					date2: '',
+					delivery: false,
+					type: [],
+					resource: '',
+					desc: ''
+				}
+			}
+		},
+		methods: {
+			onSubmit() {
+				console.log('submit!');
+			}
+		}
+	}
+
 </script>
\ No newline at end of file
diff --git a/src/pages/nav1/Table.vue b/src/pages/nav1/Table.vue
index 5b15b81..2a656e8 100644
--- a/src/pages/nav1/Table.vue
+++ b/src/pages/nav1/Table.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-	import util from '../../common/util'
+	import util from '../../common/js/util'
 	import NProgress from 'nprogress'
 	import { getUserListPage, removeUser, editUser, addUser } from '../../api/api';
 
diff --git a/src/pages/nav1/user.vue b/src/pages/nav1/user.vue
index 5ba50a4..db57336 100644
--- a/src/pages/nav1/user.vue
+++ b/src/pages/nav1/user.vue
@@ -15,22 +15,22 @@
 		<!--列表-->
 		<template>
 			<el-table :data="users" highlight-current-row v-loading="loading" style="width: 100%;">
-<el-table-column type="index" width="60">
-</el-table-column>
-<el-table-column prop="name" label="姓名" width="120" sortable>
-</el-table-column>
-<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
-</el-table-column>
-<el-table-column prop="age" label="年龄" width="100" sortable>
-</el-table-column>
-<el-table-column prop="birth" label="生日" width="120" sortable>
-</el-table-column>
-<el-table-column prop="addr" label="地址" min-width="180" sortable>
-</el-table-column>
-</el-table>
-</template>
+				<el-table-column type="index" width="60">
+				</el-table-column>
+				<el-table-column prop="name" label="姓名" width="120" sortable>
+				</el-table-column>
+				<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
+				</el-table-column>
+				<el-table-column prop="age" label="年龄" width="100" sortable>
+				</el-table-column>
+				<el-table-column prop="birth" label="生日" width="120" sortable>
+				</el-table-column>
+				<el-table-column prop="addr" label="地址" min-width="180" sortable>
+				</el-table-column>
+			</el-table>
+		</template>
 
-</section>
+	</section>
 </template>
 <script>
 	import { getUserList } from '../../api/api';
@@ -69,8 +69,9 @@
 			this.getUser();
 		}
 	};
+
 </script>
 
 <style scoped>
-	
+
 </style>
\ No newline at end of file
diff --git a/src/pages/nav2/Page4.vue b/src/pages/nav2/Page4.vue
index 9ac467d..c1c14e4 100644
--- a/src/pages/nav2/Page4.vue
+++ b/src/pages/nav2/Page4.vue
@@ -1,32 +1,33 @@
 <template>
-	<div>
-		<h1>vuex 测试</h1>
-		Clicked: {{ getCount }} times
-		<button @click="increment">+</button>
-		<button @click="decrement">-</button>
-	</div>
+  <div>
+    <h1>vuex 测试</h1>
+    Clicked: {{ getCount }} times
+    <button @click="increment">+</button>
+    <button @click="decrement">-</button>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { mapActions } from 'vuex'
+  import { mapGetters } from 'vuex'
+  import { mapActions } from 'vuex'
 
-export default {
-	computed: {
+  export default {
+    computed: {
   	// 使用对象展开运算符将 getters 混入 computed 对象中
     ...mapGetters([
       'getCount'
       // ...
     ])
-  },
-   methods: {
+    },
+    methods: {
     ...mapActions([
       'increment', // 映射 this.increment() 为 this.$store.dispatch('increment')
-	  'decrement'
+      'decrement'
     ])
-    //...mapActions({
-    //  add: 'increment' // 映射 this.add() 为 this.$store.dispatch('increment')
-    //})
+      //...mapActions({
+      //  add: 'increment' // 映射 this.add() 为 this.$store.dispatch('increment')
+      //})
+    }
   }
-}
+
 </script>
\ No newline at end of file