From a1d3e3c1c6f6a13e788b0ed8d8f10d7478b3f25a Mon Sep 17 00:00:00 2001 From: liudianxin Date: Tue, 18 Aug 2020 17:57:47 +0800 Subject: [PATCH] order,commodity,cloud,menus,user_info,fwzc --- src/assets/imgs/nav_ic_ganzhifw.png | Bin 0 -> 1260 bytes src/assets/imgs/nav_ic_ganzhifw_sel.png | Bin 0 -> 1230 bytes src/assets/imgs/nav_ic_shikongfw.png | Bin 0 -> 1254 bytes src/assets/imgs/nav_ic_shikongfw_sel.png | Bin 0 -> 1235 bytes src/assets/imgs/nav_ic_shipinfw.png | Bin 0 -> 1136 bytes src/assets/imgs/nav_ic_shipinfw_sel.png | Bin 0 -> 1128 bytes src/assets/imgs/nav_ic_shujufw.png | Bin 0 -> 1193 bytes src/assets/imgs/nav_ic_shujufw_sel.png | Bin 0 -> 1181 bytes src/assets/imgs/nav_ic_zonghefw.png | Bin 0 -> 1231 bytes src/assets/imgs/nav_ic_zonghefw_sel.png | Bin 0 -> 1204 bytes src/components/order-list/order-list-cell.vue | 19 +- src/components/order-list/order-list-com.vue | 51 +++-- src/components/order-list/order-list-list.vue | 2 +- .../service-list/commodity-card.vue | 7 +- .../service-list/commodity-cell.vue | 2 +- src/components/service-list/service_list.vue | 16 +- src/components/shop-cloud/shop-cloud.vue | 36 ++- src/components/table/table-um.vue | 1 - src/pages/authority/menu/menus.vue | 136 ++++++----- src/pages/user/order/order_detail.vue | 214 ++++++++++-------- src/pages/user/user_info.vue | 139 +++++++----- src/pages/workbench/fwgl/cloud-detail.vue | 9 +- src/pages/workbench/fwzc_fwcs.vue | 45 +++- 23 files changed, 405 insertions(+), 272 deletions(-) create mode 100644 src/assets/imgs/nav_ic_ganzhifw.png create mode 100644 src/assets/imgs/nav_ic_ganzhifw_sel.png create mode 100644 src/assets/imgs/nav_ic_shikongfw.png create mode 100644 src/assets/imgs/nav_ic_shikongfw_sel.png create mode 100644 src/assets/imgs/nav_ic_shipinfw.png create mode 100644 src/assets/imgs/nav_ic_shipinfw_sel.png create mode 100644 src/assets/imgs/nav_ic_shujufw.png create mode 100644 src/assets/imgs/nav_ic_shujufw_sel.png create mode 100644 src/assets/imgs/nav_ic_zonghefw.png create mode 100644 src/assets/imgs/nav_ic_zonghefw_sel.png diff --git a/src/assets/imgs/nav_ic_ganzhifw.png b/src/assets/imgs/nav_ic_ganzhifw.png new file mode 100644 index 0000000000000000000000000000000000000000..46e453368ef4690847825e493a3bcb447e420a43 GIT binary patch literal 1260 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!3HEhbh*6;Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?{;ELn2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09sGbq%|6*R&# z^HTE5i#5S|e0{Av^NLFn^O93NU2K(rrs!p6rdYWc8CV(`7&}^+o0}LKx;i>qTAEro zSvWcxyP7#0n;OFOy5uL9=BDPA!1Sgd^g7|x3rY^T1wfl!Qj0RnQd8WD@^cly-nPob z?G_81=0WwQ;C728PQCg-$LND17b&t~LckORV#1RykONQrsd>N@Uj$6r7AysK7#J91 zJY5_^DsJUm^4B<=D0BQ{x^a-T#`KNCo!#B0n`JU0EH@X$_Q|wq=S5u6vwpB3M(k*= zx%ks~zMv_e_NS=(O`7uT(ciV_O*ZH6y*2Oo@4t5b=Ra55ynNFa?32Xkyrbm*V(#BF zj_>lVm^$N_*1Ld$tBV)>ky_?;_HD#5MYanaDXz&upPN@jZ?u~qw(_6_lZC77wvWA0 zDSPK`A>n5i8Z2HJE^B=}Ykufm!?v|ML(@0D2z?a8eKU8NiCy5mM`F6y z{;Z7EvAe*+|Lsb_ff=65HW}C`~-Cg`O^7HgC?N^(sKJ@jRn|{$^)t;-p zQSmQZV-=fx_q+;hnZljl|P=YelF{r5}E*hDab1T literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_ganzhifw_sel.png b/src/assets/imgs/nav_ic_ganzhifw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..a77e34363eded0a8bf34459cb4566edd6b84e354 GIT binary patch literal 1230 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!3HEhbh*6;Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?{;ELn2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09sGbq%|6*R&# z^HTE5i#5S|e0{Av^NLFn^O93NU2K(rrs!p6rdYW+nYx%6S(;gxo0}LKx;i>JS~^*n zni-i}Sh^XQI=jL2y5uL9=BDPA!1Sgd^qS+;3rY^T1wfl!Qj0RnQd8WD@^cly-nPob z?G_W9=0WwQ;C72CPQCg-$LND17b&t~LckORV#1RykONQrsd>N@Uj$6r5=W-&WME*l z^K@|xskl`#ajzG1pg`;Ubu7#W51DvznI?ECx(0Zkv_4|i5)$R2E${eNbaDQ~OHQfW z8+kOsE}ETf((w4OKH~g@_lMqfG0Weve9lw;K4*qXXLIaFrB|A|zOwblv+v#TUskGq z>Oar)k88jEDe$f7@;K8Kdhs0Zwu{|QbmEO4hy3YS6(O{-LYS3}`-@@S)IXgw`yb7E z(E3A&*HC@i&b5toe(&6R-WUj`ckn;z`fT{#dck(?cb3urtV_=Mx?J>q9jnvj5YrVc zcv1g>^{4fHtTx>NUv|7T*uFvei=5?Y_p}njs3bR@BkdX=^SyJ*8}2LJFV#so;&$Ct z;hF2?fXQ|Tw%?h2_UHMi$Kf~J%ztcAJna0-_s@(y-uts7zZ~s)p>p%pg6}7H{@HN+ up2a!d{)@&pFZ^Ar8+bBP^o!45E(3-dfz0B4;XD$c62{Zj&t;ucLK6V!!L;lE literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_shikongfw.png b/src/assets/imgs/nav_ic_shikongfw.png new file mode 100644 index 0000000000000000000000000000000000000000..f5df0f4b28cb437ab14082d473a31fb3c8f1bb9c GIT binary patch literal 1254 zcmeAS@N?(olHy`uVBq!ia0vp^{2c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SUH(Gx>^`Jnp&8fn;06pIy$*oIy*W# zn;4qAm;wo7m|mCsATTyF!HJ80LTmof|f3$wQNukAa5=X13wAkiJ9!oX|MBehLT(TzThJbdrVCw1{8$#r6 z-U#gQFq?EdXIW%VtE36{)+!0Cay2vyyTQm0sF1O)!zkUteSoYG-$UN_H9|qK6wehiN@M>cE>5!3lSGdHn*ZTey0`L-iSq;w z#cgx@W`A(mW#KE4az|~8_}>W}mg(Ajc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SUDRyIU1R`I$4;Tn;06pI$Btmm^)b* znHrj#7@ImfIl}b1psc3Rf6U*5!wKq?5>7GB#LFQAoMx4BN=-w&&1BVVB z>gz4pz0uLre5Ll&y{om4f0x|9vQX;tmE|)(&-pyZxH!%4!5nUz(ugCht9BgG+Vt;+ z!orH%e~+>I6|DcJD0Qi;-Sk4(>%enicLM9|)>Z^JFWXZyd0vYByz?yei$kw(n!f&# zwB^?7i?X8qi6W|7pBG4J&vP(7x1p8k&{OUohq!kYtp2t}E}z5ymHYweEWf#CA0(Bt z_#ZLOk8omrFA-kPUA8!>d(w8tZHE^B%K7BE-d<-N|D?nBYNgC04#ZtraK`?q*-OD+ zO;bLEpL;ALx@Mv7LbdL`4}R}Mk2Su_zGbjH_MU^a)keABvFjH<(#UD5`x~geBlurv z`;kXp^Uc$b9@kKsU*I9NaZP@Hdx~0}MIDO-!+{8qhy>Fo;Bv;()z4*}Q$iB}zjC&j literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_shipinfw.png b/src/assets/imgs/nav_ic_shipinfw.png new file mode 100644 index 0000000000000000000000000000000000000000..0c7e2619233cc50c0421224cf44efa734aca5500 GIT binary patch literal 1136 zcmaJ>TWHfz7|t9{nQjV-)(RRTj!o94X`8i;tI{>QRLz`OVG}2qCTCr!$%)CC?fRfF z7{k4IVK3_R!OIwUVd8_JpbiBu56*c(Q3P)&sCau&bfBKhb^2fpBr0BA#RNf=#2R=JkEQlIvj~5eHn_&{un5(*qGs5R(vk^?hyoLUjA>F5h(J=hw%q{L z1W{O~##>RVu#S_V=9X-XJEIwxO%TP01mJTD^*_&Tv>j14tq>+E(4-GGS^$m&0>=o2JMK2ug*i-$}I!O=J|B zfMnfOE}8KK$w0`>u%V#WUrBmBOcm`3(Tv~aVK`5S^DyM(L*Zzq($0x|-DE7h3R4{j z85~Wg(`k3w=Z0pIWYxqDN9|=Yxe66o0$K|2isR143xXK@HRbH-b2hG5dd0?vB zfl_BejhrZ(Q}gHI%d0oZRr2TJ&&#E8GPHfTe;syi3p>c3PFWW(rpym??06Gf`_+qE zPJAt%#`s7)^QeF9(yW4Qj%%N+*=>D}%FheS4?bD5VB^WMgCh!6cvkGItP;g{KW0?? z>@L`_qyOsorrjg=zkR;<_VoM1qhGtuTkPYb!;)jO@{GOspv3C0Zp&VmdQO!&B1;B~ z2hY?^TQA&RUU+BlWO}&g=FpYotX0P!q_}|rzGU%yIXC`?zVhcxTN>8 zW8S($jq#CrM~02PuYJ8c)@IkQcvwGuWgB~9{3VUz!z-G7Myh*G6$IwzW`wDeYXGr literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_shipinfw_sel.png b/src/assets/imgs/nav_ic_shipinfw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..47c9454353c51719678febf45158cd9d50ecd047 GIT binary patch literal 1128 zcmaJ=TSyd97#_M>X?DS`LeoT6m5aWYl3iY!dZQQ(!sD!n&D_R-^Q>!!|@DDj(!x5X2`XCLY9sOzERO+7&ljpa6%zIsF_IABoGul6jre-ip=}G zZm-iB@Vi~Ee3tbWdmWrta52t6z@IPV`P@ma0HsD1Xeh~*|8N5-xt1MN9Y+>`p=<+k zzas}16#W*_h%J; z7JWgXIGT8Rs^`M=>#MVGe~4{(?3{I@`qPBkuKt`k9dntswGEZsLhh}jZG$h)Ogh=W z3mpy{SC{n)Cob;Y`7wBMX!!ff&*734v9uYbX8Y-bcirB76ECN2o%wacn#@a&$`5st z>A3?7pPk+Ed~s1uCcCF~)B3lSy$|~$(`KJ~wD-8ynKAsNd%=UM-IK30xBYx2PZ-y5 z;a>KgDSr3O;WyD80}I=;TIan!(AU|x?&Xcm1Eoh=S$_GvmUV;d_Ns41$Fsv(E03lB n$V}HuTfoK7dFQEU^!?IqqNAnr{`jG@U#zzu^oNCW-s+ZL04aX! literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_shujufw.png b/src/assets/imgs/nav_ic_shujufw.png new file mode 100644 index 0000000000000000000000000000000000000000..1dc9b626c6b7c972060a68e487aa9b56e4913ff4 GIT binary patch literal 1193 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0z*Q}aq-dQ%X3U2y6JC5PMspv^9+MVV!(DQ-pixe8!!TV>*Q ziz80+pn6kqyTu8oUVWfr^g)q}6xlE#UwP#t=Sr^QY!u6+*A#kiE3nwm>QFK%s8&}y1( z!MUicSfD+R@90MP1CB?ovgyMG$n>}{^_}Hke z^V_CxLxb8pp{BzTP3Z?SZ5B1mpK(F$TtTv=|Ltnt)@K{L{so-K+BPvf_f-Fxs3V$I zTB~0DR@wJKK%{Eo1FNhR3B1a`?AonOpZj0fX546{XSzE#pGVd7;#aP^B-Za%>*p2= z>fU*zB(ueMn_-s;pY#8mqlIg4Tu5PFl^gv*Lb}4u{Gr@st4sUVpS!urc%t?T(|v`# zvGKY0Ce`;pkYg`w@^SiWeX4@9DbnYqtogkOn;)!aU}mV6wcwjL$H5R(czC+{xvXl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0H{644~kr*$c704QxJ#=Pr5)3Jn^UI0aJVtFln<0zRzJ`VC405 zaSW-rHRs|+Z>B_v;~%#NKb*8+gQC)>`V6s_G(``l?+Q^(O>G6@G17B*7Fvpn|7To$ z^We8UWg=L5}^amn{3rBhMXDdQbdI$-4Y2rD4;zesmMx*RuSpa!q2NV@}2D zV+{Ek>t;St)H?BU?~0rUZJ!&WeFW3)JYJ@Dr*OW0M%C6MqH9*Owq^YP`@LRk*Kwh$ t8>dd3FX-!EQ7C=9YFTK5?DZWY2@Hu|q6|tJ592`vhNr8a%Q~loCIE73nTG%X literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_zonghefw.png b/src/assets/imgs/nav_ic_zonghefw.png new file mode 100644 index 0000000000000000000000000000000000000000..1f99ddd7e1ff16f22c9a66ab8091d72dc2e2f903 GIT binary patch literal 1231 zcmeAS@N?(olHy`uVBq!ia0vp^{2c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6Sh*S+8o4^TI9iySn;06pI$D^yn7SAm z7@L{7x*9neTf+3ZA~zMa_pn8O_cXXtq>O14V-ETj~T_3Jh*amT$6-_xo=NV5^7P%($Qhn zy>iNFLWQZ^R0T23kN^(F77@*>Fa95tmPna?wpo7m-G{Sp)*5rJN$r!FU*%#ix1rzp zN{YgZAK~&^FOD*vyZA^x8Y6YRla!TCcgO(7}yF^+qYkA zk-b^bpI}_Jbz`J;&Enez&B1RQWA9oV*0}aDh3yPy_iNL(%sUGk^lUdd+BRxdhZP^% tx1q&w&I`-FMZy1Fl_QS!%l;EiU`RS@yNOTW2P3G6@pScbS?83{1ONdTr+fea literal 0 HcmV?d00001 diff --git a/src/assets/imgs/nav_ic_zonghefw_sel.png b/src/assets/imgs/nav_ic_zonghefw_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..e148a203f4c9321da83af5e2f1af40245e52ae2f GIT binary patch literal 1204 zcmeAS@N?(olHy`uVBq!ia0vp^{2c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6Sh<>*IU1NcTUeNzn;06pI$Am!SvZXR@+i><)HbUqc=*ozR=e``TTOl z)QYvQrmufku5*-UebS5e*(Vf@Rd+P%NY&e3iQAC8>soVvL^c<1O>*(4s<7N9?Ir3> z+S?xA`u5lGd-Ao}54d$>7UUjZvHjhFyhSd54ZAG1KmNVtcWqbAjiO^rJPZqiP2Vzz Rv_^x<5l>e?mvv4FO#opVr=S1; literal 0 HcmV?d00001 diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index 6ede68a..60b0de8 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -122,7 +122,7 @@ @click="viewDetail(cellItem.order_id)" >查看详情
再次申请
@@ -140,9 +140,7 @@
评价详情：
@@ -174,6 +172,13 @@ export default { helper: helper, message: {}, }), + watch: { + cellItem: { + handler() { + this.showMsgBox = false; + } + } + }, methods: { addEvaluation() { if (this.textarea == "" && this.serviceRate == null) { @@ -274,7 +279,7 @@ export default { path: "/shop/shop_car_apply", query: query, }); - } else if (this.cellItem.order_type == 2) { + } else if (this.cellItem.order_type == 3) { this.$router.push({ path: "/shop/shop_cloud", }); @@ -512,10 +517,10 @@ export default { margin: 0 0 10px; } .msg_rate { - margin: 0 0 10px 20px; + margin: 0 0 20px 0; } .msg_text { - margin-left: 20px; + /* margin-left: 20px; */ color: #242c43; } diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue index ed7c91c..8b92f04 100644 --- a/src/components/order-list/order-list-com.vue +++ b/src/components/order-list/order-list-com.vue @@ -80,7 +80,7 @@ import OrderList from "@/components/order-list/order-list-list"; export default { components: { - OrderList + OrderList, }, data: () => ({ stateList: [ @@ -89,7 +89,7 @@ export default { { value: "2", label: "审核中" }, { value: "3", label: "已获取" }, { value: "4", label: "未通过" }, - { value: "5", label: "已取消" } + { value: "5", label: "已取消" }, ], activeName: "0", buttonList: [], @@ -97,23 +97,23 @@ export default { pagination: { rowsPerPage: 10, page: 1, - total: 0 + total: 0, }, pageOptions: [ { value: "10", - label: "10" + label: "10", }, { value: "20", - label: "20" + label: "20", }, { value: "50", - label: "50" - } + label: "50", + }, ], - datas: [] + datas: [], }), mounted() { this.getBtns(); @@ -121,13 +121,13 @@ export default { }, methods: { getBtns() { - this.$api.user.getOrderBtnTypes().then(response => { + this.$api.user.getOrderBtnTypes().then((response) => { if (response.data.success == 1) { let buttonList = response.data.data; - buttonList.forEach(item => { + buttonList.forEach((item) => { item.state = false; }); - buttonList.unshift({ id: "", name: "全部", state: false }); + buttonList.unshift({ id: 0, name: "全部", state: false }); buttonList.push({ id: "cloud", name: "云资源", state: false }); buttonList.push({ id: "app", name: "应用镜像", state: false }); this.buttonList = buttonList; @@ -147,12 +147,14 @@ export default { } this.buttonList[0].state = !this.buttonList[0].state; } + this.pagination.page = 1; this.getData(); }, // search debonce 500ms searchVal() { if (this.times !== null) clearTimeout(this.times); this.times = setTimeout(() => { + this.pagination.page = 1; this.getData(); }, 500); }, @@ -161,9 +163,13 @@ export default { let service = 0; let app = 0; let resource = 0; - this.buttonList.forEach(item => { + this.buttonList.forEach((item) => { if (item.state == true) { - if (item.id == "cloud") { + if (item.id == 0) { + resource = 1; + app = 1; + service = 1; + } else if (item.id == "cloud") { resource = 1; } else if (item.id == "app") { app = 1; @@ -186,9 +192,10 @@ export default { types: arr, service: service, app: app, - resource: resource + resource: resource, }; - this.$api.user.orderList(params).then(response => { + this.$api.user.orderList(params).then((response) => { + this.datas = []; this.datas = response.data.data; this.pagination.total = response.data.total; }); @@ -203,8 +210,8 @@ export default { }, updateList() { this.getData(); - } - } + }, + }, }; diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index 0e27b0b..037fa43 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -5,7 +5,7 @@ {{ name }} - + @@ -14,13 +14,13 @@ - +
部门联系人：
 - +
联系电话：
 @@ -127,6 +127,7 @@ v-model="formNew.dataDisk" controls-position="right" :min="0" + :max="1000" placeholder="请选择增加数据盘的数量" >
块
@@ -138,6 +139,7 @@ v-model="formNew.perDataDisk" controls-position="right" :min="0" + :max="1000" placeholder="请选择每块数据盘的容量" >
GB
@@ -215,6 +217,7 @@ v-model="formNew.appDuration" controls-position="right" :min="0" + :max="1000" >
块
@@ -393,6 +397,7 @@ v-model="formOld.perDataDisk" controls-position="right" :min="0" + :max="1000" placeholder="请选择每块数据盘的容量" >
GB
@@ -521,6 +526,7 @@ v-model="formOld.appDuration" controls-position="right" :min="0" + :max="1000" > diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue index fe639ba..55c1267 100644 --- a/src/components/table/table-um.vue +++ b/src/components/table/table-um.vue @@ -473,7 +473,6 @@ export default { }, // get data getDataFromApiSync() { - console.log("get data >>>"); this.getDataFromApi().then( data => { this.selectedTabsPage = JSON.parse(JSON.stringify(data.newArr)); diff --git a/src/pages/authority/menu/menus.vue b/src/pages/authority/menu/menus.vue index 5fd9b3d..ca8201e 100644 --- a/src/pages/authority/menu/menus.vue +++ b/src/pages/authority/menu/menus.vue @@ -119,7 +119,7 @@ export default { treeData: [], defaultProps: { children: "Child", - label: "menu_name" + label: "menu_name", }, formDetail: { menu_name: "", @@ -128,7 +128,7 @@ export default { detail: "", menu_order: "", create_user: "", - create_date: "" + create_date: "", }, formStaged: [], formContrast: { @@ -138,12 +138,12 @@ export default { detail: "", menu_order: "", create_user: "", - create_date: "" + create_date: "", }, rules: { menu_name: [ { required: true, message: "请填写菜单名称", trigger: "blur" }, - { min: 0, max: 16, message: "菜单名称不超过16位", trigger: "blur" } + { min: 0, max: 16, message: "菜单名称不超过16位", trigger: "blur" }, ], visit_url: [ { required: true, message: "请填写菜单访问地址", trigger: "blur" }, @@ -151,27 +151,29 @@ export default { min: 0, max: 50, message: "访问地址长度不超过50个字", - trigger: "blur" - } + trigger: "blur", + }, ], team_name: [ - { min: 0, max: 16, message: "菜单组别不超过16个字", trigger: "blur" } - ] + { min: 0, max: 16, message: "菜单组别不超过16个字", trigger: "blur" }, + ], }, nodeId: "", previousSibling: false, nextSibling: false, newI: 0, helper: helper, - canSave: false + canSave: false, + create_user: "", }; }, watch: { checkText(val) { this.$refs.tree.filter(val); - } + }, }, mounted() { + this.getCreateUser(); this.getTree(); }, methods: { @@ -182,13 +184,13 @@ export default { nodeClick(data, node) { this.canSave = false; if (this.nodeId.indexOf("new") > -1) { - let result = this.formStaged.some(item => { + let result = this.formStaged.some((item) => { if (item.id == this.nodeId) { return true; } }); if (result) { - this.formStaged.forEach(item => { + this.formStaged.forEach((item) => { if (item.id == this.nodeId) { item.data = this.formDetail; } @@ -209,16 +211,16 @@ export default { } let cid = String(data.menu_id); if (cid.indexOf("new") > -1) { - this.formStaged.forEach(item => { + this.formStaged.forEach((item) => { if (item.id == cid) { this.formDetail = item.data; } }); } else { let query = { - id: this.nodeId + id: this.nodeId, }; - this.$api.authority.getMenu(query).then(response => { + this.$api.authority.getMenu(query).then((response) => { if (response.data.success == 1) { this.formDetail = response.data.data; this.formDetail.create_date = helper.dateStringTransform( @@ -228,29 +230,32 @@ export default { } else { this.$message({ message: response.data.errMsg, - type: "error" + type: "error", }); } }); } }, + getCreateUser() { + this.$api.user.getNowUser().then((response) => { + if (response.data.success == 1) { + this.create_user = response.data.data.user_name; + } else { + console.log(response.data.errMsg); + } + }); + }, appendNode() { let newChild = { menu_id: "new" + this.newI, menu_name: "新菜单", - Child: [] + Child: [], }; this.newI++; this.$refs.tree.append(newChild, this.nodeId); this.$refs.tree.setCurrentKey(newChild.menu_id); let node = this.$refs.tree.getNode(newChild.menu_id); - this.$api.user.getNowUser().then(response => { - if (response.data.success == 1) { - this.formDetail.create_user = response.data.data.user_name; - } else { - console.log(response.data.errMsg); - } - }); + this.formDetail.create_user = this.create_user; this.formDetail.menu_order = node.parent.childNodes.length; this.formDetail.menu_name = newChild.menu_name; this.formDetail.team_name = node.parent.data.team_name; @@ -262,7 +267,7 @@ export default { this.formDetail.visit_url = ""; this.$message({ message: "不要忘了完善信息哦", - type: "success" + type: "success", }); this.nodeClick(newChild, node); }, @@ -270,7 +275,7 @@ export default { let newChild = { menu_id: "new" + this.newI, menu_name: "新菜单", - Child: [] + Child: [], }; this.$refs.tree.insertAfter( newChild, @@ -278,14 +283,8 @@ export default { ); this.newI++; this.$refs.tree.setCurrentKey(newChild.menu_id); - this.$api.user.getNowUser().then(response => { - if (response.data.success == 1) { - this.formDetail.create_user = response.data.data.user_name; - } else { - console.log(response.data.errMsg); - } - }); let node = this.$refs.tree.getNode(newChild.menu_id); + this.formDetail.create_user = this.create_user; this.formDetail.menu_order = this.treeData.length; this.formDetail.menu_name = newChild.menu_name; this.formDetail.team_name = "apaas"; @@ -297,22 +296,37 @@ export default { this.formDetail.visit_url = ""; this.$message({ message: "不要忘了完善信息哦", - type: "success" + type: "success", }); this.nodeClick(newChild, node); }, resetForm() { - this.formDetail.menu_name = this.formContrast.menu_name; - this.formDetail.visit_url = this.formContrast.visit_url; - this.formDetail.team_name = this.formContrast.team_name; - this.formDetail.detail = this.formContrast.detail; - this.formDetail.menu_order = this.formContrast.menu_order; - this.formDetail.create_user = this.formContrast.create_user; - this.formDetail.create_date = this.formContrast.create_date; - this.canSave = false; + if (this.nodeId.indexOf("new") > -1) { + let node = this.$refs.tree.getNode(this.nodeId); + this.formDetail.menu_name = ""; + this.formDetail.visit_url = ""; + this.formDetail.team_name = ""; + this.formDetail.detail = ""; + this.formDetail.menu_order = node.parent.childNodes.length; + this.formDetail.create_user = this.create_user; + this.formDetail.create_date = helper.dateFormat( + "YYYY-mm-dd HH:MM:SS", + new Date() + ); + this.canSave = false; + } else { + this.formDetail.menu_name = this.formContrast.menu_name; + this.formDetail.visit_url = this.formContrast.visit_url; + this.formDetail.team_name = this.formContrast.team_name; + this.formDetail.detail = this.formContrast.detail; + this.formDetail.menu_order = this.formContrast.menu_order; + this.formDetail.create_user = this.formContrast.create_user; + this.formDetail.create_date = this.formContrast.create_date; + this.canSave = false; + } }, getTree() { - this.$api.authority.getMenuList().then(response => { + this.$api.authority.getMenuList().then((response) => { if (response.data.success == 1) { this.treeData = response.data.data; this.nodeId = ""; @@ -325,7 +339,7 @@ export default { }); }, saveNode() { - this.$refs.formDetail.validate(valid => { + this.$refs.formDetail.validate((valid) => { if (valid) { let query = { menu_id: this.nodeId, @@ -334,16 +348,16 @@ export default { visit_url: this.formDetail.visit_url, team_name: this.formDetail.team_name, issystem: 1, - menu_order: this.formDetail.menu_order + menu_order: this.formDetail.menu_order, }; if (this.nodeId.substring(0, 3) == "new") { let node = this.$refs.tree.getNode(this.nodeId); query.parent_id = node.parent.data.menu_id; - this.$api.authority.addMenu(query).then(response => { + this.$api.authority.addMenu(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "插入菜单成功", - type: "success" + type: "success", }); this.getTree(); this.emptyObject(); @@ -352,11 +366,11 @@ export default { } }); } else { - this.$api.authority.editMenu(query).then(response => { + this.$api.authority.editMenu(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "修改菜单成功", - type: "success" + type: "success", }); this.getTree(); this.emptyObject(); @@ -368,7 +382,7 @@ export default { } else { this.$message({ message: "请完善信息", - type: "error" + type: "error", }); } }); @@ -379,13 +393,13 @@ export default { this.emptyObject(); } else { let params = { - id: this.nodeId + id: this.nodeId, }; - this.$api.authority.delMenu(params).then(response => { + this.$api.authority.delMenu(params).then((response) => { if (response.data.success == 1) { this.$message({ message: "删除菜单成功", - type: "success" + type: "success", }); this.getTree(); this.emptyObject(); @@ -406,19 +420,19 @@ export default { data: [ { id: node.data.menu_id, - sort: nodeNext.data.menu_order + sort: nodeNext.data.menu_order, }, { id: nodeNext.data.menu_id, - sort: node.data.menu_order - } - ] + sort: node.data.menu_order, + }, + ], }; - this.$api.authority.positionMenu(params).then(response => { + this.$api.authority.positionMenu(params).then((response) => { if (response.data.success == 1) { this.$message({ message: "更新菜单成功", - type: "success" + type: "success", }); this.getTree(); this.emptyObject(); @@ -434,8 +448,8 @@ export default { for (var i in this.formDetail) { this.formDetail[i] = ""; } - } - } + }, + }, }; diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index d154609..b87ee41 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -125,7 +125,6 @@
- 取消 修改
{ @@ -240,24 +239,24 @@ export default { email: "", organization: "", userType: "", - userTypeName: "" + userTypeName: "", }, visible1: true, visible2: true, form: { passwordOld: "", passwordNew: "", - nextname: "" + nextname: "", }, passRules: { passwordNew: [ { required: true, message: "请输入新密码", trigger: "blur" }, - { validator: checkNewPass, trigger: "blur" } + { validator: checkNewPass, trigger: "blur" }, ], nextname: [ { required: true, message: "请再次输入新密码", trigger: "blur" }, - { validator: checkNextPass, trigger: "blur" } - ] + { validator: checkNextPass, trigger: "blur" }, + ], }, imgList: [], formBusiness: { @@ -266,7 +265,7 @@ export default { ip_white: [], ip_black: [], private_token: "", - description: "" + description: "", }, whiteAddShow: false, blackAddShow: false, @@ -278,33 +277,36 @@ export default { accountNo: [ { required: true, message: "请输入账号", trigger: "blur" }, { max: 16, message: "长度请小于16个字符", trigger: "blur" }, - { validator: user_name_pass, trigger: "blur" } + { validator: user_name_pass, trigger: "blur" }, ], nickname: [ { required: true, message: "请输入昵称", trigger: "blur" }, - { max: 8, message: "长度请小于8个字符", trigger: "blur" } + { max: 8, message: "长度请小于8个字符", trigger: "blur" }, ], contactPerson: [ - { max: 6, message: "长度请小于6个字符", trigger: "blur" } + { max: 6, message: "长度请小于6个字符", trigger: "blur" }, ], phone: [ - { pattern: /^1[34578]\d{9}$/, message: "请输入正确的手机号码" } + { + pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/, + message: "请输入正确的手机号码", + }, ], email: [ { pattern: /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/, - message: "请输入正确的邮箱" - } - ] + message: "请输入正确的邮箱", + }, + ], }, rules_bussiness: { businessSystemName: [ - { max: 16, message: "长度请小于16个字符", trigger: "blur" } + { max: 16, message: "长度请小于16个字符", trigger: "blur" }, ], description: [ - { max: 500, message: "长度请小于500个字符", trigger: "blur" } - ] - } + { max: 500, message: "长度请小于500个字符", trigger: "blur" }, + ], + }, }; }, mounted() { @@ -312,7 +314,7 @@ export default { }, methods: { getCurrentUser() { - this.$api.user.getNowUser().then(response => { + this.$api.user.getNowUser().then((response) => { if (response.data.success == 1) { this.is_admin = response.data.data.is_admin; this.userId = response.data.data.user_id; @@ -323,7 +325,7 @@ export default { }); }, getUserInfo() { - this.$api.user.getUserDetail({ id: this.userId }).then(response => { + this.$api.user.getUserDetail({ id: this.userId }).then((response) => { if (response.data.success == 1) { let data = response.data.data; this.user_data.accountNo = data.user_id; @@ -340,7 +342,7 @@ export default { ? "组织管理员" : this.user_data.userType == 3 ? "普通用户" - : "普通用户开发者"; + : "开发者"; this.user_data.is_apply = data.is_apply; this.imgList = []; this.imgList.push(data.picture_path); @@ -357,11 +359,10 @@ export default { getNewList(val) { this.imgList[0] = val[0].url; }, - previous() {}, registe() { let query = {}; if (this.activeName == 0) { - this.$refs["form"].validate(valid => { + this.$refs["form"].validate((valid) => { if (valid) { query = { pageType: "personalFile", // this page is user info @@ -371,19 +372,20 @@ export default { email: this.user_data.email, is_admin: this.user_data.userType, link_man: this.user_data.contactPerson, - picture_path: this.imgList[0] + picture_path: this.imgList[0], }; - this.$api.authority.setUserInfo(query).then(response => { + this.$api.authority.setUserInfo(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "修改个人信息成功", - type: "success" + type: "success", }); this.getUserInfo(); + this.getCurrentUser(); } else { this.$message({ message: "修改个人信息失败", - type: "error" + type: "error", }); } }); @@ -392,7 +394,7 @@ export default { } }); } else if (this.activeName == 1) { - this.$refs["formBusiness"].validate(valid => { + this.$refs["formBusiness"].validate((valid) => { console.log(valid); if (valid) { query = { @@ -402,19 +404,20 @@ export default { domain_name: this.formBusiness.domainName, ip_whitelist: this.formBusiness.ip_white, ip_blacklist: this.formBusiness.ip_black, - description: this.formBusiness.description + description: this.formBusiness.description, }; - this.$api.authority.setUserInfo(query).then(response => { + this.$api.authority.setUserInfo(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "修改个人信息成功", - type: "success" + type: "success", }); this.getUserInfo(); + this.getCurrentUser(); } else { this.$message({ message: "修改个人信息失败", - type: "error" + type: "error", }); } }); @@ -424,6 +427,16 @@ export default { }); } }, + getCurrentUser() { + this.$api.user.getNowUser().then(({ data }) => { + if (data.success == 1) { + this.$store.commit("userInfofun", data.data); + this.now_user = this.level; + } else { + console.log(data.errMsg); + } + }); + }, changePassword() { this.diaPassWord = true; }, @@ -434,38 +447,40 @@ export default { this.visible2 = !this.visible2; }, cancelChangePwd() { + this.$refs.form1.resetFields(); this.diaPassWord = false; }, - check_pass_form(){ - this.$refs['form1'].validate((valid) => { - if (valid) { - this.submitChangePwd() - } else { - this.$message.error('请检查表单') - return false; - } - }); + check_pass_form() { + this.$refs["form1"].validate((valid) => { + if (valid) { + this.submitChangePwd(); + } else { + this.$message.error("请检查表单"); + return false; + } + }); }, submitChangePwd() { let query = { id: this.user_data.accountNo, form: { origin_password: this.form.passwordOld, - new_password: this.form.passwordNew - } + new_password: this.form.passwordNew, + }, }; - this.$api.user.editUserPassword(query).then(response => { + this.$api.user.editUserPassword(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "修改密码成功", - type: "success" + type: "success", }); + this.$refs.form1.resetFields(); this.diaPassWord = false; this.getUserInfo(); } else { this.$message({ - message: "修改密码失败", - type: "error" + message: response.data.errMsg, + type: "error", }); } }); @@ -475,17 +490,18 @@ export default { }, submitUpLevel() { this.upLevelDia = false; - this.$api.authority.updateLevel().then(response => { + this.$api.authority.updateLevel().then((response) => { if (response.data.success == 1) { this.$message({ message: "申请升级开发者成功", - type: "success" + type: "success", }); this.getUserInfo(); + this.getCurrentUser(); } else { this.$message({ message: "申请升级开发者失败", - type: "error" + type: "error", }); } }); @@ -496,22 +512,23 @@ export default { cancelButtonText: "取消", cancelButtonClass: "msg_btn_gray", confirmButtonClass: "msg_btn", - type: "warning" + type: "warning", }) .then(() => { this.$api.authority .resetUserKey({ user_id: this.user_data.accountNo }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.$message({ message: "重置密钥成功", - type: "success" + type: "success", }); this.getUserInfo(); + this.getCurrentUser(); } else { this.$message({ message: "重置密钥失败", - type: "error" + type: "error", }); } }); @@ -519,7 +536,7 @@ export default { .catch(() => { this.$message({ type: "info", - message: "已取消重置" + message: "已取消重置", }); }); }, @@ -535,7 +552,7 @@ export default { document.execCommand("copy"); this.$message({ message: "复制成功", - type: "success" + type: "success", }); } document.body.removeChild(input); @@ -548,14 +565,14 @@ export default { this.whiteAddShow ? this.$message({ message: "请按回车完善本次ip填写", - type: "error" + type: "error", }) : (this.whiteAddShow = true); } else if (type == "black") { this.blackAddShow ? this.$message({ message: "请按回车完善本次ip填写", - type: "error" + type: "error", }) : (this.blackAddShow = true); } @@ -575,8 +592,8 @@ export default { self.blackAddShow = false; self.newIpBlack = ""; } - } - } + }, + }, };