From ba0beebbf4fc562c0be5421ff741126c1a09e9b5 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 20 Jan 2021 22:09:08 +0800 Subject: [PATCH] no message --- app.json | 3 + assets/image/icon-finace.png | Bin 525 -> 0 bytes assets/image/icon-payment.png | Bin 743 -> 0 bytes assets/image/icon_checking.png | Bin 0 -> 920 bytes assets/image/icon_close.png | Bin 0 -> 1005 bytes assets/image/icon_finish.png | Bin 0 -> 956 bytes assets/image/icon_payment.png | Bin 0 -> 737 bytes assets/image/icon_pricing.png | Bin 0 -> 701 bytes assets/image/icon_uncheck.png | Bin 0 -> 511 bytes assets/image/tabbar/mall-blue.png | Bin 1264 -> 1321 bytes assets/image/tabbar/mall-gray.png | Bin 1958 -> 2188 bytes components/vehicle-keyboard/index.js | 90 +++++++++++++++++++ components/vehicle-keyboard/index.json | 6 ++ components/vehicle-keyboard/index.wxml | 33 +++++++ components/vehicle-keyboard/index.wxss | 113 +++++++++++++++++++++++ pages/api/request.js | 5 +- pages/api/saas.js | 4 +- pages/index/index.js | 9 +- pages/login/index.js | 70 +++++++-------- pages/login/index.wxml | 2 +- pages/process/index/index.js | 73 ++------------- pages/process/index/index.wxml | 30 ++++--- pages/process/order-check/index.js | 59 +++++++++++++ pages/process/order-check/index.json | 12 +++ pages/process/order-check/index.wxml | 94 ++++++++++++++++++++ pages/process/order-check/index.wxss | 4 + pages/process/order-info/index.js | 59 +++++++++++++ pages/process/order-info/index.json | 10 +++ pages/process/order-info/index.wxml | 118 +++++++++++++++++++++++++ pages/process/order-info/index.wxss | 10 +++ pages/process/order-list/index.js | 94 ++++++++++++++++++++ pages/process/order-list/index.json | 12 +++ pages/process/order-list/index.wxml | 40 +++++++++ pages/process/order-list/index.wxss | 1 + 34 files changed, 829 insertions(+), 122 deletions(-) delete mode 100644 assets/image/icon-finace.png delete mode 100644 assets/image/icon-payment.png create mode 100644 assets/image/icon_checking.png create mode 100644 assets/image/icon_close.png create mode 100644 assets/image/icon_finish.png create mode 100644 assets/image/icon_payment.png create mode 100644 assets/image/icon_pricing.png create mode 100644 assets/image/icon_uncheck.png create mode 100644 components/vehicle-keyboard/index.js create mode 100644 components/vehicle-keyboard/index.json create mode 100644 components/vehicle-keyboard/index.wxml create mode 100644 components/vehicle-keyboard/index.wxss create mode 100644 pages/process/order-check/index.js create mode 100644 pages/process/order-check/index.json create mode 100644 pages/process/order-check/index.wxml create mode 100644 pages/process/order-check/index.wxss create mode 100644 pages/process/order-info/index.js create mode 100644 pages/process/order-info/index.json create mode 100644 pages/process/order-info/index.wxml create mode 100644 pages/process/order-info/index.wxss create mode 100644 pages/process/order-list/index.js create mode 100644 pages/process/order-list/index.json create mode 100644 pages/process/order-list/index.wxml create mode 100644 pages/process/order-list/index.wxss diff --git a/app.json b/app.json index 3f52d25..d789c9c 100644 --- a/app.json +++ b/app.json @@ -3,6 +3,9 @@ "pages/login/index", "pages/index/index", "pages/home/mobile/index", + "pages/process/order-list/index", + "pages/process/order-check/index", + "pages/process/order-info/index", "pages/home/authory/index", "pages/htmls/agreement/index", "pages/message/index/index" diff --git a/assets/image/icon-finace.png b/assets/image/icon-finace.png deleted file mode 100644 index 45ee565f4ef9f1c5a27563e62429cde6e8a7350a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~m(&Q)G+$o^ zEg+kNfw4W4fd!-lh^2s-fq{7eBLg##W(0{XV1mnvEMP{kK?*nB{qPs4tlZPZF~maf zY{*8hW=EcXN!lF`7U?xTQ0QvzYs!E4U_m#(LetTMOD!}O?Q6_`uwVyw(}NW8xh@3- z@0alfx#XPJ|33NuyH$s7u5A20xyEx}Tv0jeuUM6v57ymoaPG~XRw3mrRJ-Nq9yYBT z#~N)SEJQRT+115PTx${+I{(;XR+Mpo*sF6@g6)CdHsvifT)6G#>N63ES9xAtsAF+^ zrv0|~+ZVCKw0koJg{8jD&Rg6Sx@F_ZO5ML60yP4=18n*OKKN{Mous?DU#)bmwd`X> zxyi{BUdNpbImE;LfBk!PW@S4KizW9IU&@^PyYA7Vm_q@J%R>sh9&}|}v2baxPfeKf z(tqEP#O@aJE!TIPX6<*KZ{yU?ImxHcL0e^}&g-{vAs;d#fIpMb)oQep@oR?bprUZ25OR9Nc3RUxA{+)78&qol`;+0Nota6#xJL diff --git a/assets/image/icon-payment.png b/assets/image/icon-payment.png deleted file mode 100644 index a72c6b5db761639d10c2cfcf28cba79861cd3ddf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 743 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~m(&Q)G+$o^ zEg+kNfw4W4fd!-lh^2s-fq{7eBLg##W(0{XV1mnvEMP{kK?*nB{qUE8fho|_#WBP} z@NS52hH#+3yvmzbYJHgx3Moe{nbNfOOHh;J-YI_+JgP4%tWc;55O8%gSIuAIFKQzubdF55EJcn z^QailES}%pf1fo4?{i$>w=Vh0s;4r`m5yB#{`|2ry4i_6)9bfb*gjj;pyk%a#eX$o z%T6ud(q3KFroU`{yvl;w?1Q~YE)Qn!Gx0 zkD0@d18M0^4+G?9-`)6X3bXs(XKrfj_I!CoD|rv!JbE)wuWhTC;~jR9Ou4$J{=D2A z`#Pg8$#Jz-y${{5AGhgM7GFo-hl&YXqrK*PAJ*Icu}P=rLwA+@`HwpqW5Xry9&Eao zwaCid<%Y3tzmQ|!<6OC)`3`(v3oRChKl0{YczfZmn^AYp75#PJpzxiI>yw)F+pLFc zm+e`ccWFnF&yjnD)8oSf`zpd3_spDBS)Ap%GW_kCh-j(){_{Jk^7&I8=dmwUo9$!m z8!%^c(6!v@@7DV22JSxk?!4943pRCM)n}$WTX)XZ*=5O$jn5er?5-r-7CxBfn`dEC zq|qI@bmzUPrH;>@Ix2kaC~jvDdLC|Odd)&`T18sFuYKIgp2+#L4E*-+nI7;qJr-+c z;K-9QX*%;J@0{<7YCqC9#7i7|aqhy2XHlo@w#}RQEyL=ryi4%I{oZxV+YcXooEmJr Q2$aY?UHx3vIVCg!0Cpxc4*&oF diff --git a/assets/image/icon_checking.png b/assets/image/icon_checking.png new file mode 100644 index 0000000000000000000000000000000000000000..9e57952cac518a7ba5a44ad04a5aed2f52252eb3 GIT binary patch literal 920 zcmV;J184k+P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q00000 z1E2u_0{{R30RRC20H6W@1ONa40RR91M4$rz1ONa40RR91L;wH)0KnP9zW@LLcu-7K zMNDaN1d;y*lK&Z?{|J@;29y69rT+nt{|1u(1d;y*lmA7-{~4kGNXGw1#s4O&{{W8v z|Ns9Vr~ezH|3=0C7oh((xc@M-{|%Y{K*0Y@$^TK!|310@6rKMwwf`%y|0S#c5S#xB zmj9dD|6s)b=Jx-(=Kp=r|IoolWrj}_cU9y7~+OH*#Sfw`K&pw=5>I`T!Nt|(#Gaj%dU1Yzd6O!bqIU0y1 zyy2nqoZAq1#uBVcs)x)o5oF1jEc8v1Z=+3fK0z{yRF#sKmpxAv@-&Ag&Vq9sKST_E z9E2oYN>YPGiHI345V+Mbd7)Clx;^B;L6My5*g&1}+WgtATBBJ~At}qEiH&p})aSV> ziW2*jkQpQ;@R*R4Ey|-uVWai=Y^=bFa*Eqz|Bsn5wW`JjoCA9VogRXNqc2p%x z$a;t1`;ueRq{j)#zaQ|sl8+xSNN#HU_HlzI&U##_6_WK>gXBx*cKdpXnm?E%F1)R5 zXIkN4-WAv4Rq#1Lc)RH6PsBeVBoOF=qJoYk`YEQ2D zR)@SZwVmZvywtFrp_a(I(>qeax*Eq=!^eS;m-}<#TFfQ(i#)Sj&;A4d?%4iHq{$)C uYQ!?J^%AB%imMP0HVwR$1a$M}FYq6_1j8}#%|_?|0000NS%G}U;vjb? zhIQv;UIIBTsS%!OzP=1vKsE;hV|yk83rGnNO93$h1M>n#29Q~dAh88Za9NiH%m_9} z;enfn_XDY=0X`wFKADBO8~@8J`ER-FzxmGp_WS-b^!>Np^Z)Db|Nf``i_QNZcHzJ8 zssBKrwBojf7R9h znJ51DJN=)1%73|~|MfQh7hmw-Y{&oL^Z%{){5RP0-+0@9t#u%y6c_zpap%9&rvEqJ z|DSR7f7*fnEocAlfBHXS&;Rr^@ijmPOO^!r1v4bixIO=)ujU`o&u+J+uUhUX%9z(U z+wbPK146NU3=B+#o-U3d5r^MSe_gc5K&0X0CDo{aEm5)h2f2ev1rNF2|9|nDN=L_& zmP>Qr_4mck{OD1%Po;gr%30r@ob*r3cvHOQ+;d^;zu|p+3-{@NI2N7X%T@APFF9h0 zM8WF$M{AFo^qj5R+@78MvB$UZ3U}_DzXJMB^A2f$D0^@4<&o?bm$1T^wTqu;@E1!b z3MJ1>-diSjq5bslGM`Or8XG;IRnGreq!)4S^!>^;6Rtd{R_&JBvM;pg#P2;PB4xzb z8=WRyJoGL3KkKKX@mrTP?vs3b+hXb@vtM1?v{dCK+s&L_Ut1dWi8J8je5nPKE`O}B zn#Xc{cLbM~Z?Xb(Kf3W+zRl{K-Z-x|O8@nx-|U{dgEoEIGj%&tRc-9Kj_p-@ zlE>TP7z-aRL|+icn#XQxBOhjK!aR$H=uaci)XJ-$u$cBA*J4o;PJM-f&q^=TCcq$pMGni64K^ra5_snuL!-8HFHK&$BytwVmB$-B0>pz=3-9I$uF!hiS@^{AoK{!mnI~KS_7*K$Sn&SD z&BAjj>ib$sqP&GJDa=(=c65l4VlN5ucFHJ5l-HOxwS$0h_7eJ!2Gj+6rOEVuRmfN^5}3{^&Htv zH>I+taFpH7v2M=Z?Q1W&>FriIt-^=3pSg<<$2qLM?4oO6kofv**<34$Dv^%)TKfgq z{sepqUcBC7%9TCcj}5&hc~shjCG>r6uF9$V$v)R|h9AdFANKfgo1gdpu(pVQjQ^B= S^#L%2GI+ZBxvXU{ literal 0 HcmV?d00001 diff --git a/assets/image/icon_finish.png b/assets/image/icon_finish.png new file mode 100644 index 0000000000000000000000000000000000000000..48232f00dde4a775ccbbebc5f55ba755a05d0df6 GIT binary patch literal 956 zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo3?%u_CN}^nmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBTsS%!OzP=1vKsE;hV|yk83rGnNO93$h1M>n#29Q~dAh88Za9NiH%m_9} z;enfn_XDZ<0X`wFKADBGOaF^4_;0i4zxmGp_WS-b^!>Np^WS9KfB#eefgtR{f9(w* zhR>=0E{Fa{oc;gl=l_5+AQ1@A+VEd^?tk_v{{znbS6cDk;lO{_BmcdQ|7V^El9yfb zUwzGg!!7^0r~lX8_+MxaNTvVj|0di2^UwM(zTkiG`Ty2nt3Ukwzv9k+=S}}_e)wN@ z{Qsm&|MxxpKQ$=gH_)k4B|(0{4AZ~dp8wHTGgb7p`%URPmMe?)&-UBaFzaG(=Hi|z z1_mZqPZ!6Kh{JEEzb;y2AkvVzw0l8Axwf|Siqef+S_&%vr{8W75IFnL?DD@GAEl46 zOscVzadH!Rda(I_>&mZ@n=kz4zw%bnd2#65%?BH|hV|-ZXdCKtFVT#==v@}M{mnFk zH4BzV2%03^i!3#3ogBcQC}|O6ty3o4oyM-YTA_e>x?D}1>-8)Vx!D=~d=rioWrrF6 zWy`I)`bJNo)0%;MlFVy6_wNx8wE6pd;OP;8il(QGUp}Cd7@c(%k*CIv`$^Y1cAgd4$+0$C_4jUv47+(lk=?B%J#`u68C?) zGtaST$`#=s7W$`Ha@jqFM6OSgv38YIc2@eya8M)p@SYYiO{JJ=UnkD7^ZOz&NokSD z(j{x=oi94c*>aChUgGj~|2xSx0ZziF7jp~0>GpWqS^JmUQGVn3(sR27et&Z3@wVA@ zBX2RY*zGU;9&X{$m%STO*Y9bXB%u5z##-hDYseSdjD^CNS%G}U;vjb? zhIQv;UIIBTsS%!OzP=1vKsE;hV|yk83rGnNO93$h1M>n#29Q~dAh88Za9NiH%m_9} z;enfn_XDZ$0G|+7pUgtdb^m=%{+C(u-|fhMtxf;UcK&xd^q* zy1l*`Xa#RckY6xE#hqOf1a&t@`YwHO_nXSWc|a%b_jGX#i8%ar+Ur?O3IYy$lcKn~ zu7CMEzc`U)@qyDXw%dQZ&G*<~nH*>Lr#<@dBAG%wjw10vEX)EEE^|%d;a1lzG?7SI zF7odKpQXK|{vz$k8yjkz{ykta75P-9K3S7fz*+I4)D!(0OOGk4?I#yq`Khu@a7M_i zWjlrDW*FId$UL6$qvObS70LSvCc6snxn0!pJn%81f7WwL@!1WlAJn|;;XZq7R&=c` z+jf=xS_@5EGXbUYOot`ePcu5sE0CU)IB%9b@hYuu+V z5y_q0@n%it(nS%!n6gf=-g&fb_biFFLm_)Po>o1atgIaAe#XI~TwG=2^jC~)FIs4n zYNc{?p2#?9eWd&SqR;xCN3N>u$+xt*W^nAu&IwX0Bu)N4s{P;IUwgrz+u)d2%%R=> zNy6<*raiyP)A)7bO7jFOslME`>$QSoN7!kms=2RI>qDEKm#h5Mn>+FM zI^nCFoxQ3nP4;^2T~!r%V#(^6S;0*QrfpeuGJsRJa!dP)kfz@euXArKTKVRG&fDP2 zcF`vSUIs|N(U5sP`M=Aj0$u%=%uget7kN}!dr4Kt{}Z&oyKG+7Hm%lTP;&Bg^>bP0 Hl+XkK(!V!| literal 0 HcmV?d00001 diff --git a/assets/image/icon_pricing.png b/assets/image/icon_pricing.png new file mode 100644 index 0000000000000000000000000000000000000000..aff05bc4919a2a359feff9ea21a3e601b6165733 GIT binary patch literal 701 zcmeAS@N?(olHy`uVBq!ia0vp^E+EXo3?%u_CN}^nmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBTsS%!OzP=1vKsE;hV|yk83rGnNO93$h1M>n#29Q~dAh88Za9NiH%m_9} z;enfn_XDY@0G|+7pUgtDo&VjB{x{$GUuW}w-HrbZHvebn|F5y(zx?w5hFky3E&Fe| z>%ZWf|3T;ei!c1oGvmMg{{QS#{>v`?Z@K%w>gxY4hyOEA`0sJ-zsdIh-Y5QRZ}@Mp z<-gyl{|PPAg@Cs3mIV0)Gj!~FBb(#U$+u_OoeN5qdz^u;oZ;!>7!q;#?eyEzniNFZ zoErlSeAj-wu;+g^pL(}$!qF{hd4C=;{V0#O4%-yge)!zEbN`(;J^Z338Ed&In2W>W zLb=oe@rfFYYkfLX)}_o?mMCR1*_eMVW56Vi2{FPy_dNOYpvr9L9G1YJw%wj$EN<_N zmYaOc@AIlDar!+Up8mboI@7V0Es58gH(plnSu9Jb zTC54nS&`UDOPJX&Up1VvMFVu zwiGSSe7a%b-1Xl@66DJ+En`%1UBqJ3^hLY#>RFfDBJ6ST8ee{>wY>Z9Tvk?hoWDJM VeoI>Sje1a0@pScbS?83{1OV0~BIf`A literal 0 HcmV?d00001 diff --git a/assets/image/icon_uncheck.png b/assets/image/icon_uncheck.png new file mode 100644 index 0000000000000000000000000000000000000000..d03475d7d64d308080403ffa628a9ad90c031ab2 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxKmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBTsS%!OzP=1vKsE;hV|yk83rGnNO93$h1M>n#29Q~dAh88Za9NE7%m_9} zVb!y=H9*QKz$e7jC$sQBWx#y1$|9g?q9s9o!3?3ZoHu{#IkV&j^Rdg^xu(zSwo7d| z{c@!;P{Aut7sn8b(^sdQ6lzuwa0#5|=yEXi-~VvtiCq#m`A#0(wj)f#nWJ!Fc;<<*ALh=B=gEJbC?SF zP2i9GD6u8Dj!(MZAy#6>rjHk+(oAEra`K+(E4<%kS@z%ZJm-b;ndN$YEtNYf_{sxX zR#s29<2<(X@{+z~U7xlKzYqI)dfUmgA4gl2giT8KO3mCSC-93S^uwL6J1+P-KZz{h zjMe{srvB}Uj!Or-t#?T+TzM?M&FPv$rJYr3?Y(vT-v0ky?RCPdtiN(cyvsNHo!miY R%|Kr>c)I$ztaD0e0sy{Q;3NP5 literal 0 HcmV?d00001 diff --git a/assets/image/tabbar/mall-blue.png b/assets/image/tabbar/mall-blue.png index b6a20722f63c35af3cb0c0198e270c5811b87c3e..357f41392b311b19cba61a242e60167a9451c561 100644 GIT binary patch delta 1208 zcmV;p1V{Vu38@N@fq#=pL_t(&1?^f(j1@%`J$GP;0pueg0SrhG1W{PR0(2#xKp>z5 z*svfW#OT5u$jr#R@R=wkELgZOh8VZ701T+OaDhaDgar#e0~n&gkpv7dAdx3r&wV{J z>FTcjJmxVJ$y8G5dbe(!drwt$)vf9W45q;zcq%<04MlCyiGOIqGAO1I_hmjO)t&L ziVlv@-5kACReya%+H@wJ|CV`13aPPzizKuXyX10N*z!}NO&62EuLD5Be4oYT;S}2R zoyHPr(M<$CMiOJn0yjW!EbVqD>@JLIQ4?0h28 z(t4TzWAi`;pzaoiVICKN-?D6FzayXNi`*X$2SCDnAAg4`j^J}0Q9qGxF0sJutcC+F zSG5M1HQHax50Gm#5-u;G~Q3vK*UORzmS64rByk+_dfe4Usck%~^? ze7wp=LwyYbkX1QbUS%lrN8Fe6h*a@zz$DD~X6Ds#5>`$V0ahfHg8QuuUlPfkS{4v? z<7VI^Vt*8>7=`ipSnl-laYy7nmOKX}%=c!#^hu~-& zSC1c<@8z^n)}83dR`w^uFf8D_U%?|)Oo&TeB8kelqEi;^!EU_CC2%PRc@FD*XK!=)uX@YZFbcrZ_3B$_*FQRk&@wk>t#BTWnXX6S%mX(`qMgETa<`S_Q z#i6)DkY!2xm?i>zMdzzQ5{R67#7H33*?(yw9b(u22ZJRd*w1P8d(yu&kw~L_@Rme; zn!g4AaO$`FOk@%9>4qTN%lNI!=g9L!q?4z@%*fc?*?m+)kO^bJW*!N)N_Un!;g3kP z`K{#(-kC+hX023}Rz+I)6D= z?9)+Qbdl!IjxH7f-c5ScigfN>(LNW8F9d&{CnOBq4%uKy>h5cdR4BH&x*Qf(Ut5UkT zE9pOxI9{91VBgxgd@h}QozIu(s4;y&eaPI!(Y0N WyARLB7BYVT00007AJOOV#TDx?p-`XH! z!a_Vjy*!#qxb%Uvs5&S#kY1e11k<(^+&~Cn?3W+YiIEpR$#XbdYNc>$WIy9?P8xD5IO;cQVihJcrKoue?=my z48!=B!RC5Kcz+fO!F?=XRlblRuj%|NGK~7HgV32PEJi=7y+CNWcSXXg6r<>5kmvmZ zJVV`G!ddC{v+P}wC~5-)La$dD9^ezNg>$dSVO7FXcG78~mt$7sg4=|%3biugoZr17 z1E>ic2%Wip7~kV_#ib=zGvR9-V@6Q4dI`@}(KHfG7Lictc3U8Xq zfb(ye`PqSh51iT4UNKX30(opI1I-J@%>3*?6t0@efb-YP{OmwNxMV5=&4=)_nV%g< zKEC4*@_#+kAdtM^3i4pP0^5OvK10S$Cp!?W ziO4YqKV%yD@`9uE*@9NtO1m~+Tf4H2eiboa;2XQjVfQg4WwmMmoV60q>H?6eUC=zM~hlX-PhFVMXBaQ-O!h^C@Lx6MA>qZ z;$J8II_UQknxvODFY)4bjPfzc>*?1?*<$*=N7<{Sa>|FJb~KJTAVTM z7JpXrVj#y6p-*w#ua}eV4>Qr|TZJ@@=}t_du!J`2NUwA3bzvK# z{aMl6QlFo78TrLHH36L zZn2QIdTUk2$LV&(^m#i*riY$SaK;oldG{~7)5?F`A5#l2$60JM0VIp*TT|zNSZfgs zE?1FY)WOOkR}pJ1g2DYyDk8WQjP+&~if`O}ntw$E7kqptRfRETjIYcx+4AtaUw3%_ zL!LyjJ`mXv(N0xTgi^{ zpm?2hf_IU2^Yy4@VsWW~ShnEBC!YuR5>u2heguQ5lF!)Oxxl#<_z$kYQ@Tm|B&xdm Q4gdfE07*qoM6N<$f{vX>(EtDd diff --git a/assets/image/tabbar/mall-gray.png b/assets/image/tabbar/mall-gray.png index b45d0ed3b1a6be46ec3db17fc96cb219e58643a7..c33a5408ee09ea5bdbce1f72a7e31b54a9792f3f 100644 GIT binary patch delta 2082 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 M07*qoM6N<$f*J=M*Z=?k delta 1850 zcmV-A2gUe|5vC82fqxK5L_t(&1?^aWOjT7JKj%F_6a_UU(o9#HiYw=;B{pW6QfA9a zg)Mc>&7wbyO$0J{zy%)2FJET1_1gL)Y0M$jYUO4*e~?N|H?s&CTNy^P^&1=tynFBI zbFQ5C?!E8cD^nj}<81ex?>XP!-}61+bIv1Vw2ek!Gy+Z$pnpzCJ+7?kjroc!FQSCq zuAh$>%-EmQ9o16w`nEHJ(Q!>jB%g0G>5=OgVNVT4;LWC?gf_bg*;rVZ_oI_+mlLv~ zp}|dh0*8jn32qy7rznIRFE8KamNYG&UItigy#5lrz9GsZOb)ZiQ zus#pKSM78171gQ23FPT-Nr?&XS_z2cT(KwbL+C!ib-PM@tKs;XZ`=FiN`4A=>Y zLrZs6}nVawOo}jN2G>^7(&U*g3;w7ZwYv~ zdUs58C?gojsI2rSm~9Djgtnhw#~9ISHqz?bqWnBotxJ3|AM)wGKxO@GkCrk}yjIhh#Na>E+2e2B8IT8{0dqSMMUJwp4}8D{DeX`d)T+_E4STA+-A0dc(Q*Dk=jF&cjpq~lBdMF zCLY_qJ+sT6GKAsR@&E~}a8cHQ60eok5Y`%M`>AsttdG&Kl$_U78CC=(?yx{AR9-7! zr+;25tEpy8KEV|7Nw3`Xy;M_^=tR$PQstX>1=Ri)rmA&{!kVPAs?uxmaJ(7_WC%LF zt$fblh?}|h@w*jA;I>(!-MRR{rb!jmPec4RfdXL`oEYax0twKQ{A}T4b1U&y zttTqkhov^ifHP^W?LU89QL*PXGY?Ovi+}w4Ih=Szj{}bzdK;zkniur*0>+bKDN*I) z&=t$)sEZVt?|)$rE1%Cdw!0^A0!-S=aA1W#!%||7c3}_AfUIYsTzhZ{WuR-r+<&~_ zn2^g**@zN&mQs~6M!CG_K{GZ;Luo6<$zsfV$Z0|MDME?;NhbqNMO2rIfMGS7ljqJ# zO;1n93pmv9t~a)W2M@|CpIlKdtCTM#SHfxLV};V-#4~`G;?wS8=(UDul;IJy?pV{w ziI`YCFddD4Aq;v#<0XVU&gZm-tAF{f;)1-@O~;#Iqb5@XmG7}se5>#+!*>rp4F@Oc z%Zr;2(tfC5L(1th3Ta%4FupNd>4aaKHJB{0Mw!Z3=l-I6cs!{{%;6!+X!n4T6 z9H}t(kicqHkH|ZrM+8Bjv>rU2$fqjFlWTkTb997Dk&YaRBF(4LkQ)n_N`I%r{C@nm z^$T;mzLfHF+6)?XgVIXh0v3>$F-q>ldji2E7w{dG3UYbsST<>gZ#Gc^%b{Zic%r!; z;$p2VKktZy{Iq2HzfIb%2;cOVuBeZWaZfnubjb0lh6`MrDJl%M;J zoeo3k)Dxj{ol;fh01mleE`RIs9OnB$k(JYoDaT66YF;wqZ^jsZ31#pDS5efj;gIDX z;(9C{k#_Hn$7Wr?2~Zv%l>Gj295y$`LN`!ceU_N+A6va5- z*Jr$w4M;)F*QF*@MxrsT{9l#KSg?GXRT&L7V{f7Ht>uUz1B_7~`G1b!Ffp2JJ+gEp zwr`w)Irj3H$mGAZP1iMR>Bx0S8fK;&as=1$j*$IS2Zv^d3bHJ#gH@h9XI5Qndk3!C zY&@BoP&-(@NYGh2(tG!$E3~~!!C|Of^JV!Gzn+J^#RuL5zDO7rl&P{wL70$BI@kc( zZeqNnTg2&(tLyK$xqo&VIPp?4jLidwQmK&+jz0#$3_aG|bd{8!cfhQQk1bb(BXDL{ z;eD`|!`KUn__^kv3Y<3Bzc8;!td1neX59|Dzbjl}WGfdBvi07*qoM6N<$f`y==iU0rr diff --git a/components/vehicle-keyboard/index.js b/components/vehicle-keyboard/index.js new file mode 100644 index 0000000..5d2f6bb --- /dev/null +++ b/components/vehicle-keyboard/index.js @@ -0,0 +1,90 @@ +Component({ + options: { + addGlobalClass: true, + }, + properties: { + plateNumber: { + type: Array, + value: ["", "", "", "", "", "", ""] + }, + safeBottom: { + type: Number, + value: 0 + } + }, + data: { + provinces: "京津沪冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤川青藏琼宁渝港澳台", + letters: "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + numbers: "0123456789", + visible: false, + activeIndex: -1, + type: 0, + disabled: true, + mode: 0 // 键盘模式 0 关闭状态 1 显示省份输入 2 显示数字和字母输入 + }, + lifetimes: { + attached: function () { + + }, + }, + methods: { + show: function (number, type) { + var index = 0 + if(number && number.length){ + this.data.plateNumber = number.split('') + index = this.data.plateNumber.length - 1 + } + this.data.type = type + this.updateNumber() + this.setData({ plateNumber: this.data.plateNumber, mode: index == 0 ? 1 : 2, activeIndex: index, visible: true}) + }, + hide: function () { + this.setData({visible: false, plateNumber: ["", "", "", "", "", "", ""]}) + this.triggerEvent("change", null) + }, + updateNumber: function(){ + this.data.disabled = false + for (let index = 0; index < this.data.plateNumber.length; index++) { + const element = this.data.plateNumber[index] + if(element.length == 0){ + this.data.disabled = true + break + } + } + this.setData({disabled: this.data.disabled, plateNumber: this.data.plateNumber}) + }, + inputKeyboard: function(e){ + let index = typeof e === 'number' ? e : e.currentTarget.dataset.index + if(e.currentTarget && this.data.plateNumber[index].length == 0){ + return + } + this.setData({ mode: index == 0 ? 1 : 2, activeIndex: index }) + }, + tapDelete: function(e){ + let activeIndex = this.data.activeIndex + this.data.plateNumber[activeIndex] = '' + this.updateNumber() + if (activeIndex > 0) { + this.inputKeyboard(--activeIndex) + } + }, + tapFinish: function(){ + if(this.data.disabled){ + return + } + this.setData({visible: false, activeIndex: -1 }) + this.triggerEvent("change", {plateNumber: this.data.plateNumber.join(''), type: this.data.type}) + }, + tapKeyboard: function(e){ + let val = e.currentTarget.dataset.val + let activeIndex = this.data.activeIndex + this.data.plateNumber[activeIndex] = val + this.updateNumber() + if (activeIndex < 6) { + this.inputKeyboard(++activeIndex) + } else { + this.tapFinish() + } + }, + } +}) \ No newline at end of file diff --git a/components/vehicle-keyboard/index.json b/components/vehicle-keyboard/index.json new file mode 100644 index 0000000..3cd0e3e --- /dev/null +++ b/components/vehicle-keyboard/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-popup": "../popup/index" + } +} \ No newline at end of file diff --git a/components/vehicle-keyboard/index.wxml b/components/vehicle-keyboard/index.wxml new file mode 100644 index 0000000..6868a94 --- /dev/null +++ b/components/vehicle-keyboard/index.wxml @@ -0,0 +1,33 @@ + + + {{plateNumber[0]}} + {{plateNumber[1]}} + + {{plateNumber[2]}} + {{plateNumber[3]}} + {{plateNumber[4]}} + {{plateNumber[5]}} + {{plateNumber[6]}} + + + + + + + + + + + 确定 + + + + \ No newline at end of file diff --git a/components/vehicle-keyboard/index.wxss b/components/vehicle-keyboard/index.wxss new file mode 100644 index 0000000..bd5c8ac --- /dev/null +++ b/components/vehicle-keyboard/index.wxss @@ -0,0 +1,113 @@ + +.license-number .item { + width: 64rpx; + height: 72rpx; + line-height: 72rpx; + text-align: center; + border: 1rpx solid #999590; + border-radius: 8rpx; + display: flex; + font-size: 28rpx; + align-items: center; + justify-content: center; +} +.license-number .item.item-new-energy { + line-height: 1em; + display: flex; + align-items: center; + border: 1rpx dashed #999590; +} +.license-number .item.item-new-energy .ico { + line-height: 1em; + font-size: 36rpx; + margin-bottom: -5rpx; + color: #777; +} +.license-number .item.item-new-energy .tit { + font-size: 12px; + transform: scale(0.7); + color: #777; +} + +.license-number .item.active { + border: 1rpx solid #008AFF; + color:#008AFF; +} + +.license-number .item.item-dot { + border: none; + width: auto; + padding: 0 6rpx; +} +.license-number .item.item-dot .dot { + width: 12rpx; + height: 12rpx; + background: #a09c96; + border-radius: 10rpx; +} + +.kb-keyboard { + padding: 6rpx; + position: relative; +} +.flex-brick { + display: flex; + flex-flow: row wrap; +} +.kb-keyboard-action { + display: flex; + justify-content: space-between; + position: absolute; + bottom: 6rpx; + right: 6rpx; +} +.kb-keyboard_td { + color: #1e1e1e; + box-shadow: 1rpx 1rpx 1rpx #919191; + background: #fff; + display: flex; + align-items: center; + justify-content: center; + width: calc((100vw - 12rpx) / 10 - 12rpx); + font-size: 18px; + height: 48px; + margin: 6rpx; + border-radius:5px; +} + +.kb-keyboard_td.disabled { + opacity: 0.5; + pointer-events: none; +} + +.kb-keyboard_td:active { + background: #f2f2f2; +} +.kb-keyboard__del { + align-self: flex-end; + width: calc(((100vw - 12rpx) / 10 - 12rpx) * 1.8); + height: 48px; + display: flex; + justify-content: center; + align-items: center; + padding-right: 1rpx; +} +.kb-keyboard__del .ico-del { + width: 44rpx; + height: 30rpx; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAeCAMAAABg6AyVAAAAclBMVEUAAAAwMDAxMTEMDAwpKSkpKSkwMDAqKioxMTExMTEpKSkqKiokJCQpKSkpKSkqKioqKioqKioqKioqKiopKSkoKCgoKCgnJycqKioqKioqKioqKioqKioqKioqKiorKysrKysoKCgqKioAAAAlJSUqKipvWYGQAAAAJXRSTlMA/lcC+OyZhmk+lioH8OXd1MlOPzQZDCDcvr2ysaWjajsTEgEiwq/YugAAAM9JREFUOMud1McWgyAQBdABKxp7S+/v/38xDUPAY/DwNs7iLoQZhoycCswkiFY69RL8SaTbA/yaZnJGQD9Z7ZA1NBuAVPoNgpaW4UuFPKVluCuxHmgZHgqUnTxmHAqSEWHsTXCao7rKOmaM8U/Jn2Vs4jbAtieZkL30aFlo4CbDXrVHsLeWlgkd1z6O3teOiMsPaZj7SG5EE62swqkvm25qZRWOkNAkfLTu2P4bzge0X51rU+ztdh0kmbtlRC3D7/Cs3B+s6yqwLxnX9WVfjA8P3SLCPZZ7QgAAAABJRU5ErkJggg==); + background-size: 100% 100%; +} +.kb-keyboard__finished { + width: calc(((100vw - 12rpx) / 10 - 12rpx) * 1.8); +} + + +@keyframes breath { + from { + border-color:rgba(11, 245, 183, 0.3); + } + 40% { border-color: #0bf5b7c2; } + 60% { border-color: #0bf5b7c2; } + to { border-color: rgba(11, 245, 183, 0.3); } +} \ No newline at end of file diff --git a/pages/api/request.js b/pages/api/request.js index a38ef92..be3c47c 100644 --- a/pages/api/request.js +++ b/pages/api/request.js @@ -4,6 +4,7 @@ import axios from "./axios" const event = require('../../utils/event') +const storage = require('../../utils/storage') const app = getApp() /** * axios defaults 配置 @@ -91,8 +92,8 @@ function handleResult(result) { } if (result.code === 401) { app.globalData.token = null - app.globalData.userToken = null - wx.removeStorageSync('Authorization') + app.userInfo = null + storage.remove('Authorization') event.emit('EventMessage', { what: 666, desc: 'Logout' }) let pages = getCurrentPages() //当前页面栈 let prevPage = pages[pages.length - 1] //当前页面 diff --git a/pages/api/saas.js b/pages/api/saas.js index dd402da..6a26520 100644 --- a/pages/api/saas.js +++ b/pages/api/saas.js @@ -10,9 +10,11 @@ const sconfig = { // *****************************************账户业务********************************************** const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig) const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig) +const getOrderList = (params) => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, params, sconfig) export { sconfig, loginToken, - getBaseInfo + getBaseInfo, + getOrderList } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index f505277..985ed14 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -9,11 +9,11 @@ Page({ safeBottom: app.globalData.safeBottom, fragment: app.globalData.safeFragmentHeight, tabList: [ - { index: 0, value: 'mall', badge: 0, name: '商城', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, + { index: 0, value: 'mall', badge: 0, name: '消息', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, { index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/image/tabbar/process-blue.png', gray: '/assets/image/tabbar/process-gray.png' }, { index: 2, value: 'home', badge: 0, name: '我的', blue: '/assets/image/tabbar/home-blue.png', gray: '/assets/image/tabbar/home-gray.png' } ], - tabIndex: 0 + tabIndex: 1 }, /************************************** 初始化流程 ********************************************/ onLoad: function (options) { @@ -27,9 +27,6 @@ Page({ }, /************************************** 生命周期函数--监听页面初次渲染完成 ********************************************/ onShow: function () { - this.onResume() - }, - onResume: function(){ var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) if (pageView && this.data.inited) { pageView.onRestart() @@ -37,7 +34,7 @@ Page({ }, onChange: function ({detail}) { this.setData({ tabIndex: detail }) - this.onResume() + this.onShow() }, stopTouchMove: function(e){ return false diff --git a/pages/login/index.js b/pages/login/index.js index 64c7554..9812ca6 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -64,10 +64,13 @@ Page({ app.globalData.safeFragmentHeight = windowHeight - statusBarHeight - app.globalData.safeBottom app.globalData.windowWidth = e.windowWidth + var authorization = app.globalData.token || storage.get('Authorization') if(this.data.code){ this.fetchQrCode(this.data.code) - } else { - this.fetchUserInfo() + } else if(!util.isEmpty(authorization)){ + wx.showLoading({ title: '登录中', mask: true }) + this.setData({ loging: true}) + this.fetchUserInfo(authorization) } } }) @@ -82,29 +85,26 @@ Page({ return false }, /************************************** 获取用户信息，进行登录 ********************************************/ - fetchUserInfo: function(){ - var authorization = app.globalData.token || storage.get('Authorization') - if (util.isEmpty(authorization)) { - return - } + fetchUserInfo: function(authorization){ app.globalData.token = authorization + storage.put('Authorization', authorization) config.header = { 'Authorization': 'QNT ' + authorization } - this.setData({ loging: true}) loginToken({loginToken: app.globalData.token}).then(result => { - sconfig.header = { 'Authorization': 'QNT ' + result.data.token } - getBaseInfo().then(result => { - this.setData({ loging: false}) - app.userInfo = result.data - wx.hideLoading() - wx.redirectTo({ url: '/pages/index/index' }) - }).catch(err => { - wx.hideLoading() - util.showToast(err) - app.globalData.token = null - storage.remove('Authorization') - config.header = null - this.setData({ loging: false}) - }) + sconfig.header = { 'Authorization': 'QNT ' + result.data } + wx.redirectTo({ url: '/pages/index/index' }) + // getBaseInfo().then(result => { + // this.setData({ loging: false}) + // app.userInfo = result.data + // wx.hideLoading() + // wx.redirectTo({ url: '/pages/index/index' }) + // }).catch(err => { + // wx.hideLoading() + // util.showToast(err) + // app.globalData.token = null + // storage.remove('Authorization') + // config.header = null + // this.setData({ loging: false}) + // }) }).catch(err => { wx.hideLoading() util.showToast(err) @@ -162,9 +162,10 @@ Page({ this.countDown = this.countDown || this.selectComponent('.count-down') this.countDown.reset() this.countDown.start() - }).catch(error => { + }).catch(err => { wx.hideLoading() - util.showToast(error) + console.log(err) + util.showToast(err) }) }, registAccount: function(){ @@ -184,22 +185,19 @@ Page({ this.setData({ loging: true }) if (this.data.type == 1) { loginCaptcha(this.data.form).then(result => { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - this.fetchUserInfo() + this.fetchUserInfo(result.data.token) }).catch(error => { wx.hideLoading() - console.log(error) util.showToast(error) + this.setData({ loging: false }) }) } else { loginPwd(this.data.form).then(result => { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - this.fetchUserInfo() + this.fetchUserInfo(result.data.token) }).catch(error => { wx.hideLoading() util.showToast(error) + this.setData({ loging: false }) }) } }, @@ -212,23 +210,25 @@ Page({ }, /************************************** 二维码流程 ********************************************/ fetchQrCode: function(code){ + wx.showLoading({ title: '处理中', mask: true }) + this.setData({ loging: true}) verifyCode(code).then(result => { this.data.code = null if(result.data.redirectUrl == '/login'){ // 根据userId来获取用户信息；并且直接登录 - app.globalData.token = result.data.metaData.token - storage.put('Authorization', app.globalData.token) - this.fetchUserInfo() + this.fetchUserInfo(result.data.metaData.token) } else { wx.hideLoading() + this.setData({ loging: false}) if(!result.data.message){ result.data.message = '二维码解析失败，请重新扫码' } util.showToast(result.data.message) } }).catch(err => { - //异常回调 wx.hideLoading() + util.showToast(err) + this.setData({ loging: false}) }) } }) \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 90ed99a..f5380db 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -31,7 +31,7 @@ - + 登录 diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 6dedb6c..4e1035d 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -12,15 +12,13 @@ Component({ * 页面的初始数据 */ data: { - userInfo: app.accountInfo, - height: app.globalData.fragmentHeight - 100, - tabIndex: 0, tabList: [ - {id: 0, name: '供货单', badge: 0, value: 'supply' }, - {id: 1, name: '采购单', badge: 0, value: 'purchase'}, - {id: 2, name: '生产单', badge: 0, value: 'production' } - ], - loading: true + { status: 0, badge: 2, name: '定价', icon: '/assets/image/icon_pricing.png' }, + { status: 1, badge: 4, name: '过磅审核', icon: '/assets/image/icon_checking.png' }, + { status: 2, badge: '', name: '代付款', icon: '/assets/image/icon_payment.png' }, + { status: 3, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }, + { status: 4, badge: '', name: '已关闭', icon: '/assets/image/icon_close.png' } + ] }, lifetimes: { // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 @@ -33,67 +31,14 @@ Component({ }, methods: { onRestart: function () { - if(this.data.loading){ - this.initAccountInfo() - } - var fragment = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - if (fragment) { - fragment.onRestart() - } + }, onEvent: function (message) { if (message.what == 888) { - this.initAccountInfo() - } - }, - initAccountInfo: function(){ - if(app.accountInfo && app.accountInfo.position == 'ORDINARY'){ - this.setData({ - loading: false, - userInfo: app.accountInfo, height: app.globalData.safeFragmentHeight - 100, - tabList: [ - {id: 0, name: '生产中', badge: 0, value: 'supply', status: 0 }, - {id: 1, name: '待生产', badge: 0, value: 'purchase', status: 1 }, - {id: 2, name: '已完成', badge: 0, value: 'production', status: 3 }, - {id: 3, name: '已终止', badge: 0, value: 'termination', status: 6 } - ] - }) - } else { - this.setData({ loading: false, userInfo: app.accountInfo, height: app.globalData.safeFragmentHeight - 100 }) - } - // 您的申请正在处理，请等待，轮询去查询userInfo - if(app.accountInfo && app.accountInfo.applicationStatus == 0){ - this.fetchUserInfo() } }, - onTabChange: function (event) { - if (this.data.tabIndex == Number(event.detail.index)) { - return - } - this.setData({ tabIndex: event.detail.index}) - var fragment = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - if (fragment) { - fragment.onRestart() - } - }, - fetchUserInfo: function(){ - getUserInfo().then(result => { - app.accountInfo = result.data - if(result.data.enterpriseId && result.data.applicationStatus == 1){ - this.initAccountInfo() - } else { - var that = this - setTimeout(function () { that.fetchUserInfo() }, 3000) - } - }).catch(err => { - console.log(err) - }) - }, - loginFrom: function(){ - wx.navigateTo({ url: '/pages/index/index' }) - }, - applyFrom: function(){ - wx.navigateTo({ url: '/pages/htmls/saas/index' }) + toOrderList: function (e) { + wx.navigateTo({ url: '/pages/process/order-list/index?status=' + e.currentTarget.dataset.status }) } } }) \ No newline at end of file diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index 6733d98..2018075 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -3,16 +3,20 @@ 工作台 - - - - 收货管理 - - - - - - - - - \ No newline at end of file + + + + 钟落潭打包厂 + + + + + + 收货订单 + + + + + + + \ No newline at end of file diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js new file mode 100644 index 0000000..7ad5f4d --- /dev/null +++ b/pages/process/order-check/index.js @@ -0,0 +1,59 @@ +// pages/process/order-check/index.js +import Dialog from '../../../components/dialog/dialog' +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + safeBottom: app.globalData.safeBottom, + form: { + plateNumber: null + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + safeBottom: app.globalData.safeBottom + }) + }, + showPlate: function (e) { + this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') + this.keyboard.show(this.data.form.plateNumber, 0) + }, + onPlatenumber: function({detail}){ + if(detail && detail.plateNumber){ + this.setData({ ['form.plateNumber']: detail.plateNumber }) + } + }, + showCategory: function(){ + + }, + bindInput: function (e) { + this.data.form[e.target.id] = e.detail.value + }, + onChange: function({ detail }) { + // 需要手动对 checked 状态进行更新 + this.setData({ ['form.isDefault']: detail ? 1 : 0 }) + }, + paddingOrder: function(){ + this.setData({ ['form.checking']: !this.data.form.checking }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + viewImage: function (e) { + var imgList = [] + for (let index = 0; index < this.data.imgList.length; index++) { + if (this.data.imgList[index].indexOf('.mp4') >= 0) { + continue + } + imgList.push(this.data.imgList[index]) + } + wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) + } +}) \ No newline at end of file diff --git a/pages/process/order-check/index.json b/pages/process/order-check/index.json new file mode 100644 index 0000000..883bfbf --- /dev/null +++ b/pages/process/order-check/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-button": "/components/button/index", + "van-checkbox": "/components/checkbox/index", + "van-loading": "/components/loading/index", + "van-image": "/components/image/index", + "van-dialog": "/components/dialog/index", + "vehicle-keyboard": "/components/vehicle-keyboard/index" + } +} \ No newline at end of file diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml new file mode 100644 index 0000000..7805737 --- /dev/null +++ b/pages/process/order-check/index.wxml @@ -0,0 +1,94 @@ + + + 定价详情 + + + + + + 客户姓名 + 客户姓名 + + + + + 车牌号码 + {{form.plateNumber || '请输入车牌号码'}} + + + + + + 废纸品类 + * + + 请选择废纸品类 + + + + + + + 单价(元/KG) + * + + + + + + + + 扣重(KG) + * + + + + + + + + 扣点(%) + * + + + + + + + 是否无皮过磅 + + + + + + + 毛重(KG) + 2000.00 + + + + + + 过毛重照片 + + + + + + + + + + + + + + 取消 + 提交 + + + + \ No newline at end of file diff --git a/pages/process/order-check/index.wxss b/pages/process/order-check/index.wxss new file mode 100644 index 0000000..c7d8322 --- /dev/null +++ b/pages/process/order-check/index.wxss @@ -0,0 +1,4 @@ +/* pages/process/order-check/index.wxss */ +.page-icon { + margin-right: 24rpx; +} \ No newline at end of file diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js new file mode 100644 index 0000000..7ad5f4d --- /dev/null +++ b/pages/process/order-info/index.js @@ -0,0 +1,59 @@ +// pages/process/order-check/index.js +import Dialog from '../../../components/dialog/dialog' +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + safeBottom: app.globalData.safeBottom, + form: { + plateNumber: null + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + safeBottom: app.globalData.safeBottom + }) + }, + showPlate: function (e) { + this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') + this.keyboard.show(this.data.form.plateNumber, 0) + }, + onPlatenumber: function({detail}){ + if(detail && detail.plateNumber){ + this.setData({ ['form.plateNumber']: detail.plateNumber }) + } + }, + showCategory: function(){ + + }, + bindInput: function (e) { + this.data.form[e.target.id] = e.detail.value + }, + onChange: function({ detail }) { + // 需要手动对 checked 状态进行更新 + this.setData({ ['form.isDefault']: detail ? 1 : 0 }) + }, + paddingOrder: function(){ + this.setData({ ['form.checking']: !this.data.form.checking }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + viewImage: function (e) { + var imgList = [] + for (let index = 0; index < this.data.imgList.length; index++) { + if (this.data.imgList[index].indexOf('.mp4') >= 0) { + continue + } + imgList.push(this.data.imgList[index]) + } + wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) + } +}) \ No newline at end of file diff --git a/pages/process/order-info/index.json b/pages/process/order-info/index.json new file mode 100644 index 0000000..e55b6ea --- /dev/null +++ b/pages/process/order-info/index.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-button": "/components/button/index", + "van-loading": "/components/loading/index", + "van-image": "/components/image/index", + "van-dialog": "/components/dialog/index" + } +} \ No newline at end of file diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml new file mode 100644 index 0000000..b907993 --- /dev/null +++ b/pages/process/order-info/index.wxml @@ -0,0 +1,118 @@ + + + 过磅详情 + + + + 待过磅审核 + + + + 客户姓名 + 刘财顺 + + + + + 车牌号码 + {{form.plateNumber || '请输入车牌号码'}} + + + + + 废纸品类 + 黄纸板 + + + + + 毛重(KG) + 黄纸板 + + + + + 皮重(KG) + 黄纸板 + + + + + 净重(KG) + 黄纸板 + + + + + 定价员 + 黄纸板 + + + + + 定价时间 + 2021年1月20日 21:46:27 + + + + + + 过毛重照片 + + + + + + + + + + + + + + 过皮重照片 + + + + + + + + + + + + + + + 单价(元/KG) + 1.80 + + + + + 金额(元) + 47001.80 + + + + + 订单时间 + 2021年1月20日 21:46:27 + + + + + 订单编号 + XXP123456709978957 + + + + + + 重新过皮重 + 通过审核 + + + \ No newline at end of file diff --git a/pages/process/order-info/index.wxss b/pages/process/order-info/index.wxss new file mode 100644 index 0000000..eb6f9a2 --- /dev/null +++ b/pages/process/order-info/index.wxss @@ -0,0 +1,10 @@ +/* pages/process/order-check/index.wxss */ +.page-icon { + margin-right: 24rpx; +} + +.info_status{ + background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%); + height:90rpx; + padding: 0rpx 32rpx; +} \ No newline at end of file diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js new file mode 100644 index 0000000..3df5463 --- /dev/null +++ b/pages/process/order-list/index.js @@ -0,0 +1,94 @@ +// pages/process/order-list/index.js +import Dialog from '../../../components/dialog/dialog' +import { getOrderList, cancelOrder, receiptOrder} from "../../api/saas" +const event = require('../../../utils/event') +const util = require('../../../utils/util') +const app = getApp() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + height: app.globalData.fragmentHeight, + loading: true, + requesting: false, + finished: false, + top: 0, + orderList: [], + form: { + status: 0, + pageNum: 1 + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + if(options.status){ + this.data.form.status = Number(options.status) + } + this.setData({ height: app.globalData.fragmentHeight }) + this.fetchOrderList() + }, + onRefreshList: function () { + this.setData({ + orderList: [], + ['form.pageNum']: 1, + loading: true, + finished: false + }) + this.fetchOrderList() + }, + fetchOrderList: function () { + if (this.data.requesting || this.data.finished) { + return + } + if (this.data.loading) { + this.data.requesting = true + } else { + this.setData({ requesting: true }) + } + getOrderList(this.data.form).then(result => { + if (result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + if(this.data.form.pageNum == 1){ + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + top: 0, + finished, + requesting: false, + loading: false + }) + } else { + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + finished, + requesting: false, + loading: false + }) + } + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + priceOrder: function(e){ + wx.navigateTo({ url: '/pages/process/order-info/index?id=' }) + } + +}) \ No newline at end of file diff --git a/pages/process/order-list/index.json b/pages/process/order-list/index.json new file mode 100644 index 0000000..83b51ac --- /dev/null +++ b/pages/process/order-list/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "refresh-view": "/components/refresher/index", + "van-button": "/components/button/index", + "van-index-bar": "/components/index-bar/index", + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-divider": "/components/divider/index", + "van-loading": "/components/loading/index", + "van-dialog": "/components/dialog/index" + } +} \ No newline at end of file diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml new file mode 100644 index 0000000..473bc41 --- /dev/null +++ b/pages/process/order-list/index.wxml @@ -0,0 +1,40 @@ + + + 定价列表 + + + + + + + + + {{loading? '正在加载' : '暂无数据'}} + + + + + + + + 客户名称：刘财顺 + 毛重：2000.00KG + + + 取消 + + 定价 + + + + + + + + + {{finished?'到底啦～':'加载中...'}} + + + + \ No newline at end of file diff --git a/pages/process/order-list/index.wxss b/pages/process/order-list/index.wxss new file mode 100644 index 0000000..649b69a --- /dev/null +++ b/pages/process/order-list/index.wxss @@ -0,0 +1 @@ +/* pages/process/order-list/index.wxss */ \ No newline at end of file