From feed12b692de4df3eb63dec7a7b9900ca4e4ecd9 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Fri, 23 May 2025 18:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=95=E9=83=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Footer.vue            |  3 ++-
 src/style/theme/common.scss          |  9 +++++++--
 src/style/theme/index.css            | 28 ++++++++++++++--------------
 src/views/ConfigureServicePrices.vue |  4 +++-
 src/views/SitePersonalization.vue    | 32 +++++++++++++++++++++++++-------
 src/views/super/Ranking/Purchase.vue | 25 ++++++++++++++++++++-----
 6 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 1898e67..eb6e4df 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -10,7 +10,8 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    color: #626573 
+    color: #626573;
+    font-size: 12px;
     a{
         text-decoration: none;
         color: #006AFF;
diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss
index dcea642..ae30391 100644
--- a/src/style/theme/common.scss
+++ b/src/style/theme/common.scss
@@ -139,6 +139,7 @@ body {
     }
 }
 
+
 .desc {
     font-size: 12px;
     font-weight: normal;
@@ -154,7 +155,7 @@ body {
 .flex-common {
     padding: 32px 36px;
     background-color: #fff;
-
+    border-radius: 4px;
     h3 {
         text-align: left;
         margin: 0 0 32px 0;
@@ -428,7 +429,7 @@ body {
 }
 
 .el-input__inner {
-    height: 100%;
+    height: 39px;
     padding: 10px 12px;
     border-radius: 4px;
 }
@@ -814,6 +815,10 @@ body {
     display: flex;
     align-items: center;
 }
+// 公共圆角类名
+.br4{
+    border-radius: 4px;
+}
 
 // 自定义下拉内容框
 .noraml-jump {
diff --git a/src/style/theme/index.css b/src/style/theme/index.css
index f8cdf3e..8e1878d 100644
--- a/src/style/theme/index.css
+++ b/src/style/theme/index.css
@@ -1673,7 +1673,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF;
 }
 
 .el-input__inner:focus {
@@ -3270,7 +3270,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF;
 }
 
 .el-input__inner:focus {
@@ -5364,7 +5364,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF
 }
 
 .el-input__inner:focus {
@@ -5801,7 +5801,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF;
 }
 
 .el-input__inner:focus {
@@ -6717,7 +6717,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -7408,7 +7408,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF;
 }
 
 .el-input__inner:focus {
@@ -9112,7 +9112,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -10292,7 +10292,7 @@
 
 .el-table .sort-caret.descending {
     border-top-color: #babdc2;
-    bottom: 7px
+    bottom: 5px
 }
 
 .el-table .ascending .sort-caret.ascending {
@@ -10535,7 +10535,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -14628,7 +14628,7 @@
 }
 
 .el-input__inner:hover {
-    border-color: #babdc2
+    border-color: #006AFF;
 }
 
 .el-input__inner:focus {
@@ -18390,7 +18390,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -26135,7 +26135,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -28619,7 +28619,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
@@ -30659,7 +30659,7 @@
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-    border-color: #006aff
+    border-color: #dfe2e6
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
diff --git a/src/views/ConfigureServicePrices.vue b/src/views/ConfigureServicePrices.vue
index 0a1b0a4..ea9e842 100644
--- a/src/views/ConfigureServicePrices.vue
+++ b/src/views/ConfigureServicePrices.vue
@@ -178,6 +178,7 @@ export default {
     // 站点设置
     name: '',
     props: [''],
+	options: { styleIsolation: "shared" },
     components: {
         PageTitle,
         GuipButton,
@@ -253,7 +254,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.alias-wrap ::v-deep .el-form-item {
+.config-service-price .el-form-item {
     margin-bottom: 0;
 }
 .config-service-price {
@@ -298,6 +299,7 @@ export default {
     }
     .content1{
         margin: 12px 0;
+        
     }
     .alias-wrap {
         width: 100%;
diff --git a/src/views/SitePersonalization.vue b/src/views/SitePersonalization.vue
index 9294fa1..44ff462 100644
--- a/src/views/SitePersonalization.vue
+++ b/src/views/SitePersonalization.vue
@@ -38,7 +38,7 @@
                         <div class="flex-wrap">
                             <div class="flex-left">
                                 <p class="flex-left-desc">旺旺客服</p>
-                                <GuipInput ref="GuipInput" class="mt12 mb24" width="100%"
+                                <GuipInput ref="GuipInput" class="mt12 mb24" width="98%"
                                     v-model="personalForm8.checkNum" placeholder="请填写账号">
                                 </GuipInput>
                                 <p class="flex-left-desc">QQ客服</p>
@@ -120,7 +120,11 @@
                         <div class="left-pay-list mb24">
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>服务列表页价格 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span class="flex">服务列表页价格 
+                                        <GuipToolTip content="----居中----">
+                                             <img style="margin-left: 13px;" src="@/assets/site/form_qua_ic.svg" alt="">
+                                        </GuipToolTip>
+                                    </span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag1" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -128,7 +132,11 @@
                             </div>
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>服务提交页价格 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span class="flex">服务提交页价格 
+                                         <GuipToolTip content="----居中----">
+                                             <img style="margin-left: 13px;" src="@/assets/site/form_qua_ic.svg" alt="">
+                                        </GuipToolTip>
+                                    </span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag2" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -142,7 +150,11 @@
                         <div class="left-pay-list mb24">
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>服务列表页价格 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span class="flex">服务列表页价格 
+                                         <GuipToolTip content="----居中----">
+                                             <img style="margin-left: 13px;" src="@/assets/site/form_qua_ic.svg" alt="">
+                                        </GuipToolTip>
+                                    </span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag3" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -150,7 +162,11 @@
                             </div>
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>服务提交页价格 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span class="flex">服务提交页价格 
+                                         <GuipToolTip content="----居中----">
+                                             <img style="margin-left: 13px;" src="@/assets/site/form_qua_ic.svg" alt="">
+                                        </GuipToolTip>
+                                    </span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag4" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -171,7 +187,7 @@
                         <div class="left-pay-list mb24">
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>60分钟内不可提交重复内容 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span>60分钟内不可提交重复内容</span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag1" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -190,7 +206,7 @@
                         <div class="left-pay-list mb24">
                             <div class="left-pay-item ">
                                 <div class="flex-between">
-                                    <span>3分钟内不可提交重复内容 <img src="@/assets/site/form_qua_ic.svg" alt=""></span>
+                                    <span>3分钟内不可提交重复内容</span>
                                     <GuipSwitch :modelValue="personalForm3.weixinFlag3" activeText="显示"
                                         inactiveText="隐藏" @change="onSwitchChange">
                                     </GuipSwitch>
@@ -228,6 +244,7 @@ import GuipInput from '@/components/GuipInput.vue';
 import { mapState } from 'vuex';
 import store from '../store';
 import GuipSwitch from '@/components/GuipSwitch.vue';
+import GuipToolTip from '@/components/GuipToolTip.vue';
 import GuipButton from '@/components/GuipButton.vue';
 import GroupFormBtns from '@/components/GroupFormBtns.vue';
 
@@ -239,6 +256,7 @@ export default {
         GuipInput,
         GuipButton,
         GuipSwitch,
+        GuipToolTip,
         GroupFormBtns
     },
     data() {
diff --git a/src/views/super/Ranking/Purchase.vue b/src/views/super/Ranking/Purchase.vue
index affd281..07d677a 100644
--- a/src/views/super/Ranking/Purchase.vue
+++ b/src/views/super/Ranking/Purchase.vue
@@ -36,11 +36,11 @@
         </div>
         <div class=" flex-common" v-if="type2filterOptions.length > 0">
             <el-form>
-                <el-table :data="tableData" style="width: 100%">
+                <GuipTable :tableData="tableData" style="width: 100%" :loading="tableLoading">
                     <template v-if="type == 'purchase'">
                         <el-table-column prop="type">
                             <template slot="header">
-                                <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
+                                <GuipSelect class="custom-select tableHeaderSelect" style="height:20px;"  v-model="chktype" :options="type2filterOptions"
                                     defaultValue="全部检测类型" @change="changeSelectType" />
                             </template>
 
@@ -49,7 +49,7 @@
                             </template>
                         </el-table-column>
 
-                        <el-table-column label="采购单价">
+                        <el-table-column label="采购单价" sortable prop="unit_price">
                             <template slot-scope="scope">
                                 {{ scope.row.unit_price }} 元 / {{
                                     scope.row.unit_num == 1 ? '篇' : scope.row.unit_num + '字' }}
@@ -66,7 +66,7 @@
                     <template v-else>
                         <el-table-column prop="type">
                             <template slot="header">
-                                <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
+                                <GuipSelect class="custom-select tableHeaderSelect" v-model="chktype" :options="type2filterOptions"
                                     defaultValue="全部检测类型" @change="changeSelectType" />
                             </template>
 
@@ -101,7 +101,7 @@
                             </template>
                         </el-table-column>
                     </template>
-                </el-table>
+                </GuipTable>
 
                 <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
                     :current-page="currentPage" :page-size=pageSize layout="prev, pager, next,jumper" :total="total">
@@ -113,6 +113,7 @@
 <script>
 
 import GuipDialog from "@/components/GuipDialog.vue";
+import GuipTable from "@/components/GuipTable.vue";
 import GuipSelect from "@/components/GuipSelect.vue";
 import GuipInput from "@/components/GuipInput.vue";
 
@@ -135,11 +136,13 @@ export default {
     components: {
         GuipInput,
         GuipSelect,
+        GuipTable,
         GuipDialog
     },
     data() {
         return {
             test: '00000',
+            tableLoading:false,
             id: 0,
             chktype: '0',
             currentPage: 1,    //当前页
@@ -221,12 +224,14 @@ export default {
         },
         getPurchase() {
             const that = this
+            this.tableLoading=true
             that.tableData = []
             this.$http('POST', '/supernew/ajax_get_purchase_list', {
                 type: that.chktype,
                 cur_page: that.currentPage,
                 page_size: that.pageSize,
             }).then(response => {
+                this.tableLoading = false
                 this.$nextTick(() => {
                     that.tableData = response.data.list
                     that.type2name = response.data.type2name
@@ -237,6 +242,7 @@ export default {
             })
         },
         getStagePurchase() {
+            this.tableLoading=true
             const that = this
             that.tableData = []
             this.$http('POST', '/supernew/ajax_get_stage_purchase', {
@@ -244,6 +250,7 @@ export default {
                 cur_page: that.currentPage,
                 page_size: that.pageSize,
             }).then(response => {
+                this.tableLoading = false
                 this.$nextTick(() => {
                     that.tableData = response.data.list
                     that.type2name = response.data.type2name
@@ -402,4 +409,12 @@ export default {
 .custom-select {
     width: 200px;
 }
+.tableHeaderSelect ::v-deep .el-input__inner{
+    font-size: 14px;
+    font-weight: normal;
+    letter-spacing: 0.08em;
+    font-family: Microsoft YaHei UI;
+    color: #1E2226;
+}
+
 </style>
\ No newline at end of file