From c48ac40431730ecacf6f814c5ecb0bfd8b437961 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 16 Jan 2026 16:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/public/errorshow.vue                         | 2 +-
 pages/NursingNew/component/leftcontent/leftcontent.vue | 2 +-
 pages/procurement/components/calculator.vue            | 3 +--
 pages/procurement/components/carditem.vue              | 6 ++----
 request/index.js                                       | 6 +++++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/component/public/errorshow.vue b/component/public/errorshow.vue
index 903df19..d64dfa5 100644
--- a/component/public/errorshow.vue
+++ b/component/public/errorshow.vue
@@ -27,7 +27,7 @@
 			default: true
 		},
 		style:{
-			type:String
+			// type:String
 		}
 	})
 
diff --git a/pages/NursingNew/component/leftcontent/leftcontent.vue b/pages/NursingNew/component/leftcontent/leftcontent.vue
index 39fbafd..176ec97 100644
--- a/pages/NursingNew/component/leftcontent/leftcontent.vue
+++ b/pages/NursingNew/component/leftcontent/leftcontent.vue
@@ -127,7 +127,7 @@
 		flex-direction: column;
 		justify-content: space-between;
 		align-items: center;
-		padding: 2.5vw 0 1vw 0;
+		padding: 2.3vw 0 1vw 0;
 		margin-right: 3vw;
 		.logo{
 			width: 3.8vw;
diff --git a/pages/procurement/components/calculator.vue b/pages/procurement/components/calculator.vue
index e7ab58f..01fd083 100644
--- a/pages/procurement/components/calculator.vue
+++ b/pages/procurement/components/calculator.vue
@@ -111,8 +111,7 @@
 	const props = defineProps({
 		show: {
 			type: Boolean,
-			default:false,
-			required: true,
+			default:false 
 		},
 		caigouobj:{
 			type:Object,
diff --git a/pages/procurement/components/carditem.vue b/pages/procurement/components/carditem.vue
index ab2d933..daa3e08 100644
--- a/pages/procurement/components/carditem.vue
+++ b/pages/procurement/components/carditem.vue
@@ -75,16 +75,14 @@
 	import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick,  defineComponent } from 'vue';
 	const props = defineProps({
 		InvoicingList: {
-			type: Array,
-			required: true
+			type: Array 
 		},
 		status: {
 			type: String
 		},
 		show: {
 			type: Boolean,
-			default: false,
-			required: true,
+			default: false 
 		},
 	})
 	const emit = defineEmits(['addcartory', 'scrolltolower','addcar','crk'])
diff --git a/request/index.js b/request/index.js
index cff7462..ec3702c 100644
--- a/request/index.js
+++ b/request/index.js
@@ -4,7 +4,8 @@ const base_url = 'https://www.focusnu.com/opeapi'
 // const base_url = 'http://localhost:8091/opeapi'
 // 请求超出时间
 const timeout = 5000
-
+// 登录过期防止多次弹出
+let loginout = false;
 // 需要修改token，和根据实际修改请求头
 export default (params) => {
 	let url = params.url;
@@ -32,12 +33,15 @@ export default (params) => {
 				// console.log(res.statusCode);
 				if (res.statusCode == 200) {
 					resolve(res.data);
+					loginout = false;
 				} else {
 					console.log("http", /^https?:\/\//.test(url) ? url : base_url + url)
 					console.log("res",response)
 					console.log("data",data)
 					switch (res.statusCode) {
 						case 401:
+						if(loginout == true){return}
+							loginout = true;
 							uni.showModal({
 								title: "提示",
 								content: "登录过期",