From 0b033c9c21499860065baf5dad4fc55b667d8627 Mon Sep 17 00:00:00 2001
From: heduo <hd15193034224@163.com>
Date: Fri, 6 Dec 2024 10:57:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(system):=20=E5=8D=8E=E4=B8=AD=E9=98=9C?=
 =?UTF-8?q?=E5=A4=96=E5=AE=9E=E9=AA=8C=E5=8A=A8=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index.wpy              | 18 +++++++++++-------
 src/pages/sydwApprovePreview.wpy |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index 69831cc..bb2520a 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -138,7 +138,8 @@ wepy.page({
     platformOptions: [],
     activeTab: 0,
     activeTitle: '',
-    platform: ''
+    platform: '',
+    requestTask: null
   },
   computed: {},
   methods: {
@@ -211,12 +212,12 @@ wepy.page({
       wx.getStorage({
 				key: 'user_info',
 				success: (res) => {
-					this.userInfo = JSON.parse(res.data);
-          wx.showLoading({
-            title: '加载中'
-          });
+					 this.userInfo = JSON.parse(res.data);
+      wx.showLoading({
+        title: '加载中'
+      });
           const requestURL = wx.getStorageSync('requestURL')
-          wx.request({
+          this.requestTask = wx.request({
             url: `${requestURL}/approveOpera/listUnApprove`,
             method: 'post',
             header: {
@@ -266,7 +267,7 @@ wepy.page({
                   title: '加载中'
                 });
                 const requestURL = wx.getStorageSync('requestURL')
-                wx.request({
+                this.requestTask = wx.request({
                   url: `${requestURL}/approveOpera/listUnApproveAnm`,
                   method: 'post',
                   header: {
@@ -309,6 +310,9 @@ wepy.page({
     onChange(event) {
       this.activeTitle = event.$wx.detail.title
       this.orderList = []
+      if (this.requestTask) {
+        this.requestTask.abort()
+      }
       if (event.$wx.detail.title === '试剂耗材') {
         this.getList()
       } else if (event.$wx.detail.title === '实验动物') {
diff --git a/src/pages/sydwApprovePreview.wpy b/src/pages/sydwApprovePreview.wpy
index 4c6d96e..bdfbf78 100644
--- a/src/pages/sydwApprovePreview.wpy
+++ b/src/pages/sydwApprovePreview.wpy
@@ -116,8 +116,8 @@
             <div>商品名称：{{ item.name }}</div>
             <div>单价：{{ item.price }}元</div>
           </div>
-          <div>{{ '品牌: '+ item.brand +'；货号：'+ item.goodsNo +'；品种：' + item.spec2 }}</div>
-          <div>{{ '规格: '+ item.spec +'；等级：'+ item.grade +'；年龄：' + item.old }}</div>
+          <div>{{ '品牌: '+ item.brand +'；货号：'+ item.goodsNo +'；品种：' + item.spec }}</div>
+          <div>{{ '规格: '+ item.spec2 +'；等级：'+ item.grade +'；年龄：' + item.old }}</div>
           <div>{{ '体重: '+ item.weight +'；性别：'+ item.sex }}</div>
           
         </div>
-- 
2.24.1