From e84fbebe82d902cbe06f2aebc88578276e2500bf Mon Sep 17 00:00:00 2001
From: zouyanyan <254651820@qq.com>
Date: Wed, 18 Mar 2026 18:06:06 +0800
Subject: [PATCH] upbug0318

---
 components/easy-scancode/easy-scancode.vue |  5 +++--
 pages/me/index.vue                         | 22 +++++++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/components/easy-scancode/easy-scancode.vue b/components/easy-scancode/easy-scancode.vue
index b6a4fe4..1aa6e90 100644
--- a/components/easy-scancode/easy-scancode.vue
+++ b/components/easy-scancode/easy-scancode.vue
@@ -96,8 +96,9 @@ export default {
 
           let windowInfo = uni.getWindowInfo();
           console.log(windowInfo);
-          const width = windowInfo.windowWidth;
-          const height = windowInfo.windowHeight;
+          const width = windowInfo.windowWidth?windowInfo.windowWidth:375;
+          const height = windowInfo.windowHeight?windowInfo.windowHeight:720; 
+		  
           // 横屏
           const aspectRatio = width / height;
           // 竖屏
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 65c06ab..f7628de 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -32,11 +32,12 @@
 						<view v-for="(item, index) in myaddresslist" :key="index" class="sitem">
 							<view class="lcon">
 								<view class="sname">
-									<!-- <text>{{item.userName}}({{item.userCode}})</text> -->
-									<text>{{ item.departCode?retType(item.departCode,1):''}}</text>
+									<text> {{ item.departCode?retType(item.departCode,1):''}}</text>
+									<text style="margin-left: 15rpx;"> {{ item.workshop?item.workshop:''}}</text>
+									<text style="margin-left: 15rpx;"> {{ item.location?item.location:''}}</text>
 								</view>
 								<view class="sinfo">
-									{{item.workshop+item.location+item.address}}
+									{{ item.address}}
 								</view>
 							</view>
 							<view class="opecon">
@@ -49,9 +50,7 @@
 				
 			</view>
 			
-		</view>
-		
-		<u-toast ref="uToast" />
+		</view> 
 		
 		<!-- 添加 -->
 		<!-- 弹框 -->
@@ -152,11 +151,6 @@
 			}
 		},
 		methods: {
-			handleImageError(e,index){
-				console.log(e,index);
-				this.icon= require("@/static/images/icon.png");
-				this.$forceUpdate();
-			},
 			async delDo(id){
 				var _this=this;
 				try{
@@ -271,7 +265,6 @@
 								}
 							});
 						}
-						console.log("address",this.address);
 					}
 				}
 				else{
@@ -357,8 +350,8 @@
 					  this.clistall[i].isChecked = false;
 					});
 					this.clistnow = this.clistall.filter((p) => {
-					   //filter过滤的意思，这个是过滤函数，将每一项符合结果的值返回到personList
-					   return ( p.address.indexOf(this.searchKey) !== -1 );
+					   //filter过滤的意思，这个是过滤函数，将每一项符合结果的值返回到List
+					   return ( p.address && p.address.indexOf(this.searchKey) !== -1 );
 					});
 					this.$forceUpdate();
 				}
@@ -538,7 +531,6 @@
 				font-weight: 600;
 				color: rgb(29, 29, 29);
 				padding: 24rpx;
-				justify-content:space-between;
 				align-items: center;
 				display: flex;
 				.tip{