From 4cc771f0e0d479b9c9392af2d6364803736ba191 Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Wed, 5 Jun 2024 21:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 3 ++- pages/shopList/shopPage.vue | 37 ++++++++++++++++++++++------------ static/tabbar/shop-active.png | Bin 2083 -> 0 bytes static/tabbar/shop.png | Bin 2670 -> 0 bytes 4 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 static/tabbar/shop-active.png delete mode 100644 static/tabbar/shop.png diff --git a/pages/index/index.vue b/pages/index/index.vue index 04ee354..5ad02ff 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -668,7 +668,7 @@ if (data.select_mechant && uni.getStorageSync('storeVersion') == 1) { this.gridList.splice(5, 1, { - image: '/static/tabbar/shop-active.png', + image: `${this.$picUrl}/static/index/shop-active.png`, text: "精选商户", path: '/pages/shopList/index', type: 2 @@ -1065,6 +1065,7 @@ if (res.status == 200) { this.logoImage = res.data.storeInfo.logoImage ? res.data.storeInfo.logoImage .preview_url : ""; + uni.setStorageSync('storeInfo', JSON.stringify(res.data.storeInfo)); uni.setStorageSync('storeVersion', res.data.storeInfo.store_version || 0); } }) diff --git a/pages/shopList/shopPage.vue b/pages/shopList/shopPage.vue index 68173a9..315c339 100644 --- a/pages/shopList/shopPage.vue +++ b/pages/shopList/shopPage.vue @@ -12,7 +12,8 @@ - + + {{ storeInfo.store_name }} 100%正品 @@ -141,15 +142,18 @@ goods: [] }; }, - // computed: { - // styleIndex() { - // const index = uni.getStorageSync('styleIndex') || ''; - // return index; - // }, - // navBgColor() { - // return this.styleIndex ? (styleColor.shopNavBgColor[this.styleIndex - 1] || '#FFA3B2') : '#FFA3B2' - // } - // }, + computed: { + storeInfo() { + return JSON.parse(uni.getStorageSync('storeInfo') || '{}'); + }, + // styleIndex() { + // const index = uni.getStorageSync('styleIndex') || ''; + // return index; + // }, + // navBgColor() { + // return this.styleIndex ? (styleColor.shopNavBgColor[this.styleIndex - 1] || '#FFA3B2') : '#FFA3B2' + // } + }, watch: { firstCate() { this.goods = []; @@ -358,15 +362,22 @@ padding: 0 24rpx; display: flex; align-items: center; - .logo { - width: 92rpx; - height: 34rpx; + >text { + font-size: 24rpx; + color: #fff; margin-right: auto; } + .logo { + width: 50rpx; + height: 50rpx; + margin-right: 10rpx; + } .tip { font-size: 22rpx; color: #fff; margin-left: 20rpx; + display: flex; + align-items: center; image { width: 26rpx; height: 26rpx; diff --git a/static/tabbar/shop-active.png b/static/tabbar/shop-active.png deleted file mode 100644 index 4cf5619514236b00fb927642141d81e6a61bfd45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2083 zcmaJ?c~nzp9!*)oGJtG?3@RZoG$>>x!~_B*B!QHD6ABf`@{kmg7n4U46h&5xpfDhN z1sbNxsUocfss|XB3RMJb9V}R&fM{_*Fm)J2K%EyWcK#UVo%7zeoO|zY`R@5%L1?g_ zvEiQ$5eS4a$DbJvk66vCkA%O`*Y{K4!3JW*KoMXPq~J;cgpUB^0Vs}$dl(1@xPtT} zw*XHBLfc6g83V-x1=9GS2+P%Auu72xW+M=u-bx9Vp8`NA9&lJFrlX&BbfZy10UaGp z4#EdXe1T-4|4}IraWpuRe>8rz#1n})JQ;_ly5bMeh-4a> zjC%W^;eb*>5-ps`ej5&6(b35eB%$GO3WWlzAYno2VH|-BV1+aVu-7B z70Vp96qtaFFBM84At**^6uCSw4WgsrWPh(hBzY$*mc8v1+%ue#E5Q-4cuiGXz@VW2 z4;6{tp=D4w@JGJ?Q&<+6E&*`ifDBBN^5L^fa?pg5(0ru;7Xqb`Aeg$<$k1dE0%ggd z1Vtoa-B6flp;!PaWX^90K|wT*SO#&$e1OBGqhSfGP$-}=Nj?WiWOo9=4NoKxSZoHF z%wqdeC{z}n4fl+?#btv0G!Y<%wzz^nxWsL_8as$2aAYPR70LktTMCL$Z)&Cqx6Osj z-d67|SFn99_-(m3I2oMgWdG}=x3*yWXr}M13oqW89}vTim%`SLJk{WgKrHP_0>K1+4MP`B5R*N}J`!|-uoH=cZNv{qps~Gp{!R7)E&=I9X&LO){5?(>@N~e4l7<&+{#iD zTlzq)lpfz_FHJkss$UWYZKYSu_3Q7BM15TK>5z6yjxFQyl`^CGzv~_Au_-aAd-$Tm zW9^#VqOn)Q)4U0*oag86_*u^Wmc=Z0l;9bv{)*q~yaFQ5UYatjti~d3%!(lNimZQr ze*c(BhuK~|dG<=M{y)CWSxP*h{DAtpz}7BPSCGa#Yc{s~VxXAh+cZ~HjBH{1Wbba; z4I-`2=LU?&*?lgZ*=83glU=jm-8;MR#W^$Ok>eh_VUbJ zuxPwK6?#;lm&ds_^sIO$j`Ap<*3g?&q`w!r{LsQW*9WrisG}F{mCJ8AZgz5Kyk~qu z8#_nJ8!)-5!tsAU3AL_2bDnI_;%0Pia4Gt`7uxpb$MuK!rPnLxW7kaejORjXa_uOo zcPEqQKy3ypcA0X9HHCh(=`gu|Q#HLfm8my-6|vtaFQbl|030b%Wg^RZwdAp09ewv# z@1Gj{Iu%iVKkC$m5hcC0Me1bXn^&*<@J{d%_rJtYGj=fxLqdSkk1S>sEq7UWUgXwV#UI+m zwBs5kEc>*MZ#)SR*%mBQNei&AFRvS`knCI= z<|y~w4D+f~Crx=y20rUG3?0O{-DrGl=rI<4JfrR>f6sobW9X%M^kv-yUHjM*?^gn+ z8rAw zWXwC{7PdkO&WW5Y82lQvqn+grIY%5Mr0w9z1B@80sZm1*Q_LxSw&hs=Nj`R(QR*wR z=YC?Lyv=Wl5ZMNtW>a$bZNt`W>$l~mUA1lhG8hTQtBR!r?}dY{*v^xMea<(Q9>m?` zhGo{?TcyM|IQ^B^a<5(J9b4-bePL{$B1SZEy}D@HIB<+rWZsrP{psBB7wsd7pI3Z& zZ7SjN!k6O_6-2+$W9jrgr!QYgI<(ro`C4ZeVzm7|t6vj#1#5oW99A&%3L`Q5KUJwv A^8f$< diff --git a/static/tabbar/shop.png b/static/tabbar/shop.png deleted file mode 100644 index b7fc37fb2173f6eec60f5647d28e1607d924c6ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2670 zcmaJ@dpwi-A77%#FG;3IwdQhMcQv*#!qCcXY{@EZwr7mpY>$jCYTc%bQ$pmDoJ8)I zE~H{9(#3I#LKmwcl+*2}3psw%sm||@U%%(|dY`4Ohv5QH0b*|; znzuSh0)!?7(%4C{Yyt=F;SO_?5j6q=0A#^r0=`g6l#$?Hb%~n&%rz1Y`w9VLN$|gu zS|1P$^A=j;qbvT>144loP~gF&KjNEE>lg(qTgL>vzG?SX3o zN;q6%2-){rIL(O!j|M?85s6GlNI)cD5h6(x5=|fwkSGiigK^X#9HogukR@{zN-e%C zkO3)M!V`l$kq|bc$chxjgCw{n*}tn0h=0fmrQbTG=^0YS5+l(F)J#?1fdK*kA1V<1 zKuf_8;GcZ|r?8ZkC(mvp&m?zbdz6X3&W(*_H*Z;D%b-i{KvWDp?568e6!`-= z^t?TaKrAIG)3{q+-869DILK6_^Hrvp~ zre@G~_`6VB*G_apvI%i(99jd?Zvj!`*Z3C&&Fk-BU5TW9Z!n{}kxyp3CR ztV)%iorg{FYCZ9US&>Q0?RH*lj`l^p3*v~iZ}5}1dmfh13)I_t+?HR)lulD~mkBKD zGc(R-&h`0F+RO>BfutN7mI-8hM?Vxc)gWx4za?b5MV8<7b02QU$ehgk*Hnd zJnH_wY3(vbykelf_eh>$BD+cN>4EqBr4-ll=iV-b;)PnwS8E2)R8rKveJuI=FXlmT zUM=!dTFK%dduznNqMbvF2>p9oT5F=xwJWK!#{!0tgZ1I9FKHd9s$7l;7dUXF)~tPL z8`JlwXP;;4%DL~vm-70D_-6~#d!2G_x5piuas*~uV=1kdbo198BZOD)n#7zs*dA`u zfXzRXn*2;>kk^)ee}3FK>leP(#bwPL+pXCv=qE}~b6rAUZ821| zw(#oSEvUVBxc&v!x+-05bxuFEj>fehT}z9xSHxLtVXMxLHXQBnkDWBF4BI`8%XVA) zg5ZgZvN&&hcwEtGcaS@!5|uKBShE6S>+YTkqcgFz3HJ~PrtKp&c({Z>IDJ1HpH&!* zGAvSb3ybEQccuzdA*l~7UW)~~Yt8SDDxWN-H}_nBl?=T$0vh36chw!eqgd$?x_4r{ z)Q6ff6x_e__&Dr@LFhyGVwZZvp8I!)eI8JaNbZcvd!h7?1h?vqKx(hkTT-ziuX)OJ zbi&x|c;d=j=QuT+?vPb32KRi5JE3+~nR|UW5Zx$PcjbDv<>!?0PNQ2D#^dE9&)v@y z+0R)@)}N5X3!JEgm@Pf42A4J1xhyH!0z&WgWH|7`#=pSf>hdF9S!2dldxM36ox2%r z@hjBn#HVZQaspb12zRr+?8Z%n7j2vS>M&38?CgH6ufg{%sPAQ&U7FG&=KA~g^xB>w zMK!mK81V}>z4~Zdq!a$EJAb-3ogZCK$~+p|_M)(tawrLsQ+27%?3ahb^czuk-}BHwtlAGpD?ALH zox&vZ_MIAzM{2E^b$J7&=Sh_$gVd$Ce;GTyYH6R*U(=b%nPVQa=0NhSs`g!L&nut# O1Elx_k}JKK^8Wx{>T`ks