From e89688f1c058bd9c4c505a2bb891643855e50a29 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 16:31:25 +0800
Subject: [PATCH] 小程序端和PC端bug修复

---
 small-program/pages/luggage-storage/luggage-storage.vue             |    6 ++++--
 small-program/pages/delivery-order-detail/delivery-order-detail.vue |    9 ++++++++-
 small-program/shop/pages/login/login.vue                            |    1 -
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index b50e23e..c330127 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -53,7 +53,7 @@
 				<view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
 					<!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
 					<view style="width: 360rpx; height: 360rpx;">
-						<canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 180px; height: 180px;"></canvas>
+						<canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas":style="'width: '+width+'px; height:'+height+'px;'"></canvas>
 					</view>
 					<text>{{info.memberVerifyCode || ''}}</text>
 					<text @tap="copyCode(info.memberVerifyCode||'')">鏍搁攢鐮�</text>
@@ -348,6 +348,8 @@
 		data() {
 			return {
 				id:null,
+				height:180,
+				width:180,
 				info:{},
 				showDone:false,
 				showCancel:false,
@@ -376,6 +378,8 @@
 			this.showPay=false
 			this.showPhone=false
 			this.getUserDetail() 
+			this.width = this.rpxToPx(200)
+			this.height = this.rpxToPx(200)
 			this.linkItem={title:'',linkname:'',linkphone:''}
 		},
 		methods:{
@@ -385,6 +389,9 @@
 					urls: images  
 				});
 			},
+			rpxToPx(rpx) {
+			  return rpx * wx.getSystemInfoSync().windowWidth / 750
+			},
 			payOrder(){
 				var that = this;
 				uni.showLoading({ title: '鍙戣捣鏀粯涓�...', mask: true })
diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 925ced2..9c482b5 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -962,9 +962,11 @@
 						} else {
 							uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
 						}
-						uni.redirectTo({
-							url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
+						uni.setStorageSync("orderStatus",-2)
+						uni.switchTab({
+							url: '/pages/itinerary/itinerary'
 						});
+						 
 					}
 				})
 			}
diff --git a/small-program/shop/pages/login/login.vue b/small-program/shop/pages/login/login.vue
index 5bfa751..954e918 100644
--- a/small-program/shop/pages/login/login.vue
+++ b/small-program/shop/pages/login/login.vue
@@ -52,7 +52,6 @@
 		},
 		onLoad() {
 			// 闈欓粯鐧诲綍
-		
 			if (this.userInfo.bindShopId) {
 				uni.showLoading({
 					title:'鐧诲綍涓�...'

--
Gitblit v1.9.3