From c313a253b1fcdc75b6be5db575fc2b29fb407021 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaCityPriceRuleWindow.vue | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 8e40ff5..74b5489 100644
--- a/admin/src/components/business/OperaCityPriceRuleWindow.vue
+++ b/admin/src/components/business/OperaCityPriceRuleWindow.vue
@@ -179,13 +179,11 @@
this.$tip.apiFailed(e)
})
},
- // 鏌ヨ寮傚湴瀵勯�佽鍒欏垪琛�
+ // 鏌ヨ棰勮鏃舵晥
fetchEstimatedDelivery () {
estimatedDelivery(this.form.cityId)
.then(data => {
- this.timeTableData = [
- data
- ]
+ this.timeTableData = data
})
.catch(e => {
this.$tip.apiFailed(e)
@@ -223,13 +221,13 @@
Promise.all([
batchSave({ cityId: this.form.cityId, items: this.jiudiTableData }),
batchSaveRemoteDelivery({ cityId: this.form.cityId, items: this.remoteTableData }),
- batchSaveEstimatedDelivery({ cityId: this.form.cityId, ...this.timeTableData[0] }),
+ batchSaveEstimatedDelivery({ cityId: this.form.cityId, items: this.timeTableData }),
batchSaveStoreDeposit({ cityId: this.form.cityId, items: this.storeDepositData }),
batchSaveRevenueShare({ cityId: this.form.cityId, items: this.shareTableData })
])
.then(() => {
this.visible = false
- this.$tip.apiSuccess('淇濆瓨鎴愬姛')
+ // this.$tip.apiSuccess('淇濆瓨鎴愬姛')
this.$emit('success')
})
.catch(e => {
--
Gitblit v1.9.3