From 60c74ea9d43eefcc5c39da2185c91559d004b56f Mon Sep 17 00:00:00 2001
From: wpage <2283204413@qq.com>
Date: Tue, 26 Nov 2024 21:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   2 +-
 src/components/PetSitterCard.vue              |   1 +
 src/components/icon/Housekeeping.png          | Bin 0 -> 946 bytes
 src/components/icon/x_快递员.png              | Bin 0 -> 3508 bytes
 src/components/icon/上门回收管理.png          | Bin 0 -> 2145 bytes
 src/components/icon/健康指标 (1).png          | Bin 0 -> 967 bytes
 src/components/icon/宠物.png                  | Bin 0 -> 1181 bytes
 src/components/icon/清除.png                  | Bin 0 -> 1218 bytes
 src/components/icon/环境应急救援队 (1).png    | Bin 0 -> 982 bytes
 src/components/icon/饮用水.png                | Bin 0 -> 861 bytes
 src/manifest.json                             |   2 +-
 src/modules/pet/createOrder/createOrder.vue   | 114 ++++
 src/modules/pet/extended/index.vue            |   1 +
 src/modules/pet/login/phone.vue               | 107 ++--
 src/modules/pet/message/index.vue             |   1 +
 src/modules/pet/push/index.vue                |   1 +
 src/modules/pet/service/accompany.vue         | 452 ++++++-------
 src/modules/pet/service/detail.vue            | 592 ++++++++++++------
 src/modules/pet/service/search.vue            |  54 +-
 src/modules/pet/space/index.vue               |   2 +-
 src/pages.json                                |  11 +-
 .../index/components/quickServiceCarousel.vue |   8 +-
 src/pages/index/index.vue                     | 124 ++--
 src/scss/_main.scss                           | 520 +++++++--------
 src/store/routers.js                          |  12 +-
 src/types/uni-pages.d.ts                      |   1 +
 src/utils/commUtils.js                        |   5 +-
 27 files changed, 1153 insertions(+), 857 deletions(-)
 create mode 100644 src/components/icon/Housekeeping.png
 create mode 100644 src/components/icon/x_快递员.png
 create mode 100644 src/components/icon/上门回收管理.png
 create mode 100644 src/components/icon/健康指标 (1).png
 create mode 100644 src/components/icon/宠物.png
 create mode 100644 src/components/icon/清除.png
 create mode 100644 src/components/icon/环境应急救援队 (1).png
 create mode 100644 src/components/icon/饮用水.png
 create mode 100644 src/modules/pet/createOrder/createOrder.vue

diff --git a/src/App.vue b/src/App.vue
index 5895ab8..3e80105 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,7 +24,7 @@ onLaunch(() => {
 })
 
 // 当应用进入前台时继续轮询服务
-onShow(() => {
+onShow((options) => {
   console.log('应用显示出来了...')
   notificationService.startPollingUnreadMessages()
 
diff --git a/src/components/PetSitterCard.vue b/src/components/PetSitterCard.vue
index d990f06..c733841 100644
--- a/src/components/PetSitterCard.vue
+++ b/src/components/PetSitterCard.vue
@@ -1,6 +1,7 @@
 <template>
   <view @click="toServiceDetail" class="pet-sitter-card bg-white p-4 rounded-lg shadow flex">
     <!-- 左侧头像和认证标识 -->
+<!--    {{ petSitter}}-->
     <view class="flex-shrink-0 mr-4 relative">
       <image :src="imgUrl(petSitter.url)" class="w-16 h-16 object-cover rounded-full"></image>
       <view class="absolute top-0 left-0 bg-[#ffc107] text-white rounded-full text-xs px-2 py-1">
diff --git a/src/components/icon/Housekeeping.png b/src/components/icon/Housekeeping.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c11021692d9a064f33ed2b1cbf5097963a61af3
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00009a7bBm000XU
z000XU0RWnu7ytkRWJyFpR9J=Wm(OclRTRfR-}~NVY%ytUsT!;hw<5HVf{Rdf<3a=%
zBI352g18bv+_(^NXS?@LaG};8xYCsx1X09P#0r8|iOD3HK+=rO%)4I~b6+}1X41@i
zUHXN~{qgQO_dDmDd(Ro2KYyNKh%r7R=`8SRr_=el*Xto^&mP+}n@yU{Cboy_ISTR-
z>(5EL3Mhnd(e{NH<H|4+bq+6)&CJXUTmK9=mBy#CENeF!jjtyrCfMIX2nQ@QE=E~m
zcilF5o==WCs3;0-*CH~C#I3=J?OUVFemC3^YHPR)_@6|HQ86(t9;1Jox?{*RfF<C1
zZ4#2+1zrY@R}kN@eYp~efg3RoyjDd=!nCBf>&C>;mu_6tb;t6+cmsG6xN!#=0Z#xQ
z)gm$QI&RqB0VWcO(?IhM;$7gOfqA=bOl$ya^xbkl@I?i6t94_dorplS+X1jP$`aYW
z`JU_)V=RYTlG=5Wm+ieIY?Eafw%7M1rq<x$d7kgaMU1gsCy9j+)(*JC_9goM9b9|C
z_PLTsQ4~lb%QAq<BvJ{mheR&v{TSnWwrBV4e+u{xcvTWHM!MZD-EJ4#2P&?kBI()<
z%vs<Q;Kih{7}9b{S0ueD>6q=(J*`R%Zeul1Y*r+_1H1ynLj;aVy4Q9`5+MYDl{zsY
zsg+9#KyLe+F$5m~+A+o*Np&pIwY{3#z9i{&`W86qPijhf*7l<9mZb9492Z-*Te<Cv
zz#|nDoC_f=0?RSRPDK(ovn*Q)z}X7I*nU1$+JCdJFdhTjw%Y+%1m<nOl|Ebs<|Taz
zAn7IgbwgqM*R=NyNsmuXPG(t_?Zg;2Dw1g1b^vYy3&6MO!w-@cfIrjx^Yq=oy6pwv
zE8w*4`_i6&Dw0@+exX|yCMQ!ro%%8%JvbmV0U&AGcHZf9X48MvsyAe%B(YsVH~{o|
zy)D~>5UN_DRVwSHg?mz8THr+L%Z!?ntR?BVZEtRFE)_*VmSw+GVIb)zNd)@-hQ42~
z0e_|WwbVLk{v-YTf$g;r!Ut1RQ`?P3gBasg;CpUA@x4P@1Uj}qB$arYo11$WxMBN*
zq%**hq;=p-TKg@PaF5#l7x-P$l%$g(gg^S6OpNh@?WYsr;t&I5k~V>lf$Ng^56st>
USWoWu2LJ#707*qoM6N<$f+jt<H2?qr

literal 0
HcmV?d00001

diff --git a/src/components/icon/x_快递员.png b/src/components/icon/x_快递员.png
new file mode 100644
index 0000000000000000000000000000000000000000..228c9d661b670b59f96a9b393a0e09dcaa4ede3c
GIT binary patch
literal 3508
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

literal 0
HcmV?d00001

diff --git a/src/components/icon/上门回收管理.png b/src/components/icon/上门回收管理.png
new file mode 100644
index 0000000000000000000000000000000000000000..77a7aff21313102a281c7170efd107c3e257a5bb
GIT binary patch
literal 2145
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
XwHdt0_Uk3_00000NkvXXu0mjfS;!%?

literal 0
HcmV?d00001

diff --git a/src/components/icon/健康指标 (1).png b/src/components/icon/健康指标 (1).png
new file mode 100644
index 0000000000000000000000000000000000000000..a7318d15336509e0ceb7b2f4aa453a1417b19a59
GIT binary patch
literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkRc}YY;R9J<*mrrP1RTRd5-@QX7f&)T>U?2!tRA`ooSgfwvKolf`
zWT+@gD`HVx6l!rJtt%D(wG|OTtEfepk>W!9v#1dj)NL1~g3^sU+k(lWI(c)Ci@f`|
z^YSJ$(=>kYn7Q}dd%o|UciuhsYHn_hh!6sjinb)otoU`#O_|wZ2w@tSkhBB9%&q{J
zfs6He{qs(zb2ZM%?S<dmPr*@RI2;7_hY;qYuoP*#)9JhmoXMZB2RU{F?0bMO%<O$&
zen_zZkC@q4z$d_6*DK&zGy4fx9D#U)5a1W!*r)=Qfm2%`?t!G^z?W4vKRG#BH1cG*
z2+UOt-XeAa<G{HzXUY+H1-N4y$RnNy4x}BafIX6qZU?KRpUv#e{Qqgzle<@dnLT#{
zInM(pfo82%n*#2Z^luec+y@S_wQT<bSeEpi_x{H$%l=G_-EJ32dy{v+m~)<X`EK>#
z7RUkK1D*sv1$xLkoese5lI~3V&1}CU9B`YNJurZvJ;44FaLCNavaINog!dlr{oaZ>
z^T3p2aOi&nnnQ?q2Utow%q%`t0x+{hXJ$J$^J-?z{51^{aRg|G5H<(^_Ek*?Axt}9
zqMyeQ!ehYsq<ZxeaT0hvAx|T5FK}xgiU}7>Y6V^cK8__dL0QCdqtQ6hXf$Gb7tjKh
zBq6DC^#GD~^s5Em1L?kSUmp>x-uowjY-MEy=N!(tRz9Z1dL$~}e}u~q6Dh9I`&mw!
zSu1zgBf`v@z@^pI)!5epW|A>2l3lM1GrQtgKgkpbAuIrY$CFFGqMP&8ltp~Awzd}k
zAEWdY41vo|(uG9PVc>`4y}w;rL63-J+)`e0M}nl^-PqXJS>T$PeFmHuA0LnQr+}v`
z=9MF{i;a;P3L%8H1FiyRfrsn$dbI79^ztTimw;9&=|)8x_^a0KcJbc7kQi=~^eS-6
z00%J=GXus|LedA``=T0N%Cd|s%aHU2aL<r_Moqei;>27&mOld=x=yE~;H{XzwQjcy
z6lZ(?Kae+pUt^=Z6P^M-+Ad}@J3y(HRBgqNOFFj=<i~*z%l-Xo!9LbQb)(1+120zD
zHoF<MLkKg#w_D&o1MCJ)^cyhfZg>G$FtdkpXa5XKEa`sWQIdqKf@WuDH+JS%>ktCY
px$^aTLDDo3pZYM@^VD~W{{S5RSHFMSdk+8r002ovPDHLkV1mjN!7l&+

literal 0
HcmV?d00001

diff --git a/src/components/icon/宠物.png b/src/components/icon/宠物.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba0aa24e8e0fe69d38df3a5068147c06055ec2f6
GIT binary patch
literal 1181
zcmV;O1Y-M%P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00009a7bBm000XU
z000XU0RWnu7ytkSPf0{UR7i=fmS2cfRTRd5-#X`9n7N82=14PHsgx#CISN5jDV0Q-
zl!YWhsT2fKU`P?Y<U^4N6%`RArdWYdnHnTkl7ti)`JhHgHHFrs{jr9bZuidFd-ZVd
zkx}kAqxQjlxO=a)zkT*z-?x`$&6<U~1K{pR!pz9?95a)<UjsZP=~Cbln&SxYqoj2)
z#!Zr<yQjcnNf!Y7C4K1bq>Y4$z%<|+;3t6o{(j2kvYXi<Nk`p%?hs@E9YBY>cS%|S
zydmj!;Km}r-5&v-Q)g#q3HS<_?(Tm{dRNjby}iAA%jGhXNRk9#K?vbhGaFx=$XVc8
zlZ2#k0FurFmd6;sXl-p>FR8t;JAiG#j2PpVvt^UiX+X{0H=Z&<nx@MneFDshF%n}$
z(y>~tw$R<5J{!Uq<Kbk?m@$M94yI|k6lgsqW~`*8fJ@pf33tcLc1ijdxM`$h?!Gz3
z_>5&)MwVs21OE&aENM0Hj=N7t(-cVnYk=jzh%Qvp>t>c)sZ=7%vbDfP!{jUkK63Zz
zgT`Jnvzvk6M!>mJ5}G-4=J}G20@+A*3e<o_z*Yb=BZM$X(r)VV7!vNj&?L=212TXT
zum!jeAjU`t;fEOGot)-c03@w2;FdEWJCO@)09HZ$E8YD|;GSXft}x*8vmh+6R?-?X
zD@eDy`va$mpJ2d*b07qG6j(9n|2kmh5V11AM!0Y{@aL(64HtR|xV0e{faifHn=N8M
z7>1~ay1-|+`<1|p&4MJo=k7O{S)tR_zzfX?PghwLNp}Gs1O3#Wp@)Gdn#5+3-gfs3
zlO!QY5+tnx_MJp1>DXxq_W+*_I;sLM1AjM(9|vrUF%~i#02Wi%E<nxP{ez*{VvN;V
ztwyz41?r~W_@zJ`BCRuousMW)Bw~!;y8FG2x$ly;wzi{Y_R!!Acc-<rwXeIo`@the
zjvUVOoN~ELk|e|!arZ@%hSZ#-X+UOXy8uE62hHqi;MZj8)Tw`j5N3xEE*o@ol~JQc
z&F$^&{k*NMjXcju)09%FlmPQ3ZD4qJx*phWW<8BfY<2eo)_CWhEy&!xKg+TO)oOL`
z#EBDWZ*OPx=+O(ZEZgbsd#FFeEyIu%Yi$Ht8U<8w_x;J(v14)fZs0melaeI4!_0Q(
zc@99WR-50_(z4CWCNqpVH^F#!$K7`oZHc<Nx{Aq;YPEV5@P08MX-S^vo7ALC&jjw?
z0sIV*OqntTGb2sY-Vnl}qE&SFWg&!(=StQ<B58*ttWkBu7#SECpjNAq=lR{h`u~Ru
zB;5~O3=JPG^wrnb$MNIGsZ=WaB)thIyz)%(HFZ}iP<Hpp?tZdy4-)qGz!Ec?mn6ws
zjIeK^-hDp?%x?JZ<G_C4Q#0FdW@yfwIfdEM)6+wxQlVTfQ#8R@mQkrxrUAD}nn&Hf
v%G4iW2Yvw#06W}$x0&@dD)Yp;gRka4{&vL#k!_Ig00000NkvXXu0mjfLj^X;

