From f54f74381c642b983f15f7f59060eeb0051f6a49 Mon Sep 17 00:00:00 2001 From: yangtao Date: Fri, 29 Mar 2024 09:49:03 +0800 Subject: [PATCH] 1 --- pages/admin/business/index.vue | 6 +++--- pages/shop/css/shop.css | 2 +- pages/shop/index.vue | 4 ++-- pages/shop/search/index.vue | 4 ++-- pages/shop_details/index.vue | 3 ++- static/images/location.png | Bin 2372 -> 5157 bytes static/images/xingxing.png | Bin 0 -> 1188 bytes 7 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 static/images/xingxing.png diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue index 560ef46..9bea2d3 100644 --- a/pages/admin/business/index.vue +++ b/pages/admin/business/index.vue @@ -9,7 +9,7 @@ - + {{item.title}} @@ -64,14 +64,14 @@ icon: 'iconfont icon-shangjiaguanli' }); } - if(this.service.is_goods){ + if(this.service.is_offline){ list.push({ title: '我要收款', url: '/pages/admin/qrcode/index?mer_id=' + merId, icon: 'haiyuefont haiyue-shoukuang' }); } - if(this.service.is_goods){ + if(this.service.is_offline){ list.push({ title: '基本信息', url: '/pages/admin/shopInfo/index?mer_id=' + merId, diff --git a/pages/shop/css/shop.css b/pages/shop/css/shop.css index fa757de..991b3af 100644 --- a/pages/shop/css/shop.css +++ b/pages/shop/css/shop.css @@ -84,7 +84,7 @@ font-weight: bold; } .content .content-list .list-container .list-item{ - background-color: #F2F2F2; + background-color: #F9F9F9; display: flex; border-radius: 20rpx; margin: 24rpx 28rpx; diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 07aaf00..1d3ad75 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -40,7 +40,8 @@ - + + {{item.service_score}}分 营业时间:{{item.config.mer_take_time.join('-')}} @@ -103,7 +104,6 @@ uni.showTabBar({animation: false}); let location=uni.getStorageSync('locationCity'); if(location){ - console.log('location: ',location); this.latitude=location.lat; this.longitude=location.lon; this.city=location.city; diff --git a/pages/shop/search/index.vue b/pages/shop/search/index.vue index 7c9e0fd..f5f9a25 100644 --- a/pages/shop/search/index.vue +++ b/pages/shop/search/index.vue @@ -38,7 +38,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/pages/shop_details/index.vue b/pages/shop_details/index.vue index cfcf662..d358cce 100644 --- a/pages/shop_details/index.vue +++ b/pages/shop_details/index.vue @@ -14,7 +14,8 @@ {{ shopInfo.mer_name }} - + + 评分{{ shopInfo.service_score }}分 FP)pidHvqf-P7IE%j`3nMKhyiq|uHRB(On*G7c`AV778> zQ>3s>96OjO1j!W}EE5U>l!6>PR6>f_DFSwk33fR#i71HTgdhk62M{13w9Sk(JxlMe zyWgI3-|KGm^z=R>@rO5R_42lR&pqGymU|yZA8m6G;6B1*E&?9`QpAW04v0y_OGwoaiPGe0Y53Oza@*KQi!c;5~yM-_mvSSBBg5tLaUfj&6DEG4*^y zbKU@%zVuR`>UFL(lIhiRz@ zYU=r@kUF{jSU7$@z*%%a&=FyB%a+YBgU_R5*K&r@kKY&*vj67a(q@OX+X8~YVgCj& z41){?jEbz~;7SfDHlAcsds zo&L_&OT=X6VQ_pi8*J;s_WyNlIks4Uus^UP&k{{1RaF5>{sk-2-xM6&?do*o&=#Tv zYfSwuF6!RoRabe9v~)9MfU;@m>ART~!Aq0lt zUCF+yIK(&x)4V?Kx|N8PMT(dDj|cX{oADU!|0Ty&5djg17hwae(J#XyY-Cnr+~nb zm4J$7Qpki{V|AE>hEB3g6a*3k=&x-rmZ%uekes+8RIwSt0MS&uXIY|YWNJE`kuH&VfSAjdyFx+#Ex6@_7>c0HiZb3K+j9nnj1I`MOwnY5;>jdQ=`?8= z^}@{oP`qw8`I?(4fS1eZBBuzvVK#X{vKmqdhyhS7z0vg;FY27wR>ix&UF`Be{NAN8AzkF=x_FppQ0ZDPAxX zg{Cnb4%67=B&Fp{UM%amsbx6;#_e=cPirgrJs!);*ut89!DN_A20JYAWsxq&nJ@B9 z<`*xPXsVv@zn->{c_Rs-Q(L}iXvV!P zHDu1U0>Xzrw(V19O8XH;v8|G+oS6#IL+w9fp-=j$*Qv!xL;%HE zd5DHg$JSWG;+)8sfnQycBKrSty!octv#Bqjqwc~nU~TX*j|2_NMYB0}2QdVZJG-P?{Oi$y zbXu`x;_wkX_0 zfeUr@3XhBqWL|LaY7}53DTVmJ2`~ge&<|c5%>uF#fQ(^KbwH#56c07wbF*qVg72O7 zTnSKi!K-!^Uf%%#yeyU}0EAsF=h&HY_S|F0pf z*07qT2Xq*0nFd!p6aZU-FTLIINIIU`nadGaw*`RVMDWK7OF4LpLO(-v(zkXjq5X7{ zUPfmk80!>0 zO=>MlUq~@)P;SK8Dy{;S9FKPGIDJfc)X>d9{x}SX1E$Kc@V!h7>}V2x(jL^mv3!zd zE16AYKoE#!CWiWATHDixW^T1uS^^Ljj!(|a6nGYsoL=$QD+ZExwzsBEf}{z0j+A=A z$aUBP z&E!Zp2bW1&$8*RN2Caij01}DEkgLS6YbsR)gwK0oO``|A*mWeoRQG*h@5W! zPpIWNiWaISM3g0MG3ZBbLrkCY1?byrM$SF~KM`-lREmMgn@)!OhmUmKoQQGv!Ml2F zafP8sDKd~nTVG3|DhSDr9{tjh9rPX;QkF_(0m;!c7FoI`qqZM{pt9It-p0HNV@NWU z$~Od~5%xE$ca8KEVdj^b84=tr5jROK#mx#6v zrL}<{>N>x@977bO`wWo6DwxB?KN~b7U+cJOdTKFEX8NZcol&mkQB^iRn>QtxZ4yzk zg0f_}5f+^M{|+uSzSy&zjyG;H2#7MLx_aa0lKr~QT~m%BtT>Za!f$> zLzwBky)XvJKtH0W!LSly@s?$+;q~$RMn;W&-T{g<S*6!USc0$5$xX9eDE^4JGfjkO#gqJw+8y{a{6|#axBgHpggTQ>f`!~ONtzJ-=X-sb2x&>9_zrtrs-=6dP zY#GVf4?dt23&={aBijbO$s_)J-9_SVmnRdd76w$ycI~7}r@*YX;U+aE-j9C!DwPl| zQ{m@MO|aS~`tc@jat}Hk!oLMxe%a=Cl`XboN2{Xip9CxRfNkpwb%PB+4CTrx6s5|6 zVU-YhE)g6Id}qy2^eOZtS}n<}2#7WEOh!IFlJ{cbo!K4 zb*}^n-0jhkk9FSM=AL{X#mhvsG@?2n+2{~AZJkMP+@(swu2O*H2HT!x;7An3c}&SR z9HnHAWr7jd(h;5$-sDU@lr_69>|BpVjo^C=h~>>!$MS44DH(~<*%QY}WksRNo7vpL zKfH0P@dF$dt|jZP1rXb8i2M-N!9;BE7ZCQIQl)@mP@JeJGqzL$FgwSe@0L9&TDn;naq&D{1i# zYpS5kf|x>qb$}@j0AuS)VJtiMHVgv0+EoG!ur7^kHjFamEL<#ewUtIPdl${u?s{b7 z7Wq*e9IobFa;>S#5Zn53N#r$vC6Lj(SI3e)-!lzVac~f0PB~LzrjbC=i2)HVm>aIOv1pgtILC8j>I7oR*}ibyi*Vc{SttCT354cG6cX zSI!-m1B(F>I(3qi3dvc`SLZ0{YvCW-u-e7%rAUT#e$*<_n?r41VL%J?} zvQ!paYX_{v5ZVwri3yWM0E9=if8|Bou6DONj>>7gR_$mA5KBuKOJrz?K`m0Ob9GYc zdjgS1do_VA4-l4GF@`K05G)*`aK|e5S5_`dzmB9M0ymJVxAagq(eu^sF!^xP)@W+= z=j4ogw_$QtIj?feQ3{rY0g`j%03+e=5dUKRI_)XwMi}PO&|Fa6fLJVH#opK9VH66e zn!hiaSbCSHIj_U6l8Iks^H~%?SjqC)Woyib+JYzmH6dqdLfy2El|v1ij0K3TC4%LK zIciD9`ZlNJ_InM3AGLyvx)gR{fUxEu=6J8WkH2SVM1Kv_9uYS60qxN1&8+M8GKC|Z zpI%hpIv|FJF?Dr%n~A^GF6f-oIi8c7V^r)$D?3_gk?)dZz(Ko}kd@8tex>004iy}jBA@F5B{lNMtR zc|j&K$8@d+C{554tl^NP{;esw?Ji9hHUN)`p?w1;!@zj6vzOo3-><*oYJ+ZMpc@xs z?MZ{{+Y1MHQ2@!i;=>4qVu()^YK?I#E=woEYW zddb;Bv$$g%tCHl!0AoR3reui4qSzRCf;C|s1smhAfgS#8|TH#6kjwSpL76}S*!`e+S*8R=n6R#ybE)~eQZhPd`YPc zNKQaecstqIM-MDtMK5EyOBBW#r;8w>dmD>4E(jp=Jda8NB}uI*ec$+nn;*@4qTPliFSsI^kx#>kzy&muC$MOXx)r=YE8H`2uG9^6^10`oZ z4l7Ox$VO|wl=}Ca`Pi-BTK46nuF2orV=SMS&+k9R$q@?#@ zpbVpHG9p?D9!MZxTwZpGlni`VmQpRDQ>RGHq-T~arMux;Uq$qpz$6+P)^VaCZgwocL`n%pi=mlF7k2xu71)s1S7a_T^ z*xuxVi)y(WTE(ST5TWqMK2%FX{295a#gsFK+Yj?#V6e#!8REG};dmvT`_LFt^Umy(UFF#UA5e| z+A$YIRLh!=J(0_vcCg#=wDtTEEzId~_ki}wpjP<_1D!FvU~@5c8<_`DmRi|~0n zC1{zmlD6g8Rb|e}g;C*AZFF(~to6g|awD69eumy0I!3QKYZQq&X|WO{I#2@;G7+!- zR(m68KB91p^AY`I6*mAZ7J@L0&PT+I2Qfop?!e1*l*S>V{*23xb%KOTkHFc-K~9ah zoKC?Nv=6q%IV)&p9QLdcBs$aC2>XR_vTGcUhGGg@fcdE}qUm_3tcHLUf*;_k@W=#-_Ed|`qL1OwRkoapgd=DxRiyULQu-qjj;|bvAS~bK z0%rqWO>H=14MT1T64c6BMSG%R8WSYs9?GNTaKMe~L`?c$VphD_Sxkqc;F}ZV(UUMd zHj42a=q|zP)-8%1BZ4rrTKGe&LKNdU(j5Vko-wthO^~>Ws?d4#9SmM#YBcA14mEL> z)3+ve^$Bum8fG8489bfZB1BP76Nj}3!jj$;OZpZQL*=d`sJT-}U+DUwN05izD$(t_ zMzYEamaQA2FNwp(&|I&Lzj z;kG~$lbyeO5LJmrfvAV9*gZ~-bTa^af;^fECm)OCsG!a0Y+qc-?{#o6v>PL`=0UfK zj$VN5bl4uIgTW`rrC;G-10C=bSwZV@Gua7IbI=3>xuxnLX%%#@H_=x*0z2zMs)tS| zxEL&gkixhYE8yYkXbR5N{?3Vkh!=1i7>X5!A)Vp#Yp|}M@Q4$;2u#`paXC|kBNCgOwc!ooU4QM6fu>N zmL(b*%mNjFsA1WN!mu}=6Aw`}Zq6u_AeDHp0B1~^z=~B!@20D&IgRKokREm=cOasA z0^_R;437rmyBAE{0%kriWezK}g%jkdbjFHMq>LWGjdLh3J>B3BsnrZ}l86H29HU#) zBPr6pOwb?@#2TXE1i5rSI`fJ)K}4TptjoLpl!p0Z0=|$#OQ%f)mefnf`VC*mUAJzV z1w7W~lS9x55Hv;C16=tTxJnuG3x?MY;9abVw*wuzG=m@)lfOfKG_hng5aCuke68gukG1WkbxBRF8G z@lONc#H%R;b)bAq_^Y+Cq(TDo&`N9p$}}t>4*+kLHXe4=@U0F=GmoDIMge^xJj}SyqhzhakD@oT2T5pyxo)qbUR>_db7XV@ZXhR5N2G z^HeHzxHcYcec)Sjjvj}gegG=qfThTwzyMD4PS?XKwg}&K*Tf6l{Q_$)a58K#unQ4E z9z!m?`~^I8iTyAd_JhF#kwgOwxPMgWB4@33?kB?=FsBcm%l^s}B9Z z0n3mn#!c!fmEcbeE>A_Ij7(0O1ETu}V94CiRt`Xb%xGXv=IDkJ=kRGo7bYMPwQp_xSDc>hqcQj7hr=&tR5VVA&%Oz-&QGQsKrU<$O%kw{hBqfJi zf5`Lzesv`yAnRbBN>D-ivR;CLN|I`*;n)Q^dGxK{im4$YTUM-vHXcEq+RxkF}ry_ zVMyzAgGW#@ADlIT#pvW-5ZnT%n~_dM{N(+H(&5N393XNJBIr%7DvKaBHMq16jj{VB3eMKi#VyJp z=sj(e)hugBV+UQL#wRErH+Pj)VYiJYlkQV-jJ+6@VEcmrRi&(4-ALUiUtz;2Fox(B zd$I{q!_4e9A*^p}A+S?b)+bv%M2b9rYZa!b{kuc8Fc0q4(bFTyrQ6{A2Ra5$A=!n9 zo?g2CXc6Q`k!hM!*EiepS_g*Ob5Mx_R+D=XMX%fTK4!cPh@RFaHuNKiup@HmN04-x ziNSKwNl-IvFN}`PwF&Zvnash+T+Hdvw06$v9Wo+Fk>t`wL{ZCAoS`GgL^cYmLpoU> zq7W3V;v+ZA2A-$sm^LQJA8G}7=O(^%{E99sa9nUDLCGY%%ox^<;zSI( z2|Rh!68Bu2qGCrP$d977s$|9CrB0$c%+eRxGnp*?GD49F@+WMw(^p+@dGc$q=edO^ z8ZKprAene`QP$>A`*4#nO30K-MO4*WdK5}}YK0&bMaev|tYR&%4P-IgXpQLk%;qJq zMvy<$#jRcjP^6Jq*LLSw<-51eH$SuKK@1Vf8)Q55VaX5GG%4 z1gU6BK8Gfcp_`>Sx)(!g@X4MM3hS7y-^-PtGSM^;pJhqh5xnN&vAYS*Cx+FqwwUp8 qP6>i6_sJ^U8G=ISJVQ_jLH`5l09j`QMsMZ-0000500001b5ch_0Itp) z=>Px(UP(kjR9HvFm|tidRTRd*@6PPxPg4@p*$oj=N`3H2N(tJRL}*b^6cJ0snjlt% zR;@~sjUhgzAXM2+O0lsGh!shw*dikSc~GpFytGoa_~e6C(n`qgCZ;52liitn?97H5 zOg5R>Zt8g&*uD4s=A3)Z`R)+6VA5aTB-;D{#2yH~rE;ES*Ywp=w`8dcy>&Vf{hpR; zmArrvLUMXkb*Jwyb&II0V)|rC!^yeo8(^>kbsC> zRq^!J+Xf>8(T7Cyt6~l*dN;c>--QJV9U19^DK)XP03I(21AL0P)IRpX2?G=wCf6U^ zVG70o)U4rX&LLW?uGHlXg^~W)DVRLyRZ!8$LeS&5Mk<`UgtV zZWizYLF50x@s5!|TtasFRUt`xzfiqLLG|qf@Lj+bD;gh?;POcv zI_3cv6ec`Gi~Ee(JvHo?_VTroj6N*n7lHanK&QoL281GyFrL0S{Z}+E>9-GxsN)-4 zVT+`Gja`|c<*=)EQb|M)gM7z}TRBtarDmy#zQXSGiT_5eXj_*7`zg^J0qFJ2GMQ*9 zX=7*Rqt!Mn4)ZY#j5nMCWM4Tdtl)@ev2}7kpTw&DzBtTav<6vx25@)zVB|ci@EBiC z&xMQ3F}qP*H45OaGUdqI<~JI;l^vOhP%sNe8@5{!eF839iso_J=$?Eo6pT(rM`^HSEz#vSv4RksAknz=Tzmo;@MP;QLm##}GCvl}hxFI&6tM;YG*iJ6PuMRRD{jPZKHtQi>1%;t{M;v^=TN2g`i