From 17e72d0bd10e3f47c139e030089287e86c81d9dc Mon Sep 17 00:00:00 2001
From: xielei <xllove1314>
Date: Thu, 7 Nov 2024 17:57:49 +0800
Subject: [PATCH] 11

---
 pages/mypage/mypage.vue |  8 ++++----
 pages/skInfo/index.vue  | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue
index 57a9d25..a9cf404 100644
--- a/pages/mypage/mypage.vue
+++ b/pages/mypage/mypage.vue
@@ -12,7 +12,7 @@
 		</view>
 		<view class="funcBar">
 			<div class="funcList" v-for="(item, index) in func" :key="index">
-				<div @click="navigateToSubPage(index)">
+				<div @click="navigateToSubPage(func,index)">
 					<div class="funcIcon">
 						<image class="icon-left" style="width: 100%; height: 100%" :src="item.img" mode="aspectFit">
 						</image>
@@ -28,7 +28,7 @@
 			<view class="" style="display: flex;">
 			
 			<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
-				<div @click="navigateToSubPage(index)">
+				<div @click="navigateToSubPage(xjxList,index)">
 					<div class="funcIcon" style="width:30px:;height:30px">
 						<image
 							class="icon-left"
@@ -87,9 +87,9 @@
 			}
 		},
 		methods: {
-			navigateToSubPage(index) {
+			navigateToSubPage(item,index) {
 				uni.navigateTo({
-					url: xjxList[index].url,
+					url: item[index].url,
 					animationType:'pop-in',
 				})
 			},
diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue
index 597cfa3..69f29cc 100644
--- a/pages/skInfo/index.vue
+++ b/pages/skInfo/index.vue
@@ -2,8 +2,8 @@
 	<view class="skinfo" @click="toDetail()">
 		<view class="title">
 			<view class="left">
-				<u-icon name="file-text" color="#f59d29" size="20"></u-icon>
-				<text style="margin-left:5px">{{dataform.resName}}</text>
+				<u-icon name="file-text" color="origin"></u-icon>
+				<text>{{dataform.resName}}</text>
 			</view>
 			<view class="right">
 				{{tm}}
@@ -13,7 +13,7 @@
 			<view class="" style="display: flex;">
 				<image src="../../static/c1.png" mode="" style="width:30%;height: 120px;"></image>
 				<view class="listItem">
-					<view class="item-text" v-for="(v,k) of list"  :key="k">
+					<view class="item-text" v-for="(v,k) of list">
 						<text>{{v}}</text>:
 						<text>{{dataform[k]}}</text>
 					</view>
@@ -42,16 +42,16 @@
 		data(){
 			return{
 				list:{
-					"rz":'当前水位m',
-					"today":'今日雨量mm',
+					'drp':'当前水位m',
+					2:'今日雨量mm',
 					'flLowLimLev':'汛限水位m',
-					"demo":'比汛期m',
+					4:'比汛期m',
 					'wcrstel':'堰顶高程m',
 					'crestElev':'坝顶高程m',
-					"24h":'24h预报mm',
-					"yesterdayDrp":'昨日雨量mm',
+					7:'24h预报',
+					8:'昨日雨量',
 					'totCap':'总库容m³',
-					"cap":'蓄水量万m³'
+					10:'蓄水量万m³'
 				},
 				tm:	moment().format('YYYY-MM-DD HH:mm:ss'),
 				dataform:{
@@ -97,13 +97,15 @@
 			justify-content: space-between;
 			align-items: center;
 			.left{
-				align-items: center;
 				font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
 				font-weight: 700;
 				font-style: normal;
 				font-size: 16px;
 				display: flex;
 			}
+			.right{
+
+			}
 			    
 		}
 		.content{