literal 0
HcmV?d00001

diff --git a/src/components/icon/清除.png b/src/components/icon/清除.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a1e4d97971a83c6142d251aa0f1d2e78f4947d
GIT binary patch
literal 1218
zcmV;z1U>tSP)<h;3K|Lk000e1NJLTq0015U0018d1^@s6@N9ht00009a7bBm000XU
z000XU0RWnu7ytkSbV)=(R7i=vmtAZXMHI(>XJ(gsOA3aN7!uH=YE9F$O#rJ<V}cr+
z62%AnelfnFBH)7>eG!!Ci_s?}f*&XbA4pIm!KhV}1~nFuj}TNsB(WeLqCQx~a(nOH
zIX>)c*)F^7tug+S$<EHqng5yD^R?36-cAuj1QEd)gNRVARuK^Zj4{+|HAI9k3~|nl
z$rS8$y{fKN)e#X{8x*qsx9CyTkARt8v5x<PxCi(Qn4TJIH4O+pq^d8fYWKe&y%8A5
zkOCZ^?8Iw;4XTQ&t}@270;g295z=1Z6CnH1{}z#ZOky|%?XHwSlZafI%r!vTpF>&^
zkv`xXV@!P8d7G)~Q^4>3br-NVIjySR8w9~lYwclGJs=|Q0iD2N;Nu)+R792nUjay0
zR~ODXthGc@gmZ435+X7WxC|IfUGcjja)*eJbL|zNoE;RAUScByAjnLjsu*K1#t=mj
zz)9ews-_h>;!mA(uw2r<G$}wMR-NEcV72eB_3xA6l!)9SBK_HkM*R3z;0X~~;@|7Q
zX5eK&{j&($RrT{Es-;nM;svVuw1^x8J_MGe<~9Kj`u;}X;R%SBIp><ZJC19CC%;Nn
z=d0><*4o9uqDg%9RiFmE<@<HujhuB?8)L3j)!o^Nz&W=IxY;>ZnusX}Z+h}~fGvRa
zN{oZ5cI6QpRXqq~Nh9F2-*_Ty1Mc_z*ML>o1tRiS;w9-O9UUD;M2@TKJm62@b-)43
zfh)K;`s85+7p{6W7YuGhL|TAfvjTR`oH<JDmqWlZ;2iKI(App=!0o_UU>~p-_ygz@
zk@dv!`XWeYXD1K`0}**fRiB-JpaP5nmlVveBz84`rNEaWaxQP7ojZ3f#u$Pi=n;`^
zc|K>YMOD8Cz6CA^nhJ<-Bfhag;FyS1lS5^_#FootDwPW7&!7LfR;xwRrcJvky+BnN
z85vm@1i=;&c?7t$fHc8uVnahjsMqTx{c$-UEm10!XlrZhkD{p84;^*RtsEU49cXH5
zIsnWsAgckPC%6XK4^XXEQB}e)93xLKE^=9G0q$1S!y>ZPIk!Mn2b!CkznFmZH{#F<
z@PVrC2Z*AGD2fVmcV4U>2D*V!FZ5CrMK=_X?gM@V?gMbny^u+%05gdTgWX=qi%*;q
z81?CKg|+ta0@5MiF<_BTr$?M~dpy}}V+^HIi7*Vei^vXOXF66-m=;y_JLlYq0_FOE
zcA&+(;>I8dT7W&kF<^sV_cd|J^MkdPq)nC<2Z>9WexM^ox(+x>>|Ov>-~g}#Sm?*r
z5Qp98RdtKC_DmRtV{SERAs`~BiNE<~e+z@abKbRP_+<w@$-<0ykAI%=vW;DJ3Kin0
z^gz8{UtX`*XQ=AN)che;J>iuagLCfvq>jsCDy0w3xwpeG{H0tjPfy&&8`dGe<W3QJ
z1^ARWYi%vsYs$YcK@bpz;n`ZP)~%{5Rdqd(7~pAqYD|j5qJm<|#Ob)}oZB=!Jp9wF
gS+j;3DDubQ9~A!M<MG9e`~Uy|07*qoM6N<$f^oeryZ`_I

literal 0
HcmV?d00001

diff --git a/src/components/icon/环境应急救援队 (1).png b/src/components/icon/环境应急救援队 (1).png
new file mode 100644
index 0000000000000000000000000000000000000000..ee74cc59a1d443ce3a2428080e650fa11b968982
GIT binary patch
literal 982
zcmV;{11bE8P)<h;3K|Lk000e1NJLTq001EX0018d1^@s6X_Tb000009a7bBm000XU
z000XU0RWnu7ytkRh)G02R9J<@mQ83}RTRg6|NCAhyf6_gx~fHjf<^@~8IXXaZA76c
zW+4?9#-+uLRl$OSRB=;rCsbnmAhat{=)#5Qrb!V6Q3r}u`$6J%D71<nnVGzt<05au
z^kqI?npppEnK$R%ch2wKch9*;V`F0!QN3O#NfO*0cSjN-1l*kv0%it)q`S;)Lelig
z%E}DzS3lozA%gze3rqo1?*5P@0EUK!D!{^j1#xRDC@^JacXpa&X5}KzwgOQGo&gSo
z5T<~#yZ3w`gfP655J!_FnE~!-Ep-u@*^WURmGnm8$Ze8T2qNqhfTS~do4c1=+0<(U
zN%R;8d&I2)w*#|Tz{w6^wLbol)bn#31n%u%Ujg0&E(6~HySq7X_gWAC8|nv<*SxzA
zOF97D)6coPpWhC|Ejfr<6h)J3Yip+@^$nisYvAWX5M6S8v@I3S0r#z~t^EPqR1g43
z^HCHPn%gZqMq2=8_7w2vRseu6fscAkXfzrd*Kr6PIY!;R=I(EW5RS86EsN@$nZ4X=
zLcZX2TZy|R?UnQ-u&-!zNpsoCb=?b{DsDV7GP23Iyu3_y9QUddEnNmab@z`Y{gA&|
ztyZa2DgYbBX%j>Tr;)oaNP0SFH{hpi{NnBx%<MvvB<GvW=1Sg4nx>S?#lB*^w6v7B
zmEC<&(lOS1fltirOto75b$oo>`Z;uW1_lO5)3gu(Kpe-L7GpR~)5n1Cfc-7w#KZ)R
zMq|Cq#xZG{5=9a9dYveWHae^8QQU#JEa_o)f6&ZmG#VsH0<a5s0{9*Hmi4n^M-+E>
zgK`u_ueI&s67WK^**q-iHlVfCXMsiFGoTJMdi?fWCRHkx{EppkW~Z~}btZ)HB2cUw
z?iNIv0}i!i$N1{%>eArg;8kd=6Ot&EO1S%JU=sK|gm7ZJ008d(T-%GjE$RDGsdNQ+
z{~Cx)yMWmc!Xohac7wMhX)c2}F6l@+9I&rFHC}2qo3Bf{c^iQab-I@UoB(EW_LGtp
zRH;-RarbwC`>!YXHgq<Q<41v7FtgqN0|3A)WN99NdEnI>8QsjD1-@$iZ*9zDz~LLj
z@H}v`-O#=<-v#~wKIrh^72qOp$=xqXng$-&YIJu$B55{n&mSBgO8PrXo!@{T-Tezm
zmvZyo3?b}s_h~cRBWXBmfXmtSHGQ4CFR)%=Pj!O(7v}PY%b^QwjQ{`u07*qoM6N<$
Eg4{30hyVZp

literal 0
HcmV?d00001

diff --git a/src/components/icon/饮用水.png b/src/components/icon/饮用水.png
new file mode 100644
index 0000000000000000000000000000000000000000..415400b1a6e648eccd7e257a7ea22febb0b40dd7
GIT binary patch
literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq0018V0018d1^@s6AFdWT00009a7bBm000XU
z000XU0RWnu7ytkR4@pEpR7i=vmOXD=RS<@s_j;|Ykt|Cj0b&biNvagMiICDEQShM@
z2nitp{{i>~AUYaEfso)I00jj|6e)rrK$U`kA_899*iMK|Y%J%-XI_dudvkZSpNW@|
zj&#q*%rkTD%-pNx<>i+m;te2x89+=|4gnQK@p(hi0r0|<fn8!7NnbWnN;`QiN&49K
zO{N$9BJi4|*_6_a25<|w101vc8E|<@U?jb4`^`MvDu5e63&8eS+eZ$y-5F;(U|^$=
zv;+K+JzJcanK?43BvMM0Wl33<M8u*bfE7ub4YxyG$p@GA_xEWwn-oRCgWf_;EM{kC
zJI*|kZLZtC)5r%l^Wi5B4-X$0S{F%3>I8E#+rDL+M!tsIwke9@(fRrLC7^kf4%j9l
zkn~Vq`bQFtJXy(JJ_TF?jvX2Kp6uH`k)N*vUGOqPpPT}?SN;SjatW-`uJ`{#_H4Io
zQ{;tpVEaA{t=)&tZE{~JayFL0-h@VelynaGdP2PeNn4Vt$YHX`*ML`O=gRBAwFz`9
zPA76CO=93x;P?Ez0bBt79Y;~pwW{`O>(|Fow*5&&T#N`(N<;(^amDrrV>(`OimXgT
ztd8OJRY`BxZmT}tmGs>x8xgVEVb&vW0YlqbO6mQG*sgu0su2+fDW&&D!O0B`sM>1>
zp19X|dSzpGclWE55;dJla(n(}VPWByq9{%eYR{5d6}+~-Lpu{s_EWO`)7;$L&D^8=
z!X@1Wez1LdKmaB1cR%<6?PTZ+mvp?@Z1w|otwqGc1HjO}-Kr|;@4RGq$2x2KjBQd%
z)t9O>^1D9;oErh(t>8V0(;A{U2YfVSAK*ja#Gp;vYqsxpcty|t&~meVJ|e!5v_$u<
zor;K0ZC@DS+<JY|o7v;k`isCbwlCBE_j??8TGC^qbbIYLdJ<-93<Chif#>>V{V<W#
zWxw~@H)+@UwB)a0@ZW&%rv$zV{M-fa$@UU>2l(}f!7IR9w)g71ey#Kp@VxD3^MAG(
n(enq0B+2%+q;G*My$AjS4*<F1-JuQ{00000NkvXXu0mjfXgig!

literal 0
HcmV?d00001

diff --git a/src/manifest.json b/src/manifest.json
index 6d7c862..5b10230 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -163,7 +163,7 @@
   },
   "quickapp": {},
   "mp-weixin": {
-    "appid": "wxf2c6d4b7361366b4",
+    "appid": "wxfcaf84cb7965fcae",
     "setting": {
       "urlCheck": false,
       "minified": true
diff --git a/src/modules/pet/createOrder/createOrder.vue b/src/modules/pet/createOrder/createOrder.vue
new file mode 100644
index 0000000..e028a7f
--- /dev/null
+++ b/src/modules/pet/createOrder/createOrder.vue
@@ -0,0 +1,114 @@
+<template>
+  <view>
+    <view v-if="orderType=='feed'" class="feed">
+      <wd-cell title="请选择宠物数量"></wd-cell>
+      <view class="tags w-full grid grid-cols-5"
+            style="height: 100rpx; gap: 20rpx;padding: 20rpx;box-sizing: border-box">
+        <wd-tag
+          class="flex flex-center"
+          style="border-radius: 20rpx;font-size: 30rpx;outline: 2rpx #f0f0f0 solid "
+          v-for="item in 5"
+          :bg-color="selectedPetNum == item ? '#FCCB30' : '#fff'"
+          color="black"
+          :key="item"
+          @click="selectedPetNum = item"
+        >{{ item }}只
+        </wd-tag>
+      </view>
+      <wd-cell title="喂宠时间"></wd-cell>
+      <view class="tags w-full grid grid-cols-5"
+            style="height: 100rpx; gap: 20rpx;padding: 20rpx;box-sizing: border-box">
+        <wd-tag
+          class="flex flex-center"
+          style="border-radius: 20rpx;font-size: 30rpx;outline: 2rpx #f0f0f0 solid "
+          v-for="item in [30,60]"
+          :bg-color="selectedFeedTime == item ? '#FCCB30' : '#fff'"
+          color="black"
+          :key="item"
+          @click="selectedFeedTime = item"
+        >{{ item }}分钟
+        </wd-tag>
+      </view>
+      <wd-cell title="请选择服务时间"></wd-cell>
+      <wd-datetime-picker style="border: 2rpx #f0f0f0 solid;margin: 20rpx;" v-model="serviceTime"/>
+    </view>
+    <!--    <view v-if="orderType=='boarding'">-->
+    <view>
+
+      <wd-cell title="请选择宠物"></wd-cell>
+      <view class="flex gap-4" style="padding: 20rpx;">
+        <view class="add flex-center"
+              style="width: 120rpx;aspect-ratio: 1/1;background-color:#FCCB30;border-radius: 20rpx;">
+          <uni-icons type="plusempty" size="30" color="#777"></uni-icons>
+        </view>
+        <view class="pet-card flex-center gap-2"
+              style="border: 2rpx solid #e5e5e5;max-width: 300rpx;max-height: 120rpx;font-size: 25rpx;border-radius: 20rpx;padding: 25rpx"
+              v-for="item in 2">
+          <view class="avatar" style="height: 80rpx;width: 80rpx;">
+            <image
+              src="http://116.204.119.171:9000/linghe/static/home/cwpb.png"
+              style="width: 100%;height: 100%;border-radius: 50%;" mode="scaleToFill"></image>
+          </view>
+          <view class="info flex-column flex">
+            <text style="font-size: 28rpx;font-weight: bold;">宠物名称</text>
+            <text style="font-size: 25rpx;color: #d1d1d1;">宠物品种</text>
+          </view>
+        </view>
+      </view>
+      <wd-cell title="选择寄养时间" value="共五天" is-link></wd-cell>
+      <view class="flex justify-around">
+        <view :style="{borderLeft:index  == 1 ? '2rpx solid #e5e5e5':'',width:'50%'}"
+              v-for="(i,index) in [['2021-5-28','9:00'],['2021-6-2','9:00']]">
+          <view style="text-align:center;">{{ i[0] }}</view>
+          <view style="text-align:center;">{{ i[1] }}</view>
+        </view>
+      </view>
+    </view>
+    <wd-cell title="联系人"></wd-cell>
+    <view style="margin: 20rpx;padding: 20rpx;border: 2rpx solid #f0f0f0;">
+      <wd-input v-model="hostNickName" no-border placeholder="请输入联系人姓名"/>
+    </view>
+    <wd-cell title="联系电话"></wd-cell>
+    <view style="margin: 20rpx;padding: 20rpx;border: 2rpx solid #f0f0f0;">
+      <wd-input v-model="phoneNumber" no-border placeholder="请输入联系电话"/>
+    </view>
+    <wd-cell title="备注"></wd-cell>
+    <view style="margin: 20rpx;padding: 20rpx;border: 2rpx solid #f0f0f0;">
+      <wd-input v-model="remarks" no-border placeholder="请输入备注信息"/>
+    </view>
+    <view class="w-full flex justify-between" style="border-top: 2rpx solid #f0f0f0;padding: 20rpx">
+      <view class="left">
+        <text color="red" style="font-size: 20rpx">￥</text>
+        <text color="red" style="font-size: 50rpx">
+          {{ orderType == 'feed' ? 30 : 50 }}
+        </text>
+      </view>
+      <view class="right"
+            style="background-color:#FCCB30;padding: 20rpx 30rpx;border-radius: 30rpx;font-size: 20rpx;font-weight: bold;">
+        <text>立即下单</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import {imgUrl} from "@/utils/commUtils";
+
+const orderType = ref("")
+onLoad((options) => {
+  orderType.value = options.type
+})
+const selectedPetNum = ref(1)
+const selectedFeedTime = ref(30)
+const serviceTime = ref("")
+const hostNickName = ref("")
+const phoneNumber = ref("")
+const remarks = ref("")
+</script>
+
+
+<style scoped lang="scss">
+view {
+  box-sizing: border-box;
+}
+</style>
diff --git a/src/modules/pet/extended/index.vue b/src/modules/pet/extended/index.vue
index 1a7811d..0838cf9 100644
--- a/src/modules/pet/extended/index.vue
+++ b/src/modules/pet/extended/index.vue
@@ -36,6 +36,7 @@ import { imgUrl } from '@/utils/commUtils'
 
 <style lang="scss" scoped>
 .container {
+  box-sizing: border-box;
   display: flex;
   flex-direction: column;
   gap: 20px;
diff --git a/src/modules/pet/login/phone.vue b/src/modules/pet/login/phone.vue
index 2b49c77..4cad469 100644
--- a/src/modules/pet/login/phone.vue
+++ b/src/modules/pet/login/phone.vue
@@ -1,8 +1,8 @@
 <route lang="json5">
 {
   style: {
-    navigationBarTitleText: "手机号登录",
-    navigationStyle: "custom",
+    navigationBarTitleText: '手机号登录',
+    navigationStyle: 'custom',
   },
 }
 </route>
@@ -10,20 +10,11 @@
 <template>
   <TopBar />
   <view class="login-phone">
-    <image
-      class="background"
-      :src="imgUrl('@/static/login/login.png')"
-      mode="aspectFill"
-    ></image>
+    <image class="background" :src="imgUrl('@/static/login/login.png')" mode="aspectFill"></image>
     <view class="content">
       <view class="input-container">
         <view class="">
-          <input
-            class="input"
-            type="text"
-            placeholder="请输入手机号"
-            v-model="phoneNumber"
-          />
+          <input class="input" type="text" placeholder="请输入手机号" v-model="phoneNumber" />
         </view>
         <view class="verification-container mt-[20px]">
           <input
@@ -33,7 +24,7 @@
             v-model="code"
           />
           <button class="get-code-button" @click="sendCode" :disabled="countdown > 0">
-            {{ countdown > 0 ? `${countdown}s后重新获取` : "获取验证码" }}
+            {{ countdown > 0 ? `${countdown}s后重新获取` : '获取验证码' }}
           </button>
         </view>
       </view>
@@ -43,95 +34,91 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted } from "vue";
-import { httpGet, httpPost } from "@/utils/http";
-import { useUserStore } from "@/store/user";
-import TopBar from "@/components/TopBar.vue";
-import { imgUrl, toast, toPath } from "@/utils/commUtils";
+import { ref, onMounted, onUnmounted } from 'vue'
+import { httpGet, httpPost } from '@/utils/http'
+import { useUserStore } from '@/store/user'
+import TopBar from '@/components/TopBar.vue'
+import { imgUrl, toast, toPath } from '@/utils/commUtils'
 
-const userStore = useUserStore();
+const userStore = useUserStore()
 
-const phoneNumber = ref("");
-const code = ref("");
-const countdown = ref(0);
-let timer = null;
+const phoneNumber = ref('')
+const code = ref('')
+const countdown = ref(0)
+let timer = null
 
 const sendCode = async () => {
   if (countdown.value === 0) {
     if (!phoneNumber.value) {
-      toast("请输入手机号");
-      return;
+      toast('请输入手机号')
+      return
     }
-    const res = await httpGet("/public/getCode", { phone: phoneNumber.value });
-    countdown.value = 60;
+    const res = await httpGet('/public/getCode', { phone: phoneNumber.value })
+    countdown.value = 60
     if (res.code === 200) {
-      toast(res.message);
+      toast(res.message)
     } else {
-      toast(res.message);
+      toast(res.message)
     }
     timer = setInterval(() => {
-      countdown.value -= 1;
+      countdown.value -= 1
       if (countdown.value === 0) {
-        clearInterval(timer);
+        clearInterval(timer)
       }
-    }, 1000);
+    }, 1000)
   }
-};
+}
 
 const login = async () => {
   if (!phoneNumber.value) {
     uni.showToast({
-      title: "请输入手机号",
-      icon: "none",
-    });
-    return;
+      title: '请输入手机号',
+      icon: 'none',
+    })
+    return
   }
   if (!code.value) {
     uni.showToast({
-      title: "请输入验证码",
-      icon: "none",
-    });
-    return;
+      title: '请输入验证码',
+      icon: 'none',
+    })
+    return
   }
 
-  const res = await httpPost(
-    "/public/login",
-    {},
-    { phone: phoneNumber.value, code: code.value }
-  );
+  const res = await httpPost('/public/login', {}, { phone: phoneNumber.value, code: code.value })
   if (res.code === 200) {
-    toast(res.message);
-    const data = res.data;
+    toast(res.message)
+    const data = res.data
     userStore.setUserInfo({
       id: data.userId,
       token: data.accessToken,
       expiresTime: data.expiresTime,
       refreshToken: data.refreshToken,
-    });
+    })
 
-    const userRes = await httpGet("/user/userinfo");
+    const userRes = await httpGet('/user/userinfo')
     if (userRes.code === 200) {
-      userStore.setUserInfo(userRes.data);
-      toPath("/");
+      userStore.setUserInfo(userRes.data)
+      toPath('/')
     } else {
-      toast(userRes.message || "登录失败请重新登录！");
+      toast(userRes.message || '登录失败请重新登录！')
     }
   } else {
-    toast(res.message || "登录失败请重新登录！");
+    toast(res.message || '登录失败请重新登录！')
   }
-};
+}
 
 onMounted(() => {
   if (timer) {
-    clearInterval(timer);
+    clearInterval(timer)
   }
-});
+})
 
 onUnmounted(() => {
   if (timer) {
-    clearInterval(timer);
+    clearInterval(timer)
   }
-});
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/modules/pet/message/index.vue b/src/modules/pet/message/index.vue
index 38e4ad6..20acdfe 100644
--- a/src/modules/pet/message/index.vue
+++ b/src/modules/pet/message/index.vue
@@ -63,6 +63,7 @@ const toPath = (path) => {
 
 <style scoped>
 .container {
+  box-sizing: border-box;
   height: 100vh;
   padding: 16px;
   background-color: #f8f8f8;
diff --git a/src/modules/pet/push/index.vue b/src/modules/pet/push/index.vue
index 43888d1..b49db47 100644
--- a/src/modules/pet/push/index.vue
+++ b/src/modules/pet/push/index.vue
@@ -86,6 +86,7 @@ const toPath = (path) => {
 /* 在这里添加任何自定义的样式 */
 .container {
   padding: 16px;
+  box-sizing: border-box;
 }
 
 button {
diff --git a/src/modules/pet/service/accompany.vue b/src/modules/pet/service/accompany.vue
index bb9a3f4..ae7fb10 100644
--- a/src/modules/pet/service/accompany.vue
+++ b/src/modules/pet/service/accompany.vue
@@ -1,296 +1,228 @@
-<route lang="json5" type="page">
+<route lang="json5">
 {
-  layout: 'default',
-  style: {
-    navigationBarTitleText: '宠物陪伴',
-  },
+style: {
+navigationBarTitleText: '选择服务',
+navigationBarBackgroundColor: '#ffff',
+},
 }
 </route>
 
 <template>
-  <view class="hot">
-    <view>
-      <view class="container">
-        <view style="position: fixed; top: 0; z-index: 19">
-          <view style="position: relative">
-            <view
-              style="
-                background: #761ee9;
-                width: 100vw;
-                height: 230rpx;
-                border-radius: 0 0 28rpx 28rpx;
-                padding-top: 280px;
-              "
-            ></view>
-            <view style="background: #f6f7f9; width: 250vw; height: 60rpx"></view>
-            <view class="swiperImg" style="position: absolute; top: 180px; width: 100vw">
-              <view style="padding: 0 30rpx">
-                <swiper
-                  :autoplay="autoplay"
-                  :duration="duration"
-                  :indicator-dots="indicatorDots"
-                  :interval="interval"
-                  circular
-                  class="swiper"
-                  indicator-active-color="rgba(0, 0, 0, 0.3)"
-                  indicator-color="rgba(255, 255, 255, 0.5)"
-                  style="height: 300rpx"
-                >
-                  <swiper-item v-for="(item, index) in swiperList" :key="index">
-                    <image
-                      :src="item.url"
-                      style="height: 100%; width: 100%; border-radius: 30rpx"
-                    ></image>
-                  </swiper-item>
-                </swiper>
-              </view>
-            </view>
+  <view class="bg-[#F5F5F5] min-h-screen p-4">
+    <!-- 过滤栏 -->
+    <view class="flex justify-around bg-white p-2 rounded-lg shadow mb-4">
+      <view class="flex items-center" @click="sortByDistance">
+        <text class="text-gray-600">离我最近</text>
+      </view>
+      <view class="flex items-center" @click="sortByPrice">
+        <text class="text-gray-600">价格</text>
+        <wd-icon :name="priceSortIcon" size="20" class="ml-2 text-gray-400"></wd-icon>
+      </view>
+      <view class="flex items-center" @click="sortByLatest">
+        <text class="text-gray-600">新发布</text>
+      </view>
+      <view class="flex items-center">
+        <text class="text-gray-600">区域</text>
+        <wd-icon name="arrow-down" size="20" class="ml-2 text-gray-400"></wd-icon>
+      </view>
+    </view>
+
+    <!-- 服务选择 -->
+    <view class="mt-4">
+      <view class="flex mt-2 space-x-4 overflow-x-auto">
+        <view
+          v-for="serviceType in serviceTypes"
+          :key="serviceType.name"
+          class="flex flex-col items-center"
+          @click="filterByService(serviceType.label)"
+        >
+          <view
+            :class="[
+              'w-16 h-16 rounded-full flex items-center justify-center',
+              selectedService === serviceType.name ? 'bg-[#ffc107]' : 'bg-gray-200',
+            ]"
+          >
+            <wd-icon
+              style="width: 36px; height: 36px"
+              :name="imgUrl(serviceType.icon)"
+              :size="48"
+              :class="selectedService === serviceType.label ? 'text-white' : 'text-gray-500'"
+            ></wd-icon>
           </view>
+          <text :class="selectedService === serviceType.label ? 'text-[#ffc107]' : 'text-gray-500'">
+            {{ serviceType.label }}
+          </text>
         </view>
       </view>
     </view>
-  </view>
-  <view class="p-5 bg-gray-100 h-screen" style="margin-top: 480rpx">
-    <!-- 表单区域 -->
-    <view class="mt-5 bg-white p-5 rounded-lg shadow" style="padding: 0">
-      <!-- 导航栏 -->
-      <view class="mb-4 navigation">
-        <text class="text-gray-800 card_font">
-          <image
-            :src="imgUrl('@/static/service/1726299427263.png')"
-            mode="scaleToFill"
-            class="card_accompany"
-          />
-          先行赔付
-        </text>
-        <text class="text-gray-800 card_font">
-          <image
-            :src="imgUrl('@/static/service/1726299704300.png')"
-            mode="scaleToFill"
-            class="card_accompany"
-          />
-          喂水喂食
-        </text>
-        <text class="text-gray-800 card_font">
-          <image
-            :src="imgUrl('@/static/service/1726299755235.png')"
-            mode="scaleToFill"
-            class="card_accompany"
-          />
-          全程监管
-        </text>
-        <text class="text-gray-800 card_font">
-          <image
-            :src="imgUrl('@/static/service/1726299776227.png')"
-            mode="scaleToFill"
-            class="card_accompany"
-          />
-          安全保障
-        </text>
-      </view>
-      <view class="position">
-        <div class="specific_position">点击此处定位具体位置</div>
-        <image
-          :src="imgUrl('@/static/service/1726370894136.png')"
-          mode="scaleToFill"
-          class="specific_img"
-        />
-        <div class="get_address">
-          <div
-            style="
-              background-color: #9093ff;
-              border-radius: 10px;
-              width: 15px;
-              height: 15px;
-              margin-left: 10px;
-            "
-          ></div>
-          <input placeholder="请输入上车地址" v-model="petName" class="address_input" />
-          <image
-            :src="imgUrl('@/static/service/1726383571208.png')"
-            mode="scaleToFill"
-            style="width: 20px; height: 20px"
-          />
-        </div>
-        <div class="get_address">
-          <div
-            style="
-              background-color: #ffd27d;
-              border-radius: 10px;
-              width: 15px;
-              height: 15px;
-              margin-left: 10px;
-            "
-          ></div>
-          <input placeholder="请输入宠物到达地址" v-model="petName" class="address_input" />
-          <image
-            :src="imgUrl('@/static/service/1726383534059.png')"
-            mode="scaleToFill"
-            style="width: 20px; height: 20px"
-          />
-        </div>
-        <div class="get_phone">
-          <image
-            :src="imgUrl('@/static/service/1726383956983.png')"
-            mode="scaleToFill"
-            style="width: 20px; height: 20px"
-          />
-          <input placeholder="请输入下单人电话" v-model="petName" class="address_input" />
-          <image
-            :src="imgUrl('@/static/service/1726383571208.png')"
-            mode="scaleToFill"
-            style="width: 20px; height: 20px"
-          />
-        </div>
 
-        <button class="get_quote">免费获取报价</button>
+    <!-- 推荐的宠物托管师 -->
+    <view v-if="petSitters.length > 0" class="mt-4">
+      <text class="text-lg font-bold">选择宠托师</text>
+      <view v-for="(petSitter, index) in petSitters" :key="index" class="mt-4">
+        <PetSitterCard :petSitter="petSitter"/>
       </view>
+      <wd-loadmore
+        :loading="loading"
+        :finished="noMoreData"
+        @load="loadMore"
+        finished-text="没有更多数据了"
+      ></wd-loadmore>
     </view>
-    <view class="mt-5 bg-white p-5 rounded-lg shadow" style="padding: 0">
-      <div style="display: flex; align-items: center; flex-direction: column; padding: 20px">
-        <image
-          :src="imgUrl('@/static/service/1726389632384.png')"
-          mode="scaleToFill"
-          style="height: 80rpx; padding-bottom: 10px; width: 70%"
-        />
-        <image
-          :src="imgUrl('@/static/service/1726389664958.png')"
-          mode="scaleToFill"
-          style="height: 100rpx"
-        />
-      </div>
-    </view>
-    <view class="mt-5 bg-white p-5 rounded-lg shadow" style="padding: 0">
-      <div style="display: flex; align-items: center; flex-direction: column; padding: 20px">
-        <image
-          :src="imgUrl('@/static/service/1726403986495.png')"
-          mode="scaleToFill"
-          style="height: 80rpx; padding-bottom: 10px; width: 70%"
-        />
-        <image
-          :src="imgUrl('@/static/service/1726404642077.png')"
-          mode="scaleToFill"
-          style="height: 550rpx"
-        />
-      </div>
-    </view>
-    <view class="mt-5 bg-white p-5 rounded-lg shadow" style="padding: 0">
-      <div style="display: flex; align-items: center; flex-direction: column; padding: 20px">
-        <image
-          :src="imgUrl('@/static/service/1726405469570.png')"
-          mode="scaleToFill"
-          style="height: 80rpx; padding-bottom: 10px; width: 70%"
-        />
-      </div>
+    <view class="pt-[80px]" v-else>
+      <EmptyState type="search" message="暂无相关服务"/>
     </view>
+
   </view>
+
 </template>
 
-<script lang="js" setup>
-import { ref, reactive } from 'vue'
-import { imgUrl, toPath } from '@/utils/commUtils'
-// 轮播图
-const swiperList = [
-  {
-    url: 'C:/Users/Administrator/Desktop/picture(2)/100-1.png',
-  },
-  {
-    url: 'C:/Users/Administrator/Desktop/picture(2)/100-1.png',
-  },
-]
-const status = 'loadmore'
-const indicatorDots = true
-const autoplay = true
-const interval = 5000
-const duration = 500
-const screenInfoList = []
-const locationInfo = {
-  pageNum: 1,
-  pageSize: 10,
-  lat: 39.908868,
-  lon: 116.404424,
-  labelList: [1, 2, 3],
-}
-const total = 0
-const scrollTop = 0
+<script setup>
+import {ref} from 'vue'
+import PetSitterCard from '@/components/PetSitterCard.vue'
+import {httpPost} from '@/utils/http'
+import {imgUrl} from '@/utils/commUtils'
+import EmptyState from '@/components/EmptyState.vue'
 
-const props = defineProps({
-  tabbar: {
-    type: [String, Boolean],
-    default: '',
-  },
+const searchTerm = ref('')
+const priceSortAsc = ref(true)
+const petSitters = ref([])
+const page = ref(1)
+const loading = ref(false)
+const noMoreData = ref(false)
+const disabled = ref(true)
+const type = ref('danger')
+const serviceTypes = ref([
+  {name: 'training', label: '宠物托运', icon: '@/static/home/mr.png'},
+  {name: 'canteen', label: '接送洗护', icon: '@/static/home/yl.png'},
+  {name: 'cleaning', label: '医疗陪护', icon: '@/static/home/yl.png'}
+])
+//医疗陪护 接送洗护 宠物托运
+
+const selectedService = ref(serviceTypes.value[0].label)
+
+// 排序字段和顺序
+const sortField = ref('')
+const sortOrder = ref('')
+
+// 获取宠托师数据
+const fetchPetSitters = async () => {
+  if (loading.value) return
+  loading.value = true
+
+  try {
+    const response = await httpPost(
+      '/personal-service/list',
+      {
+        current: page.value,
+        size: 10,
+        data: {
+          serviceName: searchTerm.value,
+          type: selectedService.value,
+        },
+      },
+      {
+        sortField: sortField.value,
+        sortOrder: sortOrder.value,
+      },
+    )
+    if (response.code === 200) {
+      if (page.value === 1) {
+        petSitters.value = response.records
+      } else {
+        petSitters.value = [...petSitters.value, ...response.records]
+      }
+
+      if (response.records.length < 10) {
+        noMoreData.value = true
+      }
+    } else {
+      console.error('获取宠托师数据失败', response.message)
+    }
+  } catch (error) {
+    console.error('获取宠托师数据失败', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+const loadMore = async () => {
+  if (!noMoreData.value) {
+    page.value += 1
+    fetchPetSitters()
+  }
+}
+
+const sortByPrice = async () => {
+  priceSortAsc.value = !priceSortAsc.value
+  sortField.value = 'price'
+  sortOrder.value = priceSortAsc.value ? 'asc' : 'desc'
+  page.value = 1
+  noMoreData.value = false
+  await fetchPetSitters()
+}
+
+const sortByLatest = async () => {
+  sortField.value = 'createTime'
+  sortOrder.value = 'desc'
+  page.value = 1
+  noMoreData.value = false
+  await fetchPetSitters()
+}
+
+const sortByDistance = () => {
+  // 按距离排序的逻辑
+}
+
+const filterByService = async (serviceName) => {
+  selectedService.value = serviceName
+  page.value = 1
+  noMoreData.value = false
+  fetchPetSitters()
+}
+
+const onSearch = () => {
+  page.value = 1
+  noMoreData.value = false
+  fetchPetSitters()
+}
+
+onLoad(() => {
+  fetchPetSitters()
 })
 </script>
 
-<style lang="scss" scoped>
-.navigation {
-  border-radius: 10px 10px 0 0;
-  height: 80rpx;
-  display: flex;
-  align-items: center;
-  background-color: #ffefeb;
+<style scoped>
+page {
+  background-color: #f5f5f5;
 }
 
-.card_accompany {
-  width: 40rpx;
-  height: 40rpx;
-  margin-left: 18rpx;
+.bg-gray-100 {
+  @apply bg-gray-100;
 }
 
-.card_font {
-  font-size: 13px;
-  color: #ff9a81;
+.bg-gray-200 {
+  @apply bg-gray-200;
 }
 
-.position {
-  flex-direction: column;
-  display: flex;
-  align-items: center;
-  color: #fa3534;
+.text-gray-400 {
+  @apply text-gray-400;
 }
 
-.specific_img {
-  margin: 7px 0;
-  height: 20px;
-  width: 30px;
+.text-gray-500 {
+  @apply text-gray-500;
 }
 
-.specific_position {
-  font-weight: bold;
+
+.rounded-full {
+  @apply rounded-full;
 }
 
-.get_address {
-  display: flex;
-  align-items: center;
-  border: 1px solid #9093ff;
-  margin-bottom: 40rpx;
-  width: 90%;
-  height: 130rpx;
-  // padding: 15px 80px 15px 80px;
-  border-radius: 10px;
+.shadow {
+  @apply shadow;
 }
 
-.reach_address {
-  border: 1px solid #9093ff;
-}
-
-.address_input {
-  margin-left: 15px;
-  width: 80%;
-}
-
-.get_phone {
-  display: flex;
-  align-items: center;
-  width: 90%;
-  height: 100rpx;
-  border-bottom: 1px solid #f4f6f8;
-}
-
-.get_quote {
-  margin: 25px 0 20px 0;
-  background-color: #9093ff;
-  color: #f4f6f8;
-  width: 90%;
+.space-x-4 {
+  @apply space-x-4;
 }
 </style>
diff --git a/src/modules/pet/service/detail.vue b/src/modules/pet/service/detail.vue
index c925bd9..441fb1d 100644
--- a/src/modules/pet/service/detail.vue
+++ b/src/modules/pet/service/detail.vue
@@ -1,113 +1,212 @@
 <route lang="json5">
 {
-  style: {
-    navigationBarTitleText: '宠托师服务详情',
-    navigationStyle: 'custom',
-  },
+style: {
+navigationBarTitleText: '服务详情',
+},
 }
 </route>
 
 <template>
-  <TopBar />
-  <view class="bg-[#F5F5F5] h-[135vh]">
-    <!-- 顶部背景和头像 -->
-    <view class="relative">
-      <image :src="serviceData.bgUrl" class="w-full h-40 object-cover" mode="widthFix"></image>
-      <view class="absolute left-4 bottom-[-20px]">
-        <image
-          :src="serviceData.userAvatar"
-          mode="aspectFill"
-          class="w-20 h-20 object-cover rounded-full border-4 border-white"
-        ></image>
-      </view>
+  <!--  <TopBar />-->
+  <view class="service-image-container">
+    <image :src="serviceData.userAvatar" class="service-image" mode="scaleToFill"></image>
+  </view>
+  <!-- 宠托师信息 -->
+  <view class="info">
+    <view class="info-name">{{ serviceData.serviceName }}</view>
+    <view class="tags">
+      <text class="tag">认证{{ serviceData.certificationTime }}</text>
+      <text class="tag">服务过{{ serviceData.serviceNumber }}次</text>
     </view>
 
-    <!-- 宠托师信息 -->
-    <view class="bg-white p-4">
-      <text class="text-2xl font-bold">{{ serviceData.userName }}</text>
-      <view class="flex items-center mt-2">
-        <text class="text-sm text-gray-500 mr-2">认证{{ serviceData.certificationTime }}</text>
-        <text class="text-sm text-gray-500">服务过 {{ serviceData.serviceNumber }} 次</text>
-      </view>
-      <view class="flex items-center mt-2">
-        <wd-icon name="location" size="20" class="text-[#ffc107]"></wd-icon>
+    <view class="address">
+      <wd-icon name="location" size="20" class="text-[#ffc107]"></wd-icon>
+      <view class="left">
+
         <text class="ml-2 text-gray-600">{{ serviceData.address }}</text>
       </view>
-      <text class="mt-4 text-gray-600">{{ serviceData.description }}</text>
+      <view class="right">
+        <text>距离{{ distance }}km</text>
+      </view>
     </view>
+    <view class="description">
+      <text class="description-text">
+        从事宠物行业四年多，因为热爱而选择，我会不懈努力提升自己，为自己喜爱的宠物行业风险热血青春，为可爱的毛孩子们提供更加专业，更加安全的服务。
+      </text>
+    </view>
+  </view>
+  <wd-cell title="喂猫服务费" value="服务详情" is-link replace></wd-cell>
+  <view class="service shadow-radius">
+    <view style="display: flex;justify-content: center;gap: 10rpx" v-for="(serviceInfo,index) in serviceInfos"
+          :key="index">
+      <view style="width: 33rpx;height: 33rpx">
+        <image class="w-full h-full" mode="scaleToFill" :src="serviceInfo[1]"></image>
+      </view>
+      <view>{{ serviceInfo[0] }}</view>
+    </view>
+    <view class="font-bold" style="margin-left: 30rpx;color:red;">￥{{ serviceData.price }}/次</view>
+  </view>
+  <wd-cell title="其他费用" value="服务详情" is-link replace></wd-cell>
+  <view class="other-cost-container" style="display: grid;grid-template-columns: 1fr 1fr;gap: 20rpx;">
+    <view class="other-cost">
+      <view style="width: 100rpx;height: 100rpx;">
+        <image class="w-full h-full" mode="scaleToFill" :src="huishou"></image>
+      </view>
+      <view class="other-description">
+        <view>基础上门费</view>
+        <view>1km以内
+          <text class="price text-bold" color="red">15</text>
+          元
+        </view>
+      </view>
+    </view>
+
+    <view class="other-cost">
+      <view style="width: 100rpx;height: 100rpx;">
+        <image class="w-full h-full" mode="scaleToFill" :src="kd"></image>
+      </view>
+      <view class="other-description">
+        <view>每公里加价</view>
+        <view>每多1km加
+          <text class="price text-bold" color="red">10</text>
+          元
+        </view>
+      </view>
+    </view>
+  </view>
+  <wd-cell title="用户评价" value="查看全部" is-link replace></wd-cell>
+  <view class="evaluation d-card">
+    <view class="evaluation-list">
+      <view class="evaluation-item">
+        <view class="e-info flex gap-2">
+          <view class="e-info-avatar" style="width: 100rpx;aspect-ratio: 1/1">
+            <image
+              :src="serviceData.userAvatar"
+              mode="aspectFill"
+              class="w-full h-full object-cover rounded-full border-4 border-white"
+            ></image>
+          </view>
+          <view class="e-right w-full">
+            <view class="e-right-1" style="display: flex;justify-content: space-between;width: 100%">
+              <view class="name">{{ serviceData.userName }}</view>
+              <view class="date">3天前</view>
+            </view>
+            <view class="e-right-2">
+              <wd-rate v-model="rate"></wd-rate>
+            </view>
+          </view>
+        </view>
+        <view class="e-content">
+          从事宠物行业四年多，因为热爱而选择，我会不懈努力提升自己，为自己喜爱的宠物行业风险热血青春，为可爱的毛孩子们提供更加专业，更加安全的服务。
+        </view>
+      </view>
+    </view>
+  </view>
+<!--  <view class="goods-carts" style="bottom: 0;">-->
+<!--    <uni-goods-nav />-->
+<!--  </view>-->
+
+  <view class="bg-[#F5F5F5] h-[135vh]">
+    <!-- 顶部背景和头像 -->
+<!--    <view class="relative">-->
+<!--      <image :src="serviceData.bgUrl" class="w-full h-40 object-cover" mode="widthFix"></image>-->
+<!--      <view class="absolute left-4 bottom-[-20px]">-->
+<!--        <image-->
+<!--          :src="serviceData.userAvatar"-->
+<!--          mode="aspectFill"-->
+<!--          class="w-20 h-20 object-cover rounded-full border-4 border-white"-->
+<!--        ></image>-->
+<!--      </view>-->
+<!--      <view>-->
+<!--      </view>-->
+<!--    </view>-->
+
+    <!-- 宠托师信息 -->
+<!--    <view class="bg-white p-4">-->
+<!--      <text class="text-2xl font-bold">{{ serviceData.userName }}</text>-->
+<!--      <view class="flex items-center mt-2">-->
+<!--        <text class="text-sm text-gray-500 mr-2">认证{{ serviceData.certificationTime }}</text>-->
+<!--        <text class="text-sm text-gray-500">服务过 {{ serviceData.serviceNumber }} 次</text>-->
+<!--      </view>-->
+<!--      <view class="flex items-center mt-2">-->
+<!--        <wd-icon name="location" size="20" class="text-[#ffc107]"></wd-icon>-->
+<!--        <text class="ml-2 text-gray-600">{{ serviceData.address }}</text>-->
+<!--      </view>-->
+<!--      <text class="mt-4 text-gray-600">{{ serviceData.description }}</text>-->
+<!--    </view>-->
 
     <!-- 服务和费用 -->
-    <view class="bg-white p-4">
-      <text class="text-lg font-bold mb-2">{{ serviceData.serviceName }}服务费</text>
-      <view class="flex justify-between items-center mb-4">
-        <view class="flex items-center space-x-4">
-          <view class="flex flex-col items-center">
-            <wd-icon name="bowl" size="24" class="text-pink-500"></wd-icon>
-            <text class="text-pink-500 text-sm">食具清洁</text>
-          </view>
-          <view class="flex flex-col items-center">
-            <wd-icon name="water" size="24" class="text-pink-500"></wd-icon>
-            <text class="text-pink-500 text-sm">添粮换水</text>
-          </view>
-          <view class="flex flex-col items-center">
-            <wd-icon name="litter" size="24" class="text-pink-500"></wd-icon>
-            <text class="text-pink-500 text-sm">铲屎添砂</text>
-          </view>
-        </view>
-        <text class="text-lg text-red-500">¥{{ serviceData.price }}/次</text>
-      </view>
-    </view>
+<!--    <view class="bg-white p-4">-->
+<!--      <text class="text-lg font-bold mb-2">{{ serviceData.serviceName }}服务费</text>-->
+<!--      <view class="flex justify-between items-center mb-4">-->
+<!--        <view class="flex items-center space-x-4">-->
+<!--          <view class="flex flex-col items-center">-->
+<!--            <wd-icon name="bowl" size="24" class="text-pink-500"></wd-icon>-->
+<!--            <text class="text-pink-500 text-sm">食具清洁</text>-->
+<!--          </view>-->
+<!--          <view class="flex flex-col items-center">-->
+<!--            <wd-icon name="water" size="24" class="text-pink-500"></wd-icon>-->
+<!--            <text class="text-pink-500 text-sm">添粮换水</text>-->
+<!--          </view>-->
+<!--          <view class="flex flex-col items-center">-->
+<!--            <wd-icon name="litter" size="24" class="text-pink-500"></wd-icon>-->
+<!--            <text class="text-pink-500 text-sm">铲屎添砂</text>-->
+<!--          </view>-->
+<!--        </view>-->
+<!--        <text class="text-lg text-red-500">¥{{ serviceData.price }}/次</text>-->
+<!--      </view>-->
+<!--    </view>-->
 
     <!-- 其他费用 -->
-    <view class="bg-white p-4">
-      <text class="text-lg font-bold mb-2">其他费用</text>
-      <view class="flex justify-between items-center mb-4">
-        <view class="flex flex-col items-center">
-          <wd-icon name="home" size="24" class="text-gray-500"></wd-icon>
-          <text class="text-gray-500 text-sm">基础上门费</text>
-          <text class="text-gray-500 text-sm">1km以内23元</text>
-        </view>
-        <view class="flex flex-col items-center">
-          <wd-icon name="scooter" size="24" class="text-gray-500"></wd-icon>
-          <text class="text-gray-500 text-sm">每公里加价</text>
-          <text class="text-gray-500 text-sm">每多1km加10元</text>
-        </view>
-      </view>
-    </view>
+<!--    <view class="bg-white p-4">-->
+<!--      <text class="text-lg font-bold mb-2">其他费用</text>-->
+<!--      <view class="flex justify-between items-center mb-4">-->
+<!--        <view class="flex flex-col items-center">-->
+<!--          <wd-icon name="home" size="24" class="text-gray-500"></wd-icon>-->
+<!--          <text class="text-gray-500 text-sm">基础上门费</text>-->
+<!--          <text class="text-gray-500 text-sm">1km以内23元</text>-->
+<!--        </view>-->
+<!--        <view class="flex flex-col items-center">-->
+<!--          <wd-icon name="scooter" size="24" class="text-gray-500"></wd-icon>-->
+<!--          <text class="text-gray-500 text-sm">每公里加价</text>-->
+<!--          <text class="text-gray-500 text-sm">每多1km加10元</text>-->
+<!--        </view>-->
+<!--      </view>-->
+<!--    </view>-->
 
     <!-- 用户评价 -->
-    <view class="bg-white p-4">
-      <text class="text-lg font-bold mb-2">用户评价</text>
-      <view class="mb-4" v-if="serviceData.comment">
-        <view class="flex items-center mb-2">
-          <text class="text-pink-500 text-lg">{{ serviceData.comment.star }}</text>
-          <view class="flex items-center ml-2">
-            <wd-icon
-              v-for="num in serviceData.comment.star"
-              name="star-on"
-              size="20"
-              class="text-[#ffc107]"
-            ></wd-icon>
-          </view>
-          <text class="text-gray-500 ml-2">({{ serviceData.comment.commentNum }}条评论)</text>
-        </view>
-        <text class="text-gray-600">{{ serviceData.comment.comment }}</text>
-      </view>
-      <view class="text-gray-500 pt-2 w-full text-center" v-else>暂无评论</view>
-    </view>
+<!--    <view class="bg-white p-4">-->
+<!--      <text class="text-lg font-bold mb-2">用户评价</text>-->
+<!--      <view class="mb-4" v-if="serviceData.comment">-->
+<!--        <view class="flex items-center mb-2">-->
+<!--          <text class="text-pink-500 text-lg">{{ serviceData.comment.star }}</text>-->
+<!--          <view class="flex items-center ml-2">-->
+<!--            <wd-icon-->
+<!--              v-for="num in serviceData.comment.star"-->
+<!--              name="star-on"-->
+<!--              size="20"-->
+<!--              class="text-[#ffc107]"-->
+<!--            ></wd-icon>-->
+<!--          </view>-->
+<!--          <text class="text-gray-500 ml-2">({{ serviceData.comment.commentNum }}条评论)</text>-->
+<!--        </view>-->
+<!--        <text class="text-gray-600">{{ serviceData.comment.comment }}</text>-->
+<!--      </view>-->
+<!--      <view class="text-gray-500 pt-2 w-full text-center" v-else>暂无评论</view>-->
+<!--    </view>-->
 
     <!-- 底部地图展示 -->
-    <view class="flex flex-col justify-center items-center bg-[#ffff] pb-[50px]">
-      <text class="text-lg font-bold mb-2 w-full pl-[20px]" style="text-align: left">服务位置</text>
-      <view class="w-full h-[20vh]">
-        <Map
-          v-show="mapShow"
-          :locationName="'服务位置'"
-          :initialLatitude="serviceData.latitude"
-          :initialLongitude="serviceData.longitude"
-        />
-      </view>
-    </view>
+<!--    <view class="flex flex-col justify-center items-center bg-[#ffff] pb-[50px]">-->
+<!--      <text class="text-lg font-bold mb-2 w-full pl-[20px]" style="text-align: left">服务位置</text>-->
+<!--      <view class="w-full h-[20vh]">-->
+<!--        <Map-->
+<!--          v-show="mapShow"-->
+<!--          :locationName="'服务位置'"-->
+<!--          :initialLatitude="serviceData.latitude"-->
+<!--          :initialLongitude="serviceData.longitude"-->
+<!--        />-->
+<!--      </view>-->
+<!--    </view>-->
 
     <!-- 底部操作栏 -->
     <view class="fixed bottom-0 w-full bg-white flex justify-between items-center mt-4 z-10 py-3">
@@ -116,100 +215,118 @@
         <button @click="message" class="bg-gray-200 text-gray-600 rounded-full w-100px">
           消息
         </button>
-        <button class="bg-[#ffc107] text-white rounded-full" @click="openReservationModal">
-          预约宠托师
+        <button class="bg-[#ffc107] text-white rounded-full" @click="()=>toPath('/modules/pet/createOrder/createOrder?type=' + 'feed')">
+          预约
         </button>
       </view>
     </view>
   </view>
 
   <!-- 预约弹窗 -->
-  <wd-overlay :show="showReservationModal">
-    <view class="bg-white rounded-lg p-4 w-full pos-absolute top-[40%] flex flex-col gap-5px">
-      <view class="text-lg font-bold mb-4">选择预约信息</view>
+<!--  <wd-overlay :show="showReservationModal">-->
+<!--    <view class="bg-white rounded-lg p-4 w-full pos-absolute top-[40%] flex flex-col gap-5px">-->
+<!--      <view class="text-lg font-bold mb-4">选择预约信息</view>-->
 
-      <!-- 服务宠物选择 -->
-      <text class="text-sm text-gray-500 mb-2">服务宠物</text>
-      <view v-if="pets.length > 0" class="flex space-x-4 mb-4 scroll-x overflow-x-auto" scroll-x>
-        <view
-          v-for="pet in pets"
-          :key="pet.id"
-          class="flex flex-col items-center"
-          @click="selectPet(pet.id)"
-          :class="selectedPetId == pet.id ? 'border-4 border-[#ffc107] color-[#ffc107]' : ''"
-        >
-          <image :src="imgUrl(pet.profileUrl)" class="w-20 h-20 rounded-full object-cover"></image>
-          <text class="text-sm">{{ pet.name }}</text>
-        </view>
-      </view>
-      <view v-else class="pet-item add-pet" @click="toPath('/modules/pet/pet/pet-add-page')">
-        <w-avatar :size="80" class="pet-avatar add-avatar">
-          <view class="add-icon">+</view>
-        </w-avatar>
-      </view>
+<!--      &lt;!&ndash; 服务宠物选择 &ndash;&gt;-->
+<!--      <text class="text-sm text-gray-500 mb-2">服务宠物</text>-->
+<!--      <view v-if="pets.length > 0" class="flex space-x-4 mb-4 scroll-x overflow-x-auto" scroll-x>-->
+<!--        <view-->
+<!--          v-for="pet in pets"-->
+<!--          :key="pet.id"-->
+<!--          class="flex flex-col items-center"-->
+<!--          @click="selectPet(pet.id)"-->
+<!--          :class="selectedPetId == pet.id ? 'border-4 border-[#ffc107] color-[#ffc107]' : ''"-->
+<!--        >-->
+<!--          <image :src="imgUrl(pet.profileUrl)" class="w-20 h-20 rounded-full object-cover"></image>-->
+<!--          <text class="text-sm">{{ pet.name }}</text>-->
+<!--        </view>-->
+<!--      </view>-->
+<!--      <view v-else class="pet-item add-pet" @click="toPath('/modules/pet/pet/pet-add-page')">-->
+<!--        <w-avatar :size="80" class="pet-avatar add-avatar">-->
+<!--          <view class="add-icon">+</view>-->
+<!--        </w-avatar>-->
+<!--      </view>-->
 
-      <!-- 预约时间 -->
-      <text class="text-sm text-gray-500 mb-2">预约时间</text>
-      <picker mode="date" :start="today" :end="weekFromToday" @change="handleDateChange">
-        <view class="bg-gray-100 p-2 rounded mb-4">{{ reservationDate || '选择日期' }}</view>
-      </picker>
+<!--      &lt;!&ndash; 预约时间 &ndash;&gt;-->
+<!--      <text class="text-sm text-gray-500 mb-2">预约时间</text>-->
+<!--      <picker mode="date" :start="today" :end="weekFromToday" @change="handleDateChange">-->
+<!--        <view class="bg-gray-100 p-2 rounded mb-4">{{ reservationDate || '选择日期' }}</view>-->
+<!--      </picker>-->
 
-      <!-- 选择预约小时 -->
-      <text class="text-sm text-gray-500 mb-2">选择服务时长</text>
-      <view>
-        <wd-input-number v-model="hours" @change="hoursHandleChange" :min="1" :max="12" />
-      </view>
+<!--      &lt;!&ndash; 选择预约小时 &ndash;&gt;-->
+<!--      <text class="text-sm text-gray-500 mb-2">选择服务时长</text>-->
+<!--      <view>-->
+<!--        <wd-input-number v-model="hours" @change="hoursHandleChange" :min="1" :max="12"/>-->
+<!--      </view>-->
 
-      <!-- 服务地址选择 -->
-      <text class="text-sm text-gray-500 mb-2">选择地址</text>
-      <picker
-        v-if="addressList.length > 0"
-        mode="selector"
-        range-key="display"
-        :range="addressList"
-        @change="handleAddressChange"
-      >
-        <view class="bg-gray-100 p-2 rounded mb-4">
-          {{ selectedAddress.display || '请选择地址' }}
-        </view>
-      </picker>
-      <view v-else class="pet-item add-pet" @click="toPath('/modules/pet/address/index')">
-        <w-avatar :size="80" class="pet-avatar add-avatar">
-          <view class="add-icon">+</view>
-        </w-avatar>
-      </view>
+<!--      &lt;!&ndash; 服务地址选择 &ndash;&gt;-->
+<!--      <text class="text-sm text-gray-500 mb-2">选择地址</text>-->
+<!--      <picker-->
+<!--        v-if="addressList.length > 0"-->
+<!--        mode="selector"-->
+<!--        range-key="display"-->
+<!--        :range="addressList"-->
+<!--        @change="handleAddressChange"-->
+<!--      >-->
+<!--        <view class="bg-gray-100 p-2 rounded mb-4">-->
+<!--          {{ selectedAddress.display || '请选择地址' }}-->
+<!--        </view>-->
+<!--      </picker>-->
+<!--      <view v-else class="pet-item add-pet" @click="toPath('/modules/pet/address/index')">-->
+<!--        <w-avatar :size="80" class="pet-avatar add-avatar">-->
+<!--          <view class="add-icon">+</view>-->
+<!--        </w-avatar>-->
+<!--      </view>-->
 
-      <!-- 操作按钮 -->
-      <view class="fixed bottom-0 left-0 w-full bg-white shadow-up py-[10px]">
-        <view class="flex justify-between">
-          <button
-            class="flex-1 mx-2 py-2 px-6 bg-gray-200 text-gray-600 rounded-full"
-            @click="closeReservationModal"
-          >
-            取消
-          </button>
-          <button
-            class="flex-1 mx-2 py-2 px-6 bg-[#ffc107] text-white rounded-full"
-            @click="confirmReservation"
-          >
-            确认预约
-          </button>
-        </view>
-      </view>
-    </view>
-  </wd-overlay>
+<!--      &lt;!&ndash; 操作按钮 &ndash;&gt;-->
+<!--      <view class="fixed bottom-0 left-0 w-full bg-white shadow-up py-[10px]">-->
+<!--        <view class="flex justify-between">-->
+<!--          <button-->
+<!--            class="flex-1 mx-2 py-2 px-6 bg-gray-200 text-gray-600 rounded-full"-->
+<!--            @click="closeReservationModal"-->
+<!--          >-->
+<!--            取消-->
+<!--          </button>-->
+<!--          <button-->
+<!--            class="flex-1 mx-2 py-2 px-6 bg-[#ffc107] text-white rounded-full"-->
+<!--            @click="confirmReservation"-->
+<!--          >-->
+<!--            确认预约-->
+<!--          </button>-->
+<!--        </view>-->
+<!--      </view>-->
+<!--    </view>-->
+<!--  </wd-overlay>-->
 
-  <LoadingAnimation v-model="loading" />
+  <LoadingAnimation v-model="loading"/>
 </template>
 
 <script lang="js" setup>
-import { ref } from 'vue'
-import { httpGet, httpPost } from "@/utils/http";
-import { baseUrl, imgUrl, toast, toPath } from '@/utils/commUtils'
-import { pay } from '@/logic/pay'
-import TopBar from '@/components/TopBar.vue'
+
+import {ref} from 'vue'
+import {httpGet, httpPost} from "@/utils/http";
+import {baseUrl, imgUrl, toast, toPath} from '@/utils/commUtils'
 import Map from '@/components/Map.vue'
 import LoadingAnimation from '@/components/LoadingAnimation.vue'
+import kd from '@/components/icon/x_快递员.png'
+import huishou from '@/components/icon/上门回收管理.png'
+import qc from '@/components/icon/清除.png'
+import cw from '@/components/icon/宠物.png'
+import yys from '@/components/icon/饮用水.png'
+import jkzb from '@/components/icon/健康指标 (1).png'
+import hj from '@/components/icon/环境应急救援队 (1).png'
+import house from '@/components/icon/Housekeeping.png'
+
+
+const serviceInfos = [
+  ["食具清洁", qc],
+  ["添粮换水", yys],
+  ["铲屎添砂", house],
+  ["互动陪玩", cw],
+  ["健康监测", jkzb],
+  ["健康监测", hj],
+]
+
 
 // 获取当前日期
 const nowday = new Date()
@@ -225,12 +342,14 @@ const showReservationModal = ref(false)
 const selectedPetId = ref('')
 const today = ref('')
 const weekFromToday = ref('')
+const selectedAddress = ref({})
 const personalServiceId = ref('')
 const hours = ref(1)
-const selectedAddress = ref({})
 const mapShow = ref(true)
+const distance = ref(10)
+const rate = ref(5)
 
-const hoursHandleChange = ({ value }) => {
+const hoursHandleChange = ({value}) => {
   if (value >= 1 && value <= 12) {
     hours.value = value
   } else {
@@ -238,7 +357,8 @@ const hoursHandleChange = ({ value }) => {
   }
 }
 
-const message = () => {}
+const message = () => {
+}
 
 const detailPay = async () => {
   console.log(reservationDate.value);
@@ -257,7 +377,7 @@ const detailPay = async () => {
 
   // 调用支付宝支付
   const createOrder = await httpPost('/order/create', order)
-  if(createOrder.code === 200) {
+  if (createOrder.code === 200) {
 
   }
 
@@ -373,7 +493,129 @@ onLoad(async (options) => {
 })
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.service-image-container {
+  width: 100%;
+  height: 560rpx;
+
+  .service-image {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.info {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 35rpx;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  gap: 20rpx;
+
+  &-name {
+    font-size: 36rpx;
+    font-weight: bold;
+  }
+
+  .address {
+    display: flex;
+    justify-content: space-between;
+    font-size: 28rpx;
+    .left{
+      width: 75%;
+    }
+  }
+
+  .tags {
+    width: 100%;
+    padding: 10rpx 0;
+    display: flex;
+    gap: 17rpx;
+
+    .tag {
+      padding: 5rpx 10rpx;
+      color: #1b1b1b;
+      font-size: 24rpx;
+      background-color: #fccb30;
+      border-radius: 6rpx;
+    }
+  }
+
+
+  .description {
+    box-sizing: border-box;
+    background-color: #f8f8f8;
+    color: #999999;
+    border-radius: 20rpx;
+    width: 100%;
+    padding: 20rpx;
+  }
+}
+
+.service {
+  @extend .d-card;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  gap: 50rpx 20rpx;
+
+}
+
+.d-card {
+  @extend .shadow-radius;
+  margin: 20rpx;
+  padding: 50rpx 20rpx;
+}
+
+.shadow {
+  box-shadow: 0 0 16rpx rgba(0, 0, 0, 0.1);
+}
+
+.shadow-radius {
+  @extend .shadow;
+  border-radius: 15rpx;
+}
+
+.other-cost {
+  @extend .d-card;
+  display: flex;
+  justify-content: center;
+  gap: 20rpx;
+  margin: 10rpx;
+  font-size: 25rpx;
+  align-items: center;
+
+  .other-description {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+}
+
+.e-content{
+  box-sizing: border-box;
+  color: #999999;
+  border-radius: 20rpx;
+  width: 100%;
+  padding: 20rpx;
+}
+
+.goods-carts {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  position: fixed;
+  left: 0;
+  right: 0;
+  /* #ifdef H5 */
+  left: var(--window-left);
+  right: var(--window-right);
+  /* #endif */
+  bottom: 0;
+}
+
 .pet-item {
   display: flex;
   flex-direction: column;
@@ -409,6 +651,7 @@ onLoad(async (options) => {
   width: 100%;
   background-color: #fff;
 }
+
 .mapContainer {
   width: 100%;
   height: 20vh;
@@ -438,9 +681,6 @@ onLoad(async (options) => {
   border-radius: 9999px;
 }
 
-.shadow {
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-}
 
 .text-red-500 {
   color: #f56565;
diff --git a/src/modules/pet/service/search.vue b/src/modules/pet/service/search.vue
index 3968f61..73766fb 100644
--- a/src/modules/pet/service/search.vue
+++ b/src/modules/pet/service/search.vue
@@ -1,9 +1,9 @@
 <route lang="json5">
 {
-  style: {
-    navigationBarTitleText: '选择服务',
-    navigationBarBackgroundColor: '#ffff',
-  },
+style: {
+navigationBarTitleText: '选择服务',
+navigationBarBackgroundColor: '#ffff',
+},
 }
 </route>
 
@@ -75,7 +75,7 @@
     <view v-if="petSitters.length > 0" class="mt-4">
       <text class="text-lg font-bold">选择宠托师</text>
       <view v-for="(petSitter, index) in petSitters" :key="index" class="mt-4">
-        <PetSitterCard :petSitter="petSitter" />
+        <PetSitterCard :petSitter="petSitter"/>
       </view>
       <wd-loadmore
         :loading="loading"
@@ -85,18 +85,30 @@
       ></wd-loadmore>
     </view>
     <view class="pt-[80px]" v-else>
-      <EmptyState type="search" message="暂无相关服务" />
+      <EmptyState type="search" message="暂无相关服务"/>
     </view>
+    <wd-fab direction="left" type="error" position="right-bottom" :disabled="disabled">
+      <view class="w-full flex justify-around gap-2">
+        <wd-button style="box-sizing:border-box;" type="warning">
+          我是宠托师
+        </wd-button>
+        <wd-button type="primary">
+          发布需求
+        </wd-button>
+      </view>
+
+    </wd-fab>
   </view>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import {ref} from 'vue'
 import PetSitterCard from '@/components/PetSitterCard.vue'
-import { httpPost } from '@/utils/http'
-import { imgUrl } from '@/utils/commUtils'
+import {httpPost} from '@/utils/http'
+import {imgUrl} from '@/utils/commUtils'
 import EmptyState from '@/components/EmptyState.vue'
 
+const disabled = ref(false)
 const searchTerm = ref('')
 const priceSortAsc = ref(true)
 const petSitters = ref([])
@@ -104,11 +116,11 @@ const page = ref(1)
 const loading = ref(false)
 const noMoreData = ref(false)
 const serviceTypes = ref([
-  { name: 'interaction', label: '宠物互动', icon: '@/static/home/book.png' },
-  { name: 'nanny', label: '宠物月嫂', icon: '@/static/home/pb.png' },
-  { name: 'canteen', label: '宠物美容', icon: '@/static/home/yl.png' },
-  { name: 'training', label: '社交教培', icon: '@/static/home/mr.png' },
-  { name: 'cleaning', label: '宠物清洁', icon: '@/static/home/yl.png' },
+  {name: 'interaction', label: '宠物互动', icon: '@/static/home/book.png'},
+  {name: 'nanny', label: '宠物月嫂', icon: '@/static/home/pb.png'},
+  {name: 'canteen', label: '宠物美容', icon: '@/static/home/yl.png'},
+  {name: 'training', label: '社交教培', icon: '@/static/home/mr.png'},
+  {name: 'cleaning', label: '宠物清洁', icon: '@/static/home/yl.png'},
 ])
 const selectedService = ref(serviceTypes.value[0].label)
 
@@ -224,12 +236,18 @@ page {
   @apply text-gray-500;
 }
 
-.bg-[#ffc107] {
-  @apply bg-[#ffc107];
+.bg-[#ffc107
+
+]
+{
+@apply bg-[#ffc107];
 }
 
-.text-[#ffc107] {
-  @apply text-[#ffc107];
+.text-[#ffc107
+
+]
+{
+@apply text-[#ffc107];
 }
 
 .rounded-full {
diff --git a/src/modules/pet/space/index.vue b/src/modules/pet/space/index.vue
index 53941c8..ab8fdab 100644
--- a/src/modules/pet/space/index.vue
+++ b/src/modules/pet/space/index.vue
@@ -149,7 +149,7 @@ const getPosts = async () => {
     if (res.code == 200) {
       postsList.value = res.data
     } else {
-      console.error(res);
+      console.error(res)
       toast(res.message || '数据获取失败')
     }
   } catch (error) {
diff --git a/src/pages.json b/src/pages.json
index 13af8c7..d4b0550 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -55,6 +55,10 @@
             "navigationBarBackgroundColor": "#ffffff"
           }
         },
+        {
+          "path": "createOrder/createOrder",
+          "type": "page"
+        },
         {
           "path": "extended/index",
           "type": "page",
@@ -241,17 +245,16 @@
         {
           "path": "service/accompany",
           "type": "page",
-          "layout": "default",
           "style": {
-            "navigationBarTitleText": "宠物陪伴"
+            "navigationBarTitleText": "选择服务",
+            "navigationBarBackgroundColor": "#ffff"
           }
         },
         {
           "path": "service/detail",
           "type": "page",
           "style": {
-            "navigationBarTitleText": "宠托师服务详情",
-            "navigationStyle": "custom"
+            "navigationBarTitleText": "服务详情"
           }
         },
         {
diff --git a/src/pages/index/components/quickServiceCarousel.vue b/src/pages/index/components/quickServiceCarousel.vue
index f7e8c88..36573a1 100644
--- a/src/pages/index/components/quickServiceCarousel.vue
+++ b/src/pages/index/components/quickServiceCarousel.vue
@@ -4,7 +4,11 @@
       <swiper-item>
         <view class="quick-services">
           <view class="quick-service-card">
-            <image :src="imgUrl('@/static/home/book.png')" class="quick-service-image"  @click="toPath('/modules/pet/service/knowledge')" />
+            <image
+              :src="imgUrl('@/static/home/book.png')"
+              class="quick-service-image"
+              @click="toPath('/modules/pet/service/knowledge')"
+            />
             <text class="quick-service-text">宠物宝典</text>
           </view>
           <view class="quick-service-card">
@@ -44,7 +48,7 @@
     </swiper>
     <view class="custom-indicators">
       <view
-        v-for="(item, index) in 2"
+        v-for="(item, index) in 1"
         :key="index"
         :class="['indicator', { active: currentIndex === index }]"
       ></view>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 05dc111..3e2c769 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,21 +1,21 @@
 <route lang="json5">
 {
-  style: {
-    navigationBarTitleText: "首页",
-    navigationStyle: "custom",
-  },
+style: {
+navigationBarTitleText: '首页',
+navigationStyle: 'custom',
+},
 }
 </route>
 
 <template>
   <view class="container">
-    <Banner />
-    <AddressCell />
+    <Banner/>
+    <AddressCell/>
     <!-- 这里放搜索框 -->
     <!-- <view :class="['w-[70vw] pos-absolute right-0', isH5 ? 'top-[1vw]' : 'top-[8vw]']">
       <Search />
     </view> -->
-    <loading-animation v-model="isLoading" />
+    <loading-animation v-model="isLoading"/>
 
     <view class="index">
       <view
@@ -37,42 +37,23 @@
         />
       </view>
       <view class="h-1xl"></view>
-      <hurry name="萌萌哒" :distance="25" :time="45" />
-      <view class="services">
-        <view
-          class="service-card large-card"
-          @click="toPath('/modules/pet/service/accompany')"
-        >
-          <image
-            :src="imgUrl('@/static/home/cwpb.png')"
-            class="service-image"
-            mode="widthFix"
-          />
-        </view>
-        <view class="right-column">
-          <view
-            class="service-card small-card"
-            @click="toPath('/modules/pet/service/slippery')"
-          >
-            <image
-              :src="imgUrl('@/static/home/cwpl.png')"
-              class="service-image"
-              mode="widthFix"
-            />
+      <hurry name="萌萌哒" :distance="25" :time="45"/>
+
+      <view class="flex flex-col w-full">
+        <view class="services">
+          <view class="service-card large-card" @click="toPath('/modules/pet/service/accompany')">
+            <image :src="imgUrl('@/static/home/cwpb.png')" class="service-image" mode="widthFix"/>
           </view>
-          <view
-            class="service-card small-card"
-            @click="toPath('/modules/pet/service/search')"
-          >
-            <image
-              :src="imgUrl('@/static/home/smfw.png')"
-              class="service-image"
-              mode="widthFix"
-            />
+          <view class="right-column">
+            <view class="service-card small-card" @click="toPath('/modules/pet/service/slippery')">
+              <image :src="imgUrl('@/static/home/cwpl.png')" class="service-image" mode="widthFix"/>
+            </view>
+            <view class="service-card small-card" @click="toPath('/modules/pet/service/search')">
+              <image :src="imgUrl('@/static/home/smfw.png')" class="service-image" mode="widthFix"/>
+            </view>
           </view>
         </view>
       </view>
-
       <view class="quick">
         <view class="head">
           <view class="quick-title">
@@ -83,68 +64,67 @@
             <wd-icon name="arrow-right"></wd-icon>
           </view>
         </view>
-
-        <QuickServiceCarousel />
+        <QuickServiceCarousel/>
       </view>
 
-      <RecommendedServices />
+      <RecommendedServices/>
     </view>
   </view>
 
   <!-- 引入tabBar -->
-  <Tabbar />
+  <Tabbar/>
 </template>
 
 <script setup>
-import ProfileInfo from "./components/profileInfo.vue";
-import hurry from "./components/hurry.vue";
-import QuickServiceCarousel from "./components/quickServiceCarousel.vue";
-import RecommendedServices from "./components/recommendedServices.vue";
-import Banner from "./components/banner.vue";
-import LoadingAnimation from "@/components/LoadingAnimation.vue";
-import { imgUrl, toast } from "@/utils/commUtils";
-import { httpGet } from "@/utils/http";
-import Tabbar from "@/components/Tabbar.vue";
-import AddressCell from "@/components/AddressCell.vue";
-import Search from "@/components/Search.vue";
-import { isH5 } from "@/utils/platform";
+import ProfileInfo from './components/profileInfo.vue'
+import hurry from './components/hurry.vue'
+import QuickServiceCarousel from './components/quickServiceCarousel.vue'
+import RecommendedServices from './components/recommendedServices.vue'
+import Banner from './components/banner.vue'
+import LoadingAnimation from '@/components/LoadingAnimation.vue'
+import {imgUrl, toast} from '@/utils/commUtils'
+import {httpGet} from '@/utils/http'
+import Tabbar from '@/components/Tabbar.vue'
+import AddressCell from '@/components/AddressCell.vue'
+import Search from '@/components/Search.vue'
+import {isH5} from '@/utils/platform'
 
-const isLoading = ref(false);
-const petInfo = ref({});
+const isLoading = ref(false)
+const petInfo = ref({})
 
 // 获取当前页面的宠物信息
 const getPetInfo = async () => {
   try {
-    const res = await httpGet("/petInfo/index");
+    const res = await httpGet('/petInfo/index')
     if (res.code === 200) {
-      petInfo.value = res.data;
+      petInfo.value = res.data
     } else {
-      toast(res.message);
+      toast(res.message)
     }
   } catch (error) {
-    console.log(error);
+    console.log(error)
   }
-};
+}
 
 const toExtended = () => {
   // 跳转到extended 页面
   uni.navigateTo({
-    url: "/modules/pet/extended/index",
-  });
-};
+    url: '/modules/pet/extended/index',
+  })
+}
 
 const toPath = (path) => {
   uni.navigateTo({
     url: path,
-  });
-};
+  })
+}
 
 onLoad(async () => {
-  await uni.hideTabBar();
-  isLoading.value = true;
-  await getPetInfo();
-  isLoading.value = false;
-});
+  await uni.hideTabBar()
+  isLoading.value = true
+  await getPetInfo()
+  isLoading.value = false
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/scss/_main.scss b/src/scss/_main.scss
index 211ef43..a8fa450 100644
--- a/src/scss/_main.scss
+++ b/src/scss/_main.scss
@@ -1,19 +1,18 @@
 body {
   color: var(--text-a);
   background-color: var(--ui-BG-1) !important;
-  font-family:
-    system-ui,
-    -apple-system,
-    'Segoe UI',
-    Roboto,
-    'Helvetica Neue',
-    Arial,
-    'Noto Sans',
-    sans-serif,
-    'Apple Color Emoji',
-    'Segoe UI Emoji',
-    'Segoe UI Symbol',
-    'Noto Color Emoji';
+  font-family: system-ui,
+  -apple-system,
+  'Segoe UI',
+  Roboto,
+  'Helvetica Neue',
+  Arial,
+  'Noto Sans',
+  sans-serif,
+  'Apple Color Emoji',
+  'Segoe UI Emoji',
+  'Segoe UI Symbol',
+  'Noto Color Emoji';
 }
 
 /* ==================
@@ -22,9 +21,11 @@ body {
 .ui-link {
   cursor: pointer;
 }
+
 navigator {
   display: inline-flex;
 }
+
 navigator.navigator-hover {
   background-color: inherit;
   transform: translate(1rpx, 1rpx);
@@ -37,51 +38,66 @@ navigator.navigator-hover {
 .none {
   display: none !important;
 }
+
 .inline {
   display: inline !important;
 }
+
 .inline-block {
   display: inline-block !important;
 }
+
 .block {
   display: block !important;
 }
+
 .touch-none {
   pointer-events: none;
 }
+
 .touch-all {
   pointer-events: all;
 }
+
 .flex {
   display: flex !important;
 }
+
 .inline-flex {
   display: inline-flex !important;
 }
+
 .w-100 {
   width: 100%;
 }
+
 /* -- 浮动 -- */
 .cf::after,
 .cf::before {
   content: '';
   display: table;
 }
+
 .cf::after {
   clear: both;
 }
+
 .fl {
   float: left;
 }
+
 .fr {
   float: right;
 }
+
 .position-center {
   @include position-center;
 }
+
 .position-relative {
   position: relative;
 }
+
 /* -- 工具类 -- */
 @function negativify-map($map) {
   $result: ();
@@ -95,247 +111,247 @@ navigator.navigator-hover {
 
 $utilities: () !default;
 $utilities: map-merge(
-  (
-    'margin': (
-      responsive: true,
-      property: margin,
-      class: m,
-      values:
+    (
+      'margin': (
+        responsive: true,
+        property: margin,
+        class: m,
+        values:
         map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-x': (
-      property: margin-right margin-left,
-      class: mx,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-y': (
-      property: margin-top margin-bottom,
-      class: my,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-top': (
-      property: margin-top,
-      class: mt,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-right': (
-      property: margin-right,
-      class: mr,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-bottom': (
-      property: margin-bottom,
-      class: mb,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'margin-left': (
-      property: margin-left,
-      class: ml,
-      values:
-        map-merge(
-          $spacers,
-          (
-            auto: auto,
-          )
-        ),
-    ),
-    'padding': (
-      responsive: true,
-      property: padding,
-      class: p,
-      values: $spacers,
-    ),
-    'padding-x': (
-      property: padding-right padding-left,
-      class: px,
-      values: $spacers,
-    ),
-    'padding-y': (
-      property: padding-top padding-bottom,
-      class: py,
-      values: $spacers,
-    ),
-    'padding-top': (
-      property: padding-top,
-      class: pt,
-      values: $spacers,
-    ),
-    'padding-right': (
-      property: padding-right,
-      class: pr,
-      values: $spacers,
-    ),
-    'padding-bottom': (
-      property: padding-bottom,
-      class: pb,
-      values: $spacers,
-    ),
-    'padding-left': (
-      property: padding-left,
-      class: pl,
-      values: $spacers,
-    ),
-    'font-weight': (
-      property: font-weight,
-      class: text,
-      values: (
-        light: $font-weight-light,
-        lighter: $font-weight-lighter,
-        normal: $font-weight-normal,
-        bold: $font-weight-bold,
-        bolder: $font-weight-bolder,
-      ),
-    ),
-    'text-align': (
-      property: text-align,
-      class: text,
-      values: left right center,
-    ),
-    'font-color': (
-      property: color,
-      class: text,
-      values:
-        map-merge(
-          $colors,
-          map-merge(
-            $grays,
-            map-merge(
-              $darks,
-              (
-                'reset': inherit,
-              )
+            $spacers,
+            (
+              auto: auto,
             )
-          )
         ),
-    ),
-    'line-height': (
-      property: line-height,
-      class: lh,
-      values: (
-        1: 1,
-        sm: $line-height-sm,
-        base: $line-height-base,
-        lg: $line-height-lg,
+      ),
+      'margin-x': (
+        property: margin-right margin-left,
+        class: mx,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'margin-y': (
+        property: margin-top margin-bottom,
+        class: my,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'margin-top': (
+        property: margin-top,
+        class: mt,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'margin-right': (
+        property: margin-right,
+        class: mr,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'margin-bottom': (
+        property: margin-bottom,
+        class: mb,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'margin-left': (
+        property: margin-left,
+        class: ml,
+        values:
+        map-merge(
+            $spacers,
+            (
+              auto: auto,
+            )
+        ),
+      ),
+      'padding': (
+        responsive: true,
+        property: padding,
+        class: p,
+        values: $spacers,
+      ),
+      'padding-x': (
+        property: padding-right padding-left,
+        class: px,
+        values: $spacers,
+      ),
+      'padding-y': (
+        property: padding-top padding-bottom,
+        class: py,
+        values: $spacers,
+      ),
+      'padding-top': (
+        property: padding-top,
+        class: pt,
+        values: $spacers,
+      ),
+      'padding-right': (
+        property: padding-right,
+        class: pr,
+        values: $spacers,
+      ),
+      'padding-bottom': (
+        property: padding-bottom,
+        class: pb,
+        values: $spacers,
+      ),
+      'padding-left': (
+        property: padding-left,
+        class: pl,
+        values: $spacers,
+      ),
+      'font-weight': (
+        property: font-weight,
+        class: text,
+        values: (
+          light: $font-weight-light,
+          lighter: $font-weight-lighter,
+          normal: $font-weight-normal,
+          bold: $font-weight-bold,
+          bolder: $font-weight-bolder,
+        ),
+      ),
+      'text-align': (
+        property: text-align,
+        class: text,
+        values: left right center,
+      ),
+      'font-color': (
+        property: color,
+        class: text,
+        values:
+        map-merge(
+            $colors,
+            map-merge(
+                $grays,
+                map-merge(
+                    $darks,
+                    (
+                      'reset': inherit,
+                    )
+                )
+            )
+        ),
+      ),
+      'line-height': (
+        property: line-height,
+        class: lh,
+        values: (
+          1: 1,
+          sm: $line-height-sm,
+          base: $line-height-base,
+          lg: $line-height-lg,
+        ),
+      ),
+      'white-space': (
+        property: white-space,
+        class: text,
+        values: (
+          nowrap: nowrap,
+        ),
+      ),
+      'radius': (
+        property: border-radius,
+        class: radius,
+        values: (
+          null: $radius,
+          sm: $radius-sm,
+          lg: $radius-lg,
+          0: 0,
+        ),
+      ),
+      'round': (
+        property: border-radius,
+        class: round,
+        values: (
+          null: $round-pill,
+          circle: 50%,
+        ),
+      ),
+      'radius-top': (
+        property: border-top-left-radius border-top-right-radius,
+        class: radius-top,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-right': (
+        property: border-top-right-radius border-bottom-right-radius,
+        class: radius-right,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-bottom': (
+        property: border-bottom-right-radius border-bottom-left-radius,
+        class: radius-bottom,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-left': (
+        property: border-bottom-left-radius border-top-left-radius,
+        class: radius-left,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-lr': (
+        property: border-top-left-radius border-bottom-right-radius,
+        class: radius-lr,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-lrs': (
+        property: border-top-right-radius border-bottom-left-radius,
+        class: radius-lr,
+        values: (
+          null: 0,
+        ),
+      ),
+      'radius-rl': (
+        property: border-top-right-radius border-bottom-left-radius,
+        class: radius-rl,
+        values: (
+          null: $radius,
+        ),
+      ),
+      'radius-rls': (
+        property: border-top-left-radius border-bottom-right-radius,
+        class: radius-rl,
+        values: (
+          null: 0,
+        ),
       ),
     ),
-    'white-space': (
-      property: white-space,
-      class: text,
-      values: (
-        nowrap: nowrap,
-      ),
-    ),
-    'radius': (
-      property: border-radius,
-      class: radius,
-      values: (
-        null: $radius,
-        sm: $radius-sm,
-        lg: $radius-lg,
-        0: 0,
-      ),
-    ),
-    'round': (
-      property: border-radius,
-      class: round,
-      values: (
-        null: $round-pill,
-        circle: 50%,
-      ),
-    ),
-    'radius-top': (
-      property: border-top-left-radius border-top-right-radius,
-      class: radius-top,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-right': (
-      property: border-top-right-radius border-bottom-right-radius,
-      class: radius-right,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-bottom': (
-      property: border-bottom-right-radius border-bottom-left-radius,
-      class: radius-bottom,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-left': (
-      property: border-bottom-left-radius border-top-left-radius,
-      class: radius-left,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-lr': (
-      property: border-top-left-radius border-bottom-right-radius,
-      class: radius-lr,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-lrs': (
-      property: border-top-right-radius border-bottom-left-radius,
-      class: radius-lr,
-      values: (
-        null: 0,
-      ),
-    ),
-    'radius-rl': (
-      property: border-top-right-radius border-bottom-left-radius,
-      class: radius-rl,
-      values: (
-        null: $radius,
-      ),
-    ),
-    'radius-rls': (
-      property: border-top-left-radius border-bottom-right-radius,
-      class: radius-rl,
-      values: (
-        null: 0,
-      ),
-    ),
-  ),
-  $utilities
+    $utilities
 );
 @each $key, $utility in $utilities {
   @if type-of($utility) == 'map' {
@@ -349,9 +365,9 @@ $utilities: map-merge(
         $properties: append((), $properties);
       }
       $property-class: if(
-        map-has-key($utility, class),
-        map-get($utility, class),
-        nth($properties, 1)
+          map-has-key($utility, class),
+          map-get($utility, class),
+          nth($properties, 1)
       );
       $property-class: if($property-class == null, '', $property-class);
       $property-class-modifier: if($key, if($property-class == '', '', '-') + $key, '');
diff --git a/src/store/routers.js b/src/store/routers.js
index ae1ed52..b411647 100644
--- a/src/store/routers.js
+++ b/src/store/routers.js
@@ -19,12 +19,12 @@ export const useRoutersStore = defineStore(
         pagePath: '/modules/pet/space/index',
         text: '互动空间',
       },
-      {
-        iconPath: '/static/tabbar/24gl-paperPlane.png',
-        selectedIconPath: '/static/tabbar/24gl-paperPlaneL.png',
-        pagePath: '/modules/pet/push/index',
-        text: '发布',
-      },
+      // {
+      //   iconPath: '/static/tabbar/24gl-paperPlane.png',
+      //   selectedIconPath: '/static/tabbar/24gl-paperPlaneL.png',
+      //   pagePath: '/modules/pet/push/index',
+      //   text: '发布',
+      // },
       {
         iconPath: '/static/tabbar/message.png',
         selectedIconPath: '/static/tabbar/messageL.png',
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 982d41e..8b56769 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -10,6 +10,7 @@ interface NavigateToOptions {
        "/modules/pet/ai/ai-interactive-space" |
        "/modules/pet/certification/index" |
        "/modules/pet/certification/pet-sitter" |
+       "/modules/pet/createOrder/createOrder" |
        "/modules/pet/extended/index" |
        "/modules/pet/h5mall/index" |
        "/modules/pet/login/index" |
diff --git a/src/utils/commUtils.js b/src/utils/commUtils.js
index 6f65e4c..9719061 100644
--- a/src/utils/commUtils.js
+++ b/src/utils/commUtils.js
@@ -115,8 +115,5 @@ export const isCancelOrder = (state) => {
   return state === "待支付" || state === "已支付"
 }
 
-
 // 判断是否能取消订单【宠托师】
-export const isTakeCancelOrder = (state) => {
-  return state === "待接单"
-}
+export const isTakeCancelOrder = (state) => state === "待接单"
\ No newline at end of file