From 2e3ab7fbbb336cf11ed37b8b0a7871976d597564 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages/luggage-storage/luggage-storage.vue |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 937f3dc..cc41f3f 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -16,7 +16,7 @@
 
 		<scroll-view scroll-y class="page-scroll">
 			<view class="page-content">
-				<view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup">
+				<view v-if="activeMode === 'local'" class="service-point-card cell-card" @click="openStorePopup0">
 					<view class="cell-left with-icon">
 							<image class="cell-icon" src="/static/icon/ic_store@2x.png" mode="widthFix"></image>
 							<view class="store-cell-copy">
@@ -617,8 +617,16 @@
 				this.tempSelectedStoreId = null
 				this.showStorePopup = true
 			},
+			openStorePopup0() {
+				this.storePopupType = 'send0'
+				this.tempSelectedStoreId = null
+				this.showStorePopup = true
+			},
 			confirmStore() {
+				
+				console.log("=========================")
 				const selected = this.storeList.find(item => item.active)
+				console.log(selected)
 				if (this.storePopupType === 'send') {
 					this.sendStore = selected
 				} else if (this.storePopupType === 'receive') {
@@ -877,7 +885,7 @@
 					orderParams.fromShopId = this.sendStore.id
 					if (this.receiveStore) {
 						orderParams.toType = 0
-						orderParams.toShopId = this.receiveStore.id
+						orderParams.takeShopId = this.receiveStore.id
 						orderParams.takeLat = this.receiveStore.latitude
 						orderParams.takeLgt = this.receiveStore.longitude
 						orderParams.takeLocation = this.receiveStore.address
@@ -1206,6 +1214,7 @@
 			display: flex;
 			align-items: center;
 			image {
+				flex-shrink: 0;
 				width: 24rpx;
 				height: 24rpx;
 				margin-right: 4rpx;

--
Gitblit v1.9.3