From e328d30ad7cd902c6b1a7f7d49f7a6caff655215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=87?= <2020377497@qq.com>
Date: Tue, 2 Jan 2024 18:16:35 +0800
Subject: [PATCH] upda

---
 api/modules/system.js                         |  10 +
 api/store/goods.js                            |  19 ++
 assets/images/folder.png                      | Bin 0 -> 1238 bytes
 assets/images/iphonex-modal.png               | Bin 0 -> 38039 bytes
 assets/images/video.png                       | Bin 0 -> 875 bytes
 components/kevy-loading/kevy-loading.vue      |   2 +-
 components/myUpload/index copy.vue            | 189 +++++++++++
 components/myUpload/index.vue                 | 216 +++++++++++++
 pages/index/index.vue                         |   6 -
 pages/login/index.vue                         |  26 +-
 store/goods/components/skuEdit.vue            |  58 +++-
 store/goods/edit.vue                          | 303 ++++++++++++++----
 store/goods/index.vue                         |  14 +-
 store/order/index.vue                         |   2 -
 uni_modules/wot-design-uni/changelog.md       |  21 +-
 .../components/composables/useCell.ts         |   2 +-
 .../components/composables/useChildren.ts     |  10 +-
 .../components/composables/useParent.ts       |  11 +-
 .../components/wd-calendar/wd-calendar.vue    |   2 +-
 .../components/wd-cell/wd-cell.vue            |   2 +-
 .../wd-col-picker/wd-col-picker.vue           |   2 +-
 .../wd-datetime-picker/wd-datetime-picker.vue |   2 +-
 .../components/wd-form-item/wd-form-item.vue  |   2 +-
 .../components/wd-form/wd-form.vue            |   2 +-
 .../components/wd-input/wd-input.vue          |   2 +-
 .../components/wd-picker/wd-picker.vue        |  52 +--
 .../wd-select-picker/wd-select-picker.vue     |   2 +-
 .../wd-swipe-action/wd-swipe-action.vue       |  13 +-
 .../components/wd-textarea/wd-textarea.vue    |   2 +-
 .../components/wd-watermark/wd-watermark.vue  |   1 -
 uni_modules/wot-design-uni/package.json       |   4 +-
 utils/request.js                              |  41 ++-
 32 files changed, 866 insertions(+), 152 deletions(-)
 create mode 100644 assets/images/folder.png
 create mode 100644 assets/images/iphonex-modal.png
 create mode 100644 assets/images/video.png
 create mode 100644 components/myUpload/index copy.vue
 create mode 100644 components/myUpload/index.vue

diff --git a/api/modules/system.js b/api/modules/system.js
index ae86708..789cef1 100644
--- a/api/modules/system.js
+++ b/api/modules/system.js
@@ -11,4 +11,14 @@ export default {
 		});
 	},
 
+	resourcesList(data) {
+		return request({
+			url: "/admin/system/resourcesList",
+			method: "POST",
+			data,
+		});
+	},
+
+
+
 };
\ No newline at end of file
diff --git a/api/store/goods.js b/api/store/goods.js
index 5113068..81a8a7f 100644
--- a/api/store/goods.js
+++ b/api/store/goods.js
@@ -38,4 +38,23 @@ export default {
 		});
 	},
 
+	goodsItem(data) {
+		return request({
+			url: "/admin/goods/goodsItem",
+			method: "POST",
+			data,
+		});
+	},
+
+	goodsEdit(data) {
+		return request({
+			url: "/admin/goods/goodsEdit",
+			method: "POST",
+			data,
+		});
+	},
+
+
+
+
 };
