From a68fcef49141208fd6abf0050d18cccdbea6a0e1 Mon Sep 17 00:00:00 2001 From: XiaoXinPro 14 IAH5R <568170040@qq.com> Date: Mon, 12 Dec 2022 18:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E6=88=B7=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/merchantImgCover.png | Bin 8454 -> 1711 bytes components/shop/shop.wxml | 34 ++++++++++-------- components/shop/shop.wxss | 53 +++++++++++++++++++---------- 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/assets/images/merchantImgCover.png b/assets/images/merchantImgCover.png index ac6476dc1e984d77cb0552b75b7ae5c405d52301..63a50ae0d12a508ac53850f06050ec902dba9083 100644 GIT binary patch literal 1711 zcmV;g22lBlP)Px*X-PyuRCr$PozH7sMHI)+xi7`8+^M8Z(std2s35L1g*4AdT)MVhsJK)YzGTxB zA@3nBT-t@S{sST@81veu(ISXHKqv}Yq&A6)7E};1V%|OS(n=pS@6F78Gm|s-e&6<< zJ9EzWeD0Zf!_2)*_*Gf~u5|PWo&Z3_ApigXpyCQtJbY9D08nuSDjq&6004-q!1{&x zdM5Ig5FPg1^B3Fu?wLArY~gp$?UuT^=oR3`N@F2oJ{3gOjvO1GX{`lmyQGZ*fRZNG zHY@;Ot5iwt06<9-Ya12-uvMz0b^xHHiM0(YIsn&~8;AGRvQt9h_irHcx8uhbU$6}v zcDEFW4giGLr2qiXm5=D&cn4s!J%3h6PDGEyqQhL|^r3od!NRmMCf)(qXwQje^~R^0 z-ecArugN#>VgLY>&M3-DwhX6oVKB9XA0HRB- zt3v>wD<9Fl0RYh@*VQ2a(3Owq-T;8;lI!Xa0O-m`bZ@)@aPy=2(XB1{F?tjZ9q!-H z2kv`(@h68{N^R;4z-GJgOh@SGZmQInpAB%}!*>GKa*+>rYcwO?7_T?q_T8c8_M8Cd zZs!`Q@pa7s4eOhboSc|$og22DRPJ{IU}L#4Nj1KlN^nK|tlFj#0B{#20ARplg9=cj zrs%#06#x~$o={W(d#zHjLyo1&BGg4c8X{z`p={f@~*Jr0|`+8!L_HiTR8vTFe1F%mGXy zYrYNu001U|{TQ$w0yID32H#Kt{8WHILMeEBci&=Cjj69fRSywfAp#5O_SI$ zuiKt!0015Uz&b!ow1?{p>i}2>uqViN5{L?5ujyV}R;B{jo?ONpz{4Cs;{i+CuayA+ z4*=|SSsSK*000265{Q++Ti+D;`QrQoTb=yHA{AwXvX2ke7cUgKH|9M-CV@7>c7cL*5z;}=YSiO_i#S<3&R_YcjselztS`+5)nH2w`NvJ$w_p6k90 z!w8La(wHtY(GqWWmJiOn{*Cp00SzkyKvzT8J%Qc<=uM=^SHjs6<+42SWb;bE91m<7 z01Q|O3<^L`zfAN?cc`FDmh-=9HRezO02Bal_aoXJCWz?+-tMf19x5sWz~;rdS;^_V zsnqsP0%KKx!9K|+xzGv=UkWi)1Ob4EUZswFY7#r<^*p1=jCcMC4E*T>pm(g`?pr-SKAp3AE1hcN*_Spc{l2NORu zHof?zEkvOJz#PCf1HSDX&twDvK;ufFx`iO$iT|%X0MK7qRV#r2Ad~_CV0@;vW~(lS zfRarDUC(7!27ntYjYl%(&rMH8GV1{S0?{xB(6}FfYuU>}^0W&8xAze~VY)}nb)l;x z9eT~>P)?8vphl1aj$lvV0MTsE1r*R-%`MFI=GgJ(OKKbn>H004Ww6s+<4ytaD+^*qW2J<(7BnCSbCh^mu88S`^Q zbfBQD>D;CPfOOO`gLRYF?;P{O3TgaiOw)GDDZ04QNnT|xo?E^3v~ z766nmsV*S_02j6V*><FKzP+AF_m}_x002ovPDHLk FV1mE8_pAT_ literal 8454 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 diff --git a/components/shop/shop.wxml b/components/shop/shop.wxml index 0247f52..37e1127 100644 --- a/components/shop/shop.wxml +++ b/components/shop/shop.wxml @@ -1,31 +1,35 @@ - 适用门店 + {{"适用门店("+mallNum+"家)"}} - {{'共'+mallNum+'家门店适用'}} + - - - {{item.mallName}} + + + + {{item.mallName}} + - - - - - {{item.merchantVoList.length+'家门店适用'}} - - - + + + + {{item.merchantVoList.length+'家门店适用'}} + + + + + + - + + \ No newline at end of file diff --git a/components/shop/shop.wxss b/components/shop/shop.wxss index 2ff71cf..ce9ed90 100644 --- a/components/shop/shop.wxss +++ b/components/shop/shop.wxss @@ -2,6 +2,7 @@ display: block; height: auto; margin-top: 15rpx; + margin-bottom: 15rpx; background-color: #fff; } @@ -20,7 +21,7 @@ } .components .header .goShop { - float: right; + float: left; font-size: 22rpx; height: 70rpx; line-height: 70rpx; @@ -53,40 +54,44 @@ } .components .body .mall .img { - width: 120rpx; - height: 120rpx; + display: inline-block; + width: 75rpx; + height: 75rpx; } .components .body .mall .mallItem { - display: flex; - justify-content: space-between; - align-items: center; + position: relative; + top: -26rpx; + display: inline-block; + margin-left: 25rpx; } .components .body .mall .mallItem .title { - font-size: 35rpx; + font-size: 28rpx; } -.components .body .goExpand { - text-align: center; +.components .body .mall .goExpand { font-size: 25rpx; color: #a6a6a6; } -.components .body .goExpand .rightArrowDown { +.components .body .mall .goExpand .text { + display: inline-block; + margin-right: 20rpx; +} + +.components .body .mall .goExpand .rightArrowDown { + display: inline-block; position: relative; - left: 50%; - transform: translate(-50%); - display: block; + top: 5rpx; width: 14rpx; transform: rotate(90deg); } -.components .body .goExpand .rightArrowUp { +.components .body .mall .goExpand .rightArrowUp { + display: inline-block; position: relative; - left: 50%; - transform: translate(-50%); - display: block; + top: 5rpx; width: 14rpx; transform: rotate(-90deg); } @@ -129,7 +134,7 @@ .components .body .shop .posi .posi_logo .shopVoList { white-space: nowrap !important; overflow-y: scroll; - height: 90rpx !important; + height: 60rpx !important; width: 360rpx; font-size: 16px; color: #333; @@ -202,4 +207,16 @@ float: right; width: 40rpx; height: 40rpx; +} + +.components .body .shop .posi .dividerInside { + width: 100%; + height: 5rpx; + background-color: #DCDFE6; +} + +.components .body .divider { + width: 100%; + height: 12rpx; + background-color: #f4f5f9; } \ No newline at end of file