From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/luggage-storage/luggage-storage.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/small-program/pages/luggage-storage/luggage-storage.vue b/small-program/pages/luggage-storage/luggage-storage.vue
index 5ca9693..92f2114 100644
--- a/small-program/pages/luggage-storage/luggage-storage.vue
+++ b/small-program/pages/luggage-storage/luggage-storage.vue
@@ -153,7 +153,7 @@
</view>
<view class="luggage-stepper">
<image class="step-btn" src="/static/icon/ic_jian@2x.png" mode="widthFix" @click="decreaseCount(index)"></image>
- <text class="step-count">{{ item.count }}</text>
+ <text class="step-count">{{ item.count || 0}}</text>
<image class="step-btn" src="/static/icon/ic_jia@2x.png" mode="widthFix" @click="increaseCount(index)"></image>
</view>
</view>
@@ -245,7 +245,7 @@
@click="storeList.forEach((row,i) => row.active = index === i)"
>
<view class="store-option-main">
- <image class="store-thumb" src="" mode="aspectFill"></image>
+ <image class="store-thumb" :src="item.coverImg || '/static/icon/default2.png'" mode="aspectFill"></image>
<view class="store-option-copy">
<view class="store-option-head">
<text class="store-option-name">{{ item.name }}</text>
@@ -557,9 +557,10 @@
})
try {
const uploadResults = await this.uploadFiles(tempFilePaths, maxCount)
+ const addrs = uploadResults.map(item => item.imgaddr)
const fullPaths = uploadResults.map(item => item.url || item.path || item)
this.uploadedImages = [...this.uploadedImages, ...fullPaths.map(url => ({ url }))]
- this.form.goodsImages = [...this.form.goodsImages, ...fullPaths]
+ this.form.goodsImages = [...this.form.goodsImages, ...addrs]
uni.hideLoading()
uni.showToast({
title: '涓婁紶鎴愬姛',
@@ -703,6 +704,7 @@
latitude: this.latitude,
longitude: this.longitude,
cityId: this.cityId,
+ name:this.storeForm.keyword,
sortType: 1
}
})
@@ -885,7 +887,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
@@ -913,7 +915,7 @@
signType: paymentData.signType || 'MD5',
paySign: paymentData.paySign || '',
success: (res) => {
- uni.navigateTo({
+ uni.redirectTo({
url: '/pages/payment-success/payment-success?orderId=' + orderId
});
},
@@ -923,6 +925,9 @@
} else {
uni.showToast({ title: '鏀粯澶辫触', icon: 'none' })
}
+ uni.redirectTo({
+ url: '/pages/delivery-order-detail/delivery-order-detail?id=' + orderId
+ });
}
})
}
--
Gitblit v1.9.3