diff --git a/yack-mini/miniprogram/assets/images/default-avatar.png b/yack-mini/miniprogram/assets/images/default-avatar.png index 606ab90f..471aadc3 100644 Binary files a/yack-mini/miniprogram/assets/images/default-avatar.png and b/yack-mini/miniprogram/assets/images/default-avatar.png differ 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 {