From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaCityPriceRuleWindow.vue | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 74b5489..1af7049 100644
--- a/admin/src/components/business/OperaCityPriceRuleWindow.vue
+++ b/admin/src/components/business/OperaCityPriceRuleWindow.vue
@@ -6,7 +6,7 @@
>
<el-tabs v-model="activeTab">
<el-tab-pane label="灏卞湴瀵勫瓨" name="local">
- <div class="price-tip">鏍规嵁琛屾潕灏哄浠ュ強瀛樻斁澶╂暟鏀惰垂锛堜笉瓒充竴澶╂寜涓�澶╄浠凤級</div>
+ <div class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁琛屾潕灏哄浠ュ強瀛樻斁澶╂暟鏀惰垂锛堜笉瓒充竴澶╂寜涓�澶╄浠凤級</div>
<div class="price-items">
<div class="price-item" v-for="(item, index) in jiudiTableData" :key="index">
<span class="price-label">鍏朵腑{{item.categoryName}}姣忓ぉ鏀惰垂</span>
@@ -15,10 +15,10 @@
</div>
</div>
</el-tab-pane>
- <el-tab-pane label="寮傚湴瀵勫瓨" name="remote">
- <div class="remote-config-title">寮傚湴瀵勯�侀厤缃�</div>
+ <el-tab-pane label="鍚屽煄瀵勯��" name="remote">
+ <div class="remote-config-title">鍚屽煄瀵勯��</div>
<div class="remote-header">
- <span class="remote-tip">鏍规嵁琛屾潕灏哄銆侀厤閫侀噷绋嬪強閰嶉�佷环鏍兼敹鍙栬垂鐢紙涓嶈冻1鍏噷鎸�1鍏噷璁′环锛�</span>
+ <span class="remote-tip"> <p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁琛屾潕绫诲瀷銆佽捣閫�/缁�侀噷绋嬪強璧烽��/缁�佷环鏍兼敹鍙栬垂鐢�(涓嶈冻1鍏噷鎸�1鍏噷璁′环)</p></span>
</div>
<el-table :data="remoteTableData" border stripe>
<el-table-column prop="categoryName" label="琛屾潕灏哄"></el-table-column>
@@ -47,9 +47,15 @@
<el-tab-pane label="棰勮鏃舵晥" name="time">
<div class="remote-config-title">棰勮鏃舵晥瑙勫垯</div>
<div class="remote-header">
- <span class="remote-tip">鏍规嵁閰嶉�侀噷绋嬮璁￠厤閫佹椂闀垮苟灞曠ず鍦ㄥ皬绋嬪簭涓嬪崟椤甸潰</span>
+ <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>
@@ -73,7 +79,8 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="闂ㄥ簵娉ㄥ唽鎶奸噾" name="deposit">
- <div class="price-tip">鏍规嵁鎵�鍦ㄥ煄甯備互鍙婃敞鍐岀被鍨嬩笉鍚岋紝骞冲彴鏀跺彇涓嶅悓鏁伴鎶奸噾銆傛娂閲戜細鍦ㄩ棬搴楅��缃戝悗绾夸笅鍘熼閫�杩橈紙闂ㄥ簵绾夸笂寰俊鏀粯鐨勬娂閲戝洜寰俊瀹樻柟瑕佹眰鍏锋湁鏃舵晥鎬э級</div>
+ <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 storeDepositData" :key="index">
<span class="price-label">鍏朵腑{{item.fieldTypeName}}鏀跺彇鎶奸噾</span>
@@ -83,11 +90,11 @@
</div>
</el-tab-pane>
<el-tab-pane label="鍒嗘垚姣斾緥" name="share">
- <div class="price-tip">鏍规嵁璁㈠崟涓笉鍚岃繍钀ヨ鑹茶�岀嫭绔嬮厤缃笉鍚屽垎鎴愭瘮渚�</div>
+ <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>
- <el-input style="width: 100px;" v-model="item.ratio" type="number" placeholder="璇疯緭鍏�"></el-input>
+ <span class="price-label">{{item.fieldTypeName}}{{item.fieldType === 4 ? '鍦ㄨ鍗曚腑浣滀负閰嶉�佸憳鏃讹紝' : '闂ㄥ簵'}}鍒嗘垚姣斾緥涓�</span>
+ <el-input style="width: 100px;" v-model="item.ratio" placeholder="璇疯緭鍏�"></el-input>
<span class="price-unit">%</span>
</div>
</div>
@@ -254,7 +261,7 @@
item.startPrice === null || item.startPrice === undefined || item.startPrice === '' ||
item.extraDistance === null || item.extraDistance === undefined || item.extraDistance === '' ||
item.extraPrice === null || item.extraPrice === undefined || item.extraPrice === '') {
- this.$message.error('璇峰～鍐欐墍鏈夊紓鍦板瘎閫佺殑閰嶇疆淇℃伅')
+ this.$message.error('璇峰～鍐欐墍鏈夊悓鍩庡瘎閫佺殑閰嶇疆淇℃伅')
return false
}
}
@@ -289,6 +296,19 @@
this.$message.error('璇峰～鍐欐墍鏈夊垎鎴愭瘮渚�')
return false
}
+ const num = Number(item.ratio)
+ if (isNaN(num) || num < 1) {
+ this.$message.error(item.fieldTypeName + '鍒嗘垚姣斾緥蹇呴』澶т簬绛変簬1')
+ return false
+ }
+ const str = String(item.ratio)
+ if (str.includes('.')) {
+ const decimal = str.split('.')[1]
+ if (decimal.length > 1) {
+ this.$message.error(item.fieldTypeName + '鍒嗘垚姣斾緥鏈�澶氭敮鎸佷竴浣嶅皬鏁�')
+ return false
+ }
+ }
}
return true
}
@@ -297,8 +317,9 @@
</script>
<style scoped>
+
.price-tip {
- margin-bottom: 20px;
+ /*margin-bottom: 20px;*/
color: #666;
font-size: 14px;
}
@@ -311,10 +332,11 @@
display: flex;
align-items: center;
gap: 10px;
+ font-size: 14px;
}
.price-label {
flex-shrink: 0;
- font-weight: 500;
+ /*font-weight: 500;*/
}
.price-unit {
color: #666;
@@ -334,7 +356,7 @@
display: flex;
align-items: center;
gap: 15px;
- margin-bottom: 15px;
+ /*margin-bottom: 15px;*/
}
.remote-tip {
color: #666;
@@ -344,4 +366,4 @@
margin-top: 15px;
text-align: right;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3