From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaCityPriceRuleWindow.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 7b575d2..9a2aef6 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>
@@ -87,7 +93,7 @@
<div class="price-tip"><p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁璁㈠崟涓笉鍚岃繍钀ヨ鑹茶�岀嫭绔嬮厤缃笉鍚屽垎鎴愭瘮渚�</p></div>
<div class="price-items">
<div class="price-item" v-for="(item, index) in shareTableData" :key="index">
- <span class="price-label">{{item.fieldType === 4 ? '鍦ㄨ鍗曚腑浣滀负閰嶉�佸憳鏃讹紝' : '鍏朵腑闂ㄥ簵绫诲瀷涓�'}}{{item.fieldTypeName}}鍒嗘垚姣斾緥涓�</span>
+ <span class="price-label">{{item.fieldTypeName}}{{item.fieldType === 4 ? '鍦ㄨ鍗曚腑浣滀负閰嶉�佸憳鏃讹紝' : '闂ㄥ簵'}}鍒嗘垚姣斾緥涓�</span>
<el-input style="width: 100px;" v-model="item.ratio" type="number" placeholder="璇疯緭鍏�"></el-input>
<span class="price-unit">%</span>
</div>
--
Gitblit v1.9.3