From 51e8abcb44b0a5716dda42ad401354ea596c4d75 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sat, 15 Jul 2023 11:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue                              | 55 ++++++++++++----------
 unpackage/dist/dev/mp-weixin/pages/index/index.js  | 42 ++++++++++-------
 .../dist/dev/mp-weixin/pages/index/index.wxml      |  2 +-
 3 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index ac712cf..3e1c508 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -82,7 +82,7 @@
 		<view class="footer_tab">
 			<view :class="activeTab == 0 ? 'btn active' : 'btn'" @click="changeActiveTab(0)">
 				<image src="/static/result.png" class="result_logo"></image>
-				<text class="font_btn">当前结果</text>
+				<text class="font_btn">刷新结果</text>
 			</view>
 			<view :class="activeTab == 1 ? 'btn active' : 'btn'" @click="changeActiveTab(1)">
 				<image src="/static/data.png" class="history_logo"></image>
@@ -101,32 +101,39 @@ export default {
 			username: '',
 			resultList: []
 		}
-	},
+	},
 	onLoad() {
-		const self = this
-		// 就在加载的时候请求一次某人的数据 筛选最新一条放入第一个tab
-		// 历史数据渲染到第二个tab
-		// 数据中有username idcard 以及信息列表
-		uni.request({
-		    url: 'http://localhost:8080/zsjyadmin/detection/current',
-				method:"GET",
-		    success: (res) => {
-					if (res?.data?.code == 0){
-						const data = res?.data?.data
-						const {idcard, username, resultList} = data	|| {}
-						self.idcard = idcard
-						self.username = username
-						// 对resultList 根据id进行排序
-						resultList.sort((a, b) => {
-							return b.id - a.id
-						})
-						self.resultList = resultList
-					}
-		    }
-		});
+		this.getData()
 	},
