From 5e0e61c08bf7c92d0972949b474ed27d7ed476f5 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Thu, 20 Nov 2025 15:37:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 16 +- pages/Warehouse/Warehouse.vue | 219 +-- pages/Warehouse/paymoney.vue | 2629 +-------------------------------- pages/Warehouse/picking.vue | 9 +- pages/watch/index.vue | 4 +- static/index/indeximage.png | Bin 0 -> 10966 bytes static/index/warehouse/ys.gif | Bin 28734 -> 28733 bytes 7 files changed, 145 insertions(+), 2732 deletions(-) create mode 100644 static/index/indeximage.png diff --git a/pages.json b/pages.json index 981822b..ac2eb43 100644 --- a/pages.json +++ b/pages.json @@ -92,6 +92,14 @@ "navigationStyle": "custom" } + }, + // 大图 + { + "path": "pages/Warehouse/Warehouse", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/NursingNew/index", @@ -155,13 +163,7 @@ } }, - { - "path": "pages/Warehouse/Warehouse", - "style": { - "navigationStyle": "custom" - } - - }, + { "path": "pages/Warehouse/procurement", "style": { diff --git a/pages/Warehouse/Warehouse.vue b/pages/Warehouse/Warehouse.vue index 8f9743a..583694d 100644 --- a/pages/Warehouse/Warehouse.vue +++ b/pages/Warehouse/Warehouse.vue @@ -1,5 +1,11 @@ @@ -51,79 +58,74 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, defineProps } from 'vue'; const darkFans = ref(false); const getblue = ref(false); - const props = defineProps({ - isShow: { - type: Boolean, - required: true, - }, - }); + const housedex = ref(-1); const lastTap = ref(0) const DOUBLE_TAP_DELAY = 300; const setout = ref(null) const housactive = (index : number) => { housedex.value = index; - const now = Date.now() - if (now - lastTap.value < DOUBLE_TAP_DELAY) { - // 双击成立 - clearTimeout(setout.value) - if (index == 0) { - navurl.value = 'pages/Warehouse/paymoney' + const now = Date.now() + if (now - lastTap.value < DOUBLE_TAP_DELAY) { + // 双击成立 + clearTimeout(setout.value) + if (index == 0) { + navurl.value = 'pages/Warehouse/paymoney' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 1) { + navurl.value = 'pages/procurement/material' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 2) { + navurl.value = 'pages/Warehouse/picking' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 3) { + navurl.value = 'pages/Warehouse/finish' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index === 5) { + uni.navigateTo({ + url: "/pages/watch/full" + }) + } + if (index == 6) { + navurl.value = 'pages/procurement/outbound?code=0' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + if (index == 7) { + navurl.value = 'pages/procurement/outbound?code=1' + uni.navigateTo({ + url: '/' + navurl.value + }) + } + // 重置,避免多次触发 + lastTap.value = 0 + } else { + setout.value = setTimeout(() => { + console.log("点击哪个了", index) + if (index === 5) { uni.navigateTo({ - url: '/' + navurl.value + url: "/pages/watch/full" }) } - if (index == 1) { - navurl.value = 'pages/procurement/material' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (index == 2) { - navurl.value = 'pages/Warehouse/picking' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (index == 3) { - navurl.value = 'pages/Warehouse/finish' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (index === 5) { - uni.navigateTo({ - url: "/pages/watch/full" - }) - } - if (index ==6) { - navurl.value = 'pages/procurement/outbound?code=0' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - if (index ==7) { - navurl.value = 'pages/procurement/outbound?code=1' - uni.navigateTo({ - url: '/' + navurl.value - }) - } - // 重置,避免多次触发 - lastTap.value = 0 - } else { - setout.value = setTimeout(()=>{ - console.log("点击哪个了",index) - if (index === 5) { - uni.navigateTo({ - url: "/pages/watch/full" - }) - } - - },DOUBLE_TAP_DELAY) - // 记录本次时间,等待下次点击 - lastTap.value = now - } - + + }, DOUBLE_TAP_DELAY) + // 记录本次时间,等待下次点击 + lastTap.value = now + } + } onMounted(() => { housedex.value = 1 @@ -132,11 +134,11 @@ const onlyjump = (index : number) => { console.log("点击了哪个图标", index) if (index > 5) { - navurl.value = 'pages/Warehouse/finish' - uni.navigateTo({ - url: '/' + navurl.value - }) - return + navurl.value = 'pages/Warehouse/finish' + uni.navigateTo({ + url: '/' + navurl.value + }) + return } if (index < 4) { housedex.value = index; @@ -246,14 +248,21 @@ \ No newline at end of file diff --git a/pages/Warehouse/paymoney.vue b/pages/Warehouse/paymoney.vue index 4a8061c..f92d009 100644 --- a/pages/Warehouse/paymoney.vue +++ b/pages/Warehouse/paymoney.vue @@ -1,2636 +1,11 @@ - \ No newline at end of file diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index da47482..f080e59 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -1590,7 +1590,7 @@ } const zuofei = () => { voidedCgdMain({ id: plsbuy.value[lefttarget.value].id }).then((res : any) => { - // console.log("res", res) + console.log("res", res) if (res.success) { uni.showToast({ title: res.message, @@ -1603,6 +1603,13 @@ Object.assign(plzinfo, mobanplzinfo) Object.assign(form, mobanform) firstgetqueryCgdList(); + }else{ + uni.showToast({ + title: res.message, + icon: 'none', + duration: 2000 + }) + badshow.value = false; } }) } diff --git a/pages/watch/index.vue b/pages/watch/index.vue index 129e695..c59992e 100644 --- a/pages/watch/index.vue +++ b/pages/watch/index.vue @@ -710,7 +710,7 @@ }) } else if (typeNow.value === 2) { uni.navigateTo({ - url: '/pages/Warehousing/index' + url: '/pages/Warehouse/Warehouse' }) } } @@ -763,7 +763,7 @@ }) } else if (typeNow.value === 2) { uni.navigateTo({ - url: '/pages/Warehousing/index' + url: '/pages/Warehouse/Warehouse' }) } diff --git a/static/index/indeximage.png b/static/index/indeximage.png new file mode 100644 index 0000000000000000000000000000000000000000..3ba6899d748ae4c10a0089abb9440ec9f3bad573 GIT binary patch literal 10966 zcmbVycUV))7Vi!SXcRDqA|e7NN2>JRgVH-llNMS8q=w!TE0L}s2uhQt2LwTyQUVg1 zpkPqxpaG<*v;d*zZBD!QecwIr-tXm~J$thHtXVVjn|;^JM3))L4Fv#zSzk}f0s!d1 zCLM5;5qwa>Kkk5!)4|%d!I%B728X!>q5(~Je^)fWzORc1+5+w39)amWs{#PMpqHg> zu&uF?vYWrJxXU4pc(`u>$PECh8sPyhZrHMh_wsUAmeJCdl2yE@bV*WPNlHpbQb|fl;i8g^l%|vn7&AG^zj(F$-9miPe!+k7 zy8nw;^B;K+^T9U&)U1UL^a@40>je7y^8fC%ve!S`qVSLM{^WK4XIm8ikyipVM&fX2 z|81!M>H_oUu=#iHf-iq(KiUsW`9LtY&ygHr0YFe&UrW<6eDwRo@uuR-6N)QyvftkF zn~S%fKs-4y8F*}#^S(W$B*BtBP&lz39&#dnF$H620l$sa66bikp*@=$?|Mf`{Py^1 znf5-#W&fP!cYRVa9-B%Y%Q2giOS?bTqw*sB`_}E3t}N9Lt*b71Eq(uf0l+miX+r@d z1OSAc0C3>EHv^ksCHSv@{x3BDDE)s`@*f5KPgaIhJ!Bu~`>YsZE#jIP zZwq$~*v6^~x$2J;@HxeY%aLdC&sby8Raq7n%MN3b&cN+;k&idd3a;~xt@k~fe~PU# z`8f;$zw?$mWF?Zg4x$!GDrEm>T=)hR z@}>~9MDI8hutUE=3A5PiMDx3*t+_9|T(*7TVR6nZ`4QrPN4rhdOA~^WF`_O&nx4<50rUMudA!48BCb>Toa4(Qmt?}F$kq7ch>9dv=eqQKAfI$s*`ff*mlHgobTlCl2ZFBnM8H2#mly`Gz`M5I0`1fmpgB$l z1e)(Oi6c$@3^h2P9BnWWVFzTFiFr=bDsrw-BS7TBXyCbkMoS^UGxshwoF^GiwR558 z%U>oDSC;UVy5}UXD1#g?!g7^^ZYu79`Rfn3vYDRq0q!04YlzwC*rqi$j7!%FedGDE2&^VS3?hWOL0%g)oTP; z^t3Y{)uvE{ju`PnfknmD(y(pp$yMzUfN@|07NrYY!Gj!6_h$$W<~y5PSF0hixJ-Db zE-aw#uzzBPV8SDwVrwOjV_YA@H$OQUZYPo*m(nKNHAA?}<0rRG&wMQoALUxUgR``S zi}o~oB1$Ipd8*oxpYPt~8I3ZG~4)V~D1>f!T* zEqt0?a`V}}1)4d(or&Gq`5cF)_dM4Q7f+P>*$WPz^Fa^RjOTsIu#-HF^W%nDP-4hb zMm*y+_I}_5btX?dF;DBe*cl|FNrGZHsqK=Hx;0Q8_PB?yTkkbTfX;RoEBL;@LBPH~ z=}y-@a0P~{{>7PrzYC1{0yf(S$Qo53|LXOEE_G~%V9j&DQ&r>xWT}LLl17U)A*t;% z1WO*j1l!B^Q_dCiVJ5d!S2cMLx37DMtM)toXI zz2J#>_LQ$4Sln9D@LdZ+zbd4cBnTqp9|o_ab`@WQ42Y!BpcrZtQMwv3P^f~CPk}pU zTYk*22Ws>724iSJMh5^#1d5nN$_G3dm~?yunE{S5nOM~yqRh3koJe2nK0%ZvOgk}^ z8RwJ*tLiDb88?pLfZ|H3cZ4gMliQ!e&U7;(^Nf;h{ny$qIo*q2v^RoYv%JF5p#X~B z-xae;uRA_zDpC%}-d?jNc#T|p>H|>5#KD{lye%sPa5p-rZGWPCq#48bKpnq@i@5&i zi8~QvBJx|8J@9FZAx#5m)m*qTixdTz50qaMKnL*2Qrq+& z`?6Lqc|SZ9`C|whIfun&0Z+565G^9iP@K+s&KvIsKy7IF-WP7fVaN6c?LhIn2pb@m z8EUO&&dm-ak)yPSCN+SMZ56BS-fmuIzzIqvEeBe;5BYd`r)?v~Yu@9RX2#*l9*vMU z1f3>bd2W-%;S{alKDHF?q9m={l!tcd>hjW#zg4G&&PPwvI~ryRrcvCt@56dIixna) znhN)(Qj%;nN4ZHRhqj+NRG|e){ke-0VWa=Kf!~GuB{UQY`L;)6Pn=NazgSzbaXy~Z zLh&a?YA@LHmG!*G8KCSZ_$xx#vgq=E-hA`pHtWHObjpJlWe8FUe?1XcX-by_+*-%T zFI*ycsLn(ISUb9;A~bP{Ru2yF)4AIO;I2!${ ztDxwS5R82y6Yo(=;N!+cf;x-+Tdj9$?3h?$1m>Q`uV-aP6jvt|qv5V8cn);Y)w-nB zudIi1yR>sMw*4O5&DP(d4Bk{L)pb}p;1!d+dLq8v8muzkZNuryMl0@O$nC#VcSM`> zsEe~%W#)F%^ohiVhoyQ5)6e2%?==f{ChdY5Y}T6)X30aEaUYvn z)UTY$IgPpK&}ypBl$CfMaah{JZzHYt6gyL5z)1wsZVoF(Ul#by)tdMU_5<@({oGl1 z<&q1R)71mg{8%rXL&V67xpr_FI;BGykYeH=&uM!FWzC`sr$}em%< zPVjLg#O$2ulg+C;67l;ghPof>saJ@j0@(RyC%Hnc90ZrN_V}L+Hhd_v4g20BecRCts4nN4(+NaXM0D<5r)f zXecjo-`cP)`RA|6AQFGs$O<^i^g}s zq$a>&RuBJj=Si^27r7DJe8-}Ek4?yY+wfh- ztyB_Qga3o1+u1x-5hrwL8BnfN%(WE7A`ib&cQi?rzj9pUED*^HP!KPTZ@A@ z9#hm{(d{MDMVvK*40!xJC+6^ai~4~pTDgdhaa;;U$hfoZgJ6K-T1K6qoSvb?Qr9(t zu}JkCGdL063PxVZ@36QG}R?K&CcrNOXa{;?Y$nl zu?d?2mOkH!r`xAryfO+-o0OYW6QG?cqT`O_;OCe}#fM*!F9$cyklX`Ok{%Az=oWGPm@v)8$*( z>$UML$P}T%=Lf#NETYTy;&2X+blf_bHBUAM7+Rks%SWLv&=J=0Y~Tj)h_`>8(Lr-$R_WY@NK;29~?x**4`bAn+MZk zyF8RcfoXe4$*+geOg^yXcZ6`xT~%(W)h;im7XmolH~Q9BwTS0mLu#lZt<;J*h#)$0 z2MR`&Zua2T{3|KRrjj#A&e#VF5fWt!b8BKaCFP)4U0JczoI+NleCA%qDk`~qg*a94 z<2i7ld+~JM?mN~LJ}LcEI91|CtSJv~Jsr4{1Z!YkqZ;j;hK(qAc$#UZlYH5|70W;K zy&hDB+_YBl8pSJ?r!Op^Xe(4$|2#u#&Lg-}|M$nb*FqVP3OVNV?t445$_=2~l>MN; zYXj?lb$a5yU97l2vB$5+iq`a1JL1#}6HhWu*a7TtT)yBp(opZk^`7BEBIL?Ht{2ZLoB!Y`}HSJa)TdoAq&!(>JW?w$mTd;rv`X1cS`doM3> z_?7Cm&Fk9vlJ&ia(7m9acc+)(vAi9v?pYmB&_zh~z$#x9IX&M%R=+$vz8bctKZ|OMUxPaZhrmGdW~$sATTw`y@sFgZ*6-C7;!( z+9M&{^fBOymQV4;(C(r#WNN8!>;_hVMMH@3r|7*iI^(CYDaSB-el;UL&o3r*wSKKm z<*S5zn-vzG$B_Ac!C3FD&ULh6;mRCyQ^^e?2PVCqXRrC-!5Z)BYiihbQIJN_?iNLC zdc7cw%EJ^=geUHU12!Pouh&Kg{`d1>12!fG4BNfKt>CZfpCZR?A90!DCNh zm(SPoT74E^fPxc8NvT@s$NZ4d=eyLZ5_<4-aVIQh?qFw1n&pS_&d`+F!NIP#HWGp? zE-}y?n#s$hYShouGFs>tZYicz*|C`cW_Pbx44^L(MT}!v7QAnkdK!S#=c@?}Ckfd$ zN$r|qfyyexZJ#oGdMIF9+*Pr)9%!~7$3dC zcjkMBD$9;F-*V@6b;h4wmtu5f062a6In^p1J0Cj-@wY;8<~XL|3jAb5z*F@XnvM4{=!Y`+j+61ntM^y4{hyE9MIJ%HB@^qbhz?n0S1tAO~(E(*g&cp zAH7I4^@h~)g}V)e zgg~u_TKpKy2yXSpSVEsZAZYZSy;k88Cm~i3&(ch1CBSOPqm` zW0Jw6M+|>=1Q|P8gali+`Wiqq3$%lu$q&N5pknKX^8&?z#pNGxE$$mJ!0T`(>p!J9 zqNavGPtM8sLH_pP&?~v{qc2v@UpNd>`R{=T@;P2Hq}uNPH63$uX$q-!(}5Ck;U2;c!@k8bpDSbi!dI^1)O12hgN~+E@SbEVv3N z`BM{^ile9gvdbFygXz#;@H}>*qjJsWP_O8}M&!_&?eL?L3zR>UL2-LKE$qL?{PdqO zpJ^4ty;;lrmnn;=nm-577Gk#hIv0E8;x64`6p`Ln?4Y2Z&Cg<+=?Y`)+kdlrr0#@B=mq1KAMspqZN4ir zm2rm@29_E?wtk}sr*3-%+_NEr>`~D9o3-Gw1a=#P-Qo3MDZ_oM>*y}z^G{)skio z;2ZYG*jsf@O!b}8H%o5b49Hwndb3=Zm;OGJu}Yc(<~U$CM1ti#VC4LgHhXX{jo=*$ z?s;O*MKU6H>wKa^sJC>VQ>1h$adq>j;@rc<#tSw$0Ht+q=h#m6ZLtl~OG^B_^6A_y z$80A^>bfaWb5x;M@fy`Ug(akbZU2kdGY$7}<~}_25ihvVkB}`=i$B1a4CucG!KS5E zmsLvmn%{b7qac8ivUKdem>}~N+71fN(&ZkxQ@;pVUk@<5_o*F|;63Fd#)fe)A3cLp zt-N^*!&M9}#>g$hLYcHPE?Jz>IWnq82RKk%p&t>C8Yb7-ezf@2(Au&#cSm6Lhugo~ zJ+li`&8)gg3EYFC2}plZk8^{iyWBSG-S!CW7SWdae#J=2@yHu={9%S3k&|b$W0S*l zcqEvwY=_>PyNUI0Z~`}}7c4!@jo!IS`D7W5g~gu%Cdi_fQX*#%6?>mg{b+Km*>cI+ z+R~T@x4OA~?`Kpqdun3%?!MqVa9FTzjgV3*hjWOjZC7%~9hc^tLnTrRCl5EcWl$Wa z-*}-eftTqKE_kaBpWt?%>l}xe(spTRv+VQ}8Z#kf30uNj0MaHJy$>2m9J7T;5||OO zJZZNjTR`%M!Tza6J6;N6M~&;qmy1vPkRMpA`+ zBO&e1?Uyh!(iPRbo~-2e4M{P_e7+|0j2?6kR`Sa1us`!8_Yj)B*EHnFGSweuOXdgr z^>1?Ew0maHen7jXa%Fj)p`CYqUD0C3R_Om-jM-RiJC7HW>eGk02TmywDrR{5qQ|{= z*v^^Z&Q-%NwTfFR(%0rD4@$+z<>!8!-Q|X58`g~Edp7dv^5paNZ}*qu4JjZp%YpmZ z=|28mVSZ7~fHfuOG~3&uq9>DyY&j z2@5-e11F;kf<>qd(uaXGY-GvYH~d+&oBAm|@W=$u(OwPKX>@&_hEbs@6*}_mp7Gjh z5M`_nyMVsssro@&MQeAQqbj#W8P&wID%z|CF?&`jtvuv&9GBIVsDI{$Ls_HE1>aM9 zT@QUe-;ckOMLm_E7qyGJk}eVS896$}G~}^11#XgDFy%c2xW{2EBzSx09Ta+-o@1XiZe7{Q zCHBJ)PNofxlFVP;#lFK+r1B_YQ4tkJJLI_t5bK#wU|~SYizh!U?%nGB4BP7bb)yi^ zQB?RF8%=_ovZei91koJ$zR#_*Nr?GyZ{Kg7ta;U^f?4fljb=Ar@OG?W|H#Vf@^2?Cz-}Dzp^=r(U%tG|X>e+G2h*TZcsW+i zb%g72>DBRXg2b(*0; zQC8_X#bl8E-g{)T_Yui+l%k-)lwl=IXSnJt#vULl?uU_M%gRdX!3 znw&-l!axn4gLjZhY9AhFc+~edy^|04mwU2b@we?d!aGL4}z%8p)sb3xtb2GF#3aI%s;N zG9v*u9{plZ(&7C9mPlVg=Nax%zvEp5#a#~yE18Q)x5AP2Ciu8VU&ii>0@oJ$vvRjM zZ;q+dy=yw!P$bkG&nR1hAS=gMgD_d`T32HKe$g7sRVBmzOW_Kf-0NLgDdEDvwZ%Mb zuPkBRg|l-K=oV-|lzF5m;K{SlMxc+jHGr5c9m|(lx56!-@LT435TT&Ae9AOL4%x1# z*7+@}2n0M?mHe3>$?I%ue$#f|xsfwOS0Gj7$gh@P20VSVB&|WqVX6;{KDW+elt?Wz zgfLp#-J1}MU$ZF!aa9Q~30$dke_N0Fk@9=1AY^hvf>J&De*0$KC- zotVd!rdv`s?@;+BfJHK?;oJMvLxM&l=pNe*bL0IWc090S%lPhy*T^TEdDtof_Y@e)^aZ~E&v6p11U4t!N% z+o#X41I!C?F!f6#6GPy5oOs_LX+;0o30A)V9T4>D-I#bA{uV!E#t z(B+R5r@ZOQxT7S`Jw7RQk^40VR+l? zC&A*35eFh?+<#tQo1x(>!F#L@7_8r*ooBkpxdr~^?wSG4)F7>FtT&CI;LZ++$u(%O z#kHedldX!KukZird#>4$DB*syugKKH|H?r=Hx!o<6iQ?!4WN~TZ9QQt*Lc*=d~l-T zPDUuok=|^;0n+ znfTJ;OAzGNbyc+!TdQz_Bi-_c9jgV6t@H$(zm`!ZjJx{*Z27KwWUgfm%P#P-6`Z7$ z+fCkZMs&dIg|B%WZq5VuejAHBOh&8F`^=031UQTE6qyJGIQH&0RtQb7bhjl5(6T87 z$@rY*eZ})@gDBCl;;RB<$$H?LXFya}s-go&l~qD6`6GVTEj3)*d#G4L>}=eswpWPPvC{=_Nh}Xg z2}|1sV64q@G^3s=j`LKR9M7HXcYQ%^vaX2Ai;Obg`E{cOhH$?X8!1VCh(F$Y<`H-& zA5XstVqC(mmdA6f7ZtsB`=e@CaGZ3gBuOL!KwN03|<1>6f_={IyR4Rs8$&x_G-nB7(y49ny# zX?7P__>!mwL?-uJ3i@RsY`p}khXMF4!450Qz68~;9W>RbroxyiaqZompB_tHUwdJB z$y_3c5rdA%$deJS+Z*oSec;NMCP(v8(au&-g_bA^3K{9Cv9(a z{M#F992gT~%CudKt+E*)`?Vqsrb2<)Jv-lX0Zmiv2{0Hc3aRS?-^DI-XQ^NA&G`c(Kj; zPkh76=%%sEEi+)H^K->QTWigTNwdbt<4r+o;0c|SYsYpzV7ne9+z5G#jSVAqpBTL7 zms4E4ht=BKNYdA+sPx!i2cbpT)ROa`*%C*x2wjc&B8yv1CdeQhML{RFU(E{`75hmNe^w0M&wewc^QBW zE`A#cgR$2oTeV#qgp6=hn3EsRWg3m1zTnG#KUdNuEhh3c6?6KC8PH7! zxPKD^Kj;Ku9}qA37bf$6p>+T4&p)un|4#vbL4p5G$$vKQ-(bT3D4-Qd)qpSp!+BZ; UjL@cG5IF<%wN11tE;`@%Ka*(~1ONa4 literal 0 HcmV?d00001 diff --git a/static/index/warehouse/ys.gif b/static/index/warehouse/ys.gif index dfc51f67fd2bc2a380ebd70a3819a6a7e985c1eb..099434dcbd0e58354ba3202a95b0b8f658d1e921 100644 GIT binary patch delta 5740 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 OVUt)2sz?OnhyMc2M7qZS delta 5730 zcmbW5c{tST-^XXh7++(V#b8F38SB{1*d1aP43Qa0NHzAYh4wm?8O@BPWcWHI$rdH4 zFp}hyEk!9(a!ThQ38^!-QYjDp&N;txe$Vq<*K3?0Dr%XutD4JpF_(#Le4ia(ZnUmW%8^JdE9YFV&Un>K z$2YzYsFOxCyx(w5YJBm-q1#ienrZ(!DQFGV2ScFdvgC^&j4Q$8P#^h%yW>CJnhI}t z4-P}E5hfSs!f*TzYQRX*=eow%*GVara~7B8jVtEXU6WF)=39G4{OYE+-F$CxaW1Oi zooU6q>BYI2#&>&fO|fgIcQ#GAR?pI|PP1xe=vSvbYNmZ_rLI?|V{g3UH%~=3zW1n} z@vNR7@2=z5*rGT~l5YgIYl^yt-=`rmgny}$C{HRaNL z%j40YYrmiFn4nh8SyawjSIt{ro~yk7#_rM#I1eL3VW755x;}+y?`T1>v7pqIn~<9*4~L?Bk7V+fhk#;Q|tpMHck{d?Sq;Cy;1?)T zq~jVDX3#`=!iGrWXu#)C+*o{Q0c8vmQ-4}R-5cIper9*Q9Ssd5a^4h{1cMgJWK}`S zg)^e~pwhx4@s$-72)l8&^Ys~$1m#AVWWauh@~xy=E>|6OI=&@9^Bk9&5d6Fj} z>#CmG@QE?J1&u?>p1_Sr<=ZS8zHzWKj|^MTs=~z^3%{SXLnc_j4%do|+KlKsyK5W7 z(HCvEScHTy!eZNq!AB^%jVj~x;ynQk{?(;g45V_La)EJkPwhqk7RquzR;;6xMbyf{ zwMO(it(9{NmDFIHq3eCo0thS7cq}?lz>Nm>2pq@q!PmWQr((?@2LF{2OAes+zM>!PAP^0C&)Pm*b!8t)gMp|YPxJ2gnFiU8=109`ax-sJW3 z*f=HGto4VV#EEuz9nH)=6!m-*`=;P<0&Y7l@jG~23bEX z?S2VqV(Ype+b%h!J_`-ybJ9@hRFjDfdxLu0%JNQLYiFS6&; zV*#Jy$@q1f3zqm~!qxu9Ty<}9{M#$+a*O~HA~l&}SAPD~rscfgI92NyoH$;YOf|ji zi%OG>5oVw(^cDZ0pGM|#Mi^-Y=qbry`nTQy zd}*oJRb6F(cWo^Ekx{}rU)bX-zBqI zEhP{56b3qI?~3A!;YxFDZRZ&Bsrm;B+9@*aLJ3#%6ErzOg9a1}OU2(JnLw^c%D`tw zXMnOU0U;Aw`6BN=neYX+u}bNAr#=`PKnp9YN0vqf5YMfcx0g-j*%M}rfsD6T^=yZY z%Y$;EQ#C}bVcvxe#J5wPj74<2=A*zh{_3%$pkj(barPUuABj3(ujFw(Fu9U@s`xiX0rNft)l1fM>NFFG00izbz6q+kQ{CMOv# z6-$*S*sJ}OXbsjvaV4()Lp~eaq{l<=X(mYo?Ajb8P(0b?>5T>7>8WcU$ISJzjDEh1 zafX-d7RN72XZltf(j?e`H+hq0Qi-m!uq~*&lv|Y`R?w^Uw?B@Fk z#6C#L6O9ux$Ncg6Hq5>YGCysT_RbE2`Jr+d;wXXQ1HOLPL9Kz2=1T|^mM4qBdQ?Oofo^pe;Jk;d2D#^ zlpjKS|5Hd;#|hKd!0@nV@nuDG@5ruUbSV>OuPm2=ZBK#Iw8b#llrk~Vl=Hjfg~=V5 z-3Y;9S+bl{GQfNkU4gAjbsri$s^yv7;Er0$eLVLhV1r9IUb4WwCJG$XgrPS^$~C#+HV608Ljs`-ccm&s+V`Ft{?*6n>AeHJ_1&P!Qs9$#hoKi`);g4N0L^1Jpo{}YlKtW!(5c#$Kv#7fJN_7l}zzjA|n2JccPB7V91Wo z=53lEgsr97qP7iv{;Gpba@BH|Ir1eH?4oKSxwLCzA35euC`C|8o%Ktc6%DWWxSQs9 z>YtrVZn=}KGG^hh{-dmuq(Zl{c4`Dbva+7}46Ybf0^K`zLFkzsks!b?d)e!r5S>ovei=c!r9N@0*lh$Ekjm|S;ZF8fx%LgY!YE7JUONwp|4 zjd-E3DsI9*&9i9b#1jAFwP2rvA@rr>vjai~iU*<2M4xWN!+kf;-qA#d*L*-B#zXfH zDuwfCgw@3q`A6H2Sqo8OOY)6T_oC^&G`U0yoL}^Vui%9bI`P9nE>3&l?Kr>Y9`47! zE5Bkr6R&{7_B>E*O#l%tX35{Zq8miRJvTK_+=_Ly>7#;$83TbP3AYFw|7nsAfoqf9 za48(FS3ao_z}*Rdj8xB!oz%~>7KmLHt_Lk=gv_?o6_2c4_Q)J%27H7Q-+fBB#+Y~* z$;@!BR5&`eyJB`cD21BYzxYwMthq$lRU`nWN6mEjg|bKiIlEL+?}C(x+q-IWu~O0V z#NUSNe~gdeFb5(Y_+EboBh9q(2yzBF*MFUThxuUUidNRaCoaFHk#|X@a>S@duune% zIEXun5n8B&C~QlGl3bdH??Fngrt(oyF%-|q3ELK#!Rkx)vTwtmUHO$j8V85$`O5{+ z0`Jny6B-Wel4hPUA^|5FAtP>r1;ObFR-M?YNXNLqsU)+;Ao(AhZEW)Sb!UV4n7QHgqUF=&$ zs14VLg<~HHtw#s;@wOLXyl|9x{P|a@fJ}59*lRCdRzd_bJpO?al2qK{`j1P9!J9r6 zLI4|l3K@RR4YXxA69!k?P0p)7SW98-A4& zbSSHO8O!@N&Q?^H;bNaJrmh=ONsORn2mp*hmgR+xKTtY(zK8h*@5j=fD6Y+{g9TZp z%@J0kU0BaBIlb+)m^7N5AWSCH9UoYAc2A$P74dpXKplTKYM=Fd!ySx^!{h5hJlAR= zW%nG!Q$G`bq=8Q(o|WwL-Umzme@16YwAR5H+V+KAPuZW)c^* zTam<50izpFYq)GJp16=1#)~>h+mD>QDB6=03rLD5C%MeyOB6%&)qW&22;A{m$img+@dGd0dd3p7Yj7J=UvkvF0ILfFV6$oj{H70{3)ZgnS|z7RT?0HzLV=63 zD&>&-!L`bZ;g4^9`^3bCfogvG&<^kiKV2Bc7Tn@TgrY&7pSk)08Zvl>uPGnlF_2B; zPhq+EuPGhrpiMh#9pPBHq$H zv|#J@kZ}eE)>-di(XwOPI8?J4g1nqAENAiTTYul|^f31HIr^%Z35%F{H zyf9GYR^&IrfP|7oOk7xP=w*NPY<8W_uu5`?DyxIugRqnW;3ken@&$rZ$%~`J6lk;q zOP6e}+3JFcT%B#N@c8bdbR_VK?Z>xLRQM&gI1=a>){il-u^h323KWx5q z`2FAg(E49~7%P6NFAyJx`TeRm9T}FoCT{cYS2x5Lx?L4yy?m;o_XEvgOR|mLD)w74oCDe)(?6o7O_QxY662G}6s?vi_jY?$2W7U^qyH;b9{* zuNJ1awrX6GwyqTxQq8+>*4jiRGJ6V2yRA?qv+3j|5Ku7!rzOYOb4hG0NAu+f$>>Xu zsL!}E%o+t_Zwr@Efz;NbLeAx-Yq00sya%Y^Jm_=s_FfsyY;vvL3q4rPPPMd1Nm-x) z^sf%6;JFDxdDZ?;+a&y9n~DlpI^e-KT1f=D`TahITBWo z1ctp{l9Z(xq3Eemai}2T9w~;F3My?hH6?dwY0mc8oH)iDKKgLoQUepkFcV+P+z_D% zV7A;JfTPGLPW|z8D?WuFiP&fg{SSJkzA=BN$LRTOr3Kt`!qQpoX)E2VR;rU~W2ryY zbU@{t*wtm}^D9QPK#zi;UI}4S8EkzFg{7gUlb+PBxO;14>ymg_ zrWKwx7^xDeIoF9Xv7Ugp`pjXha}IDHv=Qvp30~?vs|Ue|i#K;@hAJL^eOq?vZF+0q$d^aj zEL_snX7sKbaJ_&4E*s+=Iry6J@u4p7Ua&@3B0xG9YG8B_Qo93X5s~f&WzP+ zqXjl-EP#tq|D9f8Sn!W z9i6uoh{{d1#SA@9)l{NTI$o~({A%JMkEqxhdhyCgENO^70>kzSe-1R+$-=Bg%ORIB)a4+W<;oF}uZ`VrK8yRNzy4DsnRc2K+h0W<&GITYaXtUQDbd5( zgJ9pEt0zd+;eV#qk*9}?zEAC%WN-8_$-aalSbVssjU-J(w0k{nk-3w^Ezn1}ISevX zv`r^E&BAi4X1dH=6Wmc=b)lnhe}}1~4;WZC3hL&NqQ2^?ADZ}&X#Rt3x=c9&0<}T^ z-CQ60YNafi$LxNk>dxMJEfZ&ox%=?UR$sk4k*UoR-gZ~$5y2UI#BU7;M$RF!et`Wo z!H#lIzrOp*6{#e&*}4!F(PrfJjq`ni%@4}^Dyb8-YMin2>kiQyO-GB}Rw0nf@msxc zS@q9e0fyaWw!%eB8dcEs6Y=(HLPhpDUq|}>h2Q~c7}H)!U3nC0%qFtrRS|H=5B~+8 Cc(-u?