From 48b8c8f1df3eeb11027c91d67cc806fe51ed922a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 12 May 2025 16:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E2=80=9D=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.wxss                |  20 ++++++++++++++++++++
 images/mine/blue.png    | Bin 0 -> 630 bytes
 images/mine/red.png     | Bin 0 -> 615 bytes
 images/mine/round_g.png | Bin 0 -> 309 bytes
 images/mine/round_y.png | Bin 0 -> 300 bytes
 pages/mine/mine.wxml    |  38 +++++++++++++++++++++++++++++++-------
 pages/mine/mine.wxss    |  37 +++++++++++++++++++++++++++++++++----
 7 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 images/mine/blue.png
 create mode 100644 images/mine/red.png
 create mode 100644 images/mine/round_g.png
 create mode 100644 images/mine/round_y.png

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 0000000000000000000000000000000000000000..d29ad10c4114ece521670db7dba3e5cbae3d3565
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>Px%FiAu~R7gv$R!vUAKop)gEwUpRdk4J(o<SB66L$t7-he~&21X$6ObjfzgWLh`
zfRV6M+8OhnO!KDgbc&HB)0yvk-}~MV2+!~CX&)VA+7S?3YONxWBGO81@fv{K3Y~7W
zN;iwgXkGObxDE**5CZ|~%0~vz30x&J7how+|M{~kBy<e`KEl}t&9e)2NF$80Kt$=~
ze009dlPduAC;PFv>|<#j!|1=I8l$Wxx-%u?*T)t~Ofqw13q;HJ#jrK2BO88`<?^Tm
zl3a}1;{s4`vL67bYhsinu`jtU0=F;wj!M-7y~D^-M7^i&6@($7^TWE)<iF!NHlzv2
zNR|(mKY(QFMrq|t%k_NNihqHoJIY0sWWDEI3_`EU990&%rBaf_z%`vev<EJ^c+`1E
zx$Y1-bfVHrFedQjh8Hl^RgLH}7i+l&j_Q*oZ((Fwb;p>3h?)GzKu+K8TdO)w<H^QH
zTvD1mSwN@M4n81cILI2TqsQ_5pClbQl=VShUTx`2Z#(+EZa1%^05=+NRNkBNfW|ac
zIdR>=`~x{DRI#sM$uu69<vWRKYmG#XYquaI#M{2lomtuN7Gy<r;&><nw8qVG5@hqp
znyM#ARLBdP1YGJ2sIVja0n8$sbFnpHsp121lMO)6!eOG}1x){yluBV|DD<=AhJ(wA
z7GfKOVv~M-e}Kfrq_~{8iuhmGt*Y_i1TwN<glSV;szh{L3uHqDE1&g$04PN8#3<l<
Q<NyEw07*qoM6N<$f{8{Q1poj5

literal 0
HcmV?d00001

diff --git a/images/mine/red.png b/images/mine/red.png
new file mode 100644
index 0000000000000000000000000000000000000000..f374d889047f87e82e80a2777f3c18d3d714fa72
GIT binary patch
literal 615
zcmV-t0+{`YP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>Px%AxT6*R7gv$R^3s;KoH)&1RF5+fIUDDT7fU{C@_-|qyhvdGl-A!LIv6b_8`_^
zDu5*GTrRoXB{?o}<b{VMxBLC=ErR7ozVCq(_W+V>K=1(21E4Vdj35MHU*I?gTm*-6
zN1^GVC~z7AV%OG;cupa(&YP)VZ6TUYZUE`FC_tgwJw(SVK<84REHy&-j;r-Yxw%Rq
znvUkh$LG7u4@=Rzr@5dtLl<=x7zBc10MH6)MG*J+wB9zO4M1usnV=At8^2PB9w!4J
z>ZcEwyReCC)b`=N4~z{2jH1~T5zYNBB+<P5uqm4Idz!{s)1r{nMTe^%z?*4`Qqzp+
zfUC_y6q=29Hp*x=3V_(Y&QW#9HI_IkQaHus%bk&X1vQi$W&DOW$DPP6FHK-^nI2%C
zD?2(V38ycmB(GW%G)<>`9OV`^gj42A2A@Kd`XtE~pI`S)oTdkqLKBsRPHLeR*%1ev
zhH}6fW}K#f8|p+9lsRbARiiF<Q|5Q0gUZvq0Rx)RiVn?T6<Nzn!>@z3_U8HvVWYqv
z*zqpSgT<NBaq3u$T)+7U@_kPo`!;tL+N&c-Mb+|ps2xA*ou&@eikn(cRGHi=Wy(47
z;;ZZke<-F|zvN>5hUFA?;v0DZS{4pn_&mVeqCyuHZFOfT&$IOHY&l`<2jch}+zbBS
ztzAwG8vpOQbtYfNLXsAakRAD2)iW-TvGZxO{x3n|n+f@LSm*!%002ovPDHLkV1hl^
B6*K?<

literal 0
HcmV?d00001

diff --git a/images/mine/round_g.png b/images/mine/round_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..34d1316accdd79ce1e3249547af78e3d31a28c08
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#?@2^KR5(wymBA5$Fc3xmY6Ea~Myv27lM1}q02H7tIJTe#XaRb&0VAHQLS{Te
z0m?cs1ciYK#+c(~d4HEpeh4kgxkw+tlo(?$5ArmkI}@$|j>$yqnm(m^(2>%o9##N`
zZDK_{;uOn7RKXRX8_G3+xdv3<-o&0*s9*^+gegu5&4ERm+b=7tq;rZOYd;6Np}ckY
zXF9zo_QZ&?X%ge7>XZ@_f(*DP#!M&QWuFNLved59i^x5n9w6#>sX&{<{QLvZ&V=7B
zTOW$`V`Keb|K;ixRhl?WvpJ}!q2n~$mx5X~*w33_`UJcHxDI%mMVU{h00000NkvXX
Hu0mjf@QZ#3

literal 0
HcmV?d00001

diff --git a/images/mine/round_y.png b/images/mine/round_y.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d354b5f474c9730d37ee7305c737ab7e5b6698e
GIT binary patch
literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#=1D|BR5(wymB9^yKoCX$mloWUiB@5VJ$SPLEkIi^wx9)Q0eZ6sMXQj+6P6&1
z0kRuF5F`u7+2Q>^%<Mo^JaSQUIG93Y4B;S2qdY<05#r2Aa436~#b5&J$p+xCN-T|w
zkBI9cI0qC@Z2>HQgT798bc2<S8emJ9<``%KOv}XnPiOh`2#dJ<6zKII_1~;cPJFtr
z5v{n>TCq#HsUrllI{ilH#EEvw)pFufuIdfKY2=_TNf34bw9?^h$<~`<W2m!ZV|}nY
yxq7L~R-2}LIhY=`gO;x^1GTwevlpT5FW>{wd3woV4sHto0000<MNUMnLSTZ9wtRX3

literal 0
HcmV?d00001

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 @@
             <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
                 <view class="flex flex-col">
                     <view style="margin:20rpx 0 0 28rpx">空调</view>
-                    <view>正常</view>
+                    <view class="state"><image src="../../images/mine/round_g.png" class="icon-20 ml-28" mode=""/> 正常</view>
                 </view>
                 <image src="../../images/mine/device.png" />
             </view>
             <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
                 <view class="flex flex-col">
                     <view style="margin:20rpx 0 0 28rpx">空调</view>
-                    <view>正常</view>
+                    <view class="state"><image src="../../images/mine/round_g.png" class="icon-20 ml-28" mode=""/> 正常</view>
                 </view>
                 <image src="../../images/mine/device.png" />
-            </view> <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
+            </view>
+            <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
                 <view class="flex flex-col">
                     <view style="margin:20rpx 0 0 28rpx">空调</view>
-                    <view>正常</view>
+                    <view class="state"><image src="../../images/mine/round_g.png" class="icon-20 ml-28" mode=""/> 正常</view>
                 </view>
                 <image src="../../images/mine/device.png" />
-            </view> <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
+            </view>
+            <view class="flex flex-sb" style="width: 312rpx;background-color: #f3f9fc;border-radius: 10rpx;">
                 <view class="flex flex-col">
                     <view style="margin:20rpx 0 0 28rpx">空调</view>
-                    <view>正常</view>
+                    <view class="state"><image src="../../images/mine/round_g.png" class="icon-20 ml-28" mode=""/> 正常</view>
                 </view>
                 <image src="../../images/mine/device.png" />
             </view>
         </view>
     </view>
-    <view class="card">
+    <view class="card" style="width: calc(100vw - 40rpx);margin:0 auto;">
         <view class="title">
             资源管理
         </view>
+        <view class="flex flex-sb">
+            <view>
+                本月用水：<text class="num blue">12m³</text> <image class="icon-26" src="../../images/mine/blue.png"></image>
+            </view>
+            <view style="color: #bbbbbb;">
+                |
+            </view>
+            <view>
+                本月用电：<text class="num pink">28kw-h</text><image class="icon-26" src="../../images/mine/red.png"></image>
+            </view>
+        </view>
+    </view>
+    <view class="card" style="width: calc(100vw - 40rpx);margin:14rpx auto 0;">
+        <view class="title">
+            服务信息
+        </view>
+        <view class="service-c">
+            <view class="flex  p10" style="width: 180rpx;background-color: #f3f9fc;border-radius: 10rpx;" wx:for="{{7}}">
+                <image src="{{'../../images/mine/s'+(index + 1)+'.png'}}" class="icon-40" />
+                <view>空调空调</view>
+            </view>
+        </view>
     </view>
 </view>
\ 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;
+}