diff --git a/app.wxss b/app.wxss index 61e222e..51ae6af 100644 --- a/app.wxss +++ b/app.wxss @@ -196,4 +196,24 @@ page{ } .mr-30{ margin-right: 30rpx; +} +.mt-24{ + margin-top: 24rpx; +} +.p10{ + padding: 10rpx; +} +.mt-14{ + margin-top: 14rpx; +} +.icon-26{ + width: 26rpx; + height: 26rpx; +} +.ml-28{ + margin-left: 28rpx; +} +.icon-20{ + width: 20rpx !important; + height: 20rpx !important; } \ No newline at end of file diff --git a/images/mine/blue.png b/images/mine/blue.png new file mode 100644 index 0000000..d29ad10 Binary files /dev/null and b/images/mine/blue.png differ diff --git a/images/mine/red.png b/images/mine/red.png new file mode 100644 index 0000000..f374d88 Binary files /dev/null and b/images/mine/red.png differ diff --git a/images/mine/round_g.png b/images/mine/round_g.png new file mode 100644 index 0000000..34d1316 Binary files /dev/null and b/images/mine/round_g.png differ diff --git a/images/mine/round_y.png b/images/mine/round_y.png new file mode 100644 index 0000000..6d354b5 Binary files /dev/null and b/images/mine/round_y.png differ diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 30863a3..d590752 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -29,34 +29,58 @@ 空调 - 正常 + 正常 空调 - 正常 + 正常 - + + 空调 - 正常 + 正常 - + + 空调 - 正常 + 正常 - + 资源管理 + + + 本月用水:12m³ + + + | + + + 本月用电:28kw-h + + + + + + 服务信息 + + + + + 空调空调 + + \ No newline at end of file diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss index efaa395..1748f1e 100644 --- a/pages/mine/mine.wxss +++ b/pages/mine/mine.wxss @@ -1,4 +1,7 @@ /* pages/mine/mine.wxss */ +page{ + background-color: #f5f5f5; +} .navigation { width: 100%; display: flex; @@ -6,7 +9,7 @@ justify-content: center; color: #333333; font-size: 30rpx; - position: relative; + position: fixed; z-index: 100; } @@ -20,7 +23,12 @@ position: relative; top: -245rpx; } - +.title{ + color: #000000; + font-size: 32rpx; + font-weight: 600; + margin-bottom: 24rpx; +} .header-card { background: linear-gradient(180deg, rgba(83, 185, 232, 1) 0%, rgba(85, 213, 220, 1) 56%, rgba(99, 222, 214, 1) 100%); width: calc(100vw - 40rpx); @@ -46,7 +54,7 @@ padding: 40rpx; box-sizing: border-box; width: calc(100vw - 40rpx); - margin: 0 auto; + margin: 24rpx auto 0; border-radius: 20rpx 20rpx 0 0; } @@ -77,6 +85,7 @@ position: relative; top: -20rpx; border-radius: 20rpx; + background-color: #ffffff; } .device image{ width: 104rpx; @@ -91,4 +100,24 @@ gap: 14rpx; border-radius: 12rpx; flex-wrap: wrap; -} \ No newline at end of file +} +.service-c{ + display: flex; + gap: 20rpx; + border-radius: 12rpx; + flex-wrap: wrap; +} +.num{ + font-weight: 600; + font-size:32rpx ; +} +.blue{ + color: #549cf0; +} +.pink{ + color: #ff776f; +} +.state{ + font-size: 24rpx; + color: #b5b5b5; +}