-	methods: {
+	methods: {
+		getData() {
+			const self = this
+			// 就在加载的时候请求一次某人的数据 筛选最新一条放入第一个tab
+			// 历史数据渲染到第二个tab
+			// 数据中有username idcard 以及信息列表
+			uni.request({
+			    url: 'http://localhost:8080/zsjyadmin/detection/current',
+					method:"GET",
+			    success: (res) => {
+						if (res?.data?.code == 0){
+							const data = res?.data?.data
+							const {idcard, username, resultList} = data	|| {}
+							self.idcard = idcard
+							self.username = username
+							// 对resultList 根据id进行排序
+							resultList.sort((a, b) => {
+								return b.id - a.id
+							})
+							self.resultList = resultList
+						}
+			    }
+			});
+		},
 		changeActiveTab(activeTab) {
+			if(activeTab == 0) {
+				// 刷新当前结果
+				this.getData()
+			}
 			this.activeTab = activeTab
 		}
 	}
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 05260c2..8d12593 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -10,27 +10,33 @@ const _sfc_main = {
     };
   },
   onLoad() {
-    const self = this;
-    common_vendor.index.request({
-      url: "http://localhost:8080/zsjyadmin/detection/current",
-      method: "GET",
-      success: (res) => {
-        var _a, _b;
-        if (((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.code) == 0) {
-          const data = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.data;
-          const { idcard, username, resultList } = data || {};
-          self.idcard = idcard;
-          self.username = username;
-          resultList.sort((a, b) => {
-            return b.id - a.id;
-          });
-          self.resultList = resultList;
-        }
-      }
-    });
+    this.getData();
   },
   methods: {
+    getData() {
+      const self = this;
+      common_vendor.index.request({
+        url: "http://localhost:8080/zsjyadmin/detection/current",
+        method: "GET",
+        success: (res) => {
+          var _a, _b;
+          if (((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.code) == 0) {
+            const data = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.data;
+            const { idcard, username, resultList } = data || {};
+            self.idcard = idcard;
+            self.username = username;
+            resultList.sort((a, b) => {
+              return b.id - a.id;
+            });
+            self.resultList = resultList;
+          }
+        }
+      });
+    },
     changeActiveTab(activeTab) {
+      if (activeTab == 0) {
+        this.getData();
+      }
       this.activeTab = activeTab;
     }
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 043b9e8..3aedcf0 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="main_content"><view class="header_info"><view class="info_container"><view class="name_wrap"><image src="/static/user.png" class="name_logo"></image><text class="name">姓名 : {{a}}</text></view><view class="idcard_wrap"><image src="/static/card.png" class="card_logo"></image><text class="card_number">身份证号 : {{b}}</text></view></view></view><view wx:if="{{c}}" class="grid_layout content"><view class="grid_box background1"><text class="main_title">L-乳酸</text><view class="capacity_btn"><text class="unit">{{d}}mmol / L</text></view></view><view class="grid_box background2"><text class="main_title">肌酸</text><view class="capacity_btn"><text class="unit">{{e}}mmol / L</text></view></view><view class="grid_box background3"><text class="main_title">肌酐</text><view class="capacity_btn"><text class="unit">{{f}}mmol / L</text></view></view><view class="grid_box background4"><text class="main_title">尿素</text><view class="capacity_btn"><text class="unit">{{g}}mmol / L</text></view></view><view class="grid_box background5"><text class="main_title">β-羟丁酸</text><view class="capacity_btn"><text class="unit">{{h}}mmol / L</text></view></view><view class="grid_box background6"><text class="main_title">L-谷氨酸</text><view class="capacity_btn"><text class="unit">{{i}}mmol / L</text></view></view></view><view wx:if="{{j}}" class="content"><view wx:for="{{k}}" wx:for-item="item" wx:key="i" class="card_wrap"><view class="time_wrap"><image src="/static/time.png" class="time_logo"></image><text class="date">{{item.a}}</text><text class="time">{{item.b}}</text></view><view class="info_grid"><view class="info bg1"><text>L-乳酸 {{item.c}}mmol/L</text></view><view class="info bg2"><text>肌酸 {{item.d}}mmol/L</text></view><view class="info bg3"><text>肌酐 {{item.e}}mmol/L</text></view><view class="info bg4"><text>尿素 {{item.f}}mmol/L</text></view><view class="info bg5"><text>β-羟丁酸 {{item.g}}mmol/L</text></view><view class="info bg6"><text>L-谷氨酸 {{item.h}}mmol/L</text></view></view></view></view><view class="footer_tab"><view class="{{l}}" bindtap="{{m}}"><image src="/static/result.png" class="result_logo"></image><text class="font_btn">当前结果</text></view><view class="{{n}}" bindtap="{{o}}"><image src="/static/data.png" class="history_logo"></image><text class="font_btn">历史数据</text></view></view></view>
\ No newline at end of file
+<view class="main_content"><view class="header_info"><view class="info_container"><view class="name_wrap"><image src="/static/user.png" class="name_logo"></image><text class="name">姓名 : {{a}}</text></view><view class="idcard_wrap"><image src="/static/card.png" class="card_logo"></image><text class="card_number">身份证号 : {{b}}</text></view></view></view><view wx:if="{{c}}" class="grid_layout content"><view class="grid_box background1"><text class="main_title">L-乳酸</text><view class="capacity_btn"><text class="unit">{{d}}mmol / L</text></view></view><view class="grid_box background2"><text class="main_title">肌酸</text><view class="capacity_btn"><text class="unit">{{e}}mmol / L</text></view></view><view class="grid_box background3"><text class="main_title">肌酐</text><view class="capacity_btn"><text class="unit">{{f}}mmol / L</text></view></view><view class="grid_box background4"><text class="main_title">尿素</text><view class="capacity_btn"><text class="unit">{{g}}mmol / L</text></view></view><view class="grid_box background5"><text class="main_title">β-羟丁酸</text><view class="capacity_btn"><text class="unit">{{h}}mmol / L</text></view></view><view class="grid_box background6"><text class="main_title">L-谷氨酸</text><view class="capacity_btn"><text class="unit">{{i}}mmol / L</text></view></view></view><view wx:if="{{j}}" class="content"><view wx:for="{{k}}" wx:for-item="item" wx:key="i" class="card_wrap"><view class="time_wrap"><image src="/static/time.png" class="time_logo"></image><text class="date">{{item.a}}</text><text class="time">{{item.b}}</text></view><view class="info_grid"><view class="info bg1"><text>L-乳酸 {{item.c}}mmol/L</text></view><view class="info bg2"><text>肌酸 {{item.d}}mmol/L</text></view><view class="info bg3"><text>肌酐 {{item.e}}mmol/L</text></view><view class="info bg4"><text>尿素 {{item.f}}mmol/L</text></view><view class="info bg5"><text>β-羟丁酸 {{item.g}}mmol/L</text></view><view class="info bg6"><text>L-谷氨酸 {{item.h}}mmol/L</text></view></view></view></view><view class="footer_tab"><view class="{{l}}" bindtap="{{m}}"><image src="/static/result.png" class="result_logo"></image><text class="font_btn">刷新结果</text></view><view class="{{n}}" bindtap="{{o}}"><image src="/static/data.png" class="history_logo"></image><text class="font_btn">历史数据</text></view></view></view>
\ No newline at end of file