\ No newline at end of file
diff --git a/assets/images/folder.png b/assets/images/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..d71babcb52cbe20e205e3f096226e344d0dd8f9f
GIT binary patch
literal 1238
zcmcJN|1;YM7{{Ma@FA&))|bnCTO6$l-C41@p1G(mp=|^SHk4@R%*txMG{NvG?XVtA
z(RPcha??qaMx<5iq>_~})R!KkXi1M;&$lY2zO(cX*l*hp&-?xS@;uM`xqB4{2hoWH
z3jzQT0|R_RwT`_n15~SRUU5BIL()R&$3fa>H3Oi_5A^kB^I{f$W`vr08(*$_gngQF
zw#bPqD=gtInW`KWS1dc-=c9{Xc3AQ*CRUSC1JPblU&K%4v2?OUBs;!!Ei62vWblQV
zbcm2%d(UA52VJ(>BLPy{@=7fLKl<YI3=09uLtNLO7zeaey)rRV53p&1J+n%iv&$^t
zmX{eonG@eLhYDaHLCM@?|H}dr3z6ooiPvJ1d)lgEUEWNe<z9O}GCI?uC$gAW)og!M
z9@17QU)V~;8%{a@rlX#X$a|Wx*3o|`v)-0sST}`Ybl2UmdpW3M<y7_SB>xsRBN{j#
z&*?|&<~uxg(^qfS?8S7i*L<_!ILg(`Px~}~(K1=I<E|&Vypdgwam2o^5Gf$(lA7+|
z;jw$3oSLBY;p?cowzp33*A+A))hc6>8PtOk<>5F-uu0fs4O0zP7v)0A3FOVOtq5n2
z=H?qYvAOeGD@J98SW9_pR)5v&<>;_<APbl1_FdyKJ}51JS$V0GF?szYNqh}t?GLVx
zXGzclaI|5M_2mBd05w(zwzE$fxPc52woCplWPwX!iS&=95Qn9yZ~e;<J0Z*_*;ohe
zei#m_;<tCbenBAtDnf6E0c<0|71;=+7+}k#09H6rGzuyQkjDcEaiYlgoXnf4DPKM8
zU}GAA^$=6yMLB~{`GE)??*3-xAgQ=;%;-Pvp9F9AD??`+hDTm;=jZ@-g50eZ*NK9S
zEf?i?RL#!#Dh;sxN0hrO@wvn%L9FfPb2tn+I9J~QJjHN54vgz@Lpdse_AfG`iZYXE
zl!AU6j>@fWQI9vOD^1*vIZnko{bI-_VDRTV4^!Z!`;iCZ5Lq_<%Wi!?<&6)3cQ;jk
zIjwM26HHZ|aV8Nk!Dq~Uu^rf~cSzZJ{Yiw9=RJM2E2jyC*xZ2XkYqR)DkrGyre3+;
zj@<hdWTYQS*q!YjM7DW~(|Uh5irS;Jf=>ztftrwK0?+mt`iO4rFhEiuH}x#k;?xTq
zM;?l;>|eS{zxe`fWv@%mXBic?FY5DVeOMsT9lPnHaKl&X@H3bLU-xn&kax(zG4k)3
z$w`9@^+4}{ZGk#|xMftg)cVTM+kE*E@#%;@@m1#Y2hWE7QYa3OE!c2MbDC*G=b|ns
zvlSB+QEhXYm%ZvV`_x9f(ByD(k|}`Y>9!RD#MR63rjV3Q9CU(9jopWWLH5-BR09}y
rP%CMO%74V=5spT#OTy{>?*ls|b5HXs&)U&OEr$^37vw8F&dL7=Zwm%4

literal 0
HcmV?d00001

diff --git a/assets/images/iphonex-modal.png b/assets/images/iphonex-modal.png
new file mode 100644
index 0000000000000000000000000000000000000000..e890b8eac9772f4ec4c9a4478a0a16ad01cb953e
GIT binary patch
literal 38039
zcmeFadpOkF|2JGBN~N}97oyri4pUnt$5ARp4khF?(@8>%Fc`*6wxkj&r*ay0A;ggL
zag^i~ljAtf2xFXwnPJSB!}Dnu_V<3C=YF2+zOUbPJ<omXpRStE`mFVNulM2gey#Uf
z>xsFk;r6Zjwr<$4Vf)1kXRmD7AVA)*L1;i^Gw?ql<8ym}zXZL`T)Zj*{6UJ`e!O9W
z+=h#1Pha(eOb-S;ld(a`E|w1>!SPsk&r{UHq3VCsXFIt53CWR}$rb$klAq^GmW$o?
z$F(hasg?qUAH>fZ@$#%Zo?W=GA*Wzt;RW8eBOXIVH}}3dcU}49GZ}f$!hPq&4EMcM
zFSzaXNWFHi51o6bpu*D>&&Z0aoy`q^b#c39c)Rt#sv#y5v+&gC+?h!)Gx%0RSHadK
z<q~2wm^*;9kydJcQR|p7U>98%@plv|h8)rQ2_5D(@mIaxQk5A0{rEk%7L(GQ0)iqt
z<@B!)2{>LRUJ52&=p8!WB&yN$w^vTVDD#T@wWR{aGBv{o_RRY!Ojh^!d|wTy^Fi}g
z@1AXtp>Pe*ehdbLQEjGOu-R?czDN2Z`f|iu+|kJGJeOw|9&FeMy#2j(Q1rR#Bm@5p
zb=vu+Kd`<}Tcyr9jV|1Z3TVx>j(WE&(IgcMKA~IX#k<4e*4b0kmAui1L#UGNzIjsn
z_FFOk8Q_BrLCHc_uHnrF_->aYD(xe@A$p4pB6!?et3cOx{IjLdLz?B2a@Xeue)p@E
zf*6B$b_{7gMju=_+UEeW6_?ZhXE1$-p2yY?9BFE$N+i+9Z6Ewty$0eqg|`Gd+0@F-
zc<W}*j`3b&@F{33x9j)~z6-mR_GDjqm(WH5)t$eah=Q2ZLCADZby)+yzYSB<HRbzM
zG|pYZYob<thk)QC>lBqRYwbg1ji#FnsR<?j9pk(!OdC_^4Szx8$Z%bLSvDD}9LB<@
zJz>>4|2aFJubi<<?%U0v`W?^qXqULT%<tJjN+VxKp~k+<Ig~0N*1xV9<ZB_p{?gFU
z0MlbKi0F|m{xI=#iquatMPBNWEiDols*2!zt5b*ge7HkmuF^&U14R#SPoxO8d@wE%
z^D;xMvSj(7gUm*Osx8rVUEagE3u3L%eS;_1c7}^H72S4*Q&g4I$}=s{0A}A3XGR;X
z?RJP!xBD~Zy~oqTz})THm|Dp@lRlX7ln_E=-&nYi;wa#(+pK)9jfFYcI<vfR$WY7I
z&IgfGA)Sg0d6}paIC1M7g@=Bvm&bZ@E~B6f-sN>#P~^DUb(RtLb1b$KmSrfABca$l
zQP?uf|C98Z-$ajECb=#YZH6S8^EROR1nx3AUmIgU+H^kR6U+O$+cuL2`l5ogP;J@Q
zJvR49AM$^nKaH<e9u7_p6rX%h^KI)}IHf?zj!T^&fMj)b=J`8j!jF4@Kf?;mv#^Ns
zC8<*RGpxUt@V_-#Y)4GR{-cvS<??2Q+S_AE#{K8fte%b$-1p#A*-N2t*(SQrqeD(k
zsJ|0IJgKQV0vESy!w&-i^l#(Vw_H4~OX)nC*OMB^cX?1-?D-BZ)f6&s)oLht?w7V3
zZ2XQ)(o+K8AN!Qi;d_XGtDGB&twm5{xBT-KK$G?;qHlS7cc2%hEh_MZ3<0T%_wa?c
zoCOW6bbJMxiZj#B<ScwS3%~U9jXUMORp{FgO*Sqx*IlE??oWDEN(?Zpg^!hskev-<
zUJzPM`ALN*X2H|DlV)ly4_X`lYIiM8fYN+(RJ2}fW|=VceU^Y!1kZP;feEjZmb(})
zy3w##qFP#7SMK#4y)w!lbL%~CsJ8@Td$_PkNg;gQmpn87x|vT@%}2&^fg{%j$~3G8
z$^)^bhyb5bHDcFqaz~>D`b*qZirogU-s?RcU+up1>DZ-nU!m$W<5F7xeL7ka6}S`-
zh68J8KnIeNls)^ugPZv9+s(23;WESeJCFE~SX}Ul<&vW&pTZR~)Og(EQs|RhyMp__
zKP^2VG#f5u7-lj-__Di3!)<8@O@S^N?tiqk+bg_)NeL?<;cN#?4h)_KCZ=5IWX4Y3
zQjmiv)JfVEI)q}!ds2D!_d!Ao&Vu82+=Mj`wu5Hi6-~b6bbAz*R-(cm`)2PICs}^j
zfF%WkB00Q4R$P0>ykt4!_q+5KrF)c&-F6zV3;e-rqvo@6d5Uw3%Y>&=C9@k3=s(bR
z6X<U@&f5<@I(FL3?eE&b%R9z2I?V3ENL3ir6>Yl#Gc!Uz>MiULZ~jZ!JPtm3f#Tke
zE$W}L^GfA(c7CO_`=W61?)S_}em5zR{FER8vEx!?PbVWNo-Z(-rvPR9hOK$TxXt-?
zD?pHjIzX6X)&ADrv59BhVdl^K@*-m~>6$V5ntCeIC2PPl05ulZaU}*+oT)F>@msWm
z_DK+@$=E_#uzXjk|A_m2l>Z=du2O2B+m@Z<SB8c@w}xQP?GUgOavyxHnwy3-Ai#(Y
z*Kow#H<d}n#k|+ILJ#vOJ`UDY>w?2)SS5G|zdMVNd3=Y0rCzu8xj?5ev0D*tB>QJG
z4aOFaZfXVuYG5<^gdpI6`=#C7F0~W`0YUbj2C0oY%ZzGN#eJUEo(5w)Y@poEz5)Te
zVdGe#r(?@2V9C^(>EO`(@Eaifw@_MC28b7W?ij|`x_7V5GmaRsbta)5+fuh!XgVO=
zdnh}<_)Bpy(ygmwaOdNlJ^5}OpKLvagHS@W_9oYfMg+>A7(4i>U1K|Jx0E5DJ+Hvz
zIpdg;2;R3xv>zV5p_9RXj`E)O{d<GgT<b<1;d$u>ucN*@-`QOsqvhNjYsx9F=#t$i
zFm>TNl39Eci7$qG*So`a3b2Ax5eQ?53xY}Hp59jW>33&MW2e!K2$KlD?OX^$hhv`J
zprHnlu0X?Q2^Mnv)MRQUUcBV3jK$(iU-`}k8NvA7JDU<ZyEK9p4#-7gBee_%9Z~)$
zR^JR`%5-UmnqwOa7HKlOyzETn7OVaREz&WNY%;4l!5!z^o5yw-OpIg`9X4&JHA^hc
z_QfVYw^Jr=z^cg}l#5P~5ENl3%SAJl$2ms?5IL+EAQl;0Q{U>gZ6Xz2j^%U4Q=iBh
ze?-0`e$lv^%K6+oL7n-!hjd}8UN-wr&B=RFn8y@_5!RNn;2Jp~be?vR3ajY@MoYNk
z(2ul6Tx?FuE~$+zdJEf$$|yiIQzCWseDYgNjj?Wb&#<N})G?LNR(=BGCTk}6a|^5k
zc^hf?0$MsGw-fkK!*^0qHGRJUFSF7Oop7f`(I*(a@5)|DidPliM>S_)5O*jcH;zg@
zHAhWOe-&%R<I%UC2kGFt_4tR1o$h5PU43-pF!sCa?k0lA{lR@f8@Gs%H~n?;tAUWG
z9R8z@Fyp~UkqLPms)zKW+HJh$d*b$#0b<7}d4Pkv(CBv^^X@Ci`c+TGpewZ^-e{kO
zyj-+~d^S{I%1~bs3NCV|ClSj6aHqgtx~k55r~T=SCwL8wxHlO0fTJ+DA{c&$jZHgo
z8mIS8KN-?no_AFq<~1(&O#+C7sxcliK$zE8lqL4%)G6b&i$)bF2tw>>8O>K2+-p2q
zeyuoG%;l?ly|bGlSQ9=U+Qee<56ygNUs6z}^M(UDLQgSgT8%AjjoaPailB!C&an0=
zz3rFVsVEmMJS@dd6+lGN0Z5@X?WI>Uf^6%ZlLYibQ@iGvvRGG>VEiV;<<_d`#RH@(
zEK~n`uP_mml0-LRr{5xVerr-OQK(O%iB8LP&@S0+r^nIuQm8sQ>|(3%3hYdk(@#kf
zID^oh8qRvkC>k-HCw>h-IFo)V<xS!dEh%(f_{U0kD)M;{QpL^dRb2L{7+g!F&@x3e
zRfn(JNUBjQ5pT=UE~x9LLZ!wd5B1xs6V9c$0Wa)7GVC9_bs!;0nONrG_Q18JfA3ej
znDg}FP%kn^qeGmQV`56EJR=`E@1VU8y^}QRHXe{9QYaq{MtBgi?1IOx^SW8tQ*Zxt
zkE)py5h2%FWH0!qu`aS0<OI=x1hL@@BUNp^l`IRlzWT}&shseVT<L0X0M*X<GSe@r
zu3<R>T#U{jA2B&NRbdr$@*%DAHW~18Moc)0U7n^A^Y-|`qo+2eB0aj#Pnr#}TPmDG
zW2H8+GhJB~c3R@#Q<}Y7db8(GXIed^MZuu`*2F4$4&y+x6I+?w<V4-ye?|I&oecY^
zQ&bZ>*DhsyYGsoJt!{a-uyS^93Rr+EDnjN;P2TVj0Ai9vtig^uQ=e%X5vHabLnWyl
z_bit^Uw;4Trz;Y9cl?iiW1g^?<tja+$XH1WJ~9E`$LY;jwB${nBMwh4XoQaCe5pMt
zV-E^S7JNuc?n&IOcofqemx%MIDn(5}MyxN#CZWAKb4&Q+df$$0dicY2X5ehSpJMK9
zJxCh*SZFVge%EpO`tN{6-*_MIdia|fptTMQ9w)j4+bdioicKn!Ijk=E2~8Fn$(Z}h
zx0-2+ciywF$;`Bc<JY%|Vx3S{^moH@BxqV9AAZZiU_4HLM8Hji9E&{;xwC2K-K+YF
zuxM+_cF|EW^q2>6^s)pwr>(U?6mJrNaq&!yVeb$nPq-!FTO`S{>5j_%@ujToZw}Ro
zNA{pAx7Y>lumZk#Kv-AU&g;#tcXs-USi7s}V2RRL@P_!<g5za#+6#f6lrQs=$$o#U
zzf!%vUw_*cGR(g6ln;NBLrrtl>^pmzzC&5_Ic(r)-&rR6kE7;4rW{#onH;<PoT8uc
z=%dJ0iJeW#7S264gX~JcNZIqjuzf}!IkK|g<MWuaM;|_<i94m^k~j0(4!iqJ#cmfh
zwmNTkK7Jg65!|eH^s#KeWtkF4EbH&L+k<?zj;fl_%_@PJau{;=4`Y-ubN4VQV^S3{
zg=|(vdxQ$q?cM`Nt^IzAFi#l-YQ`58PuZRnoP7R^>y;EYGYnmF@rNn0sCIg@Z_#pC
z2<{e)c32^(dJ99zoUGswxZ}IGz$Wnq*aqF@*_bbjf0|7-!(!jO!612=f!H0>>FxTP
zwv!cF?NM2Zcg&9GN9cfT5J!Y)ZH2J|r?0DS8O;!|pxWCQmyAM0cK)7MGkU9{>Nu=s
z?2)V0(Bfe4@Bqv898oL(#Tykq0|*CHljS)4$#%YhmdrIpv;Mw&m&_W`3fq??C#%cC
zrOrzL@x=gA@}Ads(8I+gT{Ui43wZ09pf^$B)hYoZ=j>^=J4+GE#7|dZ(<4q(p?Z1d
z$%}{hSNzrZba*W}?T8t;yrRLZNk*_cs|G+0M`lSdckX~K+zTowvb*jPV`%cV!s6d@
zd548^iKP~anCiBHD)>|U{)EJ(nX%1F1<As{HQ@qhKdCck;Sdv1ibfa00wGIN*b%YE
zPNP4x($qSz$ZUwifV&p=TT57<y{;%&-rMf2=zdqmVU%0;q4fST?~@Fb*mkeG?Ddy2
z46$M0=^=+NxoWdaT2X)9vZPdhJ*SA(I8Q}XcQ|vp{@%2O>|7E<GTjtdK6?htYET1h
z&XTf3=j<-^KQx1n|Enw*NEQaS_8`*i@?-ibDV)U+JCbwZjpJ4CJkWfseVG@m`c;`{
zMkz9|_*I#|Z*N%72j{mvRbCdy@&mlKP9{9nL4gg4b)%7_(wBN(M{U2h7LO==u+xa#
zO@)@*amoyC)h*4c#<;_@s_e&a`Zt;%GPL1*0)hzC<t<e{Y0<iItF^C-3p>ntI}dyH
zZl7h8VaKBBtzzHFrb{E=_q;MOwl>X>R{?TQ5pQLWQ>qS)m@3cCLvsolSkxcKWdmK_
zpDM-L`XT3zv_dN_5_QpsW^Q-c$)WxT*G704_U+0p*@x4D7xk2>&Om&x2k7dbSokw8
zxsTt9O90R~_4S1WzpG){)buz}a@@8qR5W?evyd(s3D%ttEn@1vGe^1j`#T|WbR4|3
z#Noux)ed%HPpW3(b>KuywTRB8nsQJ2UmJqlg=ii4#`;C?fcQma5hPs<gd8=)=#}aU
zjm&yp#NFV03>!a@$e)*r3yYNPRqvTuI?|fgK^;)^aUV3FCfUtMB^PF1m>;XKmMosk
z;VL%sDLvo0=*&fwutbv?bgAw`2dh^LCPxkDbiS#$(u!SluyDAA)Ap)ph#JW>EY6@F
zj^iKevZIoY5G%Yh8e9u#`OYI3jupGzn$NGTC@+uZyvf!eRag#`o=7NOz9`#yktFYK
z3_9;W+n7`ras0Hb55v>cS~BhaJAFII!QD@<dk6@Y|JH-qe|^S8?1S{e7KRiMcH^R)
zusNk?(=gdHi<w*)zb#~V8Jv&1uzW{FnwqA-^qp;4@Y)iXwA@ggLqbfV4{FXx^<R~K
z_j?n)rodT@p806;s2RqQ^MZ1?9y&R-+4@vj{_OxZBTa$2hY2;CC@Z#pOir>o++nIL
zC0yBIl)Sqmj;iu-q&9Nq+R13#V)w$qP^L~kz2gaTz(iadqfs1qYyOj0SF+Wp9`TfK
z;P=X$1n{^52-<*t;nl!jQm+92_BB8=BlBV!>5ibv4d*YGSi$ZO57Lwetu;W0Z1x$+
zavnH>Q+3dH)rDzwVlX{F_!}kt(V}6NHSvVgL{FG3yE1uyw}Xx2AOhurQc=y!^i<hS
zW|gD(x2LZ(8eZ7|UStRph{lR|ii4T)HR45M8yB!%PX%XW;-d%5HQcH!<;xia+k--|
zpnz=^8g4E7N@$l5V&|=^3Z*}Q-X2ZnA5_`j972<R>b1-{t8JD(?;vaMlstrHu*o5M
z`(;Swb8iFEZaFUt*Za$J&o!D2$!=S!N-UUcas6f#R6;W2zaqJCHVx%e`U3g6zOR6G
zvD=aTU~|=1a00#0Eol>rim6<3fHJ*~^5}S8uR#&SfK|(eM1KWu1k*mZ=K5S~EE~3G
z*G!Z##MzZR_Qyk%=SRS4(0xtVfmaR<Dlh7<P$340Y98~B`&$@fwiBi7ochH~CMj{r
zWkx1rhtw7_)~p5TnX7`cqzF;>_S;JL5C;8oP+y?z(-G2t(S2K(?HMlt`$Et4ks06r
z>J7;lFKcN(1PW+uwxwCj;u!fc(4oAg!ay_j?FEI1X<jZW7A3qqoL@yk*b<vHxjm;e
zOozIYdWUo9)+1^)4T2)u!u3&^#A4MJ_ct2Hf8PW0p5(MJQkx^)bC{b*6?|=7#=a&m
zVU`jCGF<LAsxYGY48%OpmS#5N<$>-oRn|;2OA~uq9r(S%cYkL2GskOZ5Uu*ns-(bc
z2ug>>5vPtnV*`LhD96wSGX4yntf_VE^75Od^JiF%>K!132l&pA=g@7@&|NwW@KMcZ
zlCkl5TI6%jZ@lho$*_K3N-UruAZJK1?KPP1guWj~L?<&?QoU(6*f;dTMn)ATS&i)A
z`r!^*+IL)>*JM^WYBT6L0PiV3yqt={^IE?h<cL|p_#I@H3oUA#b5=|EYorX3>rjzC
zx|2t&>#t+PRERkYzcfG)Hy?9~syypBaV)B}(JYp3LC*@(!GKj#bt>F08vAFfH8(PS
zGy;dzh3O0y-aqnD@rC!g(U`<|-o48br1w*^bc!ZjN?RjC%<ueu<q#TYw+?taDVg^d
zH-sS=kd{})xVVhtM!gOxIj)DkOYn`YcrP(4i5UWM^RI#^XKnXYfH#^oFVnqF1}(@9
zDIs8%`_C%k&5FIoA#86QJ`tcEpi9pkyAHvEUX`4&-`7g-7}cKGIPAA|#xnB8Rx&H$
zb!GIs1WBb6^U0CX^VoZ8h8Q5{f#rb9bHULBPP7gz@KuTaGd-)V<gjK#D_dNQ#uyIC
zCHlsesBC5-p<xvApoQmntL!YNn!?m&#7f3}Qc;6VkQ473k1#<)+c5xm4XUx-^E<;6
zf5Y=@|ITE8dY`YFCOD_{0PMa^gWMTbFhuh%uW>?|R1{Gq)sc9B=G5yS_~ct&2n|w<
zxi_ltb-Ru#_Cz!$zI>_HQIij<czsE^sHNE|*|gcJUE(+#-s=ShWEZMih4M%VEkev)
zWZg7}Dn)~P(&N1R&wJc-6{Ojg!EkUT)hAiYPM$es=OoWO&=(V6O_9~jW>snKjuDYt
zb?)gdsYg;3lb7bg6N7h<;WIujab*q7w*oXDsYZjV(XRJL=VLTl{J!0|vA0><d9N`@
zzd11q6C0OA>-oVjW@q=?^1HjMVmVI?ebVF)%q%@O5>MrPJh=E<9^eFX8{c5A1yza~
z6T|C%P)g^5D*KIy@Va@Apf0_)n&allaXF(!?PBgPUX=)ao%#}|X3#j*LN^<r$J069
zffH>l`)I<Bz)+a}*baaamc*i%p*NPf0qsi7P%VEyK7OGeKg=o$p@~~a;;<I2e0K-Q
z?&6%phqUq|*%&P$BF?X%6q!Rr-=3`03*03KBrVNWdOeSpjJD=#PS0MzMnDIW{qncE
zi2@Ebb~7DWh0uttgdo!nh0^%ce(Q3cIi;2@oo=3-<IjCkGr&O}TkwG#zDkl9nQ&&2
zbCTu_6%@3)z}xc9+?Wz2JEcR7k^*xh&?s6Y>9DLBXiMMR$1txxkIp?!*8VJW4YMjq
zLMqeKR7%IeAn*swg!o;I3EmL2p!^(qO@no<NU}4>GA(o_zlw40IIFt<_a@0;1n<u9
zN3pwVgTKvx6w?@cz|Qk3&!Of4Ihn%pM@BIoLTGi0bDc;#L+$2VNiBTJpza6j%#+;*
zWxK0m%~8XQkVDQDp9t+6iWr1gF<&*I><`OLMz9%sxBgFc`84qFh);q1dWHSAq`IOB
zR!l)X7&&4IqI4cZFxqwmRaSFa=+=UCpXgf4oxhjr?-(_cxrD*lQl=VYiy5OIu^DdL
z$zrDQl~p&0;qsxhG()1ZJhk*gUlhar@ONO8?z7Hm#YO1x0u`dB|6NXIbnr4t%gXq%
z9%Aeh;mUsg8JX*DY!9a{^Xk$~O-47g%-Bekl1SF@H9ixU09m?hg%TwMgMFIaB$!Ij
z@<;?QvdhYWg@$tI$K)1YEPKc)z-ZV=WZT)HV2ld&BG?9kD67?1JM8ydt2>y`W{BIS
z`JCVQn(W(Wr{v1`)2IIot37F&jd(-xlrTY#t5;p1C;;43hROh`%~uiZn>*ki=;NPm
z;a$Aot0bGq9p@!YoS=0v3GZ)xJrekSk(N>!)#M4|*bjX1NK=>yBjlCBhii+i?K#nl
z!RP~k);H<8s@n^&WaGUif-wkcfbd2ESLk(vt;1$-#eB}=>fflg!v!a`*yDs-WnyTx
z#r`Q_nYfDFv{aoE8}@lRikj9>*T^Vh;M0>VCF16f?`oo-sM7E{q{_{7+`BZa%3I7g
z5Xa0cqGa!pfDxZK!L2Jy9<ydwJx8K=rhIdD1o}B__PzgLb_lI*s0sjO^YczVXo_VX
zOUWOVGh3UC0#B1qmvOUYQK5<8>HH-tymSM7wDL7C0Sy8xL3R8!GbRIFHS7gqKWwwE
zvR4g)2&vex-r36pl}G6L=S;NIV@1c{!n8kyN)usvEY8v=yT*Q>N?!NEO+rNYImib)
z%6*tm?kV~rS*t>&dHWlZ7pJib-Dj2&7$>Ldz#1v^CXaCKKM$7)EBGAdEb7YR2_?3Q
zcsJfqQS*d>V1cN(Hb3}vBxhq~;VARaY4#0}n639U<lf6XJ_1ieeofE7us{=@X8nM;
zBjP9C1PW-r!f6LqHP{^n(yMC$0tnv^h8=|Fh3ZF~k4<_i=HOB^lfO{kA*vm#q8mGF
z!5eB0@vLZLoa1(2mJ09)F0av8w)azBoMhkolj^eDetccsJpZU;oI#|U8LaUh$toVV
zoS`l%rd8sW$<LXE;~rvFwE5#p-{&zlIl0PQ1T>YikSU6JrL2wa#0#k;Ysc#iEPWLZ
zuwzA6x+vmjJWsWn<<hUjBJY_=u_<O~Fk<LUcEJ9{x5&0bp^HqlK^wn6lOs8TdLU;T
z_CwBTCZsj<jSu^7Mon6w>{Li0C>wATMThdhRb+pdDA9B9e4F%5x>-7%FoYaU+gXnx
zE;wLs<5L4BIpK_&>0oRdYs!n4$!M3+^^|2zQE$q!f@6d`gjFOXE1R326j<Xr3~{hd
z`$o@WufWL=_d>?LNd{g_oX*wJ%Fh|^WceiNsd?5uGVP1xn&#_<%sa)s-!}fHIWp09
zxr6p05wPar>$WrVr#+^=k1I!GPU+IgrWu@x{a?5ZO2Uh7Alm+H09{OqH%xt{TX@+W
z?sm#j5ZEQa%D}QFN*6|Uv0c$$0q7!8{o00eN1h!)5AJj5*Vr9UAMc?10$O8DF^lOC
z#-c~d8t3Eu7p8zNbOOI~8FvHF*kDj{+`Jfgwy1`yrG=^S6kuhtzLM>HoQ|Cn+4fqW
z=-`ONpERoveebU3drEM2pbDB8$TV`3OhA2`GmDgsU&@DQPiwA%l4<x*8l~tyl%_Rn
zEGyXe$8$nF#UmNrk|D+fRu1lB^>>UQUK{ZoXZ!-DMw=c%Q@R72n}^w)R$3c{NyW8=
zU81IP7!2!<?7vVS;!ejUNAdGD6MgLW$`sYR;9^@9%+JY%(x)a2QsQ!nAKs^JeRWcB
zv*Po(%;~|RoSxTuUzMJT?IfB{S^a>V2Zib75g#l#EhAClP-+@3`3$1(j8ko<dIz;L
z-&>x4%^m5hYM03L<hLHk%N3&K>Jd6zL+SD59I+@sLq3Y$>;I77pq({+i8?;_Tgt~}
zsTcZ?PcP#>bl!i9G2q{^{X}Cy*po`pgfee=s&O)DctTEJ4k9N^w<~dyEZ){E`&&zB
z-hQa0b>2xq&!tvFUfvzz9aw*NxN~-i7z%&-fqtSs>V-Kf)m+ukhL{9Ceryq$(Xmkd
zSvQ1ckpbe|?497;!%1S$mo!*C$-sJr-j4<ApR0Yzg0ldPMM6zoF{9{BzcqCl#Y!g)
zFzp6?dMp&NQz55|Pfr(*)NkOe)B@P|t*kPObgG(D79UqtUwAiV&g(0CT|eg3?6u|1
zl$Wd^a;&k+xfUfm_dej}MC7l<Nd1)Znj!`(%NJyiMSW^gg=+iU9ll$V1ebaL4>NZ;
z7S}hUFIG%S?rzteZ^-@6kyZ<ijZwlnU=F#k=AqU{jXxIFeY`FYhSJm}t7G@SM5iX4
z-rv1=-Cw;oSEi*pGn3@%z51aw?474D#0P;3Uk3f%i#u3PZbgkKsau1~cL2oGC5(xJ
zu4Ulk$l^=Xvx*TqW%&K?xpG=@tHVAS<j+(Ap=WwhxnN>T9efYKBs!qV6{%)$^_tqg
zF@;gq#eZ0opHkJA5^N9flkmCG*e}2gc)Oo?X*mWwXaaWl0gF1o-AZBT_LdD|uFF6u
ztGniZ@vk2Q%&(?)f|K^2{v;`h>4D4mRawk#2SxBNJI+c15oRy+!5upR@Ajt_W~EWe
z`Jl>l9bvjw#0yi3VRC{rI@1L@7(!F;AQ>qjKe$lDTqz-^x#OB^AEXr2yX-6(>$OmM
z;hjY+&YLmE!({vC00RV=R_xos#^t_x4}4GeLEP~M04M$$9l(TZMpHb9{L4JdL~SzI
zz6jHl%IV4!jeHiJM7Pw2<PMGqe|aj?e{!KeoW8OUEGW{cHV4q~!%Yj?fz1AyP+jFv
znuUcVx>SY2cf?uW)kWa`YE}4Ixd0fq(a@KifFBHe_M2svgWVTjJ@#FSRZQ!VA2hHN
zDtA1Z?+{}e=Xy&Q0rqc|Uu|c5-QB&~?~q&gwff6G=k?%7Pf|%1!%{OkBW`n`?g?Jo
zkt8+37k?Uxk+`ySEO%5SDAQL>(wEw@pnKK-#@Nr4HYVanUjTMAl|iK&Wi%J%Cs)eq
zQhxhYT_LjV%n&zBBdnR=&IDim#bjl*UnZL;Cr4vU!ZBIx6P|8|W&15gf09<eR>a-*
zGz0<D#EYa6+IOgcA!!&RV5OA7Xr=kz*M#?2|BYJA46JLokai&3zT)IB0|i9yA_*);
z7oTDhyQ-H>wDUN`c>{5hb=n)FEv%LJb~UY*+;?x_=oM+yO&HkW)apz>0Eq3Ps<ZD@
za?{Dm71{P4X#fEITE|bZ_{z^dBBMsQ(;pjN7bU#xPc;YEYX7U9e9#A#FhVQjeWy>+
z`T89uSDX4{_9eZF=jEH)aH6_4J51nxsRLJZ{;Yn3QCpL!{&hJ4Ct|hzK*9`KIF@CK
zm}50^sX0DvF=tqrnG>LN*zYLEqE;(5ebaKWB*OSC0LE5)QL*T#qzGAZ%R<02Z>@Sj
zk-<f_V4z)NM+fwXRvjMO-D`yAeLht2bjD6&u_MH5O~tmIO(}NUrClc`osj5<C<@En
z*My5d!!pbL(Igo>`Wie9IMo$R{^k>;OrY+jwhW9f|JiIhuMufxiVQ4@I1)lDG-QEI
zw)4NZB;_zDcwJq{+md~nKYitoffhnia)EvvDPUcHKV+BVP|Quwtz=NzBg~W~D0E&L
zpoLc-esua5VR2&G5+Z?SE`5Ij!usHUe2}^%DqB$tTxjdm%tfGXn4|7LU-JPqM@0sH
ztlR-)IS*7c%^}q9h~y8u$XIS8cYrb?^a_5oVvXO;I7NGFPRz#8S9{#7{Jg~AYyZK;
z!00;ATS<{X=OWbR-<mYsq*Zt5Ry!5B&QsQgXM5nNhP4E&(y~_c;p8^5vk9x@ia-B0
z_Ke+0m|`-juwCkWfXpYvS_2pH3)Jz8u!Y2l3Y@78uf45y8SP#ak)@}EmWMNjU6NFp
z6a<=9Y4$HySd%9*YMxw+fEs2jkqgaOB)go*pog^lnS?MyCe?n%mZP~g|J@>$ys^5Q
zsA~LGV!C;C03~+##k@?;MxO&~gRl~BaBZUZ(W)a(hR}3x*@XdW#Ds%Q53f${(F;M9
z%SObIH0&FPRHX4%a&k1&(p+IRYHb5ncVrbyKCVhl1PT0)hVt6K1%c(Rk3vUvR!6om
zbwGMedv>Y-tC*5Cb8CZo=;^hhT0r4M-UIXf_8V$fJKVXmsb%d|0w00pM30Tz%vM_f
zoeQsbE-11t_BAb8SGa$o!n&!gI~f7Nb@%#DcvufC>mgNS9ZdYnrq*H9I)K#wZ=v%x
z9e_eC=Xf6jFVoLu&>6L}RVq&<wa(=iSjPd$!qZL5J`DfzwS-AzoBj16plo#FHON<s
zY^DLvID@eGz+NL2jDGw)`g$U+qXn6sDfL@Z!pknu3QW_t0HFN8AD1(~3>15br0rdK
zVna|mP~nz-dtsGv&`<gMfjMNCk@`y3yHUUdsQWZ&ocvereGVvRI~aXuE%wI)Ri^*$
zc|*`spzCvrEo*th@s;||)mD3e^0=qw@w-+tm%BzlU7L{=ZuJSlBU?qtds2@dT1}q5
zML#enM!!d`W!6`LYFXto&gWOPEky|!ostcAl@8hY4k+uie%StOg(rHjE|{O9SQpGc
zs`g)}F*P*?tS3M{2K?!;*B&f(>Q2Cy;@!fFGvjO>g<o+37{TM;e)m&EySa?fy&PHO
z-Cr>-!|5Tk!&etBt|;}lw?E!A+)}9r|1R!z&WUO0o~weA=Mvi>Fk3~cW$PLZa#`R;
zDzZ#U4{?Vb!*BvEZao;yJVMb~G3Ow~jj1|D#L_hz(*q31L}=yrjqCaUI`bj-e+pdx
z3lmP8#K;PyL{#c4W!#nBNoFVRQ-2xh-M?J}*Mi91v)AWRIbTDtY5Kg7^RtKHM}BT+
z_+>~yAO&_2Fq9|mK<-UG`p=lU9<+YO@AYW@5AOQ^7|e0mLRN;@Bhts8ae{$WN9fe3
zj{^P@?j?_Y(?X-r>7McZ>!gVEa>6RC+z`|!6fZ_T2kbfs05&y(6{86dJ(*QYc`p=n
z`XOz)FjIO^H5wbTcVz!62y~I$+2pFwbzlvC&I0grwz6=I9XGE4;HP%xjx~Vitsoce
zOG!Ji)~F8vj(r#5zcw}laWq96fPC7ZoV7-sYI4y8(=1>g+)C$z0E!(%IGe15RQ(hm
zppnm&wSn&(H`Q09wi>&xH7Wv__M)iC=WEE(7r?c?kky^cB0JwX0FXNAYUpZ5g5}~n
zn=0t-@oSA{fJQTKwf<Oxu}J`oO^WMYYqTz!U*h`qKPeh%--_cawE(~5y{<vOWc$Cb
zaRFP}B&)4<CxJRq3bH<>|2JN3vux8ZB=GVtR)z~Mp)=K-_%KUv)vv_w29P>*=8kFd
zYm|Hu;(n1&Gq(&_<4jyj+5ZMSnj&Ik)gA6!G6z_IJu7Z#eHrP0k9Es`c$tI_&~7iX
z_0zxUnTMB{&)k%DO!v2)C9wY$2p-oA8L(c9LXCqsqTvH3lUM(f0WsMEsMCaXdrM_c
z=k_iCLBsslWv%N35D+-lnX#XMYn?Lu$91n$hCeaH{}p8zEJAj?T#e>@;~8qP4*wGy
zxs<we_q+I>*x{OL851}b`fp5qT(+rM9XNYPRyskNA8!r`V0o`%`8)|hAR$Q_j*B!g
z<y3X)Jfw9!T&uyUDgSXcf@AOC@s(^qKLK!%CoOA>R_V0&#=t&vhuA@r)z!GdivX`|
zal&47rP2Cp)@AcQs5h%X@_1U+I*MGi>h*e{e?+lf546T;tXIYS1P<%vma7ZA>xHI2
zMX_ERvdY5#w-plq3okUSmsS75-|KV!Q~lQq%2yJy4eL7?eu`opK&}JG^@8$WY2|uB
z`6^AbURM2ITvpBFFV5<o&!tz2&H3Ibs|+g{OnWDKPF2b1k3ENSEb32Q={eH=>Eu)P
z72ziqDLK!yJO(5l%cK;CZ7v#+$Q%UQRya#>+diGxC+8E@<I<i|w&6*5Vg5kjyUU;d
zaC~BK6s`EAc@H&iklZ@K%=vsRrg5-0NuA!RhS?~xZ$Oh2&`PgPM`^Lgw*3<ZM1aE+
zgQZgbV}sweRf2Qp`p+vtB6Z-uE0#|gf6-TJ0sbEzUH=)7>AGV5zf`PsZCTfrb?*!$
zZU0^OyZ-aKm8@IIx|RG$=hmUcI<#017VBp4uZn?nby!!2b#+*W(Cgsf-^*a@UUA(k
zu6xCGuek0N*S+HZe+aZ|z^!#tWAKUGeC@w%Vpb2!mHSp!(}6chD=RCfZ*pI3J;Kcn
z9=Qd^^&ITF2~z}vJ&`o@7>U^47yw&LR!!(mtMJ`QZeH+`UYUD+zECxD`l?Hb^<_m;
z;f+%>#G)ep%Oh*M>#n8OSSYl<EpNV*ym`Wu#fH1KbA4fUheK=EcHA+nQy$L$)>MHy
zvA0P~7K8kg>V=r{G;^7mGw%zaE|T}po?7*|0)cxJflFVKY3@+CL*V?k>b6Kwv1vv?
z6YhniKjmiF;3TEi)z+CbE7PnyaDOGI2d>*Zax|bSDIy7(HWhE_facXyCt)D>QmY@*
zQd5u2;9$4&z2?2vdf9Z~sJeDs)1h4zsIG|uVP?2)agUbFBU%S8>dHcHokT?!KHHw0
zx@;I1P&)FjFR>izV=Q<Ncb3h%c6WhwN?{DIFxAe>iuiygOalx_x*4X*pbImfy|v1I
z<2e|8Uu8v*8-j9$)Er)4#N&{uQ*fH_dGP(aq#j8LyLWG*6Af6_bSboFew_pxfnXaU
zwuVWrwL2~ON(+6$q}sD=s^k6SBz1p}2D|y6PQjk{X!D$Bb&+btJ!ilm(zs1^Z%5eb
zw&$7@(aKYZV@bH<gA2~xmh1_Gky}ukd#R=dtXrDV=sQ2UV~sC{JA3zkagX)**HD35
ztC+(qZ{WyaLQz)MLh`1OLoE7hQJmIRvZ2CZ^hs){4WoGZOj?rz&9h|SKYEOIijH%N
z@m=1RH3{YqEwxfricJkuIdh*!L$kEFlRxC+MVjmlPrkLfsgo`L&7Ck2fcN3oohBpu
zEdvR)Bic~g=>cs~a(xERD5eir(sNUkTd9Lc(+R5kS9fxvm+)WHo=EQVJCCSt2o9*%
zYU-D%n#g>jF5CwXd~2r@d2ZV3+x)7QR7sS2AheRS0`r&ugll1Nr|#M*h{AU_O_lH0
z^5lFi;>hbe=yrU&wM*Oi33GM5_w3e0O<(yW&49Eiiw5m>T;N@5PrsJUyEo<#i6;CJ
z@C#C9M$|dj!hWE)^Z5ML-ncvOPTqg4)CJWm^`*Q?O7yBv<uuGU!bXKiy^VjD_(v+_
zdB34tTT#j&l!&x8%P78zI9q)+NiU%UtJB?h##n@$flIuyP@-kSu%hmTbQmrBP{;3V
zsb4d}@z?rWM&zS4=CdrgFAM^Fd7-A=lRD9|+VqL5UHr<ZbCUjMTgdW>0c$5c{eC=%
zrkd=yY$T2?cd6ojTWW|(df#<l5v+A=VYb|zUt%iZFs{28<EuRGw>mz^mg6NDogxjf
zNOxjYMR{LinU8c+<fX(aa2G*A%f>sE*<(%2Nf}w4SbzC%ohTY-G{%V@Wj#w}=x77C
z73Dwfdhw(&%rfgFynLyJ=mbS*_(!ZBs5Ks=AGO>FJdV-;BglhE$*%ROl`5}f!<KIA
z4do=Mp|Y91|Jg~r#9dD?!jgai=fNl$+Pd{=A+%dg)#jE9c%XxvA03qZ6|w3O@7kt(
z<c?-qTFUy}MKYe4;_qKf<p2spg%K7A+728mYJcT@w{m8y>Y&=l>bGwc2p1X6>6>^>
zfn4;Osg$Y=vaZOY0w+9EjFZ%g-kS3UpLA5%!WV94gn<~<!n6G^y0;;Y-xQDSUah?z
zHyvt^dClN7OP1S>7QKmMAHaL|ygY-@l%pzxUx@W}%<QG^8%!)7%&+culwLanC&e`g
zIHNyZG%lk8Lg^Bk1X08gdgak|v4HHQ!CYCdSbo2;l4k+a-5#7cTjA<j(tIj;)d%QX
z3(QnHk|!wXSBM|mzh-CYAw7`CoyJ<B#$se~r~NHXoU~Ts0d`Vx-tpAC+gIn>T`(Rw
z*~CFyb^Rh10R!hpd)ay_qQ^oq2Mao8oQ%uTc9-`CP^EjLi($RrX8v50uUy`}peRt1
zSsb=iZFxyUda3hc)h*%J@}AG<KfpF@*uDSa+0$1)`~@d|q9r9ZqWv=Kh)X=UYiRqD
zZhwWtmo-}zjFtBY%+=+0#-u}7%O`PucS+;*aplAhXIO2wGQif>T^X^q(|4#OAc7S7
z_`Q3Q_I~Xo`s)`3oIv&_ATtL@`!Ug~vMgJw=21PGwy}eU4Pb<yM-OG1qDwn(Y6S3q
zIl#lQA2zS~T=^}Dr{HQ13DwnaZ@II^%9GuxGW|3U%N7;*M@QfWERTin(qA#zSBhLS
zg-A<0t8AlX+92%!UWFRlzV->mJ4-#?PU-@#R9-rN&W>Jd$7@clx<!Sy{?)vdoc8U-
zt*A&!q(91A^Bl?VYfprU^X+Ug<jEV(YxB@5xR3Y1DJz@N5&EURy4_}h&v$4RBX4)V
zp+uUtS&WUV7=x@j96^6o^Wyi>Im#wgG}D*H+9$(j`iin`yEiZ7UYYwok^#MUQ`Gq5
z+;-p$`iJn<pe7-HcTq}*?(3J%=&FR14Z^yry6_diwOehEanZ8jOUyVs&O-fmEMmbO
zVF`yDnIt|vvD(-wzvk<-y%vwtdk356&i(u`@DMJ4;9P}K4JqLimohdv$yX^^l8USd
zpvX8kr^8KDon%&&Y@+~JZf<zA?rL>iL7BBK{5o>F73qa=FLU+T(`4LMTd#om8deD}
zQ<!6qbYmT&76+=j25E<n=B&>1+$I46mI4yh>K%v^iV<k$eo7%=><K?+__ZPZH8L|Z
znMy1=;nsI_pwqJ(xU~G2UCcQNki-6JlH7b^DT{7kjJnHDeo;I4zW2wq$5}+b*}l;U
zP7vN?FtH*0)}SivOxwOy8N+tJs!C?Q#OT=RMfZ+QB?vPkblYeCatNh)3Lr$Aad=T~
zlDpa1mwDfadq({we(ng1<h7nJOt9iWZ;h>EIgSaU?PRGAG`)t{2A$|Gd10Q6yD<Kd
zbMA~Gz47=5h%z|HkwbKI_G>XOAyEG1i0C&eAJQH{Gj=?SBobPLbzq5RhYqldD#&J|
zbwomENNh%4bVk14ny()}e?525R2+{nCQ$kYRp^`QyW#B5se!kkcW<_hond|M?9VFa
z<{UPi{IajY*R4^OZQnoovisnQv`Sk94@1im(_1yz-&;R`xYLhZ7_;;9leXfC;UP57
zKMf<yP>1-7t%ptDzt8vaQyfI&i?0?J{A&c)vT7J#0n`-YWr8j(K!#A9#Ac-e?qyQE
zvY8t3K9QF$>Af_Y6HCx4`_TH!3Ib0$yQuzBl$x1?a|2<Nju_X17KnRND>nP2PN6S#
zEH1&ew9Oo1nl({D)?@Tu&CW6SHNmA-f@=23rWvNtd%VA;s*NG0c`S2ca0Qv(e{Ht4
z|C(($#+`2R;oyqF>zCGWieoGg{YJH7^7x7~t=Qh~au~ni!kb9XiHl8cY<I-OWU+R4
zhQphLTB+$(Wf0tKmok`3*~9{DfUeLNTrsL!W&x4VMRFM0wBSx$Z{a6h)~+YMqlWVS
zYZFo$Qxg^?*}*dI(A|)g(QRET_AC+xCNPG9#ypp!7>*HylM%1;{X?Lm4(!(6)_$AH
zReKYuyqw~++~AeU(XWY=`CT@kQgTvv8`+6@)%hg4*{P_yQ5=f%G3oPSc0X$`uz=CL
zbIz@3{Wpc6-bx3@gD^X#e(QJ?xoRR*Y*r@FqBW%jwW-Zjp|9h10HbFD-(|UwnSL2?
z?9XSVdpj8)x>t{Xyp}2eH*LWuYhiN9Vt$LmF&L4hpwKUdnDM$k#}?uvT4SU3r04|8
z-qE;2(u2@5RtWccqwzgK@7&bt=QB>H2+|}KKxrS~X_8p2F0=i874(^^Ys+8ab+?n#
z8eTk6j~sJqLuN`!eh<b}nHL@YHA~kWw^ZuDHIu45iWC%*=)AA-R@`pkdS6tAf)K>6
zkdlhjdnJoeA<<YDIwY?Y$B=vp-Gw&>Jvxl-Rxg;jE+i6t6mkZEhv@nX4ol%nz^R;`
z(O{)6z6M&WV4ku!R^h{R<42?eZ^OG)2wpRD$b;8j#Bx)v@+Vh}no-1j^%B7Yn*G`P
zG`eSu6+v|o(g{cvsw)2yNbPQmxhwC9O0BETk$lPO?v;}!w#C<wv(+a?jl)ryV`BC<
zmAj~Zcd4!5$@(IuYIIy!BVLW~qqg*>sx+^N)k~ItC01lxb&VLms%o1KdcgfpCL!m~
zxKQkRfq{tm@+vsrTXBT!1yZRy)PVKkNdc3vFpU|5El)Snw`t_cnlg!H@-eEa5J7i^
zpeaH>J@P?(k{go&de`6BS@herivk7)T^zJ31m|v2tx3iNDQEh&!Y2gOSvI2z{tOkG
zlv7jz&zE{ln;kn?kxfMUGY-cMGWnE6nzIU-ZFCf5=D4@X&bCryV26MtjUWQ8?xW|p
zmuyON{UdK!sA<#Arjfri-ZM3`_mD10dRPQaAU9>*vnkUfL{X`)v9GDmp?ml5^Ka(q
z9tvIVeN+wj(EA9fW^2#yn8~h?+-5r)ABq?{wh9PwRs}V6&FT{Xg6cv($qnBS<S6p&
zUjOr^VpEVn_QfHi>WvGW=BmLDS1M_^0n~KOQqKstSab_nT->R|AqUI9uZGIAmei?C
zkMW`QO@h)O8|^ggudAU$<|ZI|0!KJolYr3ByhqXQnh$$yicHgV-yqbq{hg$z9CdI9
z%^IWyvqKDjtIiiYyYt~gnrEt+NuuUa>k_^%5n7#ZEeYXWDfcBv;Ez%F<iQPun)cHQ
zDA<tX;9=kz(%hQdwia>(Mlxs*$YXZ6h|&I<sJl1^*Eb~GbE|>_UIr#R;Tab3kVh&a
zEH^iwh{HW^3I%JpU8@)lZ5P_<SEb);2w9B!0pEx22;Az|NI${C?F-m-tx>?K)#0L3
zD`bKtA00TFbG3?9L(I?chuqs~fY8j~aA@^(dNa7s_yG;J-#2{lMe#j%PDPkMqObdK
zUWz`8!Rjol4pg+)0B&HrA>bSC2D#xh?Y#vFO=(@e&@?zt=a#dsrs3{;Ag8Sl1?=?C
z;Cu;@)$?IT(lq3`br6H;p7I0XZlqB#Wno_*J8+j`<eelW+4D$1a~0sQ=KO;eSa!K3
zFbA=any0%J&8##}Adba|`7Dma@DXefO^;@_@TU9BiOmP2Wf8nj7j$*GIh9?v(b&`7
zIWj<EF)+L-rRq^J3M$w%NV9H*s>)uP2cl9<rG9TQg7TO<`sIe>R{K`jah0G-s74}9
zhJ}?K&|dtA^g6}Cyxp{`skukTi^kYgpgv*8f<?7KA}_N<vymIpb(*`vYK$Zmq0(1*
zbjX%*06`591<0&XGR94B2oZq)XjIAe^vax;!Dx||xg#1#V5|xnS8t)6k(K)%XB^&k
zNfD$Us*p~!>heNA=j);kz?)qFbVL6>pz&bQz%CpmA~MD`w+gNq+EVDbm6_W5aVkuG
z@=^+?U@D|TvYl~>@2*DH9>rgs>c-6sRoSI$X*Uybt|?~_Wdj+ei72y*r0UpU1l0Xj
z9LQRcw4q#$ileVa<Z(<5%NVOSn}_Q^IwcO@hZ_AxoWU<rjU=(hJyLZJzM=%4b*4mw
zJ1@sp52QdVm5D2e=~|t@4Cnb@zkLDO&obWx3adYlvl6?lh}-p*GL}VB;h)Qes@qfx
z6(UdFp`XVer^c0O{q#V94>X^BjH&WC5krZLyH3Pg6AgG*jA~(0h1#PU+cuw!juY4M
zM@}kCcJhi)C*ODW72fbeVOewWsi-)s75|%eL`V&qbP<5%5s0Iw9n6Ytb9{A<>-l?|
z-xt=3mMpBTZ{?7W6!BeoiU=r<m4UpQu0ufH?tf(OKlFMtygKohPxeR<jiyAHReQ>V
zl~l$KD6nQZUao|0Ft27d3BS!#+3IYc%152FMS|C<*=0ghZ~LDOBU1xEgJ{s{J&y;n
zJZt~J)ONTMN>H4jfb*t1vO2=)w!2a*6Q^H@TfnfCF%;<Ft2nk4K@3kiK`Q)+qMw#^
zp&0%QrJuI|L1gx+SyDy(9W0Z2EEHBb{98k)MlL^}>pOUCZ$=w}yhpsLSzbo(7;DT$
zjeCdZH>sNhy;(rD2VCvG!Q!^i(+Q46`+i2YyiY=XnnIWg57nxd;0BxO9yMAF#(+nn
zdo_^27w`w5UvHfQfYvcXOhRRaZUPDnqw5v+)Gg2`<gzjC;#_7<O4ZrolRsZ}bWVV*
zbVU9!Mi+geWr6kNh(=xJ6jr83doi`L;-=5gJjC}eWwq!yFSNglOY;KVi?0c8n|EmI
zA#YK2v<t(Yh?srI{yFFRV4*RZ@F_gxtM3=D->J-z?XbY4F3|qpWmzH84a>`wb(@E*
z0p+<r7#eAU(jy(?-`=#t0dzUJ`van*uh6lhoE1pf-_w2~Q|OoIH;OBMU%tuvgb|H%
zx`O!peW-FWJJTg_dT41pPMDGy>vLFHD>}|t*Yn<FFso4o+O+(YdaW;wIXh@zki+t*
zmJelYXKng>CF2Q-IbyC?ick`s3yVwds8d!~q7wGMGgguvzf^00=6(y*=6R=>-g}}@
zFl>M*BRZKTqptfL4pb#2qdI=W;wUgszg@9=>qcF^t@d>DWB(nwzw(1`k81$1$%^pX
zF|7Ga>@#FO0b<FWnrWG+6{8LyGGB!4u)l5jkT&c)d9`YOpeqyl)$TD$?VH!fcKK-7
zSCT~eeFt6)8X84?x5~L}K7IX;kD5c7RzmJ2{8)}sLFV*c*#T>Z>L=q-!pvDt+DCx7
zNb1enLe@}Q9{>EBNj9V*m7qO~X_p!N!888+7Rz5)0<z~-a#?cI;G8l6!VSzbSYlSh
zmSiI}&}AcLvm|v-zY`0dT_Lpg#0(6koXPfHeo~3&7+PH^XiB1gM`{GR5ov$w48-%R
z1evt#F58$K+lw>zbN`w0>vdbADIxe#(43O*N2g}K8jb=b<2O^DC?yq)4Nl|!)X`wS
z;4WuRv_{(QrP_C0q|VKE;LOt|F}csIRFJXc+BfoV#kO10HwM1z0(#IPJ1X)aJYQvg
zuQ@B&a<HrGn+f4(UJ(m2*Sl*Y0Pm$ZpfLP}KFr_}-IEZY6-qt5Y(Dk@Tb_#_{Y?MC
z%yPbbApAbJ$vP0J%^6SzUu|iP$td82Y@~*CtO8TNVEt-s9_CRuc9|7AOMDs3nheZg
zn?r2l_^SDE#!{z(MHlZ<b$BIep|~Sv1&dmR0{2AX(>vL(4FU{NXt;gbC+qum4{1_@
z^nezpvFhi+2vl*|8V;=4(z)QBlm#j-ev9_Ges6lXCJ7p8I$pe$tg(#_q5F=C@(G%W
ze2++b)z$Od^R5P!^ZLHU7x9Na>h?!~7QV&sc>RAyqrr)0s6V<UWGVRbvyh2!Z{9Dc
z2PpOPk}RY)CErX|T6X!1QPm@N{BrRQvJkZbUR8YJ{#Y9)m5h!K{a)>UT4t3e`u18s
zX;LBEWjsH4<PfgEcULykp(Icd9q0<ASE%FYBa9A&T{Abkgq*u_4*O0Oa{@Zi)_{NZ
zcRot?Ax-1!ZPb<KZ!erOhzYVwtodj3h@lsjD_m0E5kXq+!`{RklrEngC%hQW#aiCK
zydCn;yn4gfi(A-ArL-wb1L+(6`{owam7JqAP;ip%O$?dytFYwLe$cw*foe!+>m$*=
zLkpdmqHkuh)nyx(llAV95W?4qXMUwB7beVTZ?^MW<^~$9nN)0gkP2|67U=#N0B5tW
zXN{o_^QA}?v3~DLR`zFE73o(8A<D8ku$GzZlHzwNIbFc5!Iiw}K{GQGx7XSPo-5oE
z2d2L8_qDW4h%1X;U7b+28M=!4%z#<ubc=g2sY}73*)DhFp_e+#M9JG5!SG>5K;I0*
zdaB$XOG(yv=(6``QhHrZh$b^nExfW|my^Yw5w17H={{E|`($dQNIhM<1M>>$bs~;v
zXFZ|2cgZlo{L{;o+11<HN$|{vjX`mP``iO(QU~9F82L+Xmw|To6CzDbi7(WOP%1@~
z{m#~1hge`L=R$Q<b$Y#{>dH)CE7nJyWuzrq^9);6NtX-^NIH2=^_bC|@`7f_x1ccK
z#Qw0~PVgUPV3M?s6LOgp&=LQm=$vVu{Q*9elWoL24sCh5G8(%ro%M95k>sqb?hcj=
z%X*<I>jZ-lv|M6xbP5X`kqV^>Whd#_!2XZzsH*+6u#E3T>D^n??Ok>$w|_lrxhDS{
zV_oq-^J{;qZ_N<D`RUdCz27#6<Vq|!U7!Uq-(f!MsbK%2lirrnQ>^by|FoDxKV<#y
z&2yxm)ld8X=c&xUc_-gj{sJ{wf7Q%7rK|AaKZDivm)9j!s~j1Cz|+;wWt~$(696Vf
Bk$3<A

literal 0
HcmV?d00001

diff --git a/assets/images/video.png b/assets/images/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e59687a3e6d8c3bf706f2859b9cc6e7cdc44a19
GIT binary patch
literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&B}qg<RCr$Pn@w)iFcioCZrQ*J4O<qKN{@h8HnXb4C4gbaCFop$B|C<4jIzPA
zL>!?-6bY6L6$^?~7^9boC$ZzCqr`SRi7jO_89)2|-iMv%gkj)~4P1Xj0MP>q1d_KR
zfxuG$hXC%@z_|s0E^2=qKy)Gh62Ke`C;S=Xa?a}zNM?e5B*ll&=6u2uQZxlHFy*Cz
zzw!y&W64aM0C=LC{lPt<{B(5<eE+59%+YONbVvPPQ}<c?W>{RQy=}@r|6$Dc?+Cyb
z0DE%iqk|=m4*n@Kq0X;A%8*~(GX1Zq@~3CJI6d1@y1SO24R%2Qe#(SLR)6v6?@*K{
zJueBs+J|-OeYE`kNZ|7#4~I$seN>(dOsyDhMgV<Po^qR>Z%P36N6X$NykcnA0(f{|
z;L|sCxp1A0eao)}pf6*-C)actUB&fgOX<b{`l!4Kl#&Ca1#IrXT<`Fj$S>{+jR4xX
z;<oi2IsmQ%xBx(x%_g5S=y{wj+pW2LhN%ibV9KAfW7{(fSzZKCd>BIXfEWTX2iQ)6
zX{C9I#I{^piPdQm%*yN^){_k|$G8RXMjV6TWyx9rfFR@0`9L=Sh)9PJ)+?WIyb(&O
zJfP?jo<Zng>D2@15nC^R`_2!#QM>|p_4qm~N|uWk=?#G?cEF2gceb*<loJGistS$|
zZwLl}RMu3=atR_h05^iL92UU>@D&z81Gv!}0L~|D+$J$@1pq2qzCYiE;Yhpx0BVyW
z!?^7d8LS7?Sl#NjIXD2diUS-B)3#PG=8T{K)VRBK#e>=j`f_*EYSF0&(Car9*`4O<
z%<92}K*jp)Me!g)AcV?Lry)=P;MMBgg~00F<Gd*9DbDM*%3eKyCXx+!2!VMBrE%{7
z+B~?p=o<lOg<7XIK^GQmD>Hh4!2>8urymc{Zmey=p{<2n_fKX*(U+ADFFYSqxK_As
z4?qSl1IT-<zpL>%Nrz)eFVBZy7_UB=+2jbz;mkS_oq2lx(bSM26vAA2Gdevuq$UhU
z+MSrm;-CWaG|Ovm!No5}Ei&FpQPBgo(rgwd{U6XpE<51l=#u~d002ovPDHLkV1jOu
Bk*5Fv

literal 0
HcmV?d00001

diff --git a/components/kevy-loading/kevy-loading.vue b/components/kevy-loading/kevy-loading.vue
index 9b6d1b4..6624323 100644
--- a/components/kevy-loading/kevy-loading.vue
+++ b/components/kevy-loading/kevy-loading.vue
@@ -252,7 +252,7 @@ export default {
 
 <style lang="scss" scoped>
 .t-content {
-	position: fixed;
+	position: absolute;
 	z-index: 999999;
 	top: 0;
 	bottom: 0;
diff --git a/components/myUpload/index copy.vue b/components/myUpload/index copy.vue
new file mode 100644
index 0000000..ca7155d
--- /dev/null
+++ b/components/myUpload/index copy.vue	
@@ -0,0 +1,189 @@
+<template>
+	<view class="" style="z-index: 999;">
+
+
+		<wd-popup v-model="show" closable position="left" custom-style="width: 86vw;" @close="handleClose">
+			<div class="pop myUpload">
+				<div class="bg-white overflow-hidden h-full" style="background-clip: content-box;">
+
+					<view class="bg-gray-100 p-4 flex">
+						<view class="mr-4">
+							<wd-button @tap="chooseFile">上传文件</wd-button>
+						</view>
+						<view>
+							<wd-button @tap="chooseFile">确认选择</wd-button>
+						</view>
+					</view>
+
+					<div v-if="LArr.length" class="shadow-lg ">
+						<div class="text px-2 mt-3 font-bold">已选择 ({{ LArr.length }} 张)</div>
+						<div class="bg-gray images flex gap-2 overflow-x-auto p-4 pt-2 ">
+							<view @click="onClickCheck({ url: img })" class=" border-gray-100 border-solid flex rounded-[14px] relative"
+								v-for="img of LArr">
+								<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
+
+								<view class="absolute bg-white opacity-80 inset-0 flex items-center justify-center border-spacing-1">取消选择
+								</view>
+
+							</view>
+						</div>
+					</div>
+					<div v-else class="shadow-lg ">
+						<div class="text p-3 font-bold">可选择 ({{ LArr.length }} 张)</div>
+					</div>
+
+					<view class="overflow-hidden rounded-t-3xl">
+						<myList ref="myListRef" :apiObj="system.resourcesList" :params="{ ...params, classify_id }">
+							<template #default="{ list }">
+
+								<view class="grid grid-cols-2 gap-4 p-4 overflow-hidden rounded-t-3xl">
+									<view
+										class="relative flex flex-col items-center justify-center bg-gray-100 p-4 rounded-md overflow-hidden"
+										v-for="item of list" v-show="item.type === 1">
+										<div class="list-item-img" @click="onClickCheck(item)" v-if="item.type === 1"
+											:style="{ backgroundImage: 'url(' + item.url + ')' }"></div>
+										<div class="list-item-img" @dblclick="onClickDir(item)" v-if="item.type === 3"
+											:style="{ backgroundImage: 'url(' + folderPng + ')' }"></div>
+										<div class="list-item-name">{{ item.name }}</div>
+
+										<view @click="onClickCheck(item)"
+											class="absolute bg-white opacity-80 inset-2 flex items-center justify-center border-spacing-1"
+											v-if="LArr.includes(item.url)">取消选择</view>
+
+									</view>
+								</view>
+
+							</template>
+						</myList>
+					</view>
+				</div>
+			</div>
+
+		</wd-popup>
+
+
+
+
+
+
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import system from '@/api/modules/system.js'
+import myList from "/components/myList/index.vue"
+import folderPng from '@/assets/images/folder.png'
+import { uploadImage } from '@/utils/request';
+const myListRef = ref(null)
+
+const formData = ref({
+	parent_id: 0,
+	type: "image",
+})
+
+const chooseFile = async () => {
+	uni.chooseImage({
+		count: 1, // 默认9
+		sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+		sourceType: ['album'], // 从相册选择
+		success: async (res) => {
+			try {
+				if (!res.tempFilePaths || !res.tempFilePaths.length) {
+					throw new Error('未选择文件或文件路径无效。');
+				}
+
+				const filePath = res.tempFilePaths[0];
+				const result = await uploadImage({ filePath, formData: formData.value, name: "image" })
+				console.log('成功上传图片：', result);
+
+				myListRef.value.upData()
+
+				// 根据需要处理结果
+			} catch (error) {
+				console.error('选择文件或上传图片时出错：', error.message);
+				// 处理错误
+			}
+		}
+	});
+}
+
+const emit = defineEmits(['update:modelValue']);
+const props = defineProps({
+	modelValue: {
+		type: String,
+		default: ""
+	},
+	size: {
+		type: Number,
+		default: 1
+	},
+})
+
+const LArr = ref([])
+const onClickCheck = (row) => {
+	const index = LArr.value.findIndex(item => item === row.url)
+
+
+	if (index > -1) {
+		LArr.value.splice(index, 1)
+	} else {
+
+		if (props.size > LArr.value.length) {
+			LArr.value.unshift(row.url)
+		} else {
+			uni.showToast({
+				title: `已选择 ${LArr.value.length} 张`,
+				icon: 'none'
+			})
+
+			console.log(`已选择 ${LArr.value.length} 张`);
+		}
+
+
+	}
+}
+
+const show = ref(true)
+
+// if (Array.isArray(props.modelValue)) {
+
+// } else {
+
+// }
+
+
+
+// defineExpose({
+// 	upData
+// })
+</script>
+
+<style lang="scss">
+.list-item-img {
+	width: 100%;
+	height: 80px;
+	background-position: center center;
+	background-size: contain;
+	background-repeat: no-repeat;
+}
+
+.list-item-name {
+	text-align: center;
+	padding: 5px 10px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 12px;
+	width: 100%;
+}
+
+.pop {
+	// position: fixed;
+	background: rgba(0, 0, 0, 0.256);
+	background-clip: border-box;
+	z-index: 9;
+	overflow: hidden;
+	inset: 0px;
+}
+</style>
diff --git a/components/myUpload/index.vue b/components/myUpload/index.vue
new file mode 100644
index 0000000..0a365f5
--- /dev/null
+++ b/components/myUpload/index.vue
@@ -0,0 +1,216 @@
+<template>
+	<view>
+		<view v-if="props.modelValue.length" @click="open(true)" class="flex gap-2 overflow-x-auto">
+			<view class=" border-gray-100 border-solid flex rounded-[14px] relative"
+				v-for="img of (Array.isArray(props.modelValue) ? props.modelValue : [props.modelValue])" :key="img">
+				<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
+			</view>
+		</view>
+
+		<view v-else @click="open(true)" class="flex gap-2 overflow-x-auto">
+			<view style="width: 100px;height: 100px;"
+				class=" border-gray-100 border-solid flex rounded-[14px] relative  flex-col items-center justify-center">
+				<wd-icon name="image" size="28px"></wd-icon>
+				<view class="mt-2 font-bold text-[12px]">请选择</view>
+			</view>
+		</view>
+
+		<wd-popup :z-index="998" v-model="show" closable position="left" custom-style="width: 86vw;" @close="close(false)">
+			<view class="pop myUpload">
+				<view class="bg-white overflow-hidden h-full" style="background-clip: content-box;">
+
+					<view class="bg-gray-100 p-4 flex">
+						<view class="mr-4">
+							<wd-button type="warning" @tap="chooseFile">上传文件</wd-button>
+						</view>
+						<view>
+							<wd-button @tap="ok">确认选择</wd-button>
+						</view>
+					</view>
+
+					<view v-if="LArr.length" class="shadow-lg ">
+						<view class="text px-2 mt-3 font-bold">已选择 ({{ LArr.length }} 张)</view>
+						<view class="bg-gray images flex gap-2 overflow-x-auto p-4 pt-2 ">
+							<view @click="onClickCheck({ url: img })" class=" border-gray-100 border-solid flex rounded-[14px] relative"
+								v-for="img of LArr" :key="img">
+								<wd-img mode="aspectFill" radius="10" :width="100" :height="100" :src="img" />
+
+								<view class="absolute bg-white opacity-80 inset-0 flex items-center justify-center border-spacing-1">取消选择
+								</view>
+
+							</view>
+						</view>
+					</view>
+					<view v-else class="shadow-lg ">
+						<view class="text p-3 font-bold">可选择 ({{ size }} 张)</view>
+					</view>
+
+					<view class="overflow-hidden rounded-t-3xl">
+						<myList ref="myListRef" :apiObj="system.resourcesList">
+							<template #default="{ list }">
+
+								<view class="grid grid-cols-2 gap-4 p-4 overflow-hidden rounded-t-3xl">
+									<view
+										class="relative flex flex-col items-center justify-center bg-gray-100 p-4 rounded-md overflow-hidden"
+										v-for="item of list" :key="item.id" v-show="item.type === 1">
+										<view class="list-item-img" @click="onClickCheck(item)" v-if="item.type === 1"
+											:style="{ backgroundImage: 'url(' + item.url + ')' }"></view>
+										<view class="list-item-img" @dblclick="onClickDir(item)" v-if="item.type === 3"
+											:style="{ backgroundImage: 'url(' + folderPng + ')' }"></view>
+										<view class="list-item-name">{{ item.name }}</view>
+
+										<view @click="onClickCheck(item)"
+											class="absolute bg-white opacity-80 inset-2 flex items-center justify-center border-spacing-1"
+											v-if="LArr.includes(item.url)">取消选择</view>
+
+									</view>
+								</view>
+
+							</template>
+						</myList>
+					</view>
+				</view>
+			</view>
+
+		</wd-popup>
+
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import system from '@/api/modules/system.js'
+import myList from "/components/myList/index.vue"
+import folderPng from '@/assets/images/folder.png'
+import { uploadImage } from '@/utils/request';
+const myListRef = ref(null)
+
+const formData = ref({
+	parent_id: 0,
+	type: "image",
+})
+
+const chooseFile = async () => {
+	uni.chooseImage({
+		count: 1, // 默认9
+		sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+		sourceType: ['album'], // 从相册选择
+		success: async (res) => {
+			try {
+				if (!res.tempFilePaths || !res.tempFilePaths.length) {
+					throw new Error('未选择文件或文件路径无效。');
+				}
+
+				const filePath = res.tempFilePaths[0];
+				const result = await uploadImage({ filePath, formData: formData.value, name: "image" })
+				console.log('成功上传图片：', result);
+
+				myListRef.value.upData()
+
+				// 根据需要处理结果
+			} catch (error) {
+				console.error('选择文件或上传图片时出错：', error.message);
+				// 处理错误
+			}
+		}
+	});
+}
+
+const emit = defineEmits(['update:modelValue']);
+const props = defineProps({
+	modelValue: {
+		type: String,
+		default: ""
+	},
+	size: {
+		type: Number,
+		default: 1
+	},
+})
+
+const LArr = ref([])
+
+const show = ref(false)
+const open = (O) => {
+	show.value = O
+
+	if (O) {
+		myListRef.value.upData()
+	}
+
+	if (props.modelValue) {
+		if (Array.isArray(props.modelValue)) {
+			LArr.value = JSON.parse(JSON.stringify(props.modelValue))
+		} else {
+			LArr.value = [props.modelValue]
+		}
+	}
+
+}
+open(false)
+
+const close = () => {
+	// LArr.value = []
+}
+
+const ok = () => {
+	if (props.size == 1) {
+		emit("update:modelValue", LArr.value.pop())
+	} else {
+		emit("update:modelValue", LArr.value)
+	}
+
+	show.value = false
+}
+
+const onClickCheck = (row) => {
+	const index = LArr.value.findIndex(item => item === row.url)
+
+
+	if (index > -1) {
+		LArr.value.splice(index, 1)
+	} else {
+		if (props.size > LArr.value.length) {
+			LArr.value.unshift(row.url)
+		} else {
+			uni.showToast({
+				title: `已选择 ${LArr.value.length} 张`,
+				icon: 'none'
+			})
+
+			console.log(`已选择 ${LArr.value.length} 张`);
+		}
+
+	}
+}
+
+
+</script>
+
+<style lang="scss">
+.list-item-img {
+	width: 100%;
+	height: 80px;
+	background-position: center center;
+	background-size: contain;
+	background-repeat: no-repeat;
+}
+
+.list-item-name {
+	text-align: center;
+	padding: 5px 10px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 12px;
+	width: 100%;
+}
+
+.pop {
+	// position: fixed;
+	background: rgba(0, 0, 0, 0.256);
+	background-clip: border-box;
+	overflow: hidden;
+	inset: 0px;
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5b9f442..7353dd7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,10 +1,5 @@
 <template>
 	<view class="content">
-		<wd-button>主要按钮</wd-button>
-		<wd-button type="success">成功按钮</wd-button>
-		<wd-button type="info">信息按钮</wd-button>
-		<wd-button type="warning">警告按钮</wd-button>
-		<wd-button type="error">危险按钮</wd-button>
 	</view>
 </template>
 
@@ -21,7 +16,6 @@ if (token) {
 	utils.toUrl("/pages/login/index")
 }
 
-
 </script>
 
 <style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index c6a2c7a..d51b7ac 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -27,6 +27,16 @@ const model = ref({
 
 const loading = ref(false)
 const form = ref(null)
+
+// if (token) {
+// 	const user_info = uni.getStorageSync("user_info");
+// 	if (user_info.type == 1) {
+// 		utils.toUrl("/store/index/index")
+// 	}
+// } else {
+// 	utils.toUrl("/pages/login/index")
+// }
+
 function handleSubmit() {
 	loading.value = true
 	form.value
@@ -47,17 +57,25 @@ function handleSubmit() {
 							title: "登录成功",
 						});
 
-						console.log(res.data.user_info);
 						if (res.data.user_info.type == 1) {
 							utils.toUrl("/store/index/index")
+						} else {
+							uni.showToast({
+								title: '登录平台开发中 ···',
+								icon: 'none'
+							})
 						}
-
+						loading.value = false
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						loading.value = false
 					}
 
 					loading.value = false
-
 				})
-
 			}
 		})
 		.catch((error) => {
diff --git a/store/goods/components/skuEdit.vue b/store/goods/components/skuEdit.vue
index df49547..7ee707d 100644
--- a/store/goods/components/skuEdit.vue
+++ b/store/goods/components/skuEdit.vue
@@ -1,7 +1,9 @@
 <template>
   <view class="skuEdit">
-
-    <wd-table :data="skuLibrary" :stripe="false">
+    <wd-table rowHeight="100" :data="Pdata.use_sku == 0
+      ? skuDefault
+      : skuLibrary
+      " :stripe="false">
       <wd-table-col prop="name" label="SKU">
 
         <template #value="scope">
@@ -45,9 +47,20 @@
           </view>
         </template>
       </wd-table-col>
+
+      <wd-table-col prop="major" label="产品图">
+        <template #value="scope">
+          <view class="overflow-hidden w-full h-full flex items-center justify-center">
+            <view class="px-2 pb-1 bg-white flex items-center justify-center mt-4 overflow-hidden">
+              <myUpload v-model="scope.row.pic_url"></myUpload>
+            </view>
+          </view>
+        </template>
+      </wd-table-col>
+
     </wd-table>
 
-    <view class="bg-gray-100  rounded mb-2">
+    <view v-show="Pdata.use_sku == 1" class="bg-gray-100  rounded mb-2">
       <div class="p-2 bg-white w-full">
         <div class="name mb-2 text-xs">规格设置</div>
         <view class="flex bg-white px-3 py-1 rounded w-full">
@@ -58,7 +71,6 @@
         </view>
       </div>
 
-
       <div class="p-2 bg-white">
         <div style="display: flex; flex-flow: column; align-items: flex-start;">
           <div class="name mb-2 text-xs">规格组</div>
@@ -89,17 +101,26 @@
 
     </view>
 
-    <wd-toast />
 
   </view>
 </template>
 
 <script>
+import myUpload from "@/components/myUpload/index.vue"
 import { useToast } from '@/uni_modules/wot-design-uni'
 const toast = useToast()
 
 export default {
   name: "skuEdit",
+  props: {
+    Pdata: {
+      type: Object,
+      default: () => ({})
+    },
+  },
+  components: {
+    myUpload
+  },
   data() {
     return {
       // sku规格开始
@@ -128,7 +149,16 @@ export default {
       // sku规格结束
     }
   },
+  created() {
+    this.skuDefault = this.Pdata.skuDefault.length ? this.Pdata.skuDefault : this.skuDefault
+    this.skuLibrary = this.Pdata.skuLibrary
+    this.skuGroup = this.Pdata.skuGroup
+  },
   methods: {
+    successImage($event, index) {
+      console.log($event, index);
+    },
+
     /**
 * 处理规格数据
 */
@@ -217,6 +247,15 @@ export default {
     },
     // 添加规格组
     addSkuGroup() {
+
+      if (!this.addGroupData.name) {
+        uni.showToast({
+          title: '请填写规格组名称',
+          icon: 'none'
+        })
+        return
+      }
+
       // 添加一个一个规格类
       console.log("添加了一个规格组");
       this.skuGroup.push(this.addGroupData);
@@ -280,7 +319,14 @@ export default {
 
 
       if (!this.addGouppItemData[index]) {
-        toast.error('请填写规格名称!')
+        if (!this.addGroupData.name) {
+          uni.showToast({
+            title: '请填写规格名称',
+            icon: 'none'
+          })
+          return
+        }
+
         return
       }
 
diff --git a/store/goods/edit.vue b/store/goods/edit.vue
index bec9966..3e9e33b 100644
--- a/store/goods/edit.vue
+++ b/store/goods/edit.vue
@@ -1,36 +1,53 @@
 <template>
-  <view class="content p-2 bg-gray-100">
-
-
+  <view v-if="load" class="content p-2 bg-gray-100">
+    <wd-toast />
     <wd-form ref="form" :model="model">
       <wd-cell-group border>
-
         <div class="bg-gray-100">
           <div class="bg-gray-100 rounded mb-2">
             <div class="bg-white flex flex-col pt-3 pl-3">
               <div class="name mb-2 text-xs">缩略图</div>
-              <wd-upload :limit="1" :file-list="fileList" :action="action" :formData="formData" :header="header"
-                @success="successImage" name="image" :before-remove="beforeRemove"></wd-upload>
+              <myUpload v-model="model.pic_url"></myUpload>
             </div>
           </div>
         </div>
 
-        <!-- <div class="bg-gray-100">
+        <div class="bg-gray-100">
           <div class="bg-gray-100 rounded mb-2">
             <div class="bg-white flex flex-col pt-3 pl-3">
               <div class="name mb-2 text-xs">商品主图</div>
-              <wd-upload :file-list="fileList" :action="action" :formData="formData" :header="header"
-                @change="handleChange" name="image"></wd-upload>
+              <myUpload v-model="model.pic_list" :size="4"></myUpload>
             </div>
           </div>
-        </div> -->
+        </div>
 
         <view class="h-2 bg-gray-100"></view>
 
         <view class=" p-3 rounded mb-2">
           <div class="name mb-2 text-xs">商品名称</div>
           <view class="bg-white px-3 py-1 rounded">
-            <wd-textarea v-model="model.value" auto-height />
+            <wd-textarea v-model="model.name" auto-height />
+          </view>
+        </view>
+
+        <view class="h-2 bg-gray-100"></view>
+
+        <view class=" p-3 rounded mb-2">
+          <div class="name mb-2 text-xs">商品分类</div>
+          <view class="bg-white px-3 py-1 rounded">
+            <wd-checkbox-group v-model="model.classify_list">
+
+              <view class="flex overflow-auto flex-wrap">
+                <div class="grid grid-cols-3">
+                  <wd-checkbox style="width: 100%;" shape="button" v-for="cat of classifyList"
+                    :modelValue="JSON.stringify(cat.parentIds)">
+                    {{ cat.name }}
+                  </wd-checkbox>
+                </div>
+              </view>
+
+            </wd-checkbox-group>
+
           </view>
         </view>
 
@@ -40,8 +57,7 @@
           <div class="p-2 bg-white">
             <div class="name mb-2 text-xs">服务内容</div>
             <view class="bg-white px-3 py-1 rounded">
-              <wd-input type="text" v-model="value" placeholder="例子: 正品保障,极速发货,7天退换货。多个请使用英文逗号“,”分隔"
-                @change="handleChange" />
+              <wd-input type="text" v-model="model.server_project" placeholder="例子: 正品保障,极速发货,7天退换货。多个请使用英文逗号“,”分隔" />
             </view>
           </div>
         </view>
@@ -51,11 +67,12 @@
         <view class=" p-3 rounded mb-2">
           <div class="name mb-2 text-xs">商品重量</div>
           <view class="bg-white px-3 py-2 rounded flex items-center mb-4">
-            <wd-input-number v-model="value" @change="handleChange" />
+            <wd-input-number v-model="model.weight" />
             <view class="text-xs from-neutral-300 ml-4">千克</view>
           </view>
 
-          <wd-picker class="w-full" :columns="freightRules" label="运费模板" v-model="model.freight_id" />
+          <wd-picker v-if="freightRules.length" class="w-full" :columns="freightRules" label="运费模板"
+            v-model="model.freight_id" />
 
         </view>
 
@@ -63,18 +80,33 @@
 
         <view class="p-3 rounded mb-2">
           <div class="name mb-2 text-xs">商品状态</div>
-          <view class="bg-white px-3 py-2 rounded flex items-center mb-4">
-            <wd-switch v-model="model.status" />
+          <view class="bg-white px-3 py-2 rounded flex items-center">
+            <wd-switch v-model="model.status" :active-value="1" :inactive-value="0" />
+          </view>
+        </view>
+
+        <view class="h-2 bg-gray-100"></view>
+
+
+        <view class="p-3 rounded mb-2">
+          <div class="name mb-2 text-xs">规格</div>
+          <view class="bg-white px-3 py-2 rounded flex items-center">
+            <wd-radio-group shape="button" v-model="model.use_sku">
+              <wd-radio :value="0">单规格</wd-radio>
+              <wd-radio :value="1">多规格</wd-radio>
+            </wd-radio-group>
           </view>
         </view>
 
         <view class="h-2 bg-gray-100"></view>
 
-        <skuEdit></skuEdit>
+        <skuEdit ref="skuEditRef" :skuGroup="skuGroup"
+          :Pdata="{ skuDefault, skuLibrary, skuGroup, use_sku: model.use_sku }">
+        </skuEdit>
 
       </wd-cell-group>
       <view class="footer mt-4">
-        <wd-button type="primary" size="large" block>保存</wd-button>
+        <wd-button @click="saveGoods" type="primary" size="large" block>保存</wd-button>
       </view>
     </wd-form>
   </view>
@@ -82,10 +114,15 @@
 
 <script setup>
 import { ref } from 'vue'
-import system from '@/api/modules/system.js'
-import goods from '@/api/store/goods.js'
 import { useToast, useMessage } from '@/uni_modules/wot-design-uni'
+import goods from '@/api/store/goods.js'
+import system from '@/api/modules/system.js'
 import skuEdit from "./components/skuEdit.vue"
+import myUpload from "@/components/myUpload/index.vue"
+import {
+  onLoad,
+  onShow
+} from "@dcloudio/uni-app";
 
 const fileList = ref([])
 
@@ -94,34 +131,18 @@ const beforeRemove = ({ file, resolve, index }) => {
   resolve(true)
 }
 
-const action = 'https://saasdemo.byin.vip/admin/system/uploadImage'
-const token = uni.getStorageSync("token");
-const header = {
-  Authorization: `Bearer ${token}`
-}
-const formData = {
-  parent_id: 0,
-  type: "image",
-}
-
-function successImage(e) {
-  fileList.value.push({
-    url: e.file.url
-  })
-}
-
 const model = ref({
   classify_list: [], // 商品分类组
   name: "", // 商品名称
   keywords: "", // 商品关键词
   sort: 1000,
   status: 0, // 商品状态
-  freight_id: 0, //运费规则
+  freight_id: 99999999, //运费规则
   weight: 0, // 商品重量
   pic_url: "", // 商品缩略图
   pic_list: [], // 商品图组
   video: "", // 商品视频
-  detail: "", // 图文详情
+  detail: "默认", // 图文详情
   use_sku: 0, // 是否使用规格
   sku_list: [], // 规格信息
   is_discount: 0, // 是否有折扣
@@ -133,35 +154,199 @@ const model = ref({
   check_price: 0, // 佣金
 })
 
-const form = ref()
+const load = ref(false)
+
+const skuGroup = ref([])
+const skuDefault = ref([])
+const skuLibrary = ref([])
+
+const skuEditRef = ref(null)
+
+const freightRules = ref([{
+  label: "默认",
+  value: "99999999"
+}])
+
+onLoad(async (e) => {
 
-function handleSubmit1() {
-  form.value
-    .validate()
-    .then(({ valid, errors }) => {
-      if (valid) {
-        showSuccess({
-          msg: '校验通过'
+  const GetfreightRules = () => {
+    goods.freightRules().then(res => {
+
+      freightRules.value = [
+        ...freightRules.value,
+        ...res.data.rows.map(item => {
+          return {
+            label: item.name,
+            value: item.id
+          }
         })
-      }
+      ]
+    })
+  }
+  GetfreightRules()
+
+  if (e.id) {
+    const res = await goods.goodsItem({
+      id: e.id
+    })
+
+    model.value = res.data
+    model.value.pic_list = res.data.pic_list.map(({ pic_url }) => pic_url);
+
+    if (!model.value.freight_id) {
+      model.value.freight_id = 99999999
+    }
+    model.value.classify_list = model.value.classify_list.map(item => JSON.stringify(item))
+
+    if (res.data.use_sku == 0) {
+      skuDefault.value = res.data.goods_sku;
+    } else {
+      skuLibrary.value = res.data.goods_sku;
+    }
+    skuGroup.value = res.data.sku_group ? res.data.sku_group : [];
+    load.value = true
+  } else {
+    load.value = true
+  }
+
+
+})
+
+// const form = ref()
+
+const saveGoods = async () => {
+
+  // 判断商品分类是否为空
+  if (model.value.classify_list.length === 0) {
+    return uni.showToast({
+      title: '请选择商品分类!',
+      icon: 'none'
+    })
+  }
+
+  // 判断商品名称是否为空
+  if (model.value.name.trim() === "") {
+    return uni.showToast({
+      title: '请输入商品名称!',
+      icon: 'none'
+    })
+  }
+
+  // 判断商品关键词是否为空
+  // if (model.value.keywords.trim() === "") {
+  //   return uni.showToast({
+  //     title: '请输入商品关键词!',
+  //     icon: 'none'
+  //   })
+  // }
+
+  // 判断商品重量是否为非负数
+  if (model.value.weight < 0) {
+    return uni.showToast({
+      title: '请输入合法的商品重量!',
+      icon: 'none'
+    })
+  }
+
+  // 判断商品缩略图是否为空
+  if (String(model.value.pic_url).trim() === "") {
+    return uni.showToast({
+      title: '请上传商品缩略图!',
+      icon: 'none'
+    })
+  }
+
+  // 判断商品图组是否为空
+  if (model.value.pic_list.length === 0) {
+    return uni.showToast({
+      title: '请上传商品图片组!',
+      icon: 'none'
+    })
+  }
+
+  model.value.sku_group = []
+  model.value.sku_list = []
+  model.value.dist_price = Number.parseInt(model.value.dist_price)
+
+  if (model.value.use_sku == 1) {
+    model.value.sku_group = skuEditRef.value.skuGroup;
+    model.value.sku_list = skuEditRef.value.skuLibrary;
+  } else {
+    model.value.sku_list = skuEditRef.value.skuDefault;
+  }
+
+  if (!model.value.sku_list.length) {
+    uni.showToast({
+      title: '规格不完整，请调整!',
+      icon: 'none'
     })
-    .catch((error) => {
-      console.log(error, 'error')
+  }
+
+  if (!model.value.sku_list.every(item => Boolean(item.price !== "" && item.stock !== "" && item.original_price !== ""))) {
+    uni.showToast({
+      title: '规格不完整，请调整!',
+      icon: 'none'
     })
+
+    console.log("规格不完整，请调整!");
+
+    return
+  }
+
+
+  let freight_id = model.value.freight_id
+  if (freight_id = 99999999) {
+    freight_id = 0
+  }
+
+  const pic_list = model.value.pic_list.map(item => ({
+    pic_url: item
+  }))
+
+
+  const classify_list = model.value.classify_list.map(item => JSON.parse(item))
+
+  const res = await goods.goodsEdit({ ...model.value, pic_list, freight_id, classify_list });
+
+  console.log(res);
+
+
+  if (res.code == 0) {
+    uni.showToast({
+      title: '商品信息保存成功!',
+      icon: 'success'
+    })
+  }
+
 }
 
-const freightRules = ref([])
-const GetfreightRules = () => {
-  goods.freightRules().then(res => {
-    freightRules.value = res.data.rows.map(item => {
-      return {
-        label: item.name,
-        value: item.id
+const classifyList = ref([])
+const getClassify = () => {
+  function flattenCategories(categories, parentIds = []) {
+    let flatCategories = [];
+
+    for (const category of categories) {
+      const categoryWithParents = {
+        ...category,
+        parentIds: [...parentIds, category.id],
+      };
+
+      flatCategories.push(categoryWithParents);
+
+      if (category.children && category.children.length > 0) {
+        flatCategories = flatCategories.concat(flattenCategories(category.children, [...parentIds, category.id]));
       }
-    })
+    }
+
+    return flatCategories;
+  }
+  goods.classify.list().then(res => {
+    classifyList.value = flattenCategories(res.data)
+
+    console.log(classifyList.value);
   })
 }
-GetfreightRules()
+getClassify()
 </script>
 
 <style lang="scss"></style>
diff --git a/store/goods/index.vue b/store/goods/index.vue
index 83d6db3..e547178 100644
--- a/store/goods/index.vue
+++ b/store/goods/index.vue
@@ -48,7 +48,7 @@
 											style="margin-right: 8px;">下架</wd-button>
 										<wd-button @click="changeS(item)" v-if="item.status !== 1" size="small"
 											style="margin-right: 8px;">上架</wd-button>
-										<wd-button @click="utils.toUrl('/store/goods/edit')" size="small">编辑</wd-button>
+										<wd-button @click="utils.toUrl('/store/goods/edit?id=' + item.id)" size="small">编辑</wd-button>
 									</view>
 								</template>
 							</wd-card>
@@ -64,9 +64,15 @@
 <script setup>
 import { ref } from 'vue'
 import { useToast } from '@/uni_modules/wot-design-uni'
-import goods from '@/api/store/goods.js'
 import myList from "/components/myList/index.vue"
+import goods from '@/api/store/goods.js'
 import utils from '@/utils/utils.js'
+
+import {
+	onLoad,
+	onShow
+} from "@dcloudio/uni-app";
+
 const toast = useToast()
 
 const classify_id = ref(0)
@@ -147,6 +153,10 @@ const getClassify = () => {
 	})
 }
 getClassify()
+
+onShow(() => {
+	search({ value: '' })
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/store/order/index.vue b/store/order/index.vue
index 9ef9ba9..6f77e37 100644
--- a/store/order/index.vue
+++ b/store/order/index.vue
@@ -67,7 +67,6 @@
 										<view>
 											<span class="mr-2" v-if="item.shop">{{ item.shop.name }}</span>
 											<span class="mr-2" v-else>商城自营</span>
-
 											<span class="font-bold">({{ status[item.status + 1].content }})</span>
 										</view>
 
@@ -90,7 +89,6 @@
 									</view>
 								</view>
 
-
 								<view class="bg-gray-50 p-2">
 									<view class="text-[12px]" v-if="item.user">
 										<view class="mb-1">
diff --git a/uni_modules/wot-design-uni/changelog.md b/uni_modules/wot-design-uni/changelog.md
index b74d786..638fdcc 100644
--- a/uni_modules/wot-design-uni/changelog.md
+++ b/uni_modules/wot-design-uni/changelog.md
@@ -1,16 +1,25 @@
-## 0.2.3（2023-12-27）
-## 0.2版本正式发布，支持Form自定义表单校验
-> 请注意Input组件有破坏性更新
-### [0.2.3](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.2...v0.2.3) (2023-12-27)
+## 0.2.5（2023-12-28）
+## [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
 
 
-### ✏️ Documentation | 文档
+###  Bug Fixes | Bug 修复
 
-* ✏️  修复动态表单演示页面标题错误的问题 ([7c65359](https://github.com/Moonofweisheng/wot-design-uni/commit/7c65359c88614ae53c4800d0946d8e09ef547a26))
+*  修复 Form 导入FormRules、ErrorMessage时未指定为type的问题 ([c88c84e](https://github.com/Moonofweisheng/wot-design-uni/commit/c88c84e8b71fc2404643a623c28f4953ffe36e71))
+*  修复 SwipeAction 组件在H5端导致页面无法上下滚动的问题 ([1f68ce1](https://github.com/Moonofweisheng/wot-design-uni/commit/1f68ce13c8109dd92ca4bf055f66aa8dff24c83d)), closes [#149](https://github.com/Moonofweisheng/wot-design-uni/issues/149)
 
 # 更新日志 
 
 
+### [0.2.5](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.4...v0.2.5) (2023-12-28)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 🐛 修复 Form 导入FormRules、ErrorMessage时未指定为type的问题 ([c88c84e](https://github.com/Moonofweisheng/wot-design-uni/commit/c88c84e8b71fc2404643a623c28f4953ffe36e71))
+* 🐛 修复 SwipeAction 组件在H5端导致页面无法上下滚动的问题 ([1f68ce1](https://github.com/Moonofweisheng/wot-design-uni/commit/1f68ce13c8109dd92ca4bf055f66aa8dff24c83d)), closes [#149](https://github.com/Moonofweisheng/wot-design-uni/issues/149)
+
+### [0.2.4](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.3...v0.2.4) (2023-12-27)
+
 ### [0.2.3](https://github.com/Moonofweisheng/wot-design-uni/compare/v0.2.2...v0.2.3) (2023-12-27)
 
 
diff --git a/uni_modules/wot-design-uni/components/composables/useCell.ts b/uni_modules/wot-design-uni/components/composables/useCell.ts
index 99fcac2..e5d4f60 100644
--- a/uni_modules/wot-design-uni/components/composables/useCell.ts
+++ b/uni_modules/wot-design-uni/components/composables/useCell.ts
@@ -1,4 +1,4 @@
-import { getCurrentInstance, inject, onMounted, onBeforeMount, ref, watch } from 'vue'
+import { getCurrentInstance, inject, onBeforeMount, ref, watch } from 'vue'
 
 export function useCell() {
   const border = ref<boolean>(false) // 是否展示边框
diff --git a/uni_modules/wot-design-uni/components/composables/useChildren.ts b/uni_modules/wot-design-uni/components/composables/useChildren.ts
index 7daf054..b52ac9b 100644
--- a/uni_modules/wot-design-uni/components/composables/useChildren.ts
+++ b/uni_modules/wot-design-uni/components/composables/useChildren.ts
@@ -1,12 +1,12 @@
 import {
-  VNode,
   provide,
   reactive,
-  InjectionKey,
   getCurrentInstance,
-  VNodeNormalizedChildren,
-  ComponentPublicInstance,
-  ComponentInternalInstance
+  type VNode,
+  type InjectionKey,
+  type VNodeNormalizedChildren,
+  type ComponentPublicInstance,
+  type ComponentInternalInstance
 } from 'vue'
 
 // 小程序端不支持从vue导出的isVNode方法，参考uni-mp-vue的实现
diff --git a/uni_modules/wot-design-uni/components/composables/useParent.ts b/uni_modules/wot-design-uni/components/composables/useParent.ts
index eb1c05e..f48fea9 100644
--- a/uni_modules/wot-design-uni/components/composables/useParent.ts
+++ b/uni_modules/wot-design-uni/components/composables/useParent.ts
@@ -1,4 +1,13 @@
-import { ref, inject, computed, onUnmounted, InjectionKey, getCurrentInstance, ComponentPublicInstance, ComponentInternalInstance } from 'vue'
+import {
+  ref,
+  inject,
+  computed,
+  onUnmounted,
+  type InjectionKey,
+  getCurrentInstance,
+  type ComponentPublicInstance,
+  type ComponentInternalInstance
+} from 'vue'
 
 type ParentProvide<T> = T & {
   link(child: ComponentInternalInstance): void
diff --git a/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue b/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
index c3414f1..6e41888 100644
--- a/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
+++ b/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue
@@ -117,7 +117,7 @@ import { dayjs } from '../common/dayjs'
 import { deepClone, isArray, isEqual, padZero } from '../common/util'
 import { getWeekNumber, isRange } from '../wd-calendar-view/utils'
 import { useCell } from '../composables/useCell'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 
 const defaultDisplayFormat = (value, type) => {
diff --git a/uni_modules/wot-design-uni/components/wd-cell/wd-cell.vue b/uni_modules/wot-design-uni/components/wd-cell/wd-cell.vue
index e3748f2..0cfe7e3 100644
--- a/uni_modules/wot-design-uni/components/wd-cell/wd-cell.vue
+++ b/uni_modules/wot-design-uni/components/wd-cell/wd-cell.vue
@@ -60,7 +60,7 @@ export default {
 import { computed } from 'vue'
 import { useCell } from '../composables/useCell'
 import { useParent } from '../composables/useParent'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 
 interface Props {
   title?: string
diff --git a/uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue b/uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue
index 2a2bbc8..0ce1a47 100644
--- a/uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue
+++ b/uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue
@@ -97,7 +97,7 @@ export default {
 import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
 import { debounce, getRect, getType } from '../common/util'
 import { useCell } from '../composables/useCell'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 
 const $container = '.wd-col-picker__selected-container'
diff --git a/uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue b/uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue
index b4acb10..b11957f 100644
--- a/uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue
+++ b/uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue
@@ -144,7 +144,7 @@ import { computed, getCurrentInstance, nextTick, onBeforeMount, onMounted, ref,
 import { deepClone, getType, isArray, isDef, isEqual, padZero } from '../common/util'
 import { useCell } from '../composables/useCell'
 import { type DateTimeType, getPickerValue } from '../wd-datetime-picker-view/type'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 interface Props {
   customClass?: string
diff --git a/uni_modules/wot-design-uni/components/wd-form-item/wd-form-item.vue b/uni_modules/wot-design-uni/components/wd-form-item/wd-form-item.vue
index aa6145d..53ddfa2 100644
--- a/uni_modules/wot-design-uni/components/wd-form-item/wd-form-item.vue
+++ b/uni_modules/wot-design-uni/components/wd-form-item/wd-form-item.vue
@@ -36,7 +36,7 @@ export default {
 import { computed, ref } from 'vue'
 import { useParent } from '../composables/useParent'
 import WdCell from '../wd-cell/wd-cell.vue'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 
 interface Props {
   prop: string
diff --git a/uni_modules/wot-design-uni/components/wd-form/wd-form.vue b/uni_modules/wot-design-uni/components/wd-form/wd-form.vue
index b58f511..60f675c 100644
--- a/uni_modules/wot-design-uni/components/wd-form/wd-form.vue
+++ b/uni_modules/wot-design-uni/components/wd-form/wd-form.vue
@@ -19,7 +19,7 @@ export default {
 import { reactive, watch } from 'vue'
 import { deepClone, getPropByPath, isDef, isPromise } from '../common/util'
 import { useChildren } from '../composables/useChildren'
-import { FormRules, FORM_KEY, ErrorMessage, FormItemRule } from './types'
+import { type FormRules, FORM_KEY, type ErrorMessage } from './types'
 
 interface Props {
   // 表单数据对象
diff --git a/uni_modules/wot-design-uni/components/wd-input/wd-input.vue b/uni_modules/wot-design-uni/components/wd-input/wd-input.vue
index 86d03ba..f188f0d 100644
--- a/uni_modules/wot-design-uni/components/wd-input/wd-input.vue
+++ b/uni_modules/wot-design-uni/components/wd-input/wd-input.vue
@@ -88,7 +88,7 @@ export default {
 import { computed, onBeforeMount, ref, watch } from 'vue'
 import { objToStyle, requestAnimationFrame } from '../common/util'
 import { useCell } from '../composables/useCell'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 
 interface Props {
diff --git a/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue b/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue
index cb9fef3..c07c7d8 100644
--- a/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue
+++ b/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue
@@ -1,24 +1,20 @@
 <template>
-  <view
-    :class="`wd-picker ${disabled ? 'is-disabled' : ''} ${size ? 'is-' + size : ''}  ${cell.border.value ? 'is-border' : ''} ${
-      alignRight ? 'is-align-right' : ''
-    } ${error ? 'is-error' : ''} ${customClass}`"
-  >
+  <view :class="`wd-picker ${disabled ? 'is-disabled' : ''} ${size ? 'is-' + size : ''}  ${cell.border.value ? 'is-border' : ''} ${alignRight ? 'is-align-right' : ''
+    } ${error ? 'is-error' : ''} ${customClass}`">
     <!--文案-->
     <view class="wd-picker__field" @click="showPopup">
       <slot v-if="useDefaultSlot"></slot>
       <view v-else class="wd-picker__cell">
-        <view
-          v-if="label || useLabelSlot"
+        <view v-if="label || useLabelSlot"
           :class="`wd-picker__label ${customLabelClass}  ${isRequired ? 'is-required' : ''}`"
-          :style="labelWidth ? 'min-width:' + labelWidth + ';max-width:' + labelWidth + ';' : ''"
-        >
+          :style="labelWidth ? 'min-width:' + labelWidth + ';max-width:' + labelWidth + ';' : ''">
           <template v-if="label">{{ label }}</template>
           <slot v-else name="label"></slot>
         </view>
         <view class="wd-picker__body">
           <view class="wd-picker__value-wraper">
-            <view :class="`wd-picker__value ${ellipsis && 'is-ellipsis'} ${customValueClass} ${showValue ? '' : 'wd-picker__placeholder'}`">
+            <view
+              :class="`wd-picker__value ${ellipsis && 'is-ellipsis'} ${customValueClass} ${showValue ? '' : 'wd-picker__placeholder'}`">
               {{ showValue ? showValue : placeholder }}
             </view>
             <wd-icon v-if="!disabled && !readonly" custom-class="wd-picker__arrow" name="arrow-right" />
@@ -28,16 +24,8 @@
       </view>
     </view>
     <!--弹出层，picker-view 在隐藏时修改值，会触发多次change事件，从而导致所有列选中第一项，因此picker在关闭时不隐藏 -->
-    <wd-popup
-      v-model="popupShow"
-      position="bottom"
-      :hide-when-close="false"
-      :close-on-click-modal="closeOnClickModal"
-      :z-index="zIndex"
-      :safe-area-inset-bottom="safeAreaInsetBottom"
-      @close="onCancel"
-      custom-class="wd-picker__popup"
-    >
+    <wd-popup v-model="popupShow" position="bottom" :hide-when-close="false" :close-on-click-modal="closeOnClickModal"
+      :z-index="zIndex" :safe-area-inset-bottom="safeAreaInsetBottom" @close="onCancel" custom-class="wd-picker__popup">
       <view class="wd-picker__wraper">
         <!--toolBar-->
         <view class="wd-picker__toolbar" @touchmove="noop">
@@ -53,21 +41,10 @@
           </view>
         </view>
         <!--pickerView-->
-        <wd-picker-view
-          ref="pickerViewWd"
-          :custom-class="customViewClass"
-          v-model="pickerValue"
-          :columns="displayColumns"
-          :loading="isLoading"
-          :loading-color="loadingColor"
-          :columns-height="columnsHeight"
-          :value-key="valueKey"
-          :label-key="labelKey"
-          @change="pickerViewChange"
-          @pickstart="onPickStart"
-          @pickend="onPickEnd"
-          :column-change="columnChange"
-        />
+        <wd-picker-view ref="pickerViewWd" :custom-class="customViewClass" v-model="pickerValue" :columns="displayColumns"
+          :loading="isLoading" :loading-color="loadingColor" :columns-height="columnsHeight" :value-key="valueKey"
+          :label-key="labelKey" @change="pickerViewChange" @pickstart="onPickStart" @pickend="onPickEnd"
+          :column-change="columnChange" />
       </view>
     </wd-popup>
   </view>
@@ -89,7 +66,7 @@ import { getCurrentInstance, onBeforeMount, ref, watch, computed, onMounted, nex
 import { deepClone, defaultDisplayFormat, getType, isDef } from '../common/util'
 import { useCell } from '../composables/useCell'
 import { type ColumnItem, formatArray } from '../wd-picker-view/type'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 
 interface Props {
@@ -229,6 +206,7 @@ watch(
   (newValue) => {
     pickerValue.value = newValue
     // 获取初始选中项,并展示初始选中文案
+
     if (isDef(newValue)) {
       if (pickerViewWd.value && pickerViewWd.value.getSelects) {
         nextTick(() => {
@@ -458,7 +436,7 @@ function setShowValue(items) {
   const { valueKey, labelKey } = props
   showValue.value = (props.displayFormat || defaultDisplayFormat)(items, { valueKey, labelKey })
 }
-function noop() {}
+function noop() { }
 function onPickStart() {
   isPicking.value = true
 }
diff --git a/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue b/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue
index becbb39..bc53922 100644
--- a/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue
+++ b/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue
@@ -112,7 +112,7 @@ import { getCurrentInstance, onBeforeMount, ref, watch, nextTick, computed } fro
 import { useCell } from '../composables/useCell'
 import { getRect, getType, isArray, isDef, requestAnimationFrame } from '../common/util'
 import { useParent } from '../composables/useParent'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 
 type SelectPickerType = 'checkbox' | 'radio'
 
diff --git a/uni_modules/wot-design-uni/components/wd-swipe-action/wd-swipe-action.vue b/uni_modules/wot-design-uni/components/wd-swipe-action/wd-swipe-action.vue
index 3c6cb33..cdca820 100644
--- a/uni_modules/wot-design-uni/components/wd-swipe-action/wd-swipe-action.vue
+++ b/uni_modules/wot-design-uni/components/wd-swipe-action/wd-swipe-action.vue
@@ -3,9 +3,8 @@
   <view
     :class="`wd-swipe-action ${customClass}`"
     @click.stop="onClick()"
-    @touchmove="stopPropagation ? nothing : ''"
     @touchstart="startDrag"
-    @touchmove.prevent="onDrag"
+    @touchmove="onDrag"
     @touchend="endDrag"
     @touchcancel="endDrag"
   >
@@ -58,7 +57,6 @@ const props = withDefaults(defineProps<Props>(), {
 const queue = inject<Queue | null>(queueKey, null)
 
 const wrapperStyle = ref<string>('')
-const stopPropagation = ref<boolean>(false)
 
 // 滑动开始时，wrapper的偏移量
 const originOffset = ref<number>(0)
@@ -131,8 +129,7 @@ function changeState(value: string, old?: string) {
     }
   })
 }
-/** 防穿透函数的占位符 **/
-function nothing() {}
+
 /**
  * @description 获取左/右操作按钮的宽度
  * @return {Promise<[Number, Number]>} 左宽度、右宽度
@@ -202,12 +199,11 @@ function onDrag(event) {
   if (props.disabled) return
 
   touch.touchMove(event)
-
   if (touch.direction.value === 'vertical') {
-    stopPropagation.value = false
     return
   } else {
-    stopPropagation.value = true
+    event.preventDefault()
+    event.stopPropagation()
   }
 
   touching.value = true
@@ -238,7 +234,6 @@ function endDrag() {
   if (props.disabled) return
   // 滑出"操作按钮"的阈值
   const THRESHOLD = 0.3
-  stopPropagation.value = false
   touching.value = false
 
   getWidths().then(([leftWidth, rightWidth]) => {
diff --git a/uni_modules/wot-design-uni/components/wd-textarea/wd-textarea.vue b/uni_modules/wot-design-uni/components/wd-textarea/wd-textarea.vue
index ca326a7..47eab34 100644
--- a/uni_modules/wot-design-uni/components/wd-textarea/wd-textarea.vue
+++ b/uni_modules/wot-design-uni/components/wd-textarea/wd-textarea.vue
@@ -78,7 +78,7 @@ export default {
 import { computed, onBeforeMount, ref, watch } from 'vue'
 import { objToStyle, requestAnimationFrame } from '../common/util'
 import { useCell } from '../composables/useCell'
-import { FORM_KEY, FormItemRule } from '../wd-form/types'
+import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useParent } from '../composables/useParent'
 type ConfirmType = 'send' | 'search' | 'next' | 'go' | 'done'
 
diff --git a/uni_modules/wot-design-uni/components/wd-watermark/wd-watermark.vue b/uni_modules/wot-design-uni/components/wd-watermark/wd-watermark.vue
index 9836dc6..119c528 100644
--- a/uni_modules/wot-design-uni/components/wd-watermark/wd-watermark.vue
+++ b/uni_modules/wot-design-uni/components/wd-watermark/wd-watermark.vue
@@ -491,7 +491,6 @@ async function drawImageOffScreen(
   img.crossOrigin = 'anonymous'
   img.referrerPolicy = 'no-referrer'
 
-  img.referrerPolicy = 'no-referrer'
   if (isBase64Image(image)) {
     img.src = image
   } else {
diff --git a/uni_modules/wot-design-uni/package.json b/uni_modules/wot-design-uni/package.json
index 13127ee..c4fc79d 100644
--- a/uni_modules/wot-design-uni/package.json
+++ b/uni_modules/wot-design-uni/package.json
@@ -2,7 +2,7 @@
 	"id": "wot-design-uni",
 	"name": "wot-design-uni",
 	"displayName": "wot-design-uni 基于vue3+Typescript的高颜值组件库",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"description": "一个基于Vue3+TS开发的uni-app组件库，提供60+高质量组件，支持暗黑模式和自定义主题。",
 	"keywords": [
         "wot-design-uni",
@@ -12,7 +12,7 @@
         "暗黑模式"
     ],
 	"main": "index.ts",
-	"repository":"https://github.com/Moonofweisheng/wot-design-uni.git",
+	"repository": "https://github.com/Moonofweisheng/wot-design-uni.git",
 	"engines": {
 		"HBuilderX": "^3.8.7"
 	},
diff --git a/utils/request.js b/utils/request.js
index d0e494a..ebdccc3 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -138,4 +138,43 @@ export function uploadFile({
 			},
 		});
 	})
-}
\ No newline at end of file
+}
+
+const uploadImage = async ({ filePath, formData, name } = {}) => {
+
+	return new Promise(async (resolve, reject) => {
+
+		try {
+			const token = uni.getStorageSync("token");
+			const header = {
+				Authorization: `Bearer ${token}`
+			};
+
+			const formData = {
+				parent_id: 0,
+				type: "image",
+			};
+
+			uni.uploadFile({
+				url: 'https://saasdemo.byin.vip/admin/system/uploadImage',
+				filePath: filePath,
+				name: name || 'file', // 表单中文件字段的名称
+				formData: formData,
+				header: header,
+				success: (uploadFileRes) => {
+					const result = JSON.parse(uploadFileRes.data);
+					resolve(result)
+				}
+			});
+
+		} catch (error) {
+			reject(error)
+		}
+
+	})
+
+
+
+};
+
+export { uploadImage };