From a5990b44b8dd0c43ff60e27aea5c83a4598f7216 Mon Sep 17 00:00:00 2001 From: xiejiahao <422618910@qq.com> Date: Fri, 29 Apr 2022 19:14:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=A8=A1=E5=9D=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 25 +- src/App.vue | 1 + src/api/mdp/pay/pay.js | 6 + src/api/mdp/sys/modules.js | 1 + src/api/mdp/sys/order.js | 6 + src/assets/image/module/xm/xm_gongshi.png | Bin 0 -> 32240 bytes src/common/config.js | 5 + src/components/ModulesMenu/allMenus.vue | 2 +- src/components/ModulesMenu/index.scss | 6 +- src/components/ModulesMenu/modulesOfIcon.js | 3 +- src/router/routes_my_work.js | 9 + src/router/routes_order.js | 18 + src/views/login/components/login.vue | 2 +- src/views/myWork/message/index.scss | 73 ++++ src/views/myWork/message/index.vue | 78 ++++ src/views/order/components/orderSkeleton.vue | 84 ++++ src/views/order/createOrder.vue | 223 +++++++++++ src/views/order/enterprise.vue | 399 +++++++++++++++++++ src/views/order/flagShip.vue | 143 +++++++ src/views/order/index.scss | 379 ++++++++++-------- src/views/order/index.vue | 302 +++++++------- src/views/order/list.vue | 15 + src/views/order/paySuccess.vue | 35 ++ 23 files changed, 1476 insertions(+), 339 deletions(-) create mode 100644 src/api/mdp/pay/pay.js create mode 100644 src/api/mdp/sys/order.js create mode 100644 src/assets/image/module/xm/xm_gongshi.png create mode 100644 src/views/myWork/message/index.scss create mode 100644 src/views/myWork/message/index.vue create mode 100644 src/views/order/components/orderSkeleton.vue create mode 100644 src/views/order/createOrder.vue create mode 100644 src/views/order/enterprise.vue create mode 100644 src/views/order/flagShip.vue create mode 100644 src/views/order/list.vue create mode 100644 src/views/order/paySuccess.vue diff --git a/config/index.js b/config/index.js index dc6777d2..029c2cfb 100644 --- a/config/index.js +++ b/config/index.js @@ -6,19 +6,34 @@ const path = require('path') module.exports = { dev: { - // Paths assetsSubDirectory: '', assetsPublicPath: '/', proxyTable: { - '/api/m1/xm': { target: 'http://localhost:7067', changeOrigin: true, pathRewrite: { - '^/api/m1/xm': '/xm' - } - }, + '^/api/m1/xm': '/xm' + } + }, + + '/api/m1/sys': { + target: 'http://192.168.0.103:7015', + changeOrigin: true, + pathRewrite: { + '^/api/m1/sys': '/sys' + } + }, + + '/api/m1/pay': { + target: 'http://192.168.0.103:7125', + changeOrigin: true, + pathRewrite: { + '^/api/m1/pay': '/pay' + } + }, + /** '/api/m1/workflow': { target: 'http://localhost:7080', diff --git a/src/App.vue b/src/App.vue index a28656a6..623b032d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,3 +10,4 @@ } + diff --git a/src/api/mdp/pay/pay.js b/src/api/mdp/pay/pay.js new file mode 100644 index 00000000..6df3bf22 --- /dev/null +++ b/src/api/mdp/pay/pay.js @@ -0,0 +1,6 @@ +import axios from '@/utils/request' +import config from '@/common/config' +let base = config.getPayBasePath(); + +export const aliPay = params => { return axios.post(`${base}/alipay/uniOrder`, params) } +export const weixinPay = params => { return axios.post(`${base}/wxpay/uniOrder/native`, params) } diff --git a/src/api/mdp/sys/modules.js b/src/api/mdp/sys/modules.js index bb0a6ee8..862d5dbd 100644 --- a/src/api/mdp/sys/modules.js +++ b/src/api/mdp/sys/modules.js @@ -3,5 +3,6 @@ import config from '@/common/config' let base = config.getSysBasePath(); + export const getAllMenuModule = params => { return axios.get(`${base}/sys/sys/mdp/menu/menuModule/list`, {params: params }); }; export const getBuyMenuModule = params => { return axios.get(`${base}/sys/sys/mdp/menu/menuModuleBranch/list`, {params: params }); }; diff --git a/src/api/mdp/sys/order.js b/src/api/mdp/sys/order.js new file mode 100644 index 00000000..876a61ca --- /dev/null +++ b/src/api/mdp/sys/order.js @@ -0,0 +1,6 @@ +import axios from '@/utils/request' +import config from '@/common/config' +let base = config.getSysBasePath(); + +export const createOrder = params => { return axios.post(`${base}/mdp/mo/moOrder/create`, params) }; + diff --git a/src/assets/image/module/xm/xm_gongshi.png b/src/assets/image/module/xm/xm_gongshi.png new file mode 100644 index 0000000000000000000000000000000000000000..5611aef9ce4e7e364ba0a375e720ee2fcbd2dfef GIT binary patch literal 32240 zcmdSAXHZnz)-K%SBtcL?5D6lPk~2+e$w5GZ;Cz6)m|=o%{9ZAV~+5QXGK5MQlTVgB!@sClxnJq zx)2BfEAD?%V(`n1C$S^==Q>=;2(IU05BIh5vV+{W^{}>MRdcg)u+z1(vh{!R%}yG; z;p3!l1UJ%r0JZUOhN52>YZgLJWxv}Ko*WtH}Wf)3p5;8v`DZm#a$P(K;=zxsuOd)&|b z?5uw^fxF1C|2-)q&4;WC9$t2=VtfL;HUa`dtm2YYLQ%9CG^Pk`Ue4Y#hpT6@EF?f%y^{$p!zeSc3oeqB3n4<9cZupjof{{1qL z-T!$YTthG$sJ53A*c2;QMGqSvH#>K@nxYIlc*1AvWD6Cum9!GD6&2&PvKO=G6|onR zabbC3d3hm8K|v)22|)!Vc~KDs0WnGO z`$9@e|9)4^-5YM@Ze#cFv7Nx!|9V&G|M)Ic!OPAH?%}2H;oS?RC;bLWhrB5u4G8e)YG$ z)s+PqZq<5h$z1618h^Z9+Uz2^Wx96;E1do~Zhn^a-g{t6CVlm!4R_FC{E7{PxEoT| z|8<2y@W3B`Um^IUxCj5d(!g-P{Cy3D;Dh^rULk}uxW|8ASwnI6|GYx*{u=J@>putm z`~H78^nV-le;@k44f?+i{m()F!>a$e-hZx|_0;<8I41M_c<^BpSS4wBNwb_Hgp4h_ zo)7#f{}qF_e93Ku6Tm;$`Om@rn^^xA@jnOqr&#~K|8ML3r&#~K|8ML3=b-=p6YhUl z@Bd|A|DUb*KMei0r zd0eupX`}6vv-Fmf5|&aOcH~y(9X6}!HRVW^g z#LSnekDfMK@~5ok`SYcPWP8Yty?)Pj%CQYf58_kJFhq{OWxF0Y)RNQ~GZ8$U7~Kd?B~CiPasA3u&9Dln|U~ z*5toN6;7y&w0@GV6du&06}@mpiRCI>1X-Rnaq=k9E$_2Uxf!Z)Q!*)U{1hI!ll?|{ z9ge|_sOu1PVJ={d%ece{*z2HrWwsiRWB=K+R;b?!<-Gv z;PZqRWbBazb%#m*(!7s$91R>AjsAM=^`nY)%DQ|e7AGG+tO+HdKoUnby*k`Y&BqEg zwsJ7zkl8^50V)a0S?l=yW39jFR=`sZW%m!JbL<6nP94_BKX&`MaF>ORQ&~FYeKosZ zg3SxefAyR-;w?&>FP=K|B*uTv1zMhHmK4nELdU7+(l#%vpYNsh-a9T`;Lkh%;Baq^ zzXU&@YP33_Mht>GsBl>pHTcYe}lD@20dLm{<=kli|dXj zL3SN3&i&^5i{keoIhSwx|=BM>1MjnrvvvB$BAo&(m|-Cf#C6*&q;9# zv_=qr_@MwjYZKlrvmXj$mDuY4-X(eqxnQ-v`PPlW$zZiX0;lvecP%>k*ayo3p3OoH zi_P%D++S--47i;+eRK2AH?Ogf-nrczWq!&@PlA(I_}v5s;oM~lHSIIjnHBbeMajG0 zwxzHN^?SUT=UjBkZFl-Nc+kYSruZW^)x`-8MHaV9wxt-bu=ybxnVO$mc8)u78vZNy zxwFn&WP;48VW1@`WEYB1Oh~W@sJETC5RSGJdvbrM+hhM-0jGs6%ihux?yTdNU~RMR zTNHn-O(;0#HrGdRom(TZ`6^ zR#NsUHzCBb)FwF5@u*rCCEQ8Kxwx0LY4Fz`V({9P4(D$zi=#B|R#Sglil^3S^^AzY z|ErZEZN8WvP?KA(#S{(bX;F+AcjnPYo||VML`uEQuHdA-xT>UAPB1!w`VyG=BV1xh zymX|jKV7THf9#q`9CA*Yd`bMpO5>fjV7GHAl#b9~ZDD2a3comCFw5CiHa(wBs)Iry zeXZRuCEAtC;+DmxmfausQ9F6pcQR^8)|Hk%m#bKJO2&MmK%?MxU8M^}ylF)l$B1FF?RHd)2Z(LbD&eY6)}=Bb{BmGS6(zTWlyN;J{LP{u$^e@h<(2Hj#SDX57+xE zKlitnw)~hJ{NYf0kr%rBSpsp(<*OsyPDz?;ce3f`D-S+x8H%As$u0+(l_YL0Gz$$&~ z^T<@?*QI!rO%UlqPPVMiLFDltdK*GQSmgU}?`+X1laJ{kUQRL)1NmZ&@oUs+-Flp! z(!8}DIxCBnyNm`7oB2WqYqvdmlYlRIz&dq%`@7Fd)u`5L$49wIaNy!Nx-B`L*|5ZS zlnk2J-6X}Cgp464gU?bSVNVI)_Ijw7`{}>mIVq_7Fi%XaEY<`s(Tp0c=Hrvul2=g| ziRz3zn8Z3RPnDP5Yb0(hc|CIujAKwEkMx-#CkM-qJcyBK(PKQLAR<~#4R;I^NA-E+ zGbcX&NlG#1y3b&yRthRUi=pPdVL2^v!kkfN{L%4DeaoD51@+s(ZC_3r{WiS!Piba( zDPafixj;|tw}CxP_#T_>f>n=L9lrc(V>4ejHK30;Zso4;GkNN!QO-*nVS&dFn|MDE z#{+MZz|j2c;BeW@upQ_dvEd-jCa6FME+y zn$3uOX&dNAVQO_?7+glUtW*0FZlDx&m+NP0IUb;!%>0jojU^7nBV2PR&fv;0$fcIC zAG1O&%d4AsUXIM0hQm6ssaq+lDr=#8+?0vOcW$5tiGTl?EJx@dyf&{$pi2jHPY8UCi`gS<|6L87FRh&)0<>P>y~=w#NoS z7-f4`x9X{x$%aF-vI0vulznVDWM88di{F=DpK~j=eKQ!6C{6}!Tj^}=mP08H>Zi67Vh8pY_-l(-;akrR8Z95+>kGtv4**J_kgAKd|q`b;-C)Z*|#0vv^CDZ&QGnsgd|%&`9Mqvvy3S! zwuK*5PU`iOJc~tK(Z0wB4#hZaTyltj@y<;%Tlxk(VD*xYsO-@ z?gSFvx-|3j9!r9eeLfj`rC@efb63pn7NX5$^`+TCC5PZgH1TCh4hZpwi%+Da0x8z( zltN9b^J%ezMQ!IY>9zjc8K*Ckv@UK*8MFO{la%a^QL7<7%O$D?7F33yk?RqC*b};) zz=Uv;iV^KC^ko`+Qh`w2ME*DNnW#y$UIm<_v?E%3dXJeWP-%^ERrPxX-8c8s%h5#> zd)Td#TdYV=Hm-LBPp`sK!ig>!6?4{O9d1{jj|ZJdO;D)Z4mp(#&}~$^c?H@rB`BWT z=yyz^E4`x>FmgNu+$~RY?Zrlcqq?&1g$wseMPk=ymLK+b0<5I0?V(W|Uu<0mE7hdy zOZh`kCW}#5VuQvAP8NM&MKhev-b66Jc`g@k@009B za(qMYLnt22AXaQ~+0c!29kuYp=#PpV`Mw<^K1&H!6St6Zb1h#>xjwf zlZ%+KYuN?w@FqfOV4)w>E1M0U`?mCJp*FahJVir(Y+>=j1IGlT?kiG@+?YNlZq8Md z8+I}RmSa#$j)0W43=fayz4N`hpJ(Q$eK9h-zuQl%;_3!2|7J=OCQkA|OTKYvbEzM` zIekhO}==xuM3^Rd8liX_n?6|fJx*JnR^ zZ+@9y%XhlohJDO?^T^a`;u`nk1tP^I$!{QtQ>$!NIsR$ulj$yb(t6=oKS4}fo;|<_ z_MXNsdJ$s>AFQ0wQk8o*5TbpJI;fpbgychD6HKQ5j5mRyv5G&KrS(Xl{zAK;=|gr0 z5ncpD9)cInE^{Pwz3tcA&YcdqYF)HH&rKvMsTig33Exdsv*jyceEojcG0l8sZ^!6G zYwbA&YiIVJue_XV zcL6oD-`SD^w4VQV0)zNoXV4WsU{V%}lw!aB-p@|#J2rfV%7>q)fAm~C+rI&UFkjl| z>|2eyczR_pSnYXzs}fLaO7B7kk2*z7Qe%l-*?@<)aK^Ga%S&&+p=Vs4f}J%U-3HNt*Jdy<9H1bf{$}Foa=-N;=}@*uNr0Bs?OFv%Xl7tvmN@Rx0xe(O4T19#CMrF zkuP4&pK3MlXfQ~LALWPekH(#~;Y`v4)|}m)l5D-Rmgn1?VSMT=sG|c8*_zA_LZHOc z;w(ds zd#iDAxoE!Tm1BzjDvE2B<(wA;-HL4ZLGp5g$Bh*Oa+lj^yy(~nfy5h%{C+{NH*bq~ z#&CSz$vZ1DZ-DL`vZz)=H9&i1Ika%x1xd4cW$>H=o%{nCD2TRQTXAD7s4v<$7QdXo zQsHFSzmd@=z0G1m(XSw8c%xnY5YcRL)`D4;6=CB@`?&Xhq7oNe@lmqi!u8P$H^$!I zJQ9_Bn{Ri(Hf17-9t%vCBp)||^Zq;H^~(~=klu-E+#4^A?5inR;*G>ODkt9p6V0R9 zn3fL-!?RJ5?O(OTgnf7!xbe%#WY9T?0?g=Ajic8HU((CY$j_H$7_X*E{a*d(cc_qo z#k(Z5bA(1d{?*>>)=Kk2E3U+$w(V6BC$}8#tu>M%k>|?+AyOh-8RB=rrd0W=9i57E zOG6BfPU~G;hwfxkbYaGi4F<`gJ5}yTng$B6Lh(xY(;b9>2g*k-XviAYv^U!)tc{V7_G3=YlqyoZ#z&KDO&}D7#8e3 zouD(Zj0l@REjMkeq|`~{45dM;tnKcxC0TddZm=FOP_S!M=b|7p;CjeU> z#NE8Umyn9ITd*w7LQ0=aZfV%9u#r=?zt^{C`M4J~!F9iQ@8iTEu3Jkr?K$4Yau4!T zOc}lQ*WG+nx3xC}i{@&QFvrm8Rf1jzO|<{&l})fk<$2|a-Od~OHFOCV)8HB+?aj^= z#?aWIV@1rHh3t%9Q%IG# zdnPDH8M-x6>y7ncOo*t+Og;fPu7e(ZdDn5eiXYPBzux!O_E&p$^n96)Bcw?lLtpMt z(?$mGR@K%(Z8K+F#s`DYJg4U8v=Ki|>l|UiKZ8^f!3svyG@3w_GhI}XYnLl3E7ar#T(=lu$-iU)5P-Za7Ov?5N|TD z(*)f0XAT6?54L799n>9A^7rvb?MVgq5@+N2bJ!G%(Hkr5xJ_m)nD~A>bx-cb)?5*NTwKljwTjd32@s{K?5-ch=Hg6E#a22sj0? zXm}Ll07tX%oL;kMEz44Pumsj7JL`b*`y+hiN~q^E8a)r9y$qW2Ei95o?*gYVGU6@E zSlV8~9j%ls&jCpmNQXM6GAApgVy|uD0yiz~Lawdk-RZX^e`?pIon@RDARVsTzb`Ir z9*dS=j3)BuzXk&iF%9n~UD`T*25YP9=_3#d5oie5AZY({R3|%%WE$>DRfTqxj zk)QdZMI#wPH&JuBg{bwMOljP&16p^`5c!NX55+~V2j~O*6>PO@fJ?c%2J)o z_$jV))l=nodHkVlw$3pRlR>8-dXZ^9$CJO>?tcbh5XhOuEdB9Zl6u43lJIg8!vm_j zsj`UFL2iA_Hv)m{rfXy0Hescr3)ZI z_hu#$iby${$yqB%j_F-t>Yk2VYQkSWPExs8BAk@wA~^)@>rF1DEv@r=_DF_?J(AwL zZc0u3s*Zlz9S1a&isijhbG`GhvIKh2z$3k5K~B;R8$~|Ee1`dyJqQq_9rDft9ns*I zi24GIaRAm@qO)pe?Pc%iv_i<{>QnPCOk$hup&c7K@SGUYrNmfP`nlUw?P=0#z9d=M16Yud@4}!FoC<=@iy6@jD%rDt=opYNbFAD$ z4CH2bjb)k*M5siifVWC=|h1s4Uwvx{LI1ywFEO$9kCIoG6F- zDFhB&bPS?d`YcrQvlxE|3Aa3HYm)K%r*fI&XBkMc5&x`eO_R2KVfRO_Y&MS(%7 zhK}_y<2kC8L5*&{VAlmcNM8r;<>Ut8-Uykobe}&9WJt}Vaw3My5%+k(0y!)5X^L^! z-2qKPeEX(j4}ixV*hq_nj!z-LRpqZ5%01TEqN;^9wgUkn8=|V7Io}zrk9r zWzs(6zghecl0#C{M%km!;}-e6t}RR+507xow`y~u-L<*YI|2BK`?(MpwNq>9o(GL% zKmnE(SmxuD*kD5I6NTBmjr9w0f##2p_Vy2ZTLJjG7f6l2Tj)yHndTm;)DHRb?j)y@URVmJT$ggDWXk4TRLK`k=}e|5jysThL2^)uOjUcovl2QKIOm1mpB0KMAB zb(FjMZD=K%wDaDu56i2KOG@|TE=i(m%}-ULofvPF!gw9Vid3a4k@r_QMbE25)X%{Rx9&`c0%=6 zZWh8ItnD>f6UWoF6L-G4UBNYCuoFK|Iib(>9j6M3>VSmOeAx4WD3?ZxoiRMa1I9$)&T+>W*?Y6D3|@;3=@YT`2Lh2-#9%wB;v_?uzg5k+2H;{8 zny)|!8|Lm8=%gkul?>`IKxpKlK?ay7_0r1sfkw!07iqmzcmBh-TB$%?`zKu#*NrM> zi}i+9iiP)EH#E**J_g1idbKN~jaa7dJ$%3P3Na)iWny`Nnrk<&&KxAwFqnUQM9DkL z^;4f8ai=noRQRyTROI)G)mSGWS0-Fca0ld_(VgB}mI~#biU7ka5`g4TI|fROie?GEShe5=4t$`<>{BLo6;Sddu z97R8@&u5u0#7$v+4KcfYC#ueSdJd0}h7}@&`BiIrwJAyN{E5{r0p$1%N`FwQ!1RxE z04@aXe()>yx3R$T}XlqYNJ{!ah{*D>btKcs;Oz-s1vk;`gm zS?3enH0kkv+$@$u!GF1ol=15R{TzKf?{rfC>n1tK8gtM~jpni1vIm8Je@3qmLN4VP zoNc*d_KcAEZX{rWLkjD)atphwhATG{k=ukscn|_rOo$r^aU(NG9vOHn^Z}0h_>k~+OJ{20dKp~rq!uFF-?q2B(cce!xHHd$!03NLDu_>4-KcBL zK@*tay&0)YgSt2CTTnS7dI-&>{^=GsdNZflq~^qMAf7c&bj;wMJ3Rz)--+I=J_h_0 z)IYa=-MfCFLMIi`hGmDa8r7J4HZqvcC>2?SfzYQkfw}cjOH{LZ9en>@$C5Xs{b%5) zY~c8mHX5Nbqr%E#ZH6DA=KQMH%07e}lpSvKJ42nx0*WPQd(%_~g55lv*Nn-76;ACR zrR{|ueYDNmS!v{1q1f(6Ew2z*sDiScEvTJgnEH)RjIz$fh;ULEZd2gk14lLU>~y08 z&nao}Ar0)%nYtWil6y&PwoVWI0v#y#__H%zQ|UXPYRB||f#?$jcPgUe5oGwF zx-JpG*>^~RNzqb^ZDu+fl9}sWy*^DWPcQqRm`AqeGlHD1ah5aCwI-hx(K9ZpNN2WO3>zwetxhJ<+z|${>BK|^PEHbX_R8$ATNm7?!4-GDdXKC`+jBk&XgxRB8WUZ z$0^*}Zr=(Qi)litumxN%$8cHz3v^7+6k1eY|1N%qkoCd#=a^}#AnPBTYO!;!(B1sf z3k%M#jx^D4wP#otF!_4r+6Q@(wcjci1h00a=n|tn(30lQt(xI z?rm=(W^&Ow&%{usr8W-os;z$VjBlzDcMZ6H3Ar3bIf&0BmWlFojbO6tC$Lj8Z@h|x z%xr?QeO6GyVO^*0wOz%9(2EF4_6LLH&wDnX*72B?8;|WLK*DpDZ_q?=gf^rH7k*wx zu3m;kF^ZeRvu17&@9I0?zpCh0eW@WL=&Yci(&oV79^UWglJte}_2JOIosS82>_eY@ zz*`yNy{8FjEi)A!!?UesZg?>c>wNmt?w70s$Y@|gavr*)@4k3TWu67@KO&Jg@=z2m z&#Yk2Y@)!{7AY#x9`{RKan?n^m7l7Jh&DFOkDkVI(^&x2uNGr2&9A;l0s}=F2RYN3 zUIPZA@EC3*(w5G({-uqIEWY1xe=dsl4XFc!cuDLpFnUbOvOxfAFKG2 z_rcmb2O^yu{aY@B0!~Q<7SdnfJl%JJGW{9yw!hJGqS@SN*t3dKy3hK70q;I3{#Q*Z zrg#;nuVFNQuq7+Cu~-^Ase@Xj9iz3$qzC+I$&S{iONeGS(Uom0patw8rs+S(peeGJ z48B;OzE3Cry*537n~;$47AvW=n|>zI>(nh>2<(njXgPDfNCezg@Wa-O&uv^?0wAAL z+!huswJYqjy^{_o9g&Mvk8II*HFX0r9yeFP@w2J_?Uppy(=|*d1JO}&Y#I1Y@sgt( z3$FlCrjxz{785E3pz-f+-Ix!vzz&jLFp0Fz-6ULjNAY?09)PwB+V0dYJ&C4t6An5x zo0->E;kI6Xg+BBUDt{7bwEx~Ab}jP>CFyt;}ne z5>vhXmN{*)DiX)E{b~!S5>7kI^j*#(nZ}=SVa*>v7W4C|ky^^q&0WvKC>)#{it+{b z^$|NC!W0QqtG&5O1L6ygg1R@46P{-*zFPPrV>FnabCfhoKKs0e+cV*MPD zakkmBsc;2CGcjP9&+%$Wt%UD}BX1AYn$sfGd3bn-J()^ub8{&mqKaAV(mV_gH;woB z%ufu%4D5k*b4+c|#jpbYh}!z5A$HXmZ3DMHc>nlfPE+c=wYGNT31sO5^OLDy;OZih z-L&wn@5u?xXK9bKNQ3dZ+{_W8v0Aa=llsdgp_TTT)ZCJzuywuCiil%V&`|^)H~H`F&C+( z@uRIN?gE4_FQL4P;;iqV;FnV0zY?*AvclP;b#SrA>88o~huID~SOY+=0RVR~x;S;e zRm=3U)X(=#ALg@obxr+7VuMAP?B*`v<&7=^P6I8=^zcr0Ird#FMC`rr6`)$}wH#h( z$&)FlB|VJ)WcbN;o>Mb(`Kl5&xiPrfnHoEq*!MHdbPbs>y9>qf6sW>3jn$66g0c^n z0efGk_hEBSenEdV%aayn@+q)bq=*a`efPc-@NIOtb8TM_0z1%)T$f01zuY@@nW9zC zMVsfqx`@vFGRmSxFB-1GHTy|@aIZm^W|-hW8F6t>Ep}G+!&@Q2CPU@Qi>s+K7saJU zo`Ho<_hq*RW9#poaNLvID3jsU4vCZp&b|ThY~7Kt(_{K+F9iOUnB*)2W4-N%NcRKg zIzGaWGo?mZP8~1>l1vs~XSOY+SDxAXJI#L9B}kqEaCe)HXOUU!Lz}EA9=iJTFdRSt zu;+#j9tJes<-J|yiC8#q=ncnK-`2UUGdf?1d;mVMO1Hf0jI5J78m{fQygx|Nbb2&V zO$HJvb>Kas?Zhp8-o6JuD{q|}0I=9Gp60gPifrxq^Vuq<;C?=6_cM+3q$(K{A4TMO zBq$~QBEnZ0si=-gbt%224L#HB?W&KNqA$>qL{ImiE1ubi6wrx0bU9hdbE}rqE9SKD zzIzKK!mKE6;dEDm^>C_0f;Hw6bu)`ijCKZ&A1ndB}CsnGF%9ptXqxU1_%Q zRl*WQ_u@=wGDGV)aj1JXMLejFNqHp!au5@r$k)Oz?tqh^)f_N!wF2&<^6_gFM;|JV zvztFwXgsFdbx2+c+pDKFGY;q>4?(;SF$~fJ_Jn4Z%iQ-n-jH#;;}>|#!K4q%JxUgO zl!`PL2$weu%>y!<&T|9LO^fpP?WC55b%H+=rgC8wVuSj$ zaWu}??c|9$-AB(u1zO?zTxmvAc$MWeUg@p(M~8UhHMtnwYJ`uTYT>Jvn(vXm#;w+M zQ`aQ`s(t+N`Cqa3X|lWsh)9(K4$SFc_1@lj_t+NJR0=?ikjj_z4_2Q)XwCm7GR3<4 zX%v0@_d0PknGn^M!y$EwA->02AcE84E$x$Tw~BPD6K*0dKFI!@q&SKJ?o<<4Uwmmp z;H=C)zm`+QgJiaqyk>|ua(>_cdw7vAr26i&fM)QSNazEN*&RX{}$s@c=j z$d_f_2t_`TqU<*Pd8O{~x4T;Mpn9ukS*`H3)n^eEnb8hnbU1CQIDFpc>NS45O6ogg zjR#;F+(u1O`mE3+3KHA%5>!p*+T%Zkek(DEgOcxc^{Pm0uax1nx=RMaMBUXhyBo=^ zP0tIAEw7;J+S3C>@jB~-+u#8N;iYwz8BwvJQJ!Qp?;r_tYd=;eG>YHW_ELtvA*Pv~ z7R^`5mimPjza6q0@~vaH@BqxkA-4^Q&z96Rq*y{L7*V4X+=ZT3H^e zZjRHbP5C;czT$@`*z)(t`VzUFH$;zWu?O3NZ7;@d5ysEP5dK zr@3ep*%K7WmR#jila<96+bhy%Rx3_O1JZzd`?`6wnw7qP@=a$n@Ye<$X3QNP`Ff=J zZ_caP?Z^K{7-?|Xtqjj6nm`7)|13!cfO@QRlxMB@@R+^_^>1AGLLei0*pX`}YU3$sU8B<75UBs0XHlh=dk1egM z###D^(qZZu)+=$qqliOgEc#@TLFcemxV-(%lc0d#rl_IBudDlK4#0r_XwrYiZM5j> zk+)8H1&7)e!b`QpUm=IJMj=CQ2tSGtmHOf-$_-Y>UF6E(wal;W*8_;XZx+sja;g_x z;d#A3mp%Qf!N~!wgF~C&zJR`Gz;w}>1?HHh`84mu&2RQMUY@Q>4_b;lJ}wHMFZ&AM z_OTPGbbj}uh#%FQxO{Ruw4rhP=le|Dp)E7&>1U)-hK2GW zOiFhE%|(cL<)|Vq9C#3|9s>AK+OODJ&)<~+$2+)KDPO3cNvZ%FTZ*^_999aPV(v#n z`tzK?7Z_^zz0fiG0t1P=wOvoeqSoX$+%vj#dgX4#M9NBdqU!;WpbOn8tV6|Ra;~B) zclkGSqiRptfKcy%gmEc7L|I~nIp8^k={7qA_58>qL;5%#W*f+rLTdY!6WG`Id}{ zCg(Y1F~YRbl(h&xmkDg1w~Th74%De$#Qva^iin010;OHs3ub>YAjTRBtjZ+$lUM1= zIYRxj(m6BCwma8%O1*X6lH9n&($bOu1)cD90Y~?iD<%LF``~E#Lf|*L0dRpq1X&5l z(`G?385aCU`7CbCB97Mn$G) zb#v_zhLdtJe;KR2z6-0Z2j?Yh*_k|9>;nXeR-2Go56-vs?Ro*2kQ}lfH?}6q27GMs z5GY69D;}#!aBYC`IKPRPas2?u0_Kw<5Nj0zl9E=ScdVgij*$1RTx1OiX@_lf=fR6V ziX~{aB>w=;r+sQmO3Y+6WU1)PiX32B?a#!m1INA%+Q|j9Xa1PPmYz35vF`!F$gFeq z9j~lYJ%>g4;ZW=ZI~x{O3E|q)6wO1hc&Vc&8K6v`2UTro{Su91MOF<2UZPUtU+& zi=*4J?>{+Ne*afvi$hNzQY)Y5_>c_3*BHb3C#3`GK8q0gZD(|`MbgIi9i@9uoo z+SA#_;&PKU^%214wWkZL6tUMxwFo>T@MNzrZL81)7=o4Qq>EX8ql&?qugz5d{umP8 zNGXJkE7iPWR@)3j{>h(?^E(gB!(g@XFqFW8gRg2=p9$~BWxgd*P)9*)k*V=ir^ZZn zV_%md=)u91@Q_!Lsu00Ym<6_n86g!+NBL5NecS*f6QI@O+*M8ZI;%!OR0S{MGMJLU zT8q&a&8~Un=5b7&0hrF1DAb$b)r!Mlx$D_okLu7G_v2eEJETU#);tSot zfEH=4vdYkr=qJ~f`XNX} zK}d6{DXLUyt>`k*&?hZT4)?8uZe7eKyZ!9OXbi`uKS`6P8JYtWIcBEABC7+C-sLsl z0UJH}@b@0)%S%)1hGLJEgSM9>rIa*$g=0856+>P;k4I=(vP?pj9LWtLxQ%eakm9xY zuDNW+|71H%D=0Rfn@+ljBYE~NsNMw(L^7`rK}O0Z2h)jZu zCYr#|I;C~+J|%nnUB+r&WG=H8e3`nz2<1t(aH_fHcqc{52S#!%*d(RPbFZrJT0pmS z*6j53(r7^N4sCRi8|n6R<9bdrf3Cx#mt@{IGVldQdb`lTZBsDGm9rbsg^h^{Sbsin^w#ktgKeObXoq z7lQ=|qSBc=rIkU<^{IW8+ClF_N)KMmY?PuNB7FjoF0oO3J9_iVL7%?wT{SCvqz$-; z)Iy)UJKe`!eB~5=&*YK{|Gp3Tl!GEm4JV2?B)B1dA@>pf@gw>vi+G=?C1MsjR-Ikw zJ0`kWqx?>q@7!yKZGQX;58@L(9*$$gR_Fq&5gsiq(HZ8zTuKfp=L|Shj+*o#YGO+B z*Yn(dJ3}QZ(Rmp#JRkZiXkOX9sU zGyN*)w8yDdyw$ngc!~^X5E$gXgx_WHm}|A8ggLW=I+~2*Q(2h~IWvdWspz}2pFb3R z`s`76)98G)dzc-LNF=}`{C%U9(&~BK6)Fnn9(W+ff=g(gb{p6YMEv?e}tIDdXO zUp6W5*LO@X-{VY8N>}5PL%_%#mcKA%I=%nCpq>X9W6k8N&p{xjSw!d z`}oG$9b0!pS2UC!9gLH<$w}uqqfmBpsp3uH$hRiDH?$f>@H-84is3x$wi70aY;TY zmI-4vBxmKvxE+@9ra-(NoSJ0CP=hULq2Z@pWrt*vv%VS`VGMPSlSQeiX}2a&T-<0n zlun*)+CZVwAnWLBg%(h|IRYi}$Aw$Vj^Qytk_!dPy1t{1z)=kh$Che++73AM9{@DS zqZ^}P&8KOns-_{9#Uty`6&u$)Rxs75vXr z*AA7EVv6`%+g9HmoYA0z)dC$I(wi-hbTdObB3@rN9^g}hP8Yh!IY0Yc^nIseK%LDw z68XWH5U5SN6d$m)APl4mNn)}ay_|_z*UtbS%2Zz~c$BZ^ell3M#|$uN4ZD3Ey1TJ_ z_Y|Ec%K&o?d7hf3*@|h_^%e0>Pimmaeow+p#VWD1~_hb%5p8STT==mg*{KU2sU;ya^eeI9&{CVoTV(6$DG2&x*F zYUUn^lQMuTUJ^0X`@mks22!YDEzMcDi9-Cb-=QOjTYQEZcvoDer z^HK}jKSCKF17g-)z@9?pRQMyY)F~Ekm1Wz{K@8wcuvz! zApQ9yYw*$ZTEzsF-M`$iRP*pj+~P%P;9F z)*}`O5XpKe{-atVKwsvcK3<1jErnjlFgX(E;SIVbEoREi?;mhyp65|A4c^nBi~^n% z8c=l_XrAFt|E_xFR^Pva5dkx1i=S2AR707Aa2bB^(cw(kIMI4lZaJ;ygGn6~bJGQJ za?XMb9FR8F7lOW%Su>dWsxr|C8DuIK&>6vyd9#4+UH1BP*su($O+@tltJrsB3`ffc z=AsWbn&J$8Kd#Boo@S$ZMF=);&{vG;UT+sk)1O@TY38IfA9H?B3u{hCN67Y)0%AH= zYu+hIYi5rf`C|WBX7V2uSy$*dYTCYAnio)1i~6MhXq_+~e;jp|@1CSY%^{5Ry7aPZ zV|o^!mm5%*?)- zp4AddV|crr9%5L;67*Ikv$e7#vN4u%1bE{*%L9W|4uF05+Vpqe+s zm)I(3V8l~<>9rm9tC&WrzZ;D;#rU5LJ?krOvTzT)q8 z0XN9!26RB?gd5G}x8^;z!DkO2L#1?7{vAb0GT}uF;^Px)f~q;7+>NIWWIlhLK0iKp z4RznCZ26WDpm5$6Y^uLCuT6jc78H}k%^*GFn$68$yGVdYZ^E+bPt@b)PNOgL$G!M(YcN~%EU$QLl)GO520yvEYoxGTdU&lKl=Unj5rIU*W}x2SKZZ<`tf%d zs0Dcf=Tg?TnBb;_gew)h_Otl;c2iv)d$yh*5UdH*+8X^ZLd|}I#O^dX#6iUyT3FX$ zsk`huxuZb)SzJ}5vB+nD1UW;Ty00>md*9hNjKU~_>Hx2xZZd5LyTE5AA~;bcRStm` z8%XfPM9%SlmYSa{`IQC8XcK&%*&!SJSiFGyMS9+V->nJql6Aj^7`yt^ZUfVU2@Ni6 z@;6Y^z=|%0ewwS3bEgf?AO8goD2@EJOdfJH!AJyPFY0dh$xVq;mqgS1ZU%gbM0`z~ zIe!Qw$_q$5qCr(&?ZGbELKw^23Z`>+;`uTz=iXwbSC)cv!I;mY?8Kt!(X%Om0ngQ| z0ZvnCh>gqN2RSrEIUkDQ2z6YhV0Dz1lDX{+b^Pf)pQQNfcwpeoL0-b_AyiGXZ7fR$ ze9W^4`@V<%@Mh+Cl-U&Xq}CeQTMNCZ*Ndel~e5%Q_bLxH?V283T)Q5L6^AX zD2GVZ{j$9s#wr;cNvQ}blFa72?^*`{uD8GNRoU)KM7;mp%b@9V5pGj};Up{DO=}Xo z<^ZgTyj!_|znO5ObxIZ^k~<-9UKv1Xg=_`1M5XJ~$M#I}@PKLLqUu{rmMEzFnF5*w zWvB6N3lS@fLXdg<rs&vO6&ITO#1iG^KuCc?pUfd zf26I9N3X1Fh}qvM>}c6QgA-&#&n%FYbaq~~Z|<_z4@7N;it~sQiMfi>ZmyKW`tfU% z?G%w0T$%!sR-e`K11oAR@{FA_H{GF_EHt@JdF*M!88ax3fm(91A0hzL_XC(mO2|(C z1zPi+v%v8%wm!+p7fzXwzMp)VrlI?O1gR?I$s;x-v&;fT`(3$cC_eZAm(BJ&?o-T$ zC>8(=;s3Ok;V-*bA=ic=AFJw*Qo}$XkW93m7Zb*9&zA^MVbiK?*Y;rxHyMLo> zOruzmq#%2SS#N+x9vtxoBW|(Hi8#JaT}bRX9KY4nEI{w2?$*9ODquH?2TFCkanMoMt5z;eGC!V#IJ`|4Tx8DmBy`b-Mij# z(_MQHP#bOU@)6ySq$p@$G)AvRt^+3ByP!4uet59<3^&Zp!(U1OU3PbGX?vf_ag1AX z{CdfN3>&CXsa3aqeTEJ5vrkM%)CDHTP=gAAf7jaGP}ij;f(ofo4ewE=LcQ|Dw4fsE z*4G=Sbl|(%;ksfC(f;}RMH?$i7c2?7wQ?r&IoTl&=2L9lEVACsyY4WNRe z{|mnxd`CS9dv6`*waHv3(_m1%szle66p-^u6oi|#_{olwPu$fHbR~|snJVB+hA3mpz3a-y2O{vK!4Qr2F(jK-FV@Th zmMb!4)No}>v-cLVE~{bn-YOpBED@Uq%@Dd!(|+WAz^p@DQQW#xKW;3{R#4~n@EUcS zwyujMAE13vn9~eDeki>s$(?cd<7d8nQN=E%$q_Zl*l6@^qAOS-?dJ|)IVu87Z>sBJ z%`IU0N2~3eu+Ky&7*86dGp6*es&6IhV(oB9tU`|F<%{-MGeD?IRt+=);Yu`zvf=Dv z(}&hd#8ON#igg{3VeOY)2twXB{(r@NXH-*Nw=PzYt|A~EK@bQ{>7gk23ep9o7XfL~ zTOfo`lq%Ad4iRZe?=4cK2!arLFVcI51PFnu`MTHfnT_!m<^_+(RkB9|4SG=!m-7v}!gA5S8>znx&v+-?_N*Pi)JZu(o)JtZ>F|#EwoIHm$ z{;uk$xOTtljYt2k>)`Y#^8ip}=OEHD_vUV5b{R_zvn3({HX)wY;OM<$d|NoDs#49A z@3RDynL*m-@J~B6_|_QhxXVcUTn6qrAUcEN>5$)jhPpE2WhVu%s-Om+a~mC4s33^h zAHlo`uh+BRUdG*C8t3fx7TJxD5OM$f_vlUBO6xrcp^8+rh zNmjY%Y21D#Og$}+e@)#KzcE~08N{ty8|`EJR6$YLDicOr`gAMx>7$g5Z!vVwt0+B1 z0&?_|J{!!I7`vMo`o!AmQnqcLP>B;e{9D~B`l=(nRAfd!{v43*=;TQYgZh{BM}log z!m`CjU)&rRs6rd_A8r_;<;N(`1`2teLyocNzPYPUzjWiv&Or+m>BJ-B1 zk}zwBIhplik-=W28QED{mDWrvlJ_cuu3*Pl3UHS*Sx1(V{4H2+#e}Z*Dw@|?U%@Ch z#?i&ucy~5ntvsf$hvWzd;0R)-7IrkbhcaDa3!~0C#RCFO#p80-QC4Zk)6kAsp3_D^owRc?=@f zDmMMs=QgbB2?``0E_IGqQt4~^2C1MMQsG0^Nuf8`Z!o4N*WN{JMa#M~yizQRG8Mm6 zSOkUdz;3t_xrkiuXBgV&xgb&Je}|H?c`y0*;2d?90lnzki>L3EW`Q^T_D;RU;Dk=a z^9VZf`$Mau15sbvv6P2vrM0{o=t7dNXfEDRVtB1wbd9YSdq3G|zQFj}69_SNpWv?5uou-;~P z7wis*Z8YvrviYRs7$4i*>u_U9`@?z@D&IH$g12vM+pYnn-X8m^i2I2|t-a}6%86Hh zl@s3uHT7wGd*Eo%5pSaI2RnTs^5;ve!z&mC_Ha^%<#1WrbZLwePf8LFQFlYJ|4e9C z{r#s`=<>V2yNs|#Z#wrVta|t1b)u$UJvQE}_0u0dODx!fd>y-KgT$&F4ZC zWJJABs*HCh-D^`TbAjWZC1cZo+CRW*5)t`RR`G4+;Ogu(K!PDp`Sj6myyT|y2wipGgLV$4WvXw^3&-r|D`SP6-X>ky-EcqfQh6A(l?kp zU^HOi2fdNG}nU>{062 zcT{n_AN`lhVo>j{%df8sjb# z5e4QEULRa}0?rb!t$=W@;yqRG$Pis>*cP7C>hy_+IE~;7*yl{h6)IagRLqLz<^1|Bj}*` zv2l~PXh8k)7kg#J>WVG*V6UTlu0=xRZ?|{PC3j-G&R#HJ(VT)r{?=ob_zZq0=Yhl( zqv>5}md{xV&DHBg9G0>~b8z7)?TSO6UDTmu-2uj1kk7nv*x1kDd?V=`x6q6f*ycrF zI`(y2&CfY|fA)MGvyo|bK52R~KH}%N=7wBFtxG*U*^mSLM}}0D$SJc4iiFMkVEUy1 zH6IeO_VMZMd39f3@4f7+)CXqGLbJ2xC81-*o8{MU;Fnz(@1;}Ft5Dq*kY*IRr^23j zxFg_O|1QBq}3emfuAM&#T@A%idFo zvT5Gxu~3veIgnZz6xNu#r+ah<34N9Sb}tw%!dIwhv1-=PFbdx%ga=&LD_Up`H`JzM zu8IQ&xbkJ~bRH{Bsq1E^ZMVhc&sLM>$S9(v!p>o-@QgFr7xrPW-}~c`YTQ~rpQWOo z*4#wI{W7|dv=z7V7Y3xO<9 zNwBrBt>!TrtR=Y8 zDVSEX|HcSoZ0|1cyeyIri+{h;vZqGGlf*fglT#lZAz4#W*`oN$>LSE3DZ@QT;$>nh0I&?HTKn51Bcp!ir|EMW=?t*QE|*3YNQ826@xwZo7DSKa{%3 zmC&OZX1OURzWGhb#Wqi;p)zt|&iiJL3pN}y1gjz|8cn*C^Dm{FigyAu;&7C@Yogk3 zw;j{Gi+?~~@T2_eK%VMKXrg+aY<159{YIe+zN$b}b3Co`+5N8^>|B8&>p|Je_vpT9 ztbD7H=@^J16JG=-(QBFQHsehD_@&iah$_)>jWgZtF4Dpr4u)Ex&YP?a3xh7h?&ObG zC;Z2x5S)%5WUT4(#qG#o?pb3G##aqUoQ~fj{?^F=clwxWh2f)>L!bMStGaK4@kd!- z#@wE{wX~k>M^g4HB?ARog+Yrjs4@8hdM=jV_pts8*$_va&eL4$)t80g)*qcMI3N|w z&b3EI6HkUY?|rnnaZ}w_0f0-HTaW(Cn689mk~oU?c>Z5`HB^}ep?f;m+GLJEH;SI)G0en|bw zYv`w#ny2#|g}pITynP3C!wgjN#PK(u9n^o_zKh%*6*8Yzfq9BtjgOD3y5czTvsjDz z;t?+meGJyJZwsI)V#jtENX<*okyvSxw0CBTQh?bU%Tyg6wJD$*NL9cYn27t>;CUdE zwVge@GRA;su@K?(GB|8RyY^v=tBz={?Vgu=E}OwjJdsV9DQi^UN7(P!``fL75`58x z?3@sN|EsCd(IRF}JlPd~2dJt~SRO-ovgQ{De~4!1eBfoO-uT#{Xe(~7u*}g9g>8FW z`u&h(D)V%DX?SE-Cd>JPods`XSb6;k3pnW~ad* z^|z>NtB~et8G?V>ZFf2x_gcwmp^V;o!X1I92$<;bl9#=m&y}f4j!$_Jzke=ymK?KZjp}W%p^4|~ zN4>68cQeJP(XJy4@ZBPwCr-vBSE+4sf_Bl(dvki)Q5l|?_2KyLEE#X_?8*#5jtEH> zmselurO7MriC5bc-h4V&e|I_b4eo87+)xIE>~34ZbYsK!5b6mu9HGhX|2VF#v?Mnf zPn$JZ$>ARHW3a^nP`<-C~&JJ(p&0*!Fd&Wii!}4i&9>r<}p* zF+3<;B|BkD8*ROxY)#;Qy{3O^M;v8N$`bK=v2Bg^=lgild%NilS7T&WO=zDE6ClMy z$6TG`wS&`uqu*U!Cc(1QzGbr}+)B|}_srz4d4&<`E6s<+2Fd9wLGR{xWJ;x!PJfy)yoc6wsK?bSNe zHMjFw3)izz&R4i8=+#U4gmb!UH(ebEV|b=_=V{SKL2v`oX}AZ-Vd~^Er>U2W%=+H0 zxjKbvxSx6LgQ?H@&1JazHbwSY^s7Rf7B($a9PCH?e0}2=!|L0f5dU07G1 z<&y0@aZ$nphRun*E+7K@k>}DQvuxQR@XVQ5{hNFt#-Zl?YW@6e)hxyl>UtTPF!Pm< zcscaQybS9$;fP#>R==d+plyW#Zuaef`CyvEEo#G3T&3>#KBmoTcM|)< z<%b6jn}DX5Bw@8B_rYuxlvm2os2KO$X#FLJpq+aZlO9o%UroJNQCD3L398IdMi?WT z+rUgn8|tT$xLM219L%qv*SZ^Qovd6`;{ITY9Yt%Z>OR-9l*IRp=yWltVw7qTxzE=$ zWEAuXTNAkVYI2dI>1|V(Cqx0MDexmfg>vro&u=+0te5SKKB{etyc}8b-Y`O}_c;Xd z)%5P)694-rJ?5w&>&BXGsQFOX@75FJJO_up7X?L?)?ga8_`79kXn$?LJ#jfOIlR*F zYVt?X%jB1gQ1U3uq0nz8frp`=P>GDOG71ql*3$65goZcu8dLbIEJ|g7N*g?7X%OX& zN4S;xSSZqzE1!=WMKLdVH!aF4+B$Yb9zfcx^Rz`9q}PTb!Qv%Yx$HTA)0i3oV;(z9 z*4&z2d}klsKI1LjQ1J~Z^OrRJ+ph-pT?Zwss?4rfmRoCvO+DIV;$S{>Q`f#7Od9PY z!VYTri;Q4U13_-X+`b9UUr@L(kZ3dADAvbRGuO_irn#+w(ee2;S3buGVwqEPhOLh8m?`5jd0L9lSQ zwcU1gc&U23_mq9<)Q3$v61Lu0ot6UyzvOU^Rkr zCpEYmD1N8cR~1@}ZGT>KrxY14d?n6unWQ2ws1)kDOUvo|eiV&I8%Oi4vAPGjGP&O2 zPG)qymV(Uu__uYW9Nr& zm{H6TJ1@3e)W6(K3*H#B3yfx7O|nm@X5XdIFwude`tE4Ft7ZifU+*`JP9k>gjoP9l z5KnKtGjh$%Efzk_v`d*<%oy{4Ag<4sCk8*M`Yj7+PSY`KZskMP>Rx!TQkxc{s;DC+ zfygYo_3EJUcqfFHLtBXzvc_b6J8Xj<@QynxDm=(6HZ`||#8FX=z z7z{U}CUawMVZ_x1a)o$?nY1l0d{1>MrIH{smwdW}cua}vYfo648Y{yGwMt1lcSkMF z>6zmzgnV-u$u3-2daCKpFF-AhOOiNTs#9A%v7_8Gnra}X(SCrmhY%F|-hb!4* z3-@!%w)0q(4)yR?FO%3ON+Vka(aRnglWw2G_Xdw*#ONlIxaw$?MY*pU%+(fVTZ_q} z3(Mqn3L5JXCa7?WuuUzK>E8E5ml8cWea&tX-qIK{JzGcCN`6VWe{2*HGl+4 zHz;CyPBqjquL#D*b_qZWt13m@?)^zS^Q)DJSDp!&^tm#!(erqtBzm{7|$aZD7C#-glq(zOc-J&HOl_7NFwQ>Op1 zl{?2ORZfzfEj_QSd&N=JCf6E@$QdY4i|_4Gk>U;hY3KJ)+)3Y><#^`14B&N0J%ya| zh2Q>Ha?uQ@ZJfvOwa}KLJOzDXOWgQFbmz^AA&zvJf!#56j2E_G*-S!bCS5#O`Mk1L zLavnXyNk{Ym=c%1aXOVY)zb2iC)2Iy1mWL|Gr~N%>4KCqM)zeH_M-hi4@hN@Sk1% z4_ED5;U>FDQBLy7J3$Hs`K1j@mRdgcp62)~mr2~ShJ@f73hZ=Ud%+Ttt{N*d=fhQ$ ztl8tocU-+EeS2T9XIVRp9L%awv6mM8I?0;?MRL~+Sr1PB_la~e=tjQ5s>%M~vCKgd zR%8962Oh*NMPCMJ`pZ#b3=!;a;-;UqdNZuQHEG3iRYAdohonfk80s0Pcd2nO>$bfm ze`S-ob2DLaV|=!o*xkFGqv1vvI>%bnEK@c?!vRvJji zpfyWJ_wGw#)NOCvkBq}`)l_H49^xGe_AFuUH<{B|>=x1@FB5)qA|WZxZ?hR_u|`=P z6Iav^IY+gW6os`JoPz!pZ*9ADOa*b%muy%7*`2WVgq4U&bD5bV9b!k-!$)$PU7ZH_ zvW+ruvuUv`Ql$RIZ*6Yhl@pXh{V|)c&nJ9YWE-W*=4H&}O}J~JUI_KA^~GL_a}iwy zJ!=i5bfq8|qlVpDtKvm=<;&8~B$k8m{*#?9(ty_7@>IBl;T`@UqEX-;q#!zZcHzPxOE9tvzEXlZ<|= zI7=$8bly;%<(u$sGKEjpUKwvt{y%pjXWhAdgx7&sJDAanInhYpD7^<>H z-E@-m?;>Y!d#PZ~U;9Z$zEegw`y?^9O~4#~bK)kjd=(pMu9k&eABr|!8auPDh;wNg zKFJir7%2)vh3|HDCF6ITgRb2liq+E=u-Y;o{(dkL?9z;4j~}7P z$Sgb;))MEQcGo=AapcO*HSP&fkc^xX_%tQb^f}>kLHwry$JG|hDc2i^et1DR{MJN7 z?IV;2I|%t*Zd)t(md<|nqR8)3?r!uFM@38rw|X>~rhN4+sxArWnUp2R>iqfuO)~vU zmY_#$A@e70)T9-5h5GT|J;u1UT_O0vm0D;K$no!b!;qeCWJ;4y3+yJwpS>qa(Y5e~ z)r$@N{PBFBxcuK+KKwxug@3;NO)X-(gO&_rfrvo{X9;S~?P>kzFAOeOxt&)I4YJ!ns`Eb* zG3q(ZX<`b7v#4W-()G53i_ViK9eNnVnNp>#hWMx-zh*9kbO*XAPA3p-MNK2zzH{5d zdm8OkhbL40X2%~Uad4$wNuiPN{J!+^gfholx2B(YU}Wm8gy*@R$|fMNHPsoUO3+xb z5b`IPb;(&%h8`sFzR#dzz8LT+uJ=sm#%UQeR@Gqnps&ifp{A zld$aOX+QLHIq)ar+3(`hKc>d}qX1Iu;BFA>p|SH8=1j9&xVL{Ta2 z$y*&qfqrJfbiMd^_mJX-ZTU}$RiE&1D*L>eLC5U#IwKZCdt!6M#UJrpgb?K3H$=M} z2|@RKr;f1Q24{_UzN~z`B&^aN-{n@__jlf*DG9SsMFH@S@zI4+s=(|qMOU~zhdQ?z>kRN0-zXY|656Xoa7u|46OtfbAkXh2Gn?B%xJj~dt^v2&TaMrJ zRMEgAv*4^^j90}p9J=^3>?XSQ3~}2?r;{7t7Mk6Z5;sLZ!RmH#=fBLh5X*n$_=@)7|;rd+Rs%0hS@8C4?8y|Aj&uB=d;*OFoL+xYdP=Jt3)d0fwS z$D!~qZxd7P1G{>DN6A z=7CK791)BSI2kkBtv5wckG2wJK~|G>-?PyBntg$M^7ad0#YIuB@UzmFjcQV$nrD!1 zn6NzQ7pJq?D0^UhxFm9u`8Bd!QCG)wnueD!vUnmf;JRjt?|xYg;;+H@TrHw`fv_Fk zZCDglK3UFvu!$D!CcdPX5cy0;!`zq$x6yqZQhO0#Ye1^_p>yLHIU>Mc%nS@GZ zOmFphp{+Ve)90bMLc7B^oVa#|b+>{6Fj@!8rP;=gOyyM~1alUP;e>L!(`9V=t6=PN8PO9C;`)Yzfp< z48uldo7A2?7Gf~xWv76lKqCB_NcEe7$`y@PdGl|VnpC{g^BZtQ>&t-WuY9B~lV-*7TI-Mo@Wf|c7=EDeeG3q7+$$t#;iu`4KuBeev;TMp*+9=~n`H zBOQNq+Ah`0tCK+2T#NVPhN$|CWx0WZ$2VD|^vCMa#D$u2mzg0arvT>20CnFji=)Jv z^Xiu7ql9ufOuOHlJivBE8CfqqJ)E@&^Uh|In;r?TK=)rb#Cr~h$O%)QcGJ}iP%%emnMvn-R zmo1kAd}0;u&?ZPeXH_(hJM-3~Z+yg$wwnf8)O5!n8Oix^n&8y3cWO~MR=YZ##PuzA z(Yu}^zz6x9I$=a+2Mc!NL$QtWlVd&yTc#x8%Uce$ZBQWh-c*M`>Wxg(LEXTWLWr#AYL`E)>4SU2KlP|Aj6sp@HHSh+zv}SHnU!7o-fSeT9^4{JtJnLv*QUe<^;Q;SC>Jp!$52Djos-EqIu(cR5k2o9(fLP zJObwDH12SB^oun=qG8UB7FB&TSy`rsGbe=Okwk^`8{D z-{-X^ij00wA;?Ex9%OlKUERV-vs7qH;oBBLlFAsmAoi=vowcUT5uQ0>3q<-%3O@rCRWtQ~iNioHRFa7X2ApYEVF5y-j zSkin76wD0BzQ-ok*+pjE0@7*7y8S`*!S=1FMo$c5bN@!m*!JP~idHV?U1j45?VSg> z4TtaV5puEeiQC6?$^XR06o| zijM_->C)H?O_b!#>y!=o6grKzp=ky5d2cxc$@i^g>DIJy=wbJ)BOM`uaiHbZx~m5I zq}uK0YyiJ}dYVE;0V*DE=c+?h%A*4L#m|f$=u}s9Z{L9$U+nFLIN3#HNJT9rxj z^jSIE!~3DVIX^Sy$XGZw?@E8I*?>(NIa|6+wgp%Ep7bP~#Sj6AI$Un2O?jp9WYgi1 z;KJ(rjwB&DY_=xqhsKRB%<1ErcWY$bDHVRR?Ig331!?I{5F$(ChS7LLOJ|i66wdDCpCj~syM|N)}b%)X4vK1VOUB_C`b*sqq*S>> z0RZA7C%f&L+e5h^<@Kpf-eILSqYk((y)B3J8PTn6VV7;cw<*YQf0b_@!LOfKd&0oF zK*7SoC(espEYnUF>Ulmw1V7dtEhv8%i;Yh#BA=uoZNr{BI)hN%ywFE=q(zjTog{XZ z%%)KtK752ipEm}#xrJy^+qSdoN9pbsXzMbcEFI`4OU8(a6lkzgHROH?^Rxs$T8WV) z9)a^z?M{-${uJ^&84!?j7rJy+DJ?)k@D13Hsxg19677eT}38+_Ltc`D$95%}8i_ z&!z$k+=M(%sV<^h%il`5q+i*d&%y+QI-4j~%e7F-eAaCkWn{D3&pTn^?5#rubGdq} z+ch(CJ=Id43rHYwbjl^KuVaVTuX-i-Q-4@Y7joV)2AQ-96bor(UZCUNe(t2G8oxNV zZ?Eg!^@8~*M{{dzpmdqNsERIuV4|PwqTOT}f7|J?f8;GF#cdn`w!(mxAvfC3)Mr~= zuW_S>Mt#3hI}epdo&-QXGEu4wv~Tb=i(_w*E^2N;6N4fd6|%S2C>hNU2gik(xuSf9 zfTjLm1e-#C6>&c-+4p%FukNUj@tu8Wg{MC0=QF#0YY$7|&5SY$4^BuolXy;joPuKM ztZxd+*!RV z#OG#;4HWRN1Numx1|^@{Wg^IXASzHDCJ{HU?WG##ZkF44dbhk-MGKHI;|EfxhNr!m z@C1P6*zS+c|9m3JeKFEQI_TZoA$}ZWY=X*hgW*H`>dG9EZ_);) zRtG9KEp0^$Yi7-m*qy2^aR zvbrA^xe?wXqaRV}hCSeZxIVb0gfj4&y&b?wc2C7EDsZtjE}nPlkF(wuMfR3)L{rQ) zs(|@90Obb$=4hl_8&FIm|GQ`S57>dx6;Wqfle1|Mwy|3$MZJijlzx_bM#&Oy?BH8{ zB_e*j_#`B4kDi&G@k96fpWaTCHI+X4goatkc`|BwNaB|J?GxcE8ZCc*H#Qt46B)VO zD5oN6dh}cB{-dZfl#nOZE#qQ~g2U=wo#8e8G0G#L!;o)RnATfyGTMK-3iO+Tn2$5!3n+lEZSUl!(~S{;6aI{=`6_34ou~w&I5XM<55V zzz8^{J>ucy-d~QnR{X0|EB?N9zt>rfci&pS5f-yFVEFk!@_czH`5^Lq9Z@{^*-iN6B@{_StXQRMVqg%+!gm1sF zShn8aYfPLDJlH&EXS~~dJ$zP-b<0s-yYGV3YItTX=M=i6crNP^{k8=|g%l1QRk&IN@ls`_8qnX- zqem<3*sPwATqbD>7F!~-sLrL-b~u7xVBtZ^=ZETKM#?*hb%LsLr^{n*?g^B8!3hO- zmM?ntBHwkSt!gvZ2p?=A6)rNQ5+6b7mPe0#bwOSz*fO_ZmJ9q0k$~=oDyWW2d_oi{ zKgmL@SBt`Ii2G09*Me^LKP_yr?8_Iw8dljbN<(iq2Cfo2lF6V=80$QJ6(7XoQ|YDp z0lb$8Jrut{N*ve#bCZaX2UeA%K1rLydQuK*;g%WJIL{DQ91C}F56K+x0Aq^hPKi)L zQb}FeUvTn+q{%8Qt$0iu)gkM5J5ND8jQ3x*t*Ldy_@c@UR0g-V%# zFv%0pE-6dX=O`@?3HNO;p!vsn2i7*0yACsx-!+13+huJN0e_Ncp|VAc(2ELO4LOHw zmQ0uL4`qlQO#ZSm>%9f{z7J8IOp|Xv9o>wFUjwTZzuKBjcSk_$c9s6H+fexKBlreR!J*4d0XOVKRXIx+EdPCJp@ipRui89169T51jBMUB z_r?;KjK_G~W!4#6ncygTd4R6O%0JK0^YGQ1nQ*Wa4vGMoFX)Dt-?guP(NERgkyf7s zK|rv z_^iD*x>U&J0VEwtqqC;1P70Fhl2V4QTwhtFmhk5E=XXjTJ2@Z$7Y2}*x)$1K{iL=; z0xm(uh|Bp~D&pDy{Nn8f$$T*7d266%BbR@tLq1N@^Xk)w1!TQsbcr=+-D|cXWjdsh zqO=}4yvYp!%S#;yHh5N_3-G`PIEjGzem}KwlG1)Zhi?ZgB{(I@)_;iC9|y;wMMWsPdjB0T90`=w<)tXFhTEJk$t%^ z4;~2Sm$+tBj(_PVLai+RwO%>`qL*=zKl}|Va??xqgCLt%;?7)r3}dgwY0*CGG=`R; zpp0_!+&%oi&-T^Hox8{^#%iVR#Lr2lK+hkMG4JQr4*>!*QB7c;Qo6%_oQDJ=4#RD#ew=TDnvj%Az&l&t-P~_(}H`_1^ zFyTZ7dK-h{QrP%U*S^$#PzP_C1$s&Z%mA>7!C7noB>(5z|F6pz0{jn>{I6X8?=k=T z;lKa#f9bNswf}b`Hwtu3IrqJmkf>9(pY6B6NmLP_jY6ix5z(!EDK09iS{Brama&o9 zJdwWaZbYmica`vt?BP|i|GZ}yoE#?t#`2%n3SWE!s!s$=@PGaCMK^)}L6ZO5%Qjce dP5mzs4alQc`O?_lfUyxh|4034k^Jj-{|CpM=9&Ni literal 0 HcmV?d00001 diff --git a/src/common/config.js b/src/common/config.js index f2b526ad..0fe1accc 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -87,5 +87,10 @@ export default { }, getImBasePath:function(){ return '/im/im' + }, + getPayBasePath:function() { + return '/pay/pay' } + + } diff --git a/src/components/ModulesMenu/allMenus.vue b/src/components/ModulesMenu/allMenus.vue index 9a11328a..6639609b 100644 --- a/src/components/ModulesMenu/allMenus.vue +++ b/src/components/ModulesMenu/allMenus.vue @@ -114,7 +114,7 @@ export default { }); this.selectMenus = tempArr; }, - + selectItem() {}, goBuy(item) { this.visible = false; diff --git a/src/components/ModulesMenu/index.scss b/src/components/ModulesMenu/index.scss index be0b8c4a..b94f0ad5 100644 --- a/src/components/ModulesMenu/index.scss +++ b/src/components/ModulesMenu/index.scss @@ -55,8 +55,9 @@ display: flex; height: 210px; flex-direction: column; - // width: calc((100% / 5) - 10px); - width: 170px; + width: calc((100% / 4) - 20px); + margin-right: 20px; + // width: 170px; border: 2px solid #EDF0F9; box-shadow: 0px 3px 4px 0px rgba(186, 184, 184, 0.1); border-radius: 8px; @@ -64,7 +65,6 @@ position: relative; cursor: pointer; margin-top: 10px; - margin-right: 10px; img { width: 94px; height: 94px; diff --git a/src/components/ModulesMenu/modulesOfIcon.js b/src/components/ModulesMenu/modulesOfIcon.js index 82844eb9..8a7c62ba 100644 --- a/src/components/ModulesMenu/modulesOfIcon.js +++ b/src/components/ModulesMenu/modulesOfIcon.js @@ -22,6 +22,7 @@ import xmProduct from '@/assets/image/module/xm/xm_product_management.png' import xmProject from '@/assets/image/module/xm/xm_project_management.png' import xmTest from '@/assets/image/module/xm/xm_test.png' import xmCrowd from '@/assets/image/module/xm/xm_crowd-sourcing.png' +import xmWorkLoad from '@/assets/image/module/xm/xm_gongshi.png' export const modulesOfIcon = [ @@ -119,7 +120,7 @@ export const modulesOfIcon = [ }, { id: 'xm-workload', - logoUrl: '', + logoUrl: xmWorkLoad, }, { id: 'xm-crowd', diff --git a/src/router/routes_my_work.js b/src/router/routes_my_work.js index a012cdd8..e3d222ed 100644 --- a/src/router/routes_my_work.js +++ b/src/router/routes_my_work.js @@ -32,6 +32,15 @@ export default { title: '设置', icon: 'component' } + }, + { + path: 'message', + component: _import('myWork/message/index'), + name: '消息中心', + meta: { + title: '消息中心', + icon: 'component' + } }, ] } diff --git a/src/router/routes_order.js b/src/router/routes_order.js index f3c593a1..7e0bb17f 100644 --- a/src/router/routes_order.js +++ b/src/router/routes_order.js @@ -21,6 +21,24 @@ export default { title: '我的', icon: 'component' } + }, + { + path: 'create', + component: _import('order/createOrder'), + name: '创建订单', + meta: { + title: '创建订单', + icon: 'component' + } + }, + { + path: 'paySuccess', + component: _import('order/paySuccess'), + name: '支付成功', + meta: { + title: '支付成功', + icon: 'component' + } } ] }, diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index 828bae3f..d60ce41d 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -155,7 +155,7 @@ export default { loginForm: { displayUserid: '', password: '', - authType:'sms',//password/sms/password_display_userid 分别为账户密码、短信验证码快捷登录 + authType:'password_display_userid',//password/sms/password_display_userid 分别为账户密码、短信验证码快捷登录 phoneno:'',//手机号码 smsCode:'',//短信验证码 }, diff --git a/src/views/myWork/message/index.scss b/src/views/myWork/message/index.scss new file mode 100644 index 00000000..ca8d1719 --- /dev/null +++ b/src/views/myWork/message/index.scss @@ -0,0 +1,73 @@ +.message_card { + font-size: 24px; + font-weight: bold; + color: #303030; + line-height: 54px; + .message_type { + cursor: pointer; + margin-right: 58px; + position: relative; + } + + .message_type_active { + color: #4779F6; + } + + .message_type_active::after { + content: ''; + position: absolute; + width: 100px; // 边框的宽度 + height: 2px; + border-radius: 3px; + left: 50%; //距离 view 标签的距离 + bottom: -10px; + background-color: #4779F6; // 颜色 + transform: translateX(-50%); + } +} + +.message_content { + margin-top: 20px; + background: #fff; + height: calc(100vh - 172px); + overflow: auto; + cursor: pointer; + padding: 20px; + .message_content_box { + .title { + font-size: 18px; + font-weight: bold; + color: #303030; + line-height: 54px; + position: relative; + } + + .title::after { + content: ""; + position: absolute; + width: 12px; + height: 12px; + border-radius: 50%; + background-color: #E52929; + top: 8px; + } + + .date { + color: #606060; + } + + .text { + display: inline-block; + margin-top: 20px; + font-size: 14px; + font-weight: 400; + color: #606060; + line-height: 14px; + } + .line { + margin: 30px 0 15px 0; + border-bottom: 1px solid #D7D7D7; + opacity: 0.43; + } + } +} \ No newline at end of file diff --git a/src/views/myWork/message/index.vue b/src/views/myWork/message/index.vue new file mode 100644 index 00000000..81604af7 --- /dev/null +++ b/src/views/myWork/message/index.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/components/orderSkeleton.vue b/src/views/order/components/orderSkeleton.vue new file mode 100644 index 00000000..dc55716f --- /dev/null +++ b/src/views/order/components/orderSkeleton.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/createOrder.vue b/src/views/order/createOrder.vue new file mode 100644 index 00000000..86e5035d --- /dev/null +++ b/src/views/order/createOrder.vue @@ -0,0 +1,223 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/enterprise.vue b/src/views/order/enterprise.vue new file mode 100644 index 00000000..745dd0ed --- /dev/null +++ b/src/views/order/enterprise.vue @@ -0,0 +1,399 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/flagShip.vue b/src/views/order/flagShip.vue new file mode 100644 index 00000000..9ed5628d --- /dev/null +++ b/src/views/order/flagShip.vue @@ -0,0 +1,143 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/index.scss b/src/views/order/index.scss index cffa4bf3..ebfb66c9 100644 --- a/src/views/order/index.scss +++ b/src/views/order/index.scss @@ -1,7 +1,7 @@ .full_continer { width: 100%; height: 100%; - overflow: hidden; + overflow: hidden; position: relative; .banner { margin-top: 35px; @@ -16,7 +16,7 @@ } h2 { - font-size: 24px; + font-size: 28px; font-family: PingFang SC; font-weight: bold; color: #303030; @@ -34,6 +34,7 @@ h2 { p { margin-top: 34px; color: #7D7D7D; + font-size: 20px; } } @@ -50,233 +51,287 @@ h2 { margin-top: 24px; display: flex; flex-direction: row; - width: 172px; - height: 86px; + width: 220px; + height: 110px; margin-right: 20px; border-radius: 5px; background-color: #F4F5F8; cursor: pointer; img { - width: 80px; - height: 80px; + width: 110px; + height: 110px; } .desc { - margin-left: 10px; + margin-left: 8px; display: flex; flex-direction: column; justify-content: center; align-items: center; + font-size: 16px; p:nth-child(2) { margin-top: 8px; - font-size: 12px; + font-size: 14px; } } } .select { + font-size: 30px; position: absolute; right: 5px; - top: 10px; + top: 2px; color: #409EFF; } } } - .sys_type { - margin-top: 52px; - .sys_desc { - display: flex; - height: 46px; + .submit { + margin-top: 35px; + } + } +} + + + + +.enterprise { + .sys_type { + margin-top: 52px; + .sys_desc { + display: flex; + height: 46px; + width: 100%; + h2 { + margin-right: 44px; line-height: 46px; - h2 { - margin-right: 44px; - } - span { + } + .selectItem { + display: flex; + flex-direction: row; + .item { + display: flex; margin-right: 60px; + height: 46px; + align-items: center; cursor: pointer; font-size: 18px; - font-weight: bold; - color: #606060; + } + .active { + font-size: 22px; + color: rgb(116, 155, 242); } } - - .sys_modules { - margin-top: 30px; + } + .sys_modules { + margin-top: 30px; + display: flex; + flex-wrap: wrap; + .active { + border: 2px solid rgb(116, 155, 242) !important; + } + .module { display: flex; - flex-direction: row; - .module { - width: 161px; - height: 189px; + flex-direction: column; + background: #FFFFFF; + margin-right: 30px; + .head { + width: 180px; + height: 200px; + border: 1px solid #E3E4E6; border-radius: 8px; - margin-right: 20px; - border: 2px solid #E3E4E6; + margin-bottom: 20px; + position: relative; cursor: pointer; .module_top { - height: 120px; display: flex; + height: 170px; + flex-direction: column; justify-content: center; align-items: center; - flex-direction: column; img { - width: 73px; - height: 73px; + width: 90px; + height: 90px; margin-top: 20px; } span { - margin-top: 20px; - font-size: 14px; color: #606060; + margin-top: 20px; + font-size: 18px; } } .module_bottom { height: 30px; - text-align: center; - line-height: 30px; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + .selected { + color: #fff; + } + } + .module_bottom_active { + background-color: rgb(116, 155, 242); } + + } - } - } - .buy_count { - margin-top: 40px; - h2 { - span { - font-size: 12px; - margin-left: 5px; - color: #C7C7C7; + .footer { + margin-bottom: 20px; } } - .buy_count_items { + + + } + } + .buy_count { + margin-top: 32px; + h2 { + span { + font-size: 18px; + margin-left: 5px; + color: #C7C7C7; + } + } + .buy_count_items { + display: flex; + flex-direction: row; + margin-top: 30px; + .oItem { + margin-right: 30px; display: flex; - flex-direction: row; - margin-top: 30px; - .oItem { - margin-right: 12px; - display: flex; - flex-direction: column; - width: 204px; - height: 110px; - border: 3px solid rgb(245, 246, 246); - justify-content: center; - border-radius: 6px; - .item_header { - height: 40px; - width: 100%; - text-align: center; - line-height: 30px; - color: #606060; - border-bottom: 2px solid rgb(245, 246, 246); - } - .item_bottom { - height: 50px; - width: 100%; - text-align: center; - line-height: 60px; - } + flex-direction: column; + width: 200px; + height: 120px; + border: 2px solid #E3E4E6; + justify-content: center; + border-radius: 6px; + .item_header { + height: 40px; + width: 100%; + text-align: center; + line-height: 30px; + color: #606060; + border-bottom: 2px solid #E3E4E6; + } + .item_bottom { + width: 100%; + text-align: center; + line-height: 60px; } - } - - } - - .buy_date { - margin-top: 50px; - h2 { - margin-bottom: 30px; } - .buy_date_items { + } + } + + .buy_date { + margin-top: 50px; + h2 { + margin-bottom: 30px; + } + .buy_date_items { + display: flex; + flex-direction: row; + .oItem { display: flex; - flex-direction: row; - .oItem { + flex-direction: column; + width: 200px; + height: 144px; + border-radius: 8px; + margin-right: 30px; + border: 2px solid #E3E4E6; + cursor: pointer; + .header { + position: relative; + height: 44px; + width: 100%; + text-align: center; + line-height: 44px; + color: #424141; + border-bottom: 2px solid #E3E4E6; + .select { + font-size: 30px; + position: absolute; + right: 10px; + top: 5px; + color: #409EFF; + } + } + .bottom { + height: 100px; + width: 100%; + position: relative; display: flex; + justify-content: center; flex-direction: column; - width: 209px; - height: 157px; - border-radius: 8px; - margin-right: 30px; - border: 2px solid #E3E4E6; - cursor: pointer; - .header { - position: relative; - height: 60px; - width: 100%; - text-align: center; - line-height: 60px; - color: #424141; - border-bottom: 2px solid #E3E4E6; - .select { - position: absolute; - right: 10px; - top: 10px; - } + align-items: center; + img { + width: 113px; + height: 40px; } - .bottom { - height: 80px; - width: 100%; - text-align: center; - position: relative; - img { - width: 113px; - height: 40px; - } - p { - margin-top: 12px; - } - .normal { - margin-top: 57px; - } + p { + margin-top: 12px; + } + .normal { + margin-top: 57px; } - } + } } - - .pay_way { - margin-top: 50px; - h2 { - margin-bottom: 20px; - } - .pay_way_items { + } + + .pay_way { + margin-top: 50px; + h2 { + margin-bottom: 20px; + } + .pay_way_items { + display: flex; + .oItem { display: flex; - .oItem { - display: flex; - flex-direction: row; - align-items: center; - width: 209px; - height: 70px; - margin-right: 20px; - border: 2px solid #E3E4E6; - border-radius: 8px; - margin-top: 5px; - img { - width: 45px; - height: 37px; - margin: 13px 18px 13px 40px; - } + flex-direction: row; + align-items: center; + width: 200px; + height: 80px; + margin-right: 30px; + border: 2px solid #E3E4E6; + border-radius: 8px; + margin-top: 5px; + position: relative; + cursor: pointer; + img { + width: 50px; + height: 50px; + margin: 13px 18px 13px 40px; + } + .select { + font-size: 30px; + position: absolute; + right: 5px; + top: 5px; + color: #409EFF; } - } - .phone { - margin-top: 10px !important; - width: 440px; } } - .pay_allAmount { - margin-top: 30px; - h2 { - margin-bottom: 20px; - } - .allAmount { - font-size: 24px; - font-weight: bold; - color: #FA5A55; - margin-bottom: 20px; - } + .phone { + margin-top: 10px !important; + width: 440px; } - - .submit { - margin-top: 35px; + } + + .pay_allAmount { + margin-top: 30px; + h2 { + margin-bottom: 20px; + } + .allAmount { + font-size: 22px; + font-weight: bold; + color: #FA5A55; + margin-bottom: 20px; + b { + font-size: 38px; + } } - - - } -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 23a94a92..f3f2c807 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -1,11 +1,14 @@ diff --git a/src/views/order/list.vue b/src/views/order/list.vue new file mode 100644 index 00000000..6b0a2ee4 --- /dev/null +++ b/src/views/order/list.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/views/order/paySuccess.vue b/src/views/order/paySuccess.vue new file mode 100644 index 00000000..3a75555c --- /dev/null +++ b/src/views/order/paySuccess.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file