From 78d39186d7641039085e8dccd558793723240b3f Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Fri, 8 Aug 2025 09:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/site/addSiteStep/step3.vue          | 19 ++++++++++++++----
 .../site/serviceSetting/menuColorSet.vue           | 23 +++++++++++++---------
 src/utils/common.js                                |  6 +++---
 src/views/agent/siteServiceList.vue                | 19 ++++++++++++++----
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/components/site/addSiteStep/step3.vue b/src/components/site/addSiteStep/step3.vue
index b5844b3..df82745 100644
--- a/src/components/site/addSiteStep/step3.vue
+++ b/src/components/site/addSiteStep/step3.vue
@@ -31,9 +31,9 @@
                                         <div style="text-align: center">
                                             <div class="flex">
                                                 <GuipInput ref="GuipInput" width="133px" v-model="row.price" label="售价" placeholder="请输入售价" :unit="row.price_unit"></GuipInput>
-                                                <template  v-if="row.price_unit_num>1">
+                                                <template  v-if="row.freedom_set || row.supply_unit_num>1">
                                                     <span class="shortspan">/</span>
-                                                    <GuipInput ref="GuipInput" width="133px" v-model="row.price_unit_num" unit="字符">
+                                                    <GuipInput ref="GuipInput" width="133px" v-model="row.unit_num" :unit="row.unit_name" @input="inputPrice(row)">
                                                     </GuipInput>
                                                 </template>
                                             </div>
@@ -313,6 +313,17 @@ export default {
               item.removeAttribute('aria-hidden')
           })
       },
+      inputPrice(row){
+          if(row.freedom_set){
+              if(row.unit_num == 1) {
+                  row.unit_name = '篇';
+              }else{
+                  row.unit_name = '字符';
+              }
+          }else{
+              row.unit_name = row.supply_unit_name;
+          }
+      },
       // 保存价格
       saveEdit(row, type) {
           row[type + 'PopoverVisible'] = false; // 关闭弹框
@@ -335,7 +346,7 @@ export default {
           let obj = {}
           obj.uid = this.siteInfo.uid
           obj.type = row.type
-          obj.unit_num = row.price_unit_num
+          obj.unit_num = row.unit_num
           if(row.price_unit == '元'){
               obj.unit_price = row.price
           }else{
@@ -343,7 +354,7 @@ export default {
           }
 
           const res = await this.saveRequest('/agentnew/ajax_set_service_price', obj)
-          if(res) row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.price_unit_num);
+          if(res) row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.unit_num, row.unit_name);
       },
       async onSwitchChange(row){
           let obj = {}
diff --git a/src/components/site/serviceSetting/menuColorSet.vue b/src/components/site/serviceSetting/menuColorSet.vue
index 36ab0ed..9edd051 100644
--- a/src/components/site/serviceSetting/menuColorSet.vue
+++ b/src/components/site/serviceSetting/menuColorSet.vue
@@ -34,7 +34,7 @@
                         <GuipFormItem column="column" label="主题颜色">
                             <span class="desc" slot="formRight"> 按钮及提示文字颜色</span>
                             <div class="flex gap12" slot="formDom">
-                                <el-color-picker popper-class="color-drop" v-model="themeColor"></el-color-picker>
+                                <el-color-picker class="color-drop" popper-class="color-drop" v-model="themeColor"></el-color-picker>
                                 <GuipInput ref="GuipInput" style="flex:1" v-model="themeColor" placeholder="请输入主题颜色"
                                     @change="changeThemeColor">
                                 </GuipInput>
@@ -43,7 +43,7 @@
                         <GuipFormItem column="column" class="mt24" label="选中颜色">
                             <span class="desc" slot="formRight"> 分页导航栏选中色</span>
                             <div class="flex gap12" slot="formDom">
-                                <el-color-picker popper-class="color-drop" v-model="tabColor"></el-color-picker>
+                                <el-color-picker class="color-drop" popper-class="color-drop" v-model="tabColor"></el-color-picker>
                                 <GuipInput ref="GuipInput" style="flex:1" v-model="tabColor" placeholder="请输入选中颜色"
                                     @change="changetabColor">
                                 </GuipInput>
@@ -52,7 +52,7 @@
                         <GuipFormItem column="column" class="mt24" label="导航栏色">
                             <span class="desc" slot="formRight"> logo处导航栏背景色</span>
                             <div class="flex gap12" slot="formDom">
-                                <el-color-picker popper-class="color-drop" v-model="navColor"></el-color-picker>
+                                <el-color-picker class="color-drop" popper-class="color-drop" v-model="navColor"></el-color-picker>
                                 <GuipInput ref="GuipInput" style="flex:1" v-model="navColor" placeholder="请输入导航栏色"
                                     @change="changeNavColor">
                                 </GuipInput>
@@ -196,13 +196,18 @@ export default {
 }
 </script>
 <style lang="scss">
-   
-    .color-drop .el-color-dropdown__btns{
+    .color-drop {
+      .el-color-dropdown__btns{
         display: flex;
         justify-content: space-between;
+      }
+      .el-button {
+        width: 70px;
+        height: 30px;
+      }
+
+      .el-icon-close:before{
+        content: "";
+      }
     }
-    .color-drop .el-button {
-                width: 70px;
-                height: 30px;
-            }
 </style>
\ No newline at end of file
diff --git a/src/utils/common.js b/src/utils/common.js
index f2af514..a3a9bf8 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -8,11 +8,11 @@ export function setHighActive(dom) {
     },1000)
 }
 
