From 6d5807a11995300bef0fc37a7fd0ed1d3834e031 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 17:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaCityPriceRuleWindow.vue |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 7b575d2..26c55c0 100644
--- a/admin/src/components/business/OperaCityPriceRuleWindow.vue
+++ b/admin/src/components/business/OperaCityPriceRuleWindow.vue
@@ -50,6 +50,12 @@
           <span class="remote-tip"><p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁閰嶉�侀噷绋嬮璁￠厤閫佹椂闀垮苟灞曠ず鍦ㄥ皬绋嬪簭涓嬪崟椤甸潰</p></span>
         </div>
         <el-table :data="timeTableData" border stripe>
+          <el-table-column label="璁㈠崟绾у埆">
+            <template slot-scope="{row}">
+              <span v-if="row.fieldA == 1"  >鏍囬�熻揪</span>
+              <span v-if="row.fieldA == 2"  >鎬ラ�熻揪</span>
+            </template>
+          </el-table-column>
           <el-table-column label="璧烽�侀噷绋�(鍏噷)">
             <template slot-scope="{row}">
               <el-input v-model="row.startDistance" type="number" placeholder="璇疯緭鍏�"></el-input>

--
Gitblit v1.9.3