From d146afe5fa505a169743d51013a0378092548e0f Mon Sep 17 00:00:00 2001 From: zhugongping Date: Sat, 5 Sep 2026 15:35:20 +0800 Subject: [PATCH] =?UTF-8?q?20260905:=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F-=E8=93=9D=E7=89=99=E9=87=87=E9=9B=86=E7=BD=91?= =?UTF-8?q?=E5=85=B3-=E6=A0=B7=E5=BC=8F=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/images/default-avatar.png | Bin 1930 -> 2841 bytes .../components/device-card/device-card.wxml | 4 ++- .../components/device-card/device-card.wxss | 25 ++++++++++++- yack-mini/miniprogram/env.config.js | 4 +-- .../pages/device/detail/detail.wxss | 13 ++++++- .../miniprogram/pages/device/scan/scan.wxss | 34 ++++++++++++++++-- yack-mini/miniprogram/pages/index/index.wxml | 4 +-- yack-mini/miniprogram/pages/index/index.wxss | 12 ++++++- yack-mini/miniprogram/pages/login/login.wxml | 2 +- yack-mini/miniprogram/pages/login/login.wxss | 9 +++++ yack-mini/miniprogram/pages/mine/mine.wxml | 2 +- yack-mini/miniprogram/pages/mine/mine.wxss | 7 +++- 12 files changed, 102 insertions(+), 14 deletions(-) diff --git a/yack-mini/miniprogram/assets/images/default-avatar.png b/yack-mini/miniprogram/assets/images/default-avatar.png index 606ab90f3146a6b236da2b105c909f4baae1206d..471aadc3a621ef6e4af9d9a255c1d8fc5aa6659a 100644 GIT binary patch literal 2841 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 literal 1930 zcmb_dYfuwc6b?{{U5w;m#JaS?vKoocqGQqyK}>^WOG`ASiUU=OuXY+^q9U2WQ6ucQ zQR2X2YdbQjg`lOrh_o>#(PElOwYJ*YR~!hM*v_;HF`3RVOiOFe?)p!Ec4v~i-`RW4 zz2~0ueb>ICvRr^nM|eD*fY566FkWST6EoreOx0N@kH=q0XqFkQX(Lyzw>{8K%~&z` zSz5UNk+kJv$*&>f%YXez&wNjF&}E*CJ^i_HQs{T9EJA{``qcq)#NOU!ppH(7uQBRs zT3qVlZeezx$|9kWRF~R#US-(scyIz#ii-wf-Q~l z*R}DvKJ+2hlk7&;e?1yHq>amc=sDUjRzxn?&={Y9Tk4~ZHCp*@d+=zlDpi47)|R4*!gXm;*NX{GHg#(i8 zJbR>^!v=32i<>zPw+{L8Ct#aG&_zOO?8kbfcH;X;8C9Rsl ziiQn`T)_i^8Xgh)r!{n2&;fZ06Un8j_P)h5ZePo$NHf;OXWZmTAAr(Urd zmrhb>9kfpeA>)oW4gPUn7v&#s!Bc#!O{s$aVKkPXH8c*Qx|J$ zVof2|G`_rHLzzDIZ6;Rt&fQvEl&Z!pF5B}FC#C#g#I8VMB;~;{bX$0*oeiyH0lD^`qQ*nJgTkRmLYO4PR@eql|h(3X}AT)M%CiR=@iv% zQ$Ws^B9Cm{;@$$9ilD^srabI@cJ(sG1DZK2bC+5yD$lp8CTT*qN;Pu@F!W~`b(#+7 zt@YC*X@n-%fe&qc?D)S9wfv}q>Z(@^ZM{2zMnp1MPqKo^he;KN-uA@u&`KZLIL+GT zQilja9;ki1er-8;UaD7&79}$o&w`$0Cmi(j$l8X2x&={(N)WI!E?Rlu3X@dsala^K ziaIU{0!*j_5b7FhcY%F=)KM@g@F8P|`QP{3e5mN$eN*nHT0X?)w;QZ|wx)Uow&#=| z%Ec7@DHVRQ4|4n2q8qv9c^h_)@S)#J#iG5pqE&5%$l6$`M>ZAe_|S*Wp%MNxs9Ep| z*M*O`E-W%*kZ2;jc1j6EW4iW7mO966*{uf3O1pwrkQo~r>wppdolM`B)ZTUZ(3HxD z0tG+~P%V}?<99>Xy@JSUS#qlC8FKFauK!uBTrKe`4Ow=}9H0Cx$2V zq%6Ye$xc>Jwv$=FaUMk(Iwl$wB3fSnu`OfiK=LlQ0KsaH7jd(09NJT@BrbY`IwN1KO#gFBW- MlvQfZs%!WE2YOUIDF6Tf diff --git a/yack-mini/miniprogram/components/device-card/device-card.wxml b/yack-mini/miniprogram/components/device-card/device-card.wxml index 4c4e6419..b5653440 100644 --- a/yack-mini/miniprogram/components/device-card/device-card.wxml +++ b/yack-mini/miniprogram/components/device-card/device-card.wxml @@ -32,6 +32,8 @@ bindchange="handleSwitch" /> - 删除 + \ No newline at end of file diff --git a/yack-mini/miniprogram/components/device-card/device-card.wxss b/yack-mini/miniprogram/components/device-card/device-card.wxss index 61a3d567..2ab7e726 100644 --- a/yack-mini/miniprogram/components/device-card/device-card.wxss +++ b/yack-mini/miniprogram/components/device-card/device-card.wxss @@ -83,7 +83,9 @@ display: flex; flex-direction: column; align-items: flex-end; + justify-content: space-between; margin-left: 20rpx; + height: 120rpx; } .device-switch { @@ -92,7 +94,28 @@ } .delete-btn { + display: flex; + align-items: center; + justify-content: center; + min-width: 100rpx; + height: 56rpx; + padding: 0 20rpx; + margin: 0; font-size: 24rpx; color: #ff4d4f; - padding: 4rpx 12rpx; + background-color: #fff1f0; + border: 1rpx solid #ffa39e; + border-radius: 28rpx; + line-height: 1; + transition: all 0.2s ease; +} + +.delete-btn::after { + border: none; +} + +.delete-btn:active { + background-color: #ff4d4f; + color: #fff; + border-color: #ff4d4f; } \ No newline at end of file diff --git a/yack-mini/miniprogram/env.config.js b/yack-mini/miniprogram/env.config.js index 5585f230..451ac248 100644 --- a/yack-mini/miniprogram/env.config.js +++ b/yack-mini/miniprogram/env.config.js @@ -5,8 +5,8 @@ // 开发环境 const DEV_CONFIG = { - baseUrl: 'http://localhost:8080', - mqttServer: 'wxs://localhost:8084/mqtt', + baseUrl: 'http://192.168.110.117:8080', + mqttServer: 'wxs://192.168.110.117:8084/mqtt', }; // 生产环境 diff --git a/yack-mini/miniprogram/pages/device/detail/detail.wxss b/yack-mini/miniprogram/pages/device/detail/detail.wxss index 6518c601..1f9bdc06 100644 --- a/yack-mini/miniprogram/pages/device/detail/detail.wxss +++ b/yack-mini/miniprogram/pages/device/detail/detail.wxss @@ -140,11 +140,22 @@ .btn-upload { flex: 1; min-width: 200rpx; + display: flex; + align-items: center; + justify-content: center; height: 80rpx; - line-height: 80rpx; + line-height: 1; font-size: 28rpx; border-radius: 8rpx; border: none; + padding: 0; + margin: 0; +} + +.btn-connect::after, +.btn-mqtt::after, +.btn-upload::after { + border: none; } .btn-connect { diff --git a/yack-mini/miniprogram/pages/device/scan/scan.wxss b/yack-mini/miniprogram/pages/device/scan/scan.wxss index 51b087b2..f549ed78 100644 --- a/yack-mini/miniprogram/pages/device/scan/scan.wxss +++ b/yack-mini/miniprogram/pages/device/scan/scan.wxss @@ -119,22 +119,40 @@ .btn-scan { flex: 1; + display: flex; + align-items: center; + justify-content: center; background-color: #1890ff; color: #fff; height: 88rpx; - line-height: 88rpx; + line-height: 1; border-radius: 44rpx; border: none; + padding: 0; + margin: 0; +} + +.btn-scan::after { + border: none; } .btn-stop { flex: 1; + display: flex; + align-items: center; + justify-content: center; background-color: #ff4d4f; color: #fff; height: 88rpx; - line-height: 88rpx; + line-height: 1; border-radius: 44rpx; border: none; + padding: 0; + margin: 0; +} + +.btn-stop::after { + border: none; } /* 配置弹窗 */ @@ -212,12 +230,22 @@ .btn-cancel, .btn-confirm { flex: 1; + display: flex; + align-items: center; + justify-content: center; height: 100rpx; - line-height: 100rpx; + line-height: 1; font-size: 30rpx; border: none; border-radius: 0; background-color: transparent; + padding: 0; + margin: 0; +} + +.btn-cancel::after, +.btn-confirm::after { + border: none; } .btn-cancel { diff --git a/yack-mini/miniprogram/pages/index/index.wxml b/yack-mini/miniprogram/pages/index/index.wxml index a4dc5cf6..c7798bea 100644 --- a/yack-mini/miniprogram/pages/index/index.wxml +++ b/yack-mini/miniprogram/pages/index/index.wxml @@ -1,14 +1,14 @@ - + diff --git a/yack-mini/miniprogram/pages/index/index.wxss b/yack-mini/miniprogram/pages/index/index.wxss index 434f62b3..b47ccb28 100644 --- a/yack-mini/miniprogram/pages/index/index.wxss +++ b/yack-mini/miniprogram/pages/index/index.wxss @@ -58,16 +58,26 @@ } .add-btn { + width: 100%; + display: flex; + align-items: center; + justify-content: center; background-color: #1890ff; color: #fff; height: 92rpx; - line-height: 92rpx; + line-height: 1; font-size: 32rpx; border-radius: 46rpx; border: none; + padding: 0; + margin: 0; box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.4); } +.add-btn::after { + border: none; +} + .add-btn:active { background-color: #096dd9; } \ No newline at end of file diff --git a/yack-mini/miniprogram/pages/login/login.wxml b/yack-mini/miniprogram/pages/login/login.wxml index 9a8353c9..11166af9 100644 --- a/yack-mini/miniprogram/pages/login/login.wxml +++ b/yack-mini/miniprogram/pages/login/login.wxml @@ -4,7 +4,7 @@ diff --git a/yack-mini/miniprogram/pages/login/login.wxss b/yack-mini/miniprogram/pages/login/login.wxss index aae82f74..2fc07462 100644 --- a/yack-mini/miniprogram/pages/login/login.wxss +++ b/yack-mini/miniprogram/pages/login/login.wxss @@ -78,12 +78,21 @@ .btn-login { width: 100%; height: 88rpx; + display: flex; + align-items: center; + justify-content: center; background-color: #1890ff; color: #fff; font-size: 32rpx; border-radius: 8rpx; margin-top: 40rpx; border: none; + padding: 0; + line-height: 1; +} + +.btn-login::after { + border: none; } .btn-login:active { diff --git a/yack-mini/miniprogram/pages/mine/mine.wxml b/yack-mini/miniprogram/pages/mine/mine.wxml index 9fc5fb88..56b348ec 100644 --- a/yack-mini/miniprogram/pages/mine/mine.wxml +++ b/yack-mini/miniprogram/pages/mine/mine.wxml @@ -6,7 +6,7 @@ {{userInfo.userName || '未登录'}} - ID: {{userInfo.userId || '-'}} + diff --git a/yack-mini/miniprogram/pages/mine/mine.wxss b/yack-mini/miniprogram/pages/mine/mine.wxss index da6aa39e..781adf82 100644 --- a/yack-mini/miniprogram/pages/mine/mine.wxss +++ b/yack-mini/miniprogram/pages/mine/mine.wxss @@ -118,12 +118,17 @@ .logout-btn { width: 100%; height: 88rpx; - line-height: 88rpx; + display: flex; + align-items: center; + justify-content: center; background-color: #fff; color: #ff4d4f; font-size: 32rpx; border: none; border-radius: 8rpx; + padding: 0; + margin: 0; + line-height: 1; } .logout-btn::after {