-export function getServicePriceDesc(price, price_unit, unit_num) {
+export function getServicePriceDesc(price, price_unit, unit_num, unit_name) {
     let unit = 0;
     let unit_str = "";
 
-    if (unit_num == 1) return price + price_unit +'/篇';
+    if (unit_num == 1) return price + price_unit +'/'+unit_name;
 
     if (unit_num/10000 < 10) {
         unit = Math.ceil(unit_num/10000);
@@ -27,6 +27,6 @@ export function getServicePriceDesc(price, price_unit, unit_num) {
         unit_str = unit == 1 ? '百' : unit+'百';
     }
 
-    return price + price_unit + "/" +unit_str + "字符";
+    return price + price_unit + "/" +unit_str + unit_name;
 }
 
diff --git a/src/views/agent/siteServiceList.vue b/src/views/agent/siteServiceList.vue
index 7ad2724..853151b 100644
--- a/src/views/agent/siteServiceList.vue
+++ b/src/views/agent/siteServiceList.vue
@@ -40,9 +40,9 @@
                                 <div style="text-align: center">
                                     <div class="flex">
                                         <GuipInput ref="GuipInput" width="133px" v-model="row.price" label="售价" placeholder="请输入售价" :unit="row.price_unit"></GuipInput>
-                                        <template  v-if="row.price_unit_num>1">
+                                        <template  v-if="row.freedom_set || row.supply_unit_num>1">
                                             <span class="shortspan">/</span>
-                                            <GuipInput ref="GuipInput" width="133px" v-model="row.price_unit_num" unit="字符">
+                                            <GuipInput ref="GuipInput" width="133px" v-model="row.unit_num" :unit="row.unit_name" @input="inputPrice(row)">
                                             </GuipInput>
                                         </template>
                                     </div>
@@ -362,6 +362,17 @@ export default {
                 item.removeAttribute('aria-hidden')
             })
         },
+        inputPrice(row){
+            if(row.freedom_set){
+                if(row.unit_num == 1) {
+                    row.unit_name = '篇';
+                }else{
+                    row.unit_name = '字符';
+                }
+            }else{
+                row.unit_name = row.supply_unit_name;
+            }
+        },
         // 保存价格
         saveEdit(row, type) {
             row[type + 'PopoverVisible'] = false; // 关闭弹框
@@ -388,7 +399,7 @@ export default {
             let obj = {}
             obj.uid = this.uid
             obj.type = row.type
-            obj.unit_num = row.price_unit_num
+            obj.unit_num = row.unit_num
             if(row.price_unit == '元'){
                 obj.unit_price = row.price
             }else{
@@ -396,7 +407,7 @@ export default {
             }
 
             const res = await this.saveRequest('/agentnew/ajax_set_service_price', obj)
-            if(res) row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.price_unit_num);
+            if(res) row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.unit_num, row.unit_name);
         },
         async onSwitchChange(row){
             let obj = {}