From a48f9f711be6761eea982f3e49b6ba3640c6eaa5 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Wed, 28 Dec 2022 10:50:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/ShopItem/ShopItem.vue | 10 ++++----- src/components/BrandScroll/BrandScroll.vue | 2 +- .../CarouselWithIntro/CarouselWithIntro.vue | 2 +- .../KeyboardByLetter/KeyboardByLetter.vue | 2 +- .../KeyboardByWritten/KeyboardByWritten.vue | 4 ++-- src/components/PublicComponent/Tabs.vue | 2 +- src/components/Search/Search.vue | 2 +- .../SearchResultItem/SearchResultItem.vue | 4 ++-- src/themes/business/grid.png | Bin 795 -> 400 bytes src/themes/business/gridActive.png | Bin 766 -> 394 bytes src/themes/business/loc.png | Bin 911 -> 851 bytes src/themes/business/row.png | Bin 768 -> 370 bytes src/themes/business/rowActive.png | Bin 738 -> 364 bytes src/themes/business/style.json | 3 ++- src/themes/fashion/style.json | 3 ++- src/themes/highend/style.json | 3 ++- src/themes/luxury/style.json | 3 ++- src/themes/main/style.json | 3 ++- src/views/Index/Index.vue | 20 +++++++++--------- 19 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index 6809371..7ded5bd 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -64,7 +64,7 @@ const deactivate = () => store.SET_SHOP(null) width: 230px; height: 200px; background: var(--brand-background); - border-radius: 8px; + border-radius: var(--global-radius, 8px); overflow: hidden; .logo-wrapper { width: 230px; @@ -150,7 +150,7 @@ const deactivate = () => store.SET_SHOP(null) width: 230px; height: 242px; background: var(--food-background); - border-radius: 40px; + border-radius: var(--global-radius, 40px); align-items: center; .logo-wrapper { width: 180px; @@ -200,7 +200,7 @@ const deactivate = () => store.SET_SHOP(null) .qrcode { height: 160px; background: #ffffff; - border-radius: 8px; + border-radius: var(--global-radius, 8px); display: flex; justify-content: center; align-items: center; @@ -226,7 +226,7 @@ const deactivate = () => store.SET_SHOP(null) width: 194px; height: 45px; background: linear-gradient(99.5deg, #f0b92b 0%, #f9d556 100%); - border-radius: 100px; + border-radius: var(--global-radius, 100px); line-height: 45px; margin-top: 9px; } @@ -252,7 +252,7 @@ const deactivate = () => store.SET_SHOP(null) background: rgba(255, 255, 255, 0.8); box-shadow: 0px 20px 60px rgba(0, 0, 0, 0.2); backdrop-filter: blur(7px); - border-radius: 12px; + border-radius: var(--global-radius, 12px); display: flex; flex-direction: column; align-items: center; diff --git a/src/components/BrandScroll/BrandScroll.vue b/src/components/BrandScroll/BrandScroll.vue index 98f1197..de9e757 100644 --- a/src/components/BrandScroll/BrandScroll.vue +++ b/src/components/BrandScroll/BrandScroll.vue @@ -148,7 +148,7 @@ watch([scroll, () => props.shop], () => { color: #ffffff; justify-content: center; align-items: center; - border-radius: 6px; + border-radius: var(--global-radius, 6px); margin-left: 12px; } } diff --git a/src/components/CarouselWithIntro/CarouselWithIntro.vue b/src/components/CarouselWithIntro/CarouselWithIntro.vue index f7d4bcc..75b2e81 100644 --- a/src/components/CarouselWithIntro/CarouselWithIntro.vue +++ b/src/components/CarouselWithIntro/CarouselWithIntro.vue @@ -76,7 +76,7 @@ const qr = computed(() => props.data.qrFileList ?? []) .banner { width: 944px; height: 532px; - border-radius: 8px; + border-radius: var(--global-radius, 8px); object-fit: cover; } } diff --git a/src/components/KeyboardByLetter/KeyboardByLetter.vue b/src/components/KeyboardByLetter/KeyboardByLetter.vue index 70ff122..6160914 100644 --- a/src/components/KeyboardByLetter/KeyboardByLetter.vue +++ b/src/components/KeyboardByLetter/KeyboardByLetter.vue @@ -54,7 +54,7 @@ function handleLetter(item, index) { line-height: 48px; background: #ffffff; box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.03), inset 0px -1px 0px rgba(177, 189, 220, 0.1); - border-radius: 8px; + border-radius: var(--global-radius, 8px); font-weight: 700; font-size: 18px; font-family: 'font_bold'; diff --git a/src/components/KeyboardByWritten/KeyboardByWritten.vue b/src/components/KeyboardByWritten/KeyboardByWritten.vue index fe7844e..e14d660 100644 --- a/src/components/KeyboardByWritten/KeyboardByWritten.vue +++ b/src/components/KeyboardByWritten/KeyboardByWritten.vue @@ -58,7 +58,7 @@ function del() { width: 552px; height: 252px; background: #ffffff; - border-radius: 12px; + border-radius: var(--global-radius, 12px); margin-top: 16px; overflow: hidden; .word-scroll { @@ -97,7 +97,7 @@ function del() { bottom: 8px; background: rgba(0, 0, 0, 0.05); box-shadow: inset 0px -1px 0px rgba(177, 189, 220, 0.1); - border-radius: 8px; + border-radius: var(--global-radius, 8px); } } diff --git a/src/components/PublicComponent/Tabs.vue b/src/components/PublicComponent/Tabs.vue index aca0012..175a12a 100644 --- a/src/components/PublicComponent/Tabs.vue +++ b/src/components/PublicComponent/Tabs.vue @@ -89,7 +89,7 @@ const goPage = item => { align-items: center; height: 97px; background: rgba(255, 255, 255, 0.4); - border-radius: 24px; + border-radius: var(--global-radius, 24px); img { width: 80px; height: 80px; diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index 2256b0b..198dee6 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -243,7 +243,7 @@ onBeforeUnmount(() => { max-width: 170px; height: 52px; background: rgba(255, 255, 255, 0.8); - border-radius: 100px; + border-radius: var(--global-radius, 100px); .text { text-align: center; font-weight: 900; diff --git a/src/components/SearchResultItem/SearchResultItem.vue b/src/components/SearchResultItem/SearchResultItem.vue index e669c5f..7ec450b 100644 --- a/src/components/SearchResultItem/SearchResultItem.vue +++ b/src/components/SearchResultItem/SearchResultItem.vue @@ -37,7 +37,7 @@ function handleShop() { width: 210px; height: 200px; background: rgba(255, 255, 255, 0.6); - border-radius: 8px; + border-radius: var(--global-radius, 8px); margin-right: 8px; margin-top: 24px; .icon-wrapper { @@ -45,7 +45,7 @@ function handleShop() { width: 210px; height: 160px; background: #ffffff; - border-radius: 8px; + border-radius: var(--global-radius, 8px); justify-content: center; align-items: center; .icon { diff --git a/src/themes/business/grid.png b/src/themes/business/grid.png index 098b5cfb717f26ef8285de8907f284a2c66aea82..c70a4f1bea12f98b4230c6e28bdeb00ebb2911ad 100644 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9E$svykh8Km+7D9BhG zP~weE!q$ z-v*u2uTOkFcZmgT%Es~o%h#rVSbzS<-t*R8!lVMPJz_#VQ%GV5o zD7xnN<8)Xo1Q5~~Y_}DCnu*RK#u%jgEBd_#1|Wl{tDnm{ Hr-UW|op68K delta 722 zcmbQhJezGoXg$*gPZ!6K3dXm07ZyncinM>+?6Z7E!mL?IU71;3o+Y`Vzxh_!iNBvP z>sZ+0fZj!Fp&CgmZq7S=FV*biB-O^d^+&$X-g$BY!=t)teeRC4IsTRNzW=>mE$=M9 z+|IA&3vc4v$JdTuI^NrFA31I9_sWE8CG7KmH2#-awH!nZWwWGfD{~F#2eZSV*v9%?4gnn3@XKKUoV6y!0-{Q%i`gPU*pHkLYUH>LD ze~I$^lljNf@-EBd=Q1y`ou9ircJ|u4&wrKvY=6aNVXn5H+wi#f(_Y_(Q!CYW8R~6c zRKyx1vFn>=-Iq&sC222iMV_gzUDGhpQPHo;O)w!NK+>%txcSs;X}iVA9qI8Y}tIH^vM11@<-1u`>il_+8G8Q@O1TaS?83{1OQS} BMTh_Z diff --git a/src/themes/business/gridActive.png b/src/themes/business/gridActive.png index 368f9607c742f49c29ed0f81229ce4cedd597725..748ed4a5e60b08db174e2b4ab3de75d3a4a58afb 100644 GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9E$svykh8Km+7D9BhG zM5Yw4Q0Qr;B4q1>@VhcXOp2McN*2)?l@eeZc4N=-$Gn8?rl^r!-tBi-}fA_rm`^3Hp9}gX^sZRSpVc8~bS-y7d`kh~QeVkR% zyLTN=;`^z4%HpKgA78cV+w__ZS+@_c*S*odzvo>qV}0+`>*f4P^?SEmyvguM?tjA9 z2an%Q3uC`{L$H_e$=VG?NF<-*@_pzHM z`~47inD@C}vibh@C#Jf`Tb>7BXg2)eEK#j{O5R^~!t#0d+Z1DuhlE%qBud=6{IYiH z^MCej3y&H;u(En^ZGnLGzv~W?k>q{=iyB1El_r{m}R**Q|bIUXcTkd$1);n2fy z1P}3Ma_5;e5|}K@?6>vo!S!<=@BX)M-v!1b76ms3Btrg~ z)q>ZbKlK*@9S71<57hJc`OBn|1_{Ov!3K%*E$3_Q2fP3o1vGCSXZJ-6BW#4l7BfR! zR-vZj#tza3){BdXU@5qG=ay=f#MB(X2ds`a%2RXu+Mj z?|KA&P1y79)Ro{6-{@z}pKi_Q+cjy;z0a3l+Dqjhd&;}~SmRD^!?w%I4)TZIUS4dj zv*#V}bgk=Q_UCwOE=oB}JU=PvuinoHCfl%wa?;`FU3n@t{n~fy*z1o!8^5X6Gse$Y V7Q3Qw(=7%d@O1TaS?83{1ORScLLvYF diff --git a/src/themes/business/loc.png b/src/themes/business/loc.png index eb3e38c9a3c6686120554b6df1455156f0d97450..2c6910daf429757a7e5e4f32b65a0ce88711ffbd 100644 GIT binary patch delta 779 zcmV+m1N8il2h#?SReu8LNkl5`#n=EAP)lP zMe8w^3Q;)F07+`BsS8@Lj~5yXD2~5VbEyW++~Kdi5}4r1my>;fh}1PDfKxt~e7RST zD)yPX+F$iJ(tmIp9~`&8W?P75u6FDLlh%Ibl16rW&wx65H9Nj_v|G?QzuHjPts5)H zq`*HZ|IR30IR?$B6+K5gfIS*;5c0Q>HVw(QnL^r98ti)YwFipHb-0V zsjEN`pl)0laEOi`6ay7(AH*K$T(~u4qi9PMweKthaDS%mcgF9SfF3YMlrgB-mYTH_ zZLN(k8c^q7O*Y`~K^Ukr33G#>V9gK5_zUm#X3;vWw&yj-jOXhyD^-+3HikUdj)`9iu<4PH~Q*4tsTcJ?Yj;E ze5F5tD1V|;5tVB=O#jWeeCS5)>L+1xYPnNH~K4Nh>O@k{U!2h&xkpCn{jR>}>As-g~ouW-(2_>)D9kbmaRCeFsrW@xCUfQhr` z9NxYy&dyL@+|?8R_l~INvN`ni ztpHy;+e8trGJh-q{X(_|^G(KybFJ>T0c1FaqWs0#*FbxEd)wJfXY0;Rjdna6xp{7j zeluUcqIK9BiDwQlHrfq*+g_=jeK;x2J7eE3@#Ue>&h#MN{#2BCENC+%*b8UZly@5* zf*Y~C%ej94I=k!3iEp!VKCVI6J@K3$CmP%{REupMDS!0`D4qgaT4yW7+v54B@;)hj zlpms(k9?UE9AO#4kpjeLdM)2DJ>@&52NUtEg_g6Gx5QgyUY=v=@jdaLZ67G($jRSA zOTd`{C_kc2;h;S1R zLN9NM`ftwOJNu)I&v8>xW`3#O#i4|i?%xq*dVk>!x)GO#yg6RMh(sveVh5QPF(J5t zn*U1#l%kll($j}l=$>8tPO9 zNG&>mObxio|Bvec#zLlT;hF%pg-m1MngTY3Ok?5N0M>;}yMUu&etzR^u!Ca8lHUfM zz(7&4zYl7VQc-YJn-EKB;m#EeN5ukC8e}JMR2P7hgyeH4aQ{OI?Dg16{{Ti}#lwJW Rj;8JZ}dNs^oFl0<(I>OSyDIlz%=HNq`!0)~jb3U8PrK~OO zYv2YOQT9VHdnXn{OuwY@)@p*RTC>nl9Mi7NZTHqJ)K>*Lz|`a!6ZuYp_~HgDbB~mN Ug|g^AU=T5Qy85}Sb4q9e0OZnXtpET3 delta 695 zcmeyw)W9|&w4Q0Ir;B4q1>@Vhy2Vm~BJCeH`z)W4Fl$y)S7uh1XGw18Z`pvqF*WU1 zOtwk2W{H@tbP{wv`%UIsT-s%w);(|j8Bcz0UOZWmv3TBI?lm_L@r6uFy?+ z!TPML9}4S>S3CX5{FR>EP;#aIo2h|K+YQ$Hv&s&yWw85WvA^D^?f;FWAL4R}k^hs| z|5K3t$+KT}_RVFI`MJzXitU!qEz9+LYxjEkPyVm61z9}%xeXt0{*xfQ;9H>ZU5V$x zf%h2G+t$@~$nPz&vob7stCChPZ=H}5(7|uJn8Uzi1&{K9jgC)4SuBiJ@F+2aTa^B? zZ5ClX!lB^CV93-V=+MKE#3G>FAb~Daov1YVipfXKmytxX{~vv8$A2 zhuMlXN(U}2*wn)i&NlVFU_#;^{uMe^FXNt1Z(H}b=jQYNh4sbG*V8^G3m@=4qOPb^ zl0Gl3?s0d7NTlQ~G2?kp*>5wv-2328$Ax7x-d4`~daT!5Ff%$vLhzP=@!xs=wviXV zoY|!Fm~VCbnq7>xa(ePVx39Aj*&R1AuT<{)EO}`;CA&LkUM-)yE9w5~%Xu9F?|Iw1 z^tXMyn{}_`%JsLr6PC&v8hrYC?0WXIJW600K`}KbLh*2~7Z^05FaK diff --git a/src/themes/business/rowActive.png b/src/themes/business/rowActive.png index a9a6359817a7ab8c24bcd13c1c799ad37ccf443a..a70735781c0b577f8ff1f8724747025c302c2874 100644 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9E$svykh8Km+7D9BhG z;9E*2NF#FG8rvAW@ zuh%7%OSj(bQ{la~Gx;8z0>TPv4n7St7z`Pcn2xY?kSOrKbIsOgzTfTz7chbi;ImKC z6~{DlbDQ0oh4QK(i%d@Vh7k#B2Mcf|l4&zdg)sek1>3*j+M~MTw=D{V*%bB-3 zu$JA^Jt~`GbwGAT^-akG*P3`MzPmrFxx~>rW4h(MNE;iURQFqX+tdF&y>z^_e_{Wv z<1-a=YEU0(Z@$?EjxmAKz;DFyHX|$J@^JORmR#Nox4hw|`^W zr;l~U*-l&5bzEck8M}W&+U$eJRplpdyJ~Rbf17{ZoA*BdGOyZ+RpynyS;KJe=Une? z+lAzqpVCT+s^Ij%nvo(yA0L#^Kb3X{CWH^*NN!!_0IFpC2MPGCuF_2eR%!% z(0jk%^VD{yAE;c@;N9%B=VN`nTLX9VseTRvlNCIVB?W%lx93RB=Gb6*f`=!FML@Yh zg7FB4f*XS&Q-`2K4?_~V(3{zvJ;#%O`-H8Ys=0v)qV%7J{xL3WS|6L3JU02#tpqaE zf>$(|6=-HXhM|R0vkIktxq_{m)7G^SYAOx~K($A(SiE|aSdt{nILT4fwPCAcsx0F_ zsgP+;wGQt%F?scxU*Bsdyx%%k`j=V%&gWLqbC diff --git a/src/themes/business/style.json b/src/themes/business/style.json index 7af0e83..2514ea1 100644 --- a/src/themes/business/style.json +++ b/src/themes/business/style.json @@ -1,7 +1,8 @@ { "global": { "background": "linear-gradient(180deg, #7C9DC4 0%, #BFD3E1 100%)", - "appBackground": "#dee6f6" + "appBackground": "#dee6f6", + "radius": "0px" }, "weather": { "iconColor": "#FFFFFF", diff --git a/src/themes/fashion/style.json b/src/themes/fashion/style.json index 9f84fd1..d1eb56c 100644 --- a/src/themes/fashion/style.json +++ b/src/themes/fashion/style.json @@ -1,7 +1,8 @@ { "global": { "background": "linear-gradient(180deg, #6257d7 0%, #f191c0 100%)", - "appBackground": "#dee6f6" + "appBackground": "#dee6f6", + "radius": "" }, "weather": { "iconColor": "#fff", diff --git a/src/themes/highend/style.json b/src/themes/highend/style.json index 1be32e9..51ddfb7 100644 --- a/src/themes/highend/style.json +++ b/src/themes/highend/style.json @@ -1,7 +1,8 @@ { "global": { "background": "center / cover no-repeat", - "appBackground": "#F2EEE8" + "appBackground": "#F2EEE8", + "radius": "" }, "weather": { "iconColor": "#000", diff --git a/src/themes/luxury/style.json b/src/themes/luxury/style.json index aa811a6..14ea478 100644 --- a/src/themes/luxury/style.json +++ b/src/themes/luxury/style.json @@ -1,7 +1,8 @@ { "global": { "background": "bottom / cover no-repeat", - "appBackground": "#E7E7E7" + "appBackground": "#E7E7E7", + "radius": "" }, "weather": { "iconColor": "#000", diff --git a/src/themes/main/style.json b/src/themes/main/style.json index 67dcc27..ffac5da 100644 --- a/src/themes/main/style.json +++ b/src/themes/main/style.json @@ -1,7 +1,8 @@ { "global": { "background": "#dee6f6", - "appBackground": "#dee6f6" + "appBackground": "#dee6f6", + "radius": "" }, "weather": { "iconColor": "#000", diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index 2b5fe99..23bac88 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -149,7 +149,7 @@ getActivityList(3).then(({ data }) => { height: 52px; background: rgba(255, 255, 255, 0.8); - border-radius: 100px; + border-radius: var(--global-radius, 100px); .text { text-align: center; font-weight: 900; @@ -190,7 +190,7 @@ getActivityList(3).then(({ data }) => { height: 557px; background: var(--index-guideBackground); border: var(--index-guideBorder); - border-radius: 32px; + border-radius: var(--global-radius, 32px); overflow: hidden; padding: 460px 0 0 40px; @@ -201,7 +201,7 @@ getActivityList(3).then(({ data }) => { width: 100%; height: 432px; background: var(--index-guideTopBg); - border-radius: 32px; + border-radius: var(--global-radius, 32px); padding: 40px; z-index: 1; .title { @@ -294,7 +294,7 @@ getActivityList(3).then(({ data }) => { width: 110px; height: 110px; background: #ffffff; - border-radius: 12px; + border-radius: var(--global-radius, 12px); padding: 10px; object-fit: contain; } @@ -307,7 +307,7 @@ getActivityList(3).then(({ data }) => { height: 100%; margin-left: 40px; background: var(--index-foodBg); - border-radius: 32px; + border-radius: var(--global-radius, 32px); border: var(--index-foodBorder); align-items: center; overflow: hidden; @@ -318,7 +318,7 @@ getActivityList(3).then(({ data }) => { height: 160px; flex: 0 0 160px; box-shadow: 0px 15px 26px rgba(244, 142, 88, 0.32); - border-radius: 27px; + border-radius: var(--global-radius, 27px); padding: 32px 0 0 40px; } } @@ -330,7 +330,7 @@ getActivityList(3).then(({ data }) => { margin-left: 40px; background: var(--index-recBg); border: var(--index-recBorder); - border-radius: 32px; + border-radius: var(--global-radius, 32px); align-items: center; overflow: hidden; .title { @@ -340,7 +340,7 @@ getActivityList(3).then(({ data }) => { height: 160px; flex: 0 0 160px; box-shadow: 0px 15px 26px rgba(230, 201, 148, 0.3); - border-radius: 27px; + border-radius: var(--global-radius, 27px); padding: 32px 0 0 40px; } } @@ -384,7 +384,7 @@ getActivityList(3).then(({ data }) => { justify-content: center; align-items: center; height: 118px; - border-radius: 24px; + border-radius: var(--global-radius, 24px); img { width: 80px; height: 80px; @@ -431,7 +431,7 @@ getActivityList(3).then(({ data }) => { position: relative; width: 944px; height: 531px; - border-radius: 24px; + border-radius: var(--global-radius, 24px); overflow: hidden; .banner { width: 944px;