From 9e609bd1e5cce8efa429262c92b765f49f9ee2ee Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Wed, 11 Jun 2025 14:00:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |  50 +++---
 src/assets/loding_.json                   |   1 +
 src/assets/menu/Totalprofit.svg           |   1 +
 src/assets/menu/Totalprofit1.svg          |   1 +
 src/assets/menu/Totalprofit2.svg          |   1 +
 src/assets/menu/Totalprofit3.svg          |   1 +
 src/components/SvgIcon1.vue               | 175 +++++++++++++++++++
 src/store/index.js                        | 189 +++++++++++++++++---
 src/style/theme/common.scss               |  19 +-
 src/style/theme/index.css                 |   1 +
 src/views/Register.vue                    |  88 ++++++----
 src/views/elementGroups.vue               |  95 +++++++++-
 src/views/super/Ranking/RankBatchList.vue | 279 ++++++++++++++++++++++++++----
 src/views/super/Ranking/Ranking.vue       |  15 +-
 14 files changed, 793 insertions(+), 123 deletions(-)
 create mode 100644 src/assets/loding_.json
 create mode 100644 src/assets/menu/Totalprofit.svg
 create mode 100644 src/assets/menu/Totalprofit1.svg
 create mode 100644 src/assets/menu/Totalprofit2.svg
 create mode 100644 src/assets/menu/Totalprofit3.svg
 create mode 100644 src/components/SvgIcon1.vue

diff --git a/src/App.vue b/src/App.vue
index d19fd5f..e751a54 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,5 @@
 <template>
   <div id="app">
-    <!-- <nav>
-      <router-link to="/">Home</router-link> |
-      <router-link to="/about">About</router-link> |
-      <router-link to="/ui">组件示例文件</router-link>
-    </nav> -->
-    <!-- <router-view/> -->
     <el-container>
       <el-header style="height: 62px;" v-if="showHeader">
         <Header></Header>
@@ -14,7 +8,7 @@
         <div class="bg"></div>
       </el-header>
       <el-container :class="(showHeader ? 'short-container' : '')">
-        <SliderMenu v-if="showSidebar"></SliderMenu>
+        <SliderMenu v-if="showSidebar" :menuData="menuData"></SliderMenu>
         <el-container>
           <!-- 面包屑导航 -->
           <Breadcrumb />
@@ -45,26 +39,26 @@ export default {
   data() {
     return {
       isCollapse: true,
-      menuData: [
-        {
-          index: '1',
-          title: '父级菜单1',
-          icon: 'el-icon-location',
-          children: [
-            { index: '1-1', title: '子级菜单1-1', path: '/' },
-            { index: '1-2', title: 'ui页面', path: '/ui' }
-          ]
-        },
-        {
-          index: '2',
-          title: '父级菜单2',
-          icon: 'el-icon-menu',
-          children: [
-            { index: '2-1', title: '子级菜单2-1', path: '/about' },
-            { index: '2-2', title: '加盟耶main', path: '/franchise' }
-          ]
-        }
-      ]
+    //   menuData: [
+    //     {
+    //       index: '1',
+    //       title: '父级菜单1',
+    //       icon: 'el-icon-location',
+    //       children: [
+    //         { index: '1-1', title: '子级菜单1-1', path: '/' },
+    //         { index: '1-2', title: 'ui页面', path: '/ui' }
+    //       ]
+    //     },
+    //     {
+    //       index: '2',
+    //       title: '父级菜单2',
+    //       icon: 'el-icon-menu',
+    //       children: [
+    //         { index: '2-1', title: '子级菜单2-1', path: '/about' },
+    //         { index: '2-2', title: '加盟耶main', path: '/franchise' }
+    //       ]
+    //     }
+    //   ]
     };
   },
   components: {
@@ -76,7 +70,7 @@ export default {
     Breadcrumb
   },
   computed: {
-    ...mapState(['showSidebar', 'showFooter', 'showHeader']) // 从Vuex映射showSidebar状态到组件的计算属性中
+    ...mapState(['menuData','showSidebar', 'showFooter', 'showHeader']) // 从Vuex映射showSidebar状态到组件的计算属性中
   },
   mounted() {
     window.addEventListener('beforeunload', this.clearStorage);
diff --git a/src/assets/loding_.json b/src/assets/loding_.json
new file mode 100644
index 0000000..c720267
--- /dev/null
+++ b/src/assets/loding_.json
@@ -0,0 +1 @@
+{"v":"5.12.2","fr":60,"ip":0,"op":55,"w":88,"h":88,"nm":"Frame 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"▽ Group 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[360]},{"t":55,"s":[720]}],"ix":10},"p":{"a":0,"k":[44.5,43.5,0],"ix":2,"l":2},"a":{"a":0,"k":[33.5,33.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Ellipse 2","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50.25,16.75,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-18.502]],"o":[[18.502,0],[0,0]],"v":[[-16.75,-16.75],[16.75,16.75]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.357,0.435,0.965],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":7,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Ellipse 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Ellipse 1","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33.5,33.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[67,67],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.898,0.91,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":7,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":55,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file
diff --git a/src/assets/menu/Totalprofit.svg b/src/assets/menu/Totalprofit.svg
new file mode 100644
index 0000000..cd29104
--- /dev/null
+++ b/src/assets/menu/Totalprofit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="15.0205078125" height="15.5" viewBox="0 0 15.0205078125 15.5"><g><g><path d="M3.79662953125,3.8964666281738283Q1.6965055312500001,6.345712628173828,0.24108353125000004,10.452212628173829Q-0.43852046874999995,12.369692628173828,0.79886053125,13.960272628173827Q1.99668953125,15.499962628173828,4.02287953125,15.499962628173828L10.99261953125,15.499962628173828Q13.02321953125,15.499962628173828,14.22261953125,13.954422628173829Q15.46071953125,12.358772628173828,14.77801953125,10.437962628173828Q13.31601953125,6.324762628173828,11.23551953125,3.896659628173828Q11.19771953125,3.852576628173828,11.15361953125,3.8148316281738284Q11.10951953125,3.7770866281738282,11.06011953125,3.746578628173828Q11.01071953125,3.7160706281738283,10.95721953125,3.6935256281738282Q10.90371953125,3.670981628173828,10.84741953125,3.656938628173828Q10.79101953125,3.642894628173828,10.73323953125,3.637686628173828Q10.67541953125,3.6324786281738284,10.61747953125,3.636230628173828Q10.55954953125,3.639981628173828,10.50288953125,3.652603628173828Q10.44621953125,3.665225628173828,10.39217953125,3.686416628173828Q9.08217953125,4.200049628173828,7.51886953125,4.200049628173828Q5.95146953125,4.200049628173828,4.6394495312499995,3.6862946281738282Q4.58541953125,3.665140628173828,4.52878953125,3.652546628173828Q4.47215953125,3.639952628173828,4.41425953125,3.636218628173828Q4.3563695312499995,3.632483628173828,4.29858953125,3.637696628173828Q4.24080953125,3.642910628173828,4.18450953125,3.6569476281738282Q4.12821953125,3.670985628173828,4.07475953125,3.693512628173828Q4.0212995312499995,3.716040628173828,3.97192953125,3.746522628173828Q3.92256953125,3.777003628173828,3.87847953125,3.814714628173828Q3.83438953125,3.852424628173828,3.79662953125,3.8964666281738283ZM1.98278953125,13.039242628173827Q1.24962953125,12.096802628173828,1.65491053125,10.953312628173828Q2.90057953125,7.438632628173828,4.6114095312500005,5.267114628173828Q5.96870953125,5.700052628173828,7.51886953125,5.700052628173828Q9.06522953125,5.700052628173828,10.42028953125,5.267401628173828Q12.11401953125,7.421702628173828,13.36461953125,10.940332628173827Q13.77251953125,12.087702628173828,13.03751953125,13.034832628173827Q12.28851953125,14.000002628173828,10.99261953125,14.000002628173828L4.02287953125,14.000002628173828Q2.73020953125,14.000002628173828,1.98278953125,13.039242628173827Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M5.416015625,8.399959564208984L9.615995625,8.399959564208984Q9.689865625,8.399959564208984,9.762315625,8.414370564208983Q9.834765625,8.428781564208984,9.903005624999999,8.457049564208985Q9.971255625000001,8.485318564208985,10.032675625,8.526357564208984Q10.094095625,8.567396564208984,10.146325625,8.619629564208985Q10.198555625000001,8.671862564208984,10.239595625,8.733281564208985Q10.280635625,8.794701564208985,10.308905625000001,8.862946564208984Q10.337175625,8.931192564208985,10.351585625,9.003641564208984Q10.365995625,9.076091064208985,10.365995625,9.149959564208984Q10.365995625,9.223828064208984,10.351585625,9.296277564208985Q10.337175625,9.368726564208984,10.308905625000001,9.436972564208984Q10.280635625,9.505217564208984,10.239595625,9.566637564208984Q10.198555625000001,9.628056564208984,10.146325625,9.680289564208984Q10.094095625,9.732522564208985,10.032675625,9.773561564208984Q9.971255625000001,9.814600564208984,9.903005624999999,9.842869564208984Q9.834765625,9.871137564208984,9.762315625,9.885548564208985Q9.689865625,9.899959564208984,9.615995625,9.899959564208984L5.416015625,9.899959564208984Q5.342147125,9.899959564208984,5.269697625,9.885548564208985Q5.197248625,9.871137564208984,5.129002625,9.842869564208984Q5.060757625,9.814600564208984,4.999337625,9.773561564208984Q4.937918625,9.732522564208985,4.885685625,9.680289564208984Q4.833452625,9.628056564208984,4.792413625,9.566637564208984Q4.751374625,9.505217564208984,4.723105625,9.436972564208984Q4.694837625,9.368726564208984,4.680426625,9.296277564208985Q4.666015625,9.223828064208984,4.666015625,9.149959564208984Q4.666015625,9.076091064208985,4.680426625,9.003641564208984Q4.694837625,8.931192564208985,4.723105625,8.862946564208984Q4.751374625,8.794701564208985,4.792413625,8.733281564208985Q4.833452625,8.671862564208984,4.885685625,8.619629564208985Q4.937918625,8.567396564208984,4.999337625,8.526357564208984Q5.060757625,8.485318564208985,5.129002625,8.457049564208985Q5.197248625,8.428781564208984,5.269697625,8.414370564208983Q5.342147125,8.399959564208984,5.416015625,8.399959564208984Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M5.416015625,10.499946594238281L9.615995625,10.499946594238281Q9.689865625,10.499946594238281,9.762315625,10.51435759423828Q9.834765625,10.528768594238281,9.903005624999999,10.557036594238282Q9.971255625000001,10.585305594238282,10.032675625,10.626344594238281Q10.094095625,10.66738359423828,10.146325625,10.719616594238282Q10.198555625000001,10.771849594238281,10.239595625,10.833268594238282Q10.280635625,10.894688594238282,10.308905625000001,10.962933594238281Q10.337175625,11.031179594238282,10.351585625,11.10362859423828Q10.365995625,11.176078094238282,10.365995625,11.249946594238281Q10.365995625,11.323815094238281,10.351585625,11.396264594238282Q10.337175625,11.468713594238281,10.308905625000001,11.536959594238281Q10.280635625,11.60520459423828,10.239595625,11.66662459423828Q10.198555625000001,11.728043594238281,10.146325625,11.78027659423828Q10.094095625,11.832509594238282,10.032675625,11.873548594238281Q9.971255625000001,11.91458759423828,9.903005624999999,11.94285659423828Q9.834765625,11.971124594238281,9.762315625,11.985535594238282Q9.689865625,11.999946594238281,9.615995625,11.999946594238281L5.416015625,11.999946594238281Q5.342147125,11.999946594238281,5.269697625,11.985535594238282Q5.197248625,11.971124594238281,5.129002625,11.94285659423828Q5.060757625,11.91458759423828,4.999337625,11.873548594238281Q4.937918625,11.832509594238282,4.885685625,11.78027659423828Q4.833452625,11.728043594238281,4.792413625,11.66662459423828Q4.751374625,11.60520459423828,4.723105625,11.536959594238281Q4.694837625,11.468713594238281,4.680426625,11.396264594238282Q4.666015625,11.323815094238281,4.666015625,11.249946594238281Q4.666015625,11.176078094238282,4.680426625,11.10362859423828Q4.694837625,11.031179594238282,4.723105625,10.962933594238281Q4.751374625,10.894688594238282,4.792413625,10.833268594238282Q4.833452625,10.771849594238281,4.885685625,10.719616594238282Q4.937918625,10.66738359423828,4.999337625,10.626344594238281Q5.060757625,10.585305594238282,5.129002625,10.557036594238282Q5.197248625,10.528768594238281,5.269697625,10.51435759423828Q5.342147125,10.499946594238281,5.416015625,10.499946594238281Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M6.76904296875,9.149959564208984Q6.76904296875,9.076091064208985,6.78345396875,9.003641564208984Q6.79786496875,8.931192564208985,6.82613296875,8.862946564208984Q6.85440196875,8.794701564208985,6.89544096875,8.733281564208985Q6.93647996875,8.671862564208984,6.98871296875,8.619629564208985Q7.04094596875,8.567396564208984,7.10236496875,8.526357564208984Q7.16378496875,8.485318564208985,7.23202996875,8.457049564208985Q7.30027596875,8.428781564208984,7.37272496875,8.414370564208983Q7.44517446875,8.399959564208984,7.51904296875,8.399959564208984Q7.59291146875,8.399959564208984,7.66536096875,8.414370564208983Q7.73780996875,8.428781564208984,7.80605596875,8.457049564208985Q7.87430096875,8.485318564208985,7.93572096875,8.526357564208984Q7.99713996875,8.567396564208984,8.04937296875,8.619629564208985Q8.10160596875,8.671862564208984,8.14264496875,8.733281564208985Q8.18368396875,8.794701564208985,8.21195296875,8.862946564208984Q8.24022096875,8.931192564208985,8.254631968750001,9.003641564208984Q8.26904296875,9.076091064208985,8.26904296875,9.149959564208984L8.26904296875,12.649939564208985Q8.26904296875,12.723809564208985,8.254631968750001,12.796259564208984Q8.24022096875,12.868709564208984,8.21195296875,12.936949564208984Q8.18368396875,13.005199564208985,8.14264496875,13.066619564208985Q8.10160596875,13.128039564208985,8.04937296875,13.180269564208984Q7.99713996875,13.232509564208986,7.93572096875,13.273539564208985Q7.87430096875,13.314579564208984,7.80605596875,13.342849564208985Q7.73780996875,13.371119564208986,7.66536096875,13.385529564208984Q7.59291146875,13.399939564208985,7.51904296875,13.399939564208985Q7.44517446875,13.399939564208985,7.37272496875,13.385529564208984Q7.30027596875,13.371119564208986,7.23202996875,13.342849564208985Q7.16378496875,13.314579564208984,7.10236496875,13.273539564208985Q7.04094596875,13.232509564208986,6.98871296875,13.180269564208984Q6.93647996875,13.128039564208985,6.89544096875,13.066619564208985Q6.85440196875,13.005199564208985,6.82613296875,12.936949564208984Q6.79786496875,12.868709564208984,6.78345396875,12.796259564208984Q6.76904296875,12.723809564208985,6.76904296875,12.649939564208985L6.76904296875,9.149959564208984Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M4.885685625,7.580298719482422Q4.780196625,7.474809719482422,4.723105625,7.336981719482422Q4.666015625,7.199152719482422,4.666015625,7.049968719482422Q4.666015625,6.976100219482422,4.680426625,6.903650719482422Q4.694837625,6.831201719482422,4.723105625,6.762955719482422Q4.751374625,6.694710719482422,4.792413625,6.633290719482422Q4.833452625,6.571871719482422,4.885685625,6.519638719482422Q4.937918625,6.4674057194824215,4.999337625,6.426366719482422Q5.060757625,6.385327719482422,5.129002625,6.3570587194824215Q5.197248625,6.328790719482422,5.269697625,6.314379719482422Q5.342147125,6.299968719482422,5.416015625,6.299968719482422Q5.565199625,6.299968719482422,5.703028625,6.3570587194824215Q5.840856625,6.414149719482422,5.946345625,6.519638719482422L7.516005625,8.089298719482422L9.085505625,6.519792719482422L9.085665625,6.519638719482422Q9.191155625,6.414149719482422,9.328985625,6.3570587194824215Q9.466805625,6.299968719482422,9.615995625,6.299968719482422Q9.689865625,6.299968719482422,9.762315625,6.314379719482422Q9.834765625,6.328790719482422,9.903005624999999,6.3570587194824215Q9.971255625000001,6.385327719482422,10.032675625,6.426366719482422Q10.094095625,6.4674057194824215,10.146325625,6.519638719482422Q10.198555625000001,6.571871719482422,10.239595625,6.633290719482422Q10.280635625,6.694710719482422,10.308905625000001,6.762955719482422Q10.337175625,6.831201719482422,10.351585625,6.903650719482422Q10.365995625,6.976100219482422,10.365995625,7.049968719482422Q10.365995625,7.199152719482422,10.308905625000001,7.336981719482422Q10.251815624999999,7.474809719482422,10.146325625,7.580298719482422L8.046335625000001,9.680288719482423Q7.9941056249999995,9.732518719482421,7.9326856249999995,9.773558719482422Q7.8712656249999995,9.814598719482422,7.8030156250000005,9.842868719482421Q7.734775625,9.871138719482422,7.662325624999999,9.885548719482422Q7.5898756249999995,9.899958719482422,7.516005625,9.899958719482422Q7.442135625000001,9.899958719482422,7.369685625,9.885548719482422Q7.297235625,9.871138719482422,7.228995625,9.842868719482421Q7.160745625,9.814598719482422,7.0993256250000005,9.773558719482422Q7.0379056250000005,9.732518719482421,6.985675625,9.680288719482423L4.885685625,7.580298719482422L4.885685625,7.580298719482422Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M3.9841803125,0.6841028Q2.2158203125,1.5002710000000001,2.2158203125,2.84999Q2.2158203125,4.19971,3.9841803125,5.01587Q5.4664103125,5.69998,7.5158003125,5.69998Q9.5651903125,5.69998,11.0474103125,5.01587Q12.8157703125,4.19971,12.8157703125,2.84999Q12.8157703125,1.5002710000000001,11.0474103125,0.6841029Q9.5651903125,0,7.5158003125,0Q5.4664103125,0,3.9841803125,0.6841028ZM3.8763123125,3.16068Q3.7158203125,2.98555,3.7158203125,2.84999Q3.7158203125,2.71443,3.8763123125,2.5393Q4.1198603125,2.2735399999999997,4.6127703125,2.04604Q5.7958603125,1.5,7.5158003125,1.5Q9.2357303125,1.5,10.4188203125,2.04604Q10.9117303125,2.2735399999999997,11.1552803125,2.5393Q11.3157703125,2.71443,11.3157703125,2.84999Q11.3157703125,2.98555,11.1552803125,3.16068Q10.9117303125,3.42644,10.4188203125,3.65394Q9.2357303125,4.19998,7.5158003125,4.19998Q5.7958603125,4.19998,4.6127703125,3.65394Q4.1198603125,3.42644,3.8763123125,3.16068Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/menu/Totalprofit1.svg b/src/assets/menu/Totalprofit1.svg
new file mode 100644
index 0000000..5f28324
--- /dev/null
+++ b/src/assets/menu/Totalprofit1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_401_002005"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_401_002005)"><g><path d="M15.002033373069763,12.004133373069763Q15.095533373069763,11.957433373069764,15.172633373069763,11.886933373069763Q15.249733373069763,11.816533373069763,15.304633373069763,11.727633373069763Q15.359533373069763,11.638733373069764,15.388133373069763,11.538333373069763Q15.416633373069763,11.437833373069763,15.416633373069763,11.333333373069763L15.416633373069763,4.666663373069763Q15.416633373069763,4.562203373069764,15.388133373069763,4.461713373069763Q15.359533373069763,4.361233373069763,15.304633373069763,4.272363373069763Q15.249733373069763,4.1835033730697635,15.172633373069763,4.113033373069763Q15.095533373069763,4.042563373069763,15.002033373069763,3.9958433730697633L8.335413373069763,0.6625133730697632Q8.257303373069764,0.6234593730697632,8.172313373069763,0.6033963730697632Q8.087323373069763,0.5833333730697632,8.000003373069763,0.5833333730697632Q7.912673373069763,0.5833333730697632,7.827683373069763,0.6033963730697632Q7.742693373069764,0.6234593730697632,7.6645933730697635,0.6625123730697632L0.9979233730697632,3.9958433730697633Q0.9044883730697633,4.042563373069763,0.8273763730697632,4.113033373069763Q0.7502643730697632,4.1835033730697635,0.6953453730697632,4.272363373069763Q0.6404263730697631,4.361233373069763,0.6118793730697631,4.461713373069763Q0.5833333730697632,4.562203373069764,0.5833333730697632,4.666663373069763L0.5833333730697632,11.333333373069763Q0.5833333730697632,11.437833373069763,0.6118793730697631,11.538333373069763Q0.6404253730697632,11.638733373069764,0.6953453730697632,11.727633373069763Q0.7502643730697632,11.816533373069763,0.8273763730697632,11.886933373069763Q0.9044883730697633,11.957433373069764,0.9979233730697632,12.004133373069763L7.6645933730697635,15.337533373069764Q7.742693373069764,15.376533373069764,7.827683373069763,15.396633373069763Q7.912673373069763,15.416633373069763,8.000003373069763,15.416633373069763Q8.087323373069763,15.416633373069763,8.172313373069763,15.396633373069763Q8.257303373069764,15.376533373069764,8.335413373069763,15.337533373069764L15.002033373069763,12.004133373069763ZM13.916633373069763,10.869803373069763L8.000003373069763,13.828133373069763L2.083333373069763,10.869803373069763L2.083333373069763,5.130193373069764L8.000003373069763,2.171858373069763L13.916633373069763,5.130193373069764L13.916633373069763,10.869803373069763Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M1.6687433730697632,3.9958465077209473L8.335413373069763,7.329176507720947Q8.428843373069764,7.375896507720947,8.505953373069763,7.446366507720947Q8.583063373069763,7.516836507720948,8.637983373069762,7.605706507720948Q8.692903373069763,7.694566507720947,8.721453373069764,7.795046507720947Q8.750003373069763,7.895536507720948,8.750003373069763,7.999996507720947Q8.750003373069763,8.073866507720947,8.735583373069764,8.146316507720947Q8.721173373069764,8.218766507720947,8.692913373069764,8.287016507720947Q8.664643373069763,8.355256507720947,8.623603373069763,8.416676507720947Q8.582563373069764,8.478096507720947,8.530333373069762,8.530326507720947Q8.478093373069763,8.582566507720948,8.416673373069763,8.623596507720947Q8.355253373069763,8.664636507720948,8.287013373069763,8.692906507720947Q8.218763373069763,8.721176507720948,8.146313373069763,8.735586507720948Q8.073863373069763,8.749996507720947,8.000003373069763,8.749996507720947Q7.822953373069764,8.749996507720947,7.6645933730697635,8.670816507720946L0.9979233730697632,5.337486507720947Q0.9044883730697633,5.290769507720947,0.8273763730697632,5.2202975077209475Q0.7502643730697632,5.149826507720947,0.6953453730697632,5.060964507720947Q0.6404263730697631,4.972103507720948,0.6118793730697631,4.8716165077209475Q0.5833333730697632,4.771129507720947,0.5833333730697632,4.666666507720947Q0.5833333730697632,4.592798007720948,0.5977443730697631,4.520348507720947Q0.6121553730697632,4.4478995077209476,0.6404233730697632,4.379653507720947Q0.6686923730697631,4.311408507720947,0.7097313730697632,4.249988507720947Q0.7507703730697631,4.188569507720947,0.8030033730697632,4.136336507720947Q0.8552363730697632,4.084103507720947,0.9166553730697632,4.043064507720947Q0.9780753730697631,4.002025507720948,1.0463203730697632,3.9737565077209474Q1.1145663730697632,3.945488507720947,1.1870153730697632,3.931077507720947Q1.259464873069763,3.9166665077209473,1.3333333730697632,3.9166665077209473Q1.5103843730697633,3.9166665077209473,1.6687433730697632,3.9958465077209473Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M7.25,8Q7.25,7.9261315,7.264411,7.853682Q7.278822,7.781233,7.30709,7.712987Q7.335359,7.644742,7.376398,7.583322Q7.417437,7.521903,7.46967,7.46967Q7.521903,7.417437,7.583322,7.376398Q7.644742,7.335359,7.712987,7.30709Q7.781233,7.278822,7.853682,7.264411Q7.9261315,7.25,8,7.25Q8.0738685,7.25,8.146318,7.264411Q8.218767,7.278822,8.287013,7.30709Q8.355258,7.335359,8.416678,7.376398Q8.478097,7.417437,8.53033,7.46967Q8.582563,7.521903,8.623602,7.583322Q8.664641,7.644742,8.69291,7.712987Q8.721178,7.781233,8.735589000000001,7.853682Q8.75,7.9261315,8.75,8L8.75,14.66667Q8.75,14.74054,8.735589000000001,14.81298Q8.721178,14.88543,8.69291,14.95368Q8.664641,15.02192,8.623602,15.08334Q8.582563,15.14476,8.53033,15.197Q8.478097,15.24923,8.416678,15.29027Q8.355258,15.33131,8.287013,15.359580000000001Q8.218767,15.38784,8.146318,15.40226Q8.0738685,15.41667,8,15.41667Q7.9261315,15.41667,7.853682,15.40226Q7.781233,15.38784,7.712987,15.359580000000001Q7.644742,15.33131,7.583322,15.29027Q7.521903,15.24923,7.46967,15.197Q7.417437,15.14476,7.376398,15.08334Q7.335359,15.02192,7.30709,14.95368Q7.278822,14.88543,7.264411,14.81298Q7.25,14.74054,7.25,14.66667L7.25,8Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M15.00208,5.337486507720947Q15.09551,5.290769507720947,15.17262,5.2202975077209475Q15.24974,5.149826507720947,15.30466,5.060964507720947Q15.35957,4.972103507720948,15.38812,4.8716165077209475Q15.41667,4.771129507720947,15.41667,4.666666507720947Q15.41667,4.592798007720948,15.40226,4.520348507720947Q15.38784,4.4478995077209476,15.359580000000001,4.379653507720947Q15.33131,4.311408507720947,15.29027,4.249988507720947Q15.24923,4.188569507720947,15.197,4.136336507720947Q15.14476,4.084103507720947,15.08334,4.043064507720947Q15.02192,4.002025507720948,14.95368,3.9737565077209474Q14.88543,3.945488507720947,14.81298,3.931077507720947Q14.74054,3.9166665077209473,14.66667,3.9166665077209473Q14.48962,3.9166665077209473,14.33126,3.9958465077209473L14.33113,3.9959115077209475L7.6645900000000005,7.329176507720947Q7.571155,7.375896507720947,7.494043,7.446366507720947Q7.416931,7.516836507720948,7.362012,7.605706507720948Q7.307093,7.694566507720947,7.278546,7.795046507720947Q7.25,7.895536507720948,7.25,7.999996507720947Q7.25,8.073866507720947,7.264411,8.146316507720947Q7.278822,8.218766507720947,7.30709,8.287016507720947Q7.335359,8.355256507720947,7.376398,8.416676507720947Q7.417437,8.478096507720947,7.46967,8.530326507720947Q7.521903,8.582566507720948,7.583322,8.623596507720947Q7.644742,8.664636507720948,7.712987,8.692906507720947Q7.781233,8.721176507720948,7.853682,8.735586507720948Q7.9261315,8.749996507720947,8,8.749996507720947Q8.177051,8.749996507720947,8.33541,8.670816507720946L15.00208,5.337486507720947L15.00208,5.337486507720947Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M11.668746507720947,3.67082Q11.762176507720948,3.624103,11.839286507720947,3.553631Q11.916406507720946,3.48316,11.971326507720947,3.394298Q12.026236507720947,3.305437,12.054786507720948,3.20495Q12.083336507720947,3.104463,12.083336507720947,3Q12.083336507720947,2.9261315,12.068926507720947,2.853682Q12.054506507720948,2.781233,12.026246507720948,2.712987Q11.997976507720947,2.644742,11.956936507720947,2.583322Q11.915896507720948,2.521903,11.863666507720946,2.46967Q11.811426507720947,2.417437,11.750006507720947,2.376398Q11.688586507720947,2.335359,11.620346507720948,2.30709Q11.552096507720947,2.278822,11.479646507720947,2.264411Q11.407206507720947,2.25,11.333336507720947,2.25Q11.156286507720948,2.25,10.997926507720948,2.32918L10.997796507720947,2.3292450000000002L4.331256507720948,5.66251Q4.237821507720947,5.70923,4.160709507720947,5.7797Q4.083597507720947,5.85017,4.028678507720947,5.93904Q3.9737595077209473,6.0279,3.9452125077209472,6.12838Q3.9166665077209473,6.228870000000001,3.9166665077209473,6.33333Q3.9166665077209473,6.4072,3.931077507720947,6.4796499999999995Q3.945488507720947,6.552099999999999,3.9737565077209474,6.62035Q4.002025507720948,6.68859,4.043064507720947,6.75001Q4.084103507720947,6.81143,4.136336507720947,6.863659999999999Q4.188569507720947,6.915900000000001,4.249988507720947,6.95693Q4.311408507720947,6.9979700000000005,4.379653507720947,7.02624Q4.4478995077209476,7.05451,4.520348507720947,7.06892Q4.592798007720948,7.08333,4.666666507720947,7.08333Q4.843717507720947,7.08333,5.002076507720947,7.00415L11.668746507720947,3.67082L11.668746507720947,3.67082Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/menu/Totalprofit2.svg b/src/assets/menu/Totalprofit2.svg
new file mode 100644
index 0000000..ce705a9
--- /dev/null
+++ b/src/assets/menu/Totalprofit2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_401_001999"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_401_001999)"><g><ellipse cx="8" cy="4.333333373069763" rx="3" ry="3" fill-opacity="0" stroke-opacity="1" stroke="#626573" fill="none" stroke-width="1.5" stroke-linejoin="round"/></g><g><path d="M12.349266626930238,11.106606984558105Q13.583366626930237,12.905226984558105,13.583366626930237,14.666666984558105L15.083366626930237,14.666666984558105Q15.083366626930237,12.440116984558106,13.586166626930236,10.257976984558105Q12.945366626930237,9.324010984558106,12.207566626930237,8.710940584558106Q11.377756626930237,8.021309984558105,10.631176626930237,7.923075984558105Q10.540716626930237,7.911173984558106,10.450056626930238,7.921304984558105Q10.359386626930236,7.931435984558106,10.273786626930237,7.963008984558106Q10.188186626930237,7.994580984558105,10.112656626930237,8.045753984558106Q10.037126626930236,8.096926984558106,9.976066626930237,8.164714984558106L8.012336626930237,10.344846984558105Q7.1830266269302365,9.399840984558105,6.013606626930237,8.153486984558105Q5.940656626930237,8.075738984558106,5.848936626930237,8.021399984558105Q5.757216626930237,7.967059984558105,5.653976626930237,7.940433984558106Q5.550746626930237,7.9138079845581055,5.444186626930237,7.9170039845581055Q5.337616626930236,7.9201999845581055,5.2361666269302365,7.952965984558105Q3.5965666269302368,8.482500984558106,2.293123626930237,10.401516984558105Q0.9166666269302368,12.428016984558106,0.9166666269302368,14.666666984558105L2.416666626930237,14.666666984558105Q2.416666626930237,12.889266984558105,3.5339566269302365,11.244316984558106Q4.358736626930237,10.030036984558105,5.273056626930237,9.557899984558105Q6.597626626930237,10.980916984558105,7.426976626930236,11.963056984558106Q7.4600066269302365,12.002166984558105,7.498046626930237,12.036436984558105Q7.608896626930237,12.136276984558105,7.7495166269302365,12.186096984558105Q7.890126626930237,12.235926984558105,8.039116626930237,12.228146984558105Q8.188096626930236,12.220366984558105,8.322756626930236,12.156166984558105Q8.457416626930236,12.091966984558105,8.557266626930236,11.981116984558106L10.766836626930237,9.528061984558105Q10.981896626930236,9.642688984558106,11.248906626930237,9.864576984558106Q11.826366626930238,10.344466984558105,12.349266626930238,11.106606984558105Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M0.75,13.916666984558105L15.15,13.916666984558105Q15.2239,13.916666984558105,15.2963,13.931077984558105Q15.3688,13.945488984558105,15.437,13.973756984558106Q15.5053,14.002025984558106,15.5667,14.043064984558105Q15.6281,14.084103984558105,15.6803,14.136336984558106Q15.7326,14.188569984558105,15.7736,14.249988984558106Q15.8146,14.311408984558106,15.8429,14.379653984558106Q15.8712,14.447899984558106,15.8856,14.520348984558105Q15.9,14.592798484558106,15.9,14.666666984558105Q15.9,14.740535484558105,15.8856,14.812984984558106Q15.8712,14.885433984558105,15.8429,14.953679984558105Q15.8146,15.021924984558105,15.7736,15.083344984558105Q15.7326,15.144763984558105,15.6803,15.196996984558105Q15.6281,15.249229984558106,15.5667,15.290268984558105Q15.5053,15.331307984558105,15.437,15.359576984558105Q15.3688,15.387844984558106,15.2963,15.402255984558106Q15.2239,15.416666984558105,15.15,15.416666984558105L0.75,15.416666984558105Q0.6761315,15.416666984558105,0.603682,15.402255984558106Q0.5312330000000001,15.387844984558106,0.462987,15.359576984558105Q0.394742,15.331307984558105,0.333322,15.290268984558105Q0.271903,15.249229984558106,0.21967000000000003,15.196996984558105Q0.16743699999999995,15.144763984558105,0.126398,15.083344984558105Q0.08535899999999996,15.021924984558105,0.057089999999999974,14.953679984558105Q0.028822000000000014,14.885433984558105,0.014410999999999952,14.812984984558106Q0,14.740535484558105,0,14.666666984558105Q0,14.592798484558106,0.014410999999999952,14.520348984558105Q0.028822000000000014,14.447899984558106,0.057089999999999974,14.379653984558106Q0.08535899999999996,14.311408984558106,0.126398,14.249988984558106Q0.16743699999999995,14.188569984558105,0.21967000000000003,14.136336984558106Q0.271903,14.084103984558105,0.333322,14.043064984558105Q0.394742,14.002025984558106,0.462987,13.973756984558106Q0.5312330000000001,13.945488984558105,0.603682,13.931077984558105Q0.6761315,13.916666984558105,0.75,13.916666984558105Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/menu/Totalprofit3.svg b/src/assets/menu/Totalprofit3.svg
new file mode 100644
index 0000000..fad6881
--- /dev/null
+++ b/src/assets/menu/Totalprofit3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="15.5" height="13.399993896484375" viewBox="0 0 15.5 13.399993896484375"><g><g><path d="M3.60362,13.0303Q3.65329,13.1147,3.72298,13.1836Q3.79268,13.2524,3.87771,13.301Q3.96275,13.3497,4.05743,13.3748Q4.15211,13.4,4.25007,13.4L11.2501,13.4Q11.3481,13.4,11.4427,13.3748Q11.5374,13.3497,11.6225,13.301Q11.7075,13.2524,11.7772,13.1835Q11.8469,13.1147,11.8966,13.0303L15.3965,7.08026Q15.4473,6.99381,15.4737,6.89705Q15.5,6.80029,15.5,6.7Q15.5,6.59971,15.4737,6.50295Q15.4473,6.40619,15.3965,6.31974L11.8966,0.369743Q11.8469,0.285303,11.7772,0.216453Q11.7075,0.14760399999999996,11.6225,0.09896499999999997Q11.5374,0.05032700000000001,11.4427,0.025163999999999964Q11.3481,0,11.2501,0L4.25007,0Q4.15211,0,4.05743,0.025162000000000018Q3.96275,0.05032499999999995,3.87771,0.09896099999999997Q3.79268,0.147598,3.72298,0.216445Q3.65329,0.285291,3.60362,0.369729L0.103553,6.31973Q0.05270200000000003,6.40617,0.026351000000000013,6.50294Q0,6.59971,0,6.7Q0,6.80029,0.026351000000000013,6.89706Q0.05270200000000003,6.99383,0.103553,7.08027L3.60362,13.0303ZM4.6790199999999995,11.9L1.6201400000000001,6.7L4.6790199999999995,1.5L10.8211,1.5L13.8799,6.7L10.8211,11.9L4.6790199999999995,11.9Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M6.032236190734864,4.932235809265137Q5.300000190734863,5.6644718092651365,5.300000190734863,6.699999809265137Q5.300000190734863,7.735529809265136,6.032236090734863,8.467759809265136Q6.764472190734863,9.199999809265137,7.800000190734863,9.199999809265137Q8.835530190734863,9.199999809265137,9.567760190734862,8.467759809265136Q10.300000190734863,7.735529809265136,10.300000190734863,6.699999809265137Q10.300000190734863,5.6644718092651365,9.567760190734862,4.932235709265137Q8.835530190734863,4.199999809265137,7.800000190734863,4.199999809265137Q6.764472190734863,4.199999809265137,6.032236190734864,4.932235809265137ZM7.092900190734863,7.407099809265137Q6.800000190734863,7.114209809265137,6.800000190734863,6.699999809265137Q6.800000190734863,6.285789809265137,7.092900190734863,5.992899809265136Q7.3857901907348635,5.699999809265137,7.800000190734863,5.699999809265137Q8.214210190734864,5.699999809265137,8.507100190734864,5.992899809265136Q8.800000190734863,6.285789809265137,8.800000190734863,6.699999809265137Q8.800000190734863,7.114209809265137,8.507100190734864,7.407099809265137Q8.214210190734864,7.699999809265137,7.800000190734863,7.699999809265137Q7.3857901907348635,7.699999809265137,7.092900190734863,7.407099809265137Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/components/SvgIcon1.vue b/src/components/SvgIcon1.vue
new file mode 100644
index 0000000..a3d852d
--- /dev/null
+++ b/src/components/SvgIcon1.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="svg-icon-wrapper" :style="wrapperStyle" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
+    <div class="svg-icon" v-html="svgContent" :style="{
+      '--icon-color': (hoverEffect || isActive) ? activeColor : defaultColor,
+      '--icon-hover-color': activeColor
+    }"></div>
+    <!-- :style="iconStyle" -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SvgIcon',
+  props: {
+    // 图标路径（必须）
+    iconPath: {
+      type: String,
+      required: true
+    },
+    // 默认颜色
+    defaultColor: {
+      type: String,
+      default: '#606266'
+    },
+    // 激活颜色（传入后才允许变色）
+    activeColor: {
+      type: String,
+      default: null
+    },
+    // 是否开启悬停变色
+    hoverEffect: {
+      type: Boolean,
+      default: false
+    },
+    // 图标大小
+    size: {
+      type: [String, Number],
+      default: '14px'
+    },
+    // 是否当前激活状态
+    isActive: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      svgContent: '',
+      isHovering: false,
+      currentColor: this.defaultColor
+    }
+  },
+  computed: {
+    wrapperStyle() {
+      return {
+        width: typeof this.size === 'number' ? `${this.size}px` : this.size,
+        height: typeof this.size === 'number' ? `${this.size}px` : this.size,
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center'
+      }
+    },
+    iconStyle() {
+      return {
+        width: '100%',
+        height: '100%',
+        color: this.currentColor,
+        transition: 'color 0.3s ease'
+      }
+    },
+    shouldChangeColor() {
+      return this.activeColor && (this.hoverEffect || this.isActive)
+    }
+  },
+  watch: {
+    isActive(newVal) {
+      console.log(newVal, 'newVal---');
+      if (this.shouldChangeColor) {
+        this.currentColor = newVal ? this.activeColor : this.defaultColor
+        console.log(this.currentColor, 'this.currentColor--');
+      }
+    },
+    defaultColor(newVal) {
+      if (!this.isHovering && !this.isActive) {
+        this.currentColor = newVal
+      }
+    },
+    activeColor() {
+      this.updateColorState()
+    }
+  },
+  methods: {
+    async loadSvg() {
+      try {
+        const response = await fetch(this.iconPath)
+        this.svgContent = await response.text()
+        this.processSvg()
+      } catch (error) {
+        console.error('Failed to load SVG:', error)
+      }
+    },
+    processSvg() {
+      // 确保SVG没有自带颜色，以便用CSS控制
+      this.$nextTick(() => {
+        const svgElement = this.$el.querySelector('svg')
+        if (svgElement) {
+          // 更彻底地移除颜色属性
+          svgElement.removeAttribute('fill')
+          svgElement.removeAttribute('style')
+          const paths = svgElement.querySelectorAll('path, circle, rect, polygon')
+          paths.forEach(el => {
+            el.removeAttribute('fill')
+          })
+          svgElement.style.fill = 'currentColor'
+          svgElement.style.width = '100%'
+          svgElement.style.height = '100%'
+        }
+      })
+    },
+    handleMouseEnter() {
+      this.isHovering = true
+      this.updateColorState()
+    },
+    handleMouseLeave() {
+      this.isHovering = false
+      this.updateColorState()
+    },
+    updateColorState() {
+      if (this.activeColor) {
+        if (this.isActive) {
+          this.currentColor = this.activeColor
+        } else {
+          this.currentColor = this.isHovering && this.hoverEffect ?
+            this.activeColor :
+            this.defaultColor
+        }
+      } else {
+        this.currentColor = this.defaultColor
+      }
+    }
+  },
+  created() {
+    this.loadSvg()
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon-wrapper {
+  cursor: pointer;
+}
+
+
+.svg-icon {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--icon-color);
+  transition: color 0.3s;
+}
+
+.svg-icon:hover {
+  color: var(--icon-hover-color);
+}
+
+.svg-icon {
+  display: inline-flex;
+}
+
+.svg-icon>>>svg {
+  fill: currentColor;
+}
+</style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 7dc10e2..401fd33 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,42 +6,183 @@ Vue.use(Vuex)
 export default new Vuex.Store({
   state: {
     showSidebar: false,
-    showFooter:false,
-    showHeader:false,
-    menuList:[],//目录菜单
-    showBreadcrumb:false,//是否展示面包屑
-    pageTitle:'一般新文献',//页面标题
-    addServiceList:[],//选中的服务
-    isLoading: false,//页面loading
+    showFooter: false,
+    showHeader: false,
+    menuList: [], //目录菜单
+    showBreadcrumb: false, //是否展示面包屑
+    pageTitle: '一般新文献', //页面标题
+    addServiceList: [], //选中的服务
+    isLoading: false, //页面loading
+    rankMenuData: [{
+        index: '1',
+        title: '总利润',
+        icon: 'Totalprofit',
+        children: [{
+            index: '1-1',
+            title: '年排行',
+            path: '/super/ranking/yearProfit'
+          },
+          {
+            index: '1-2',
+            title: '月排行',
+            path: '/super/ranking/monthProfit'
+          }
+        ]
+      },
+      {
+        index: '2',
+        title: '产品',
+        icon: 'Totalprofit1',
+        children: [{
+            index: '2-1',
+            title: '毛利润排行',
+            path: '/super/ranking/checkProfit'
+          },
+          {
+            index: '2-2',
+            title: '订单数排行',
+            path: '/super/ranking/checkOrdernum'
+          },
+          {
+            index: '2-3',
+            title: '退单数排行',
+            path: '/super/ranking/checkRefund'
+          },
+          {
+            index: '2-4',
+            title: '负毛利排行',
+            path: '/super/ranking/loss'
+          }
+        ]
+      },
+      {
+        index: '3',
+        title: '代理商',
+        icon: 'Totalprofit2',
+        children: [{
+            index: '3-1',
+            title: '毛利润排行',
+            path: '/super/ranking/agentProfit'
+          },
+          {
+            index: '3-2',
+            title: '充值排行',
+            path: '/super/ranking/agentRecharge'
+          },
+          {
+            index: '3-3',
+            title: '新加盟',
+            path: '/super/ranking/agentNew'
+          }
+        ]
+      },
+      {
+        index: '4',
+        title: '设置',
+        icon: 'Totalprofit3',
+        children: [{
+            index: '4-1',
+            title: '采购价',
+            path: '/super/ranking/purchase'
+          },
+          {
+            index: '4-2',
+            title: '阶段采购',
+            path: '/super/ranking/stagePurchase'
+          }
+        ]
+      },
+    ],
+    menuData: [
+      {
+        index: '1',
+        title: '首页',
+        path:'/',
+        icon: 'Totalprofit',
+      },
+      // {
+      //   name: '用户管理',
+      //   icon: 'el-icon-user',
+      //   children: [
+      //     { name: '用户列表', path: '/user/list' },
+      //     { name: '角色管理', path: '/user/role' }
+      //   ]
+      // },
+      {
+        index: '2',
+        title: '父级菜单1',
+        icon: 'Totalprofit',
+        children: [{
+            index: '2-1',
+            title: '子级菜单2-1',
+            path: '/'
+          },
+          {
+            index: '2-2',
+            title: 'ui页面',
+            path: '/ui'
+          }
+        ]
+      },
+      {
+        index: '3',
+        title: '父级菜单2',
+        icon: 'Totalprofit',
+        children: [{
+            index: '3-1',
+            title: '子级菜单3-1',
+            path: '/about'
+          },
+          {
+            index: '3-2',
+            title: '加盟耶main',
+            path: '/franchise'
+          }
+        ]
+      }
+    ]
   },
   actions: {
-    SET_HEADER({ commit }) {
+    SET_HEADER({
+      commit
+    }) {
       commit('SET_HEADER');
     },
-    SET_SIDEBAR({ commit }) {
+    SET_SIDEBAR({
+      commit
+    }) {
       commit('SET_SIDEBAR');
     },
-    SET_FOOTER({ commit }) {
+    SET_FOOTER({
+      commit
+    }) {
       commit('SET_FOOTER');
     },
-    SHOW_BREAD({ commit }) {
+    SHOW_BREAD({
+      commit
+    }) {
       commit('SHOW_BREAD');
     },
-    SET_PAGETITLE({ commit }) {
+    SET_PAGETITLE({
+      commit
+    }) {
       commit('SET_PAGETITLE');
     },
-    SET_ADDSERVICELIST({ commit }) {
+    SET_ADDSERVICELIST({
+      commit
+    }) {
       commit('SET_ADDSERVICELIST');
     },
-    showLoading({ commit }) {
-      console.log('zhixingle111');
+    showLoading({
+      commit
+    }) {
       commit('SHOW_LOADING')
     },
-    hideLoading({ commit }) {
-      console.log('zhixingle222');
-
+    hideLoading({
+      commit
+    }) {
       commit('HIDE_LOADING')
-    }
+    },
   },
   mutations: {
     SHOW_LOADING(state) {
@@ -70,9 +211,7 @@ export default new Vuex.Store({
       state.addServiceList = list;
     }
   },
-  getters: {
-  },
-  
-  modules: {
-  }
-})
+  getters: {},
+
+  modules: {}
+})
\ No newline at end of file
diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss
index 01abe15..8738e46 100644
--- a/src/style/theme/common.scss
+++ b/src/style/theme/common.scss
@@ -13,6 +13,15 @@ body {
         padding: 0;
     }
 }
+.element {
+    overflow: hidden; /* 通用方法 */
+    scrollbar-width: none; /* Firefox */
+}
+ 
+/* 对于WebKit浏览器 */
+.element::-webkit-scrollbar {
+    display: none; /* Chrome, Safari, Edge */
+}
 .common_title{
     font-weight: bold;
     letter-spacing: 0.08em;
@@ -799,7 +808,7 @@ body {
 
 // table start
 .el-table{
-    min-height: 258px;
+    min-height: 218px;
     th,td{
         font-size: 14px;
         font-weight: normal;
@@ -953,6 +962,14 @@ body {
 }
 ::v-deep .custom-popover {
     position: fixed !important;
+    // max-height: 290px;
+    // overflow-y: auto;
+    margin-top: 0 !important;
+    margin-left: 0 !important;
+    transform: none !important;
+}
+::v-deep .custom-popover1 {
+    position: fixed !important;
     max-height: 290px;
     overflow-y: auto;
     margin-top: 0 !important;
diff --git a/src/style/theme/index.css b/src/style/theme/index.css
index 0732fda..d20537a 100644
--- a/src/style/theme/index.css
+++ b/src/style/theme/index.css
@@ -15593,6 +15593,7 @@ border-color:#006AFF !important;
     font-size: 14px;
     color: #606266;
     line-height: 40px;
+    white-space: nowrap;
     padding: 0 12px 0 0;
     -webkit-box-sizing: border-box;
     box-sizing: border-box
diff --git a/src/views/Register.vue b/src/views/Register.vue
index 20c5b0e..8b410df 100755
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -327,7 +327,10 @@
     </div>
     <div class="step3-wrap min-flex" v-if="activeStep == 3">
       <div class="step3-top flex-common">
-        <h3>服务列表</h3>
+        <h3>
+          <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                          :hoverColor="'#006AFF'" />
+          服务列表</h3>
         <div class="btngroup">
           <GuipButton type="ignore" :btnstyle="{ width: '97px', height: '33px' }" @click="showDomainModal">添加查重服务
           </GuipButton>
@@ -338,27 +341,28 @@
       <div>
         <div class="flex-common table-wrap">
           <el-form>
-            <GuipTable :tableData="tableData1" :loading="tableLoading">
-              <el-table-column prop="name" label="检测服务" width="210">
+            <GuipTable :border="true" :tableData="tableData1" :loading="tableLoading">
+              <el-table-column prop="name" fixed="left" label="检测服务" width="200">
                 <template slot-scope="scope">
-                  <div class="flex">
-                    <span :class="(scope.row.type == 'a' ? 'green' : 'blue')">{{ scope.row.type == 'a' ? '查重服务' : '写作辅助'
-                    }}</span>
-                    <span class="">{{ scope.row.name }}</span>
+                  <div class="flex nowrap ">
+                    <div :class="(scope.row.type == 'a' ? 'green' : 'blue')">{{ scope.row.type == 'a' ? '查重服务' : '写作辅助'
+                    }}</div>
+                    <div class="">{{ scope.row.name }}</div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="stock" label="今日供货价" width="198">
+              <el-table-column prop="stock" label="今日供货价" min-width="138">
                 <template slot-scope="scope">
                   <div class="flex cell_render">
                     <span>¥{{ scope.row.stock }}/篇</span>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="price" label="售价" width="200">
+              <el-table-column prop="price" label="售价" width="300">
                 <template #default="{ row,$index }">
-                  <el-popover :ref="`pricePopover-${row.id}`" popper-class="single-popover" placement="top" :append-to-body="true" trigger="manual"
-                    v-model="row.pricePopoverVisible" @show="closeOtherPopovers(row, 'price')">
+                  <el-popover v-model="row.pricePopoverVisible" :ref="`pricePopover-${row.id}`"
+                                placement="bottom" trigger="manual" :append-to-body="false"  :visible-arrow="true"
+                                popper-class="custom-popover"  @show="popshow" >
                     <div style="text-align: center">
                       <GuipInput ref="GuipInput" v-if="!row.word" width="252px" v-model="row.edit_price" label="售价"
                         placeholder="请输入售价" unit="元">
@@ -380,6 +384,8 @@
                       <div class="flex cell_render" @click="handlePriceClick(row,$index,'price')">
                         <span v-if="row.word" :key="random()">¥{{ row.price }}/{{ row.word }}字</span>
                         <span v-else :key="random()">¥{{ row.price }}/篇</span>
+                        <span>测试用一下</span>
+                        <span>随便写的</span>
                         <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
                           :hoverColor="'#006AFF'" />
                       </div>
@@ -388,7 +394,7 @@
                 </template>
               </el-table-column>
 
-              <el-table-column prop="num" label="排序" width="126">
+              <el-table-column prop="num" label="排序" min-width="95">
                 <template #default="{ row,$index }">
                   <!-- <el-tooltip :manual="true" v-model="row.numPopoverVisible" placement="top" effect="light">
                     <template #content>
@@ -410,8 +416,11 @@
                         :hoverColor="'#006AFF'" />
                     </div>
                   </el-tooltip> -->
-                  <el-popover v-model="row.numPopoverVisible" placement="top" trigger="manual"  append-to-body :ref="`popover-${row.id}`">
-                    <div style="text-align: center">
+                  <el-popover v-model="row.numPopoverVisible" :ref="`popover-${row.id}`"
+                                placement="bottom" trigger="manual" :append-to-body="false"  :visible-arrow="true"
+                                popper-class="custom-popover"  @show="popshow" >
+                  <!-- <el-popover v-model="row.numPopoverVisible" placement="top" class="single-popover" trigger="manual" :append-to-body="false" :ref="`popover-${row.id}`"> -->
+                    <div style="text-align: center" :visible-arrow="true">
                       <GuipInput ref="GuipInput" width="252px" v-model="row.edit_num" label="排序" placeholder="请输入数字">
                       </GuipInput>
                       <p
@@ -424,7 +433,9 @@
                     </div>
                     <span slot="reference" @click="handlePriceClick(row,$index,'num')">
                       <div class="flex cell_render">
-                        <span>{{ row.num }}</span>
+                        <GuipToolTip :content="row.num">
+                          <span class="nowrap">{{ row.num }}</span>
+                        </GuipToolTip>
                         <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
                           :hoverColor="'#006AFF'" />
                       </div>
@@ -432,7 +443,7 @@
                   </el-popover>
                 </template>
               </el-table-column>
-              <el-table-column prop="stock" label="收款方式" width="198">
+              <el-table-column prop="stock" label="收款方式" min-width="258">
                 <template slot-scope="scope">
                   <div class="flex cell_render">
                     <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{ scope.row.payment
@@ -443,14 +454,13 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="stock" label="上首页" width="110">
+              <el-table-column prop="stock" fixed="right" label="上首页" min-width="160">
                 <template slot-scope="scope">
                   <GuipSwitch :modelValue="scope.row.homeFlag" @change="onSwitchChange(scope.row)">
                   </GuipSwitch>
                 </template>
               </el-table-column>
-              <!-- :fixed="popoverFlag ? 'false' : 'right'"  -->
-              <el-table-column label="操作" width="150">
+              <el-table-column label="操作" fixed="right" min-width="150px">
                 <template slot-scope="scope">
                   <div class="flex">
                     <el-button type="text">编辑</el-button>
@@ -481,7 +491,7 @@
       <DomainModal />
     </GuipDialog>
 
-    <el-dialog :visible.sync="dialogVisibleAdd" ref="addDialog" width="1011px" class="addDialog-wrap"
+    <el-dialog :visible.sync="dialogVisibleAdd" ref="addDialog" append-to-body width="1011px" class="addDialog-wrap"
       :show-close="false">
       <div class="addService_wrap">
         <div class="addServicetop">
@@ -548,6 +558,7 @@ import CustomDropdown from '@/components/CustomDropdown.vue';
 import SvgIcon from '@/components/SvgIcon.vue';
 import store from '../store';
 import GuipTable from '@/components/GuipTable.vue';
+import GuipToolTip from '@/components/GuipToolTip.vue';
 
 export default {
   components: {
@@ -563,7 +574,8 @@ export default {
     PaymentMethod,
     DomainModal,
     CustomDropdown,
-    GuipTable
+    GuipTable,
+    GuipToolTip
   },
   data() {
     return {
@@ -821,21 +833,21 @@ export default {
         '3': '想卖哪些东西？来选选吧',
       },
       tableData1: [
-        { id: 1, name: '万方大学生版', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a', num: '1', edit_num: '', num_popover: false, homeFlag: true, payment: '0' },
+        { id: 1, name: '万方大学生版', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a', num: '18567988777736366363', edit_num: '', num_popover: false, homeFlag: true, payment: '0' },
         { id: 2, name: '维普检测版', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a', num: '2', edit_num: '', num_popover: false, homeFlag: true, payment: '1' },
         { id: 3, name: '商品C1', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b', num: '2', edit_num: '', num_popover: false, homeFlag: false, payment: '0' },
         { id: 11, name: '商品A2', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a', num: '3', edit_num: '', num_popover: false, homeFlag: false, payment: '0' },
         { id: 21, name: '商品B2', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a', num: '0', edit_num: '', num_popover: false, homeFlag: true },
-        { id: 31, name: '商品C2', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b', num: '1', edit_num: '' },
+        { id: 31, name: '商品C2', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b', num: '1333333333333333333', edit_num: '' },
         { id: 12, name: '商品A3', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a' },
-        { id: 22, name: '商品B3', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
-        { id: 32, name: '商品C3', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
-        { id: 13, name: '商品A4', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a' },
-        { id: 23, name: '商品B4', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
-        { id: 33, name: '商品C4', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
-        { id: 14, name: '商品A5', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a' },
-        { id: 24, name: '商品B5', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
-        { id: 34, name: '商品C5', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
+        // { id: 22, name: '商品B3', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
+        // { id: 32, name: '商品C3', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
+        // { id: 13, name: '商品A4', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a' },
+        // { id: 23, name: '商品B4', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
+        // { id: 33, name: '商品C4', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
+        // { id: 14, name: '商品A5', stock: 100, price: 50, pricePopoverVisible: false, edit_price: '', type: 'a' },
+        // { id: 24, name: '商品B5', stock: 200, price: 80, word: 1000, pricePopoverVisible: false, edit_price: '', editWord: '', type: 'a' },
+        // { id: 34, name: '商品C5', stock: 150, price: 120, pricePopoverVisible: false, edit_price: '', type: 'b' },
       ],
       tableLoading: false,
       typelistobj: {
@@ -1170,8 +1182,16 @@ export default {
 </script>
 <style lang="scss" scoped>
 .single-popover {
-  transform: translateX(-50%); /* 根据需要调整 */
-  left: 50% !important; /* 根据需要调整 */
+  // transform: translateX(-50%); /* 根据需要调整 */
+  // left: 50% !important; /* 根据需要调整 */
+}
+::v-deep .custom-popover {
+    position: fixed !important;
+    // max-height: 290px;
+    // overflow-y: auto;
+    margin-top: 0 !important;
+    margin-left: 0 !important;
+    transform: none !important;
 }
 /* 隐藏固定列中的弹出框 */
 .el-table__fixed .el-popover,
@@ -1372,6 +1392,8 @@ export default {
 
 .green,
 .blue {
+  width: 80px;
+  box-sizing: border-box;
   display: flex;
   flex-direction: row;
   justify-content: center;
diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue
index 10c8746..3175aab 100644
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@@ -43,7 +43,7 @@
                                             '0' ? '文字居中' : '文字居中' }}</span>
                                     </GuipToolTip>
                                     <GuipToolTip content="图标居中">
-                                        <svg-icon size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                        <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
                                         :hoverColor="'#006AFF'" />
                                     </GuipToolTip>
 
@@ -58,7 +58,7 @@
                                             scope.row.payment
                                                 ==
                                             '0' ? '单元格局中' : '单元格局中' }}</span>
-                                             <svg-icon size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                             <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
                                              :hoverColor="'#006AFF'" />
                                     </div>
 
@@ -292,6 +292,33 @@
                 <GuipSwitch v-model="switchValue" activeText="开启" inactiveText="关闭" @change="onSwitchChange">
                 </GuipSwitch>
             </div>
+            <el-table
+      :data="tableData3"
+      :span-method="objectSpanMethod"
+      :border="true"
+      style="width: 100%; margin-top: 20px">
+      <el-table-column
+        prop="id"
+        label="ID"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名">
+      </el-table-column>
+      <el-table-column
+        prop="amount1"
+        label="数值 1（元）">
+      </el-table-column>
+      <el-table-column
+        prop="amount2"
+        label="数值 2（元）">
+      </el-table-column>
+      <el-table-column
+        prop="amount3"
+        label="数值 3（元）">
+      </el-table-column>
+    </el-table>
             <el-button type="primary" @click="submitForm">Submit</el-button>
 
         </el-form>
@@ -395,6 +422,38 @@ export default {
     },
     data() {
         return {
+            tableData3: [{
+          id: '12987122',
+          name: '王小虎',
+          amount1: '234',
+          amount2: '3.2',
+          amount3: 10
+        }, {
+          id: '12987123',
+          name: '王小虎',
+          amount1: '165',
+          amount2: '4.43',
+          amount3: 12
+        }, {
+          id: '12987124',
+          name: '王小虎',
+          amount1: '324',
+          amount2: '1.9',
+          amount3: 9
+        }, {
+          id: '12987125',
+          name: '王小虎',
+          amount1: '621',
+          amount2: '2.2',
+          amount3: 17
+        }, {
+          id: '12987126',
+          name: '王小虎',
+          amount1: '539',
+          amount2: '4.1',
+          amount3: 15
+        }],
+            tableWidth: 0,
             currentPage: 1,    //当前页
             pageSize: 5,   //每页的容量
             total: 0,   //列表总数
@@ -620,7 +679,35 @@ export default {
 
     },
     methods: {
-        openMessage(type){
+        arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+            console.log(row, column);
+        if (rowIndex % 2 === 0) {
+          if (columnIndex === 0) {
+            return [1, 2];
+          } else if (columnIndex === 1) {
+            return [0, 0];
+          }
+        }
+      },
+
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        console.log(row, column);
+
+        if (columnIndex === 0) {
+          if (rowIndex % 2 === 0) {
+            return {
+              rowspan: 2,
+              colspan: 1
+            };
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            };
+          }
+        }
+      },
+        openMessage(type) {
             console.log(type);
             // 单独指定方法调用
             switch(type){
@@ -674,7 +761,7 @@ export default {
                 this.tableLoading = false
                 this.$nextTick(() => {
                     that.tableData = response.data.list
-                    console.log(that.tableData,'---that.tableData');
+                    // console.log(that.tableData,'---that.tableData');
                     // that.type2name = response.data.type2name
                     that.total = response.data.total
                 })
diff --git a/src/views/super/Ranking/RankBatchList.vue b/src/views/super/Ranking/RankBatchList.vue
index 2da66f0..1ed2705 100644
--- a/src/views/super/Ranking/RankBatchList.vue
+++ b/src/views/super/Ranking/RankBatchList.vue
@@ -57,7 +57,7 @@
                                 :ref="`popover-${$index}`" :append-to-body="false" :visible-arrow="true"
                                 popper-class="custom-popover" @show="popshow"> -->
                                 <el-popover v-model="row.id_popover" :ref="`popover-${row.id}`" 
-                                placement="top" trigger="manual" :append-to-body="false"  :visible-arrow="true"
+                                placement="bottom" trigger="manual" :append-to-body="false"  :visible-arrow="true"
                                 popper-class="custom-popover"  @show="popshow" >
 
                                 <div v-if="type != 'agent'" class="pop-wrap">
@@ -136,10 +136,14 @@
                         :render-header=" (h, scope) => renderHeaderWithIcon(h, scope, require('@/assets/require.svg')) "
                         key="top" prop="top" label="代理商排行" width="250" fixed="right">
                         <template v-slot="{ row, $index }">
-                            <el-popover v-model="row.id_popover_2" :ref="`popover_2-${$index}`" placement="top" trigger="manual"
-                                popper-class="custom-popover"  @show="popshow" :append-to-body="false"
-                                 :visible-arrow="true"
-                               >
+                            <!-- :fallback-placements="['bottom','top','left']" -->
+                            <el-popover v-model="row.id_popover_2" :ref="`popover_2-${$index}`"
+                                placement="bottom" trigger="manual" :append-to-body="false"  :visible-arrow="true"
+                                popper-class="custom-popover"  @show="popshow" >
+                            <!-- <el-popover v-model="row.id_popover_2" :ref="`popover_2-${$index}`" trigger="manual"
+                                popper-class="custom-popover"  @show="popshow" :append-to-body="false" 
+                                 :visible-arrow="true" 
+                               > -->
                                 <div class="pop-wrap">
                                     <div class="flex-between flex pop-top">
                                         <h3>
@@ -150,11 +154,11 @@
                                             <img src="@/assets/register/close.svg">
                                         </span>
                                     </div>
-                                    <el-table :data="tableData1" style="width: 100%">
+                                    <GuipTable :data="tableData1" style="width: 100%" max-height="218">
                                         <el-table-column prop="sort" width="100" label="排行"></el-table-column>
                                         <el-table-column prop="name" width="200" label="代理商"></el-table-column>
                                         <el-table-column prop="value_1" width="200" label="销售额"></el-table-column>
-                                    </el-table>
+                                    </GuipTable>
                                 </div>
                                 <span v-if="top_list[row.id]" slot="reference" class="flex">
                                     No.1 {{ top_list[row.id]['name'] }}
@@ -520,26 +524,243 @@ export default {
         getTypeRanking() {
             //产品排行
             const that = this
-            that.tableData = []
-            that.top_list = []
-            this.loading = true;
-            this.$http('POST', '/supernew/ajax_get_type_batch_list', {
-                date: that.text,
-                rank_type: that.dataRank,
-                sort_by: that.sort_by,
-                sort_order: that.sort_order,
-                cur_page: that.currentPage,
-                page_size: that.pageSize,
-            }).then(response => {
-                this.loading = false;
-                this.$nextTick(() => {
-                    that.tableData = response.data.list
-                    that.top_list = response.data.top_list
-                    that.total = response.data.total
-                })
-            }).catch(error => {
-                console.error(error, 'error')
-            })
+            that.tableData = [
+              
+                {
+                    id
+                        :
+                        6,
+                    name
+                        :
+                        "维普大学生版",
+                    sort
+                        :
+                        1,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "479,820.85"
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "0"
+
+                },
+                {
+                    id
+                        :
+                        6,
+                    name
+                        :
+                        "维普大学生版",
+                    sort
+                        :
+                        1,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "479,820.85"
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "0"
+
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "569,820.85"
+
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "569,820.85"
+
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "569,820.85"
+
+                },
+                {
+                    id
+                        :
+                        94,
+                    name
+                        :
+                        "ai中文大学生版",
+                    sort
+                        :
+                        2,
+                    value_1
+                        :
+                        "23,754.25",
+                    value_2
+                        :
+                        "43,012.15",
+                    value_3
+                        :
+                        "61,869.09",
+                    value_4
+                        :
+                        "569,820.85"
+
+                }
+            ]
+            that.top_list = {
+                94: {
+                    id
+                        :
+                        "94",
+                    name
+                        :
+                        "尚志教育",
+                    value_1
+                        :
+                        "156409.50"
+                },
+                6: {
+                    id
+                        :
+                        "6",
+                    name
+                        :
+                        "千校论文查重平台",
+                    value_1
+                        :
+                        "238081.00"
+                }
+            }
+            // that.tableData = []
+            // that.top_list = []
+            // this.loading = true;
+            // this.$http('POST', '/supernew/ajax_get_type_batch_list', {
+            //     date: that.text,
+            //     rank_type: that.dataRank,
+            //     sort_by: that.sort_by,
+            //     sort_order: that.sort_order,
+            //     cur_page: that.currentPage,
+            //     page_size: that.pageSize,
+            // }).then(response => {
+            //     this.loading = false;
+            //     this.$nextTick(() => {
+            //         that.tableData = response.data.list
+            //         that.top_list = response.data.top_list
+            //         that.total = response.data.total
+            //     })
+            // }).catch(error => {
+            //     console.error(error, 'error')
+            // })
         },
         getRankingDetail(obj) {
             const that = this
@@ -611,8 +832,8 @@ export default {
 }
 ::v-deep .custom-popover {
     position: fixed !important;
-    max-height: 290px;
-    overflow-y: auto;
+    // max-height: 290px;
+    // overflow-y: auto;
     margin-top: 0 !important;
     margin-left: 0 !important;
     transform: none !important;
diff --git a/src/views/super/Ranking/Ranking.vue b/src/views/super/Ranking/Ranking.vue
index 0a47609..3e7f7f5 100644
--- a/src/views/super/Ranking/Ranking.vue
+++ b/src/views/super/Ranking/Ranking.vue
@@ -1,6 +1,9 @@
 <template>
     <div class="siteSetting-wrap">
-        <RankingLeft/>
+        <!-- <RankingLeft /> -->
+         <SliderMenu :menuData= "rankMenuData" />
+         <!-- <SliderMenu :menuData= "rankMenuData" :default-collapsed="false"
+         @collapse-change="handleCollapseChange"/> -->
         <!-- 主内容区域 -->
         <main class="main-content" ref="scrollContainer">
             <router-view></router-view>
@@ -10,7 +13,9 @@
 </template>
 <script>
 import Footer from '@/components/Footer.vue';
-import RankingLeft from '@/components/super/RankingLeft.vue'
+import SliderMenu from '@/components/SliderMenu.vue';
+// import RankingLeft from '@/components/super/RankingLeft.vue'
+import { mapState } from 'vuex';
 
 export default {
     // 站点设置
@@ -18,13 +23,17 @@ export default {
     props: [''],
     components: {
         Footer,
-        RankingLeft,
+        SliderMenu,
+        // RankingLeft,
     },
     data() {
         return {
             path: ''
         }
     },
+    computed: {
+      ...mapState(['rankMenuData']), // 直接映射 state 中的 count 属性到组件的局部计算属性中
+    },
     mounted() {
         this.path = this.$route.path;
         if(this.$route.query.str) localStorage.setItem('token', this.$route.query.str)

From 5476dd0fa131b86625125a978e48d6f1d70b25ad Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 11:13:13 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SliderMenu.vue | 239 +++++++++++++++++++++++++++++++++---------
 1 file changed, 192 insertions(+), 47 deletions(-)

diff --git a/src/components/SliderMenu.vue b/src/components/SliderMenu.vue
index 2e7b954..8e6e316 100644
--- a/src/components/SliderMenu.vue
+++ b/src/components/SliderMenu.vue
@@ -1,61 +1,103 @@
 <template>
-  <el-menu :default-active="activeMenu" class="el-menu-vertical-demo" @select="handleSelect" :collapse="isCollapse"
+      <transition name="menu-collapse">
+  <el-menu :default-active="activeMenu" class="el-menu-vertical-demo custom-menu"  @open="handleOpen"
+   @close="handleClose" @select="handleSelect" :collapse="isCollapse" :collapse-transition="true"
     :default-openeds="['1', '2']">
-    <div class="menu-top">
-      <span v-show="!isCollapse">
-        导航
-      </span>
-      <img v-if="!isCollapse" src="../assets/menu-close.svg" @click="changeMenuStatus(true)" alt="">
-      <img v-else src="../assets/menu-open.svg" @click="changeMenuStatus(false)" alt="">
-    </div>
-    <el-submenu v-for="item in menuData" :key="item.index" :index="item.index">
-      <template slot="title">
-        <i :class="item.icon"></i>
-        <span>{{ item.title }}</span>
-      </template>
-      <el-menu-item style="padding: 0 22px;" v-for="subItem in item.children" :key="subItem.index"
-        :index="subItem.index" @click="handleMenuItemClick(subItem)">
-        {{ subItem.title }}
-      </el-menu-item>
-    </el-submenu>
+      <div style="height: 100%;padding: 0 0 20px;box-sizing: border-box;" >
+        <div class="menu-top">
+          <span v-show="!isCollapse">
+            导航
+          </span>
+          <GuipToolTip :content="isCollapse ? '展开' : '收起'">
+            <img v-if="!isCollapse" class="point" src="../assets/menu-close.svg" @click="changeMenuStatus(true)" alt="" >
+            <img v-else class="point" src="../assets/menu-open.svg" @click="changeMenuStatus(false)" alt="">
+          </GuipToolTip>
+        </div>
+        <el-submenu v-for="item in menuData" :key="item.index" :index="item.index">
+          <template slot="title">
+            <SvgIcon1
+              :iconPath="require(`@/assets/menu/${item.icon}.svg`)"
+              defaultColor="#8A9099"
+              activeColor="#006AFF"
+              :isActive="item.index == activeMenu.substr(0,1) && isCollapse"
+              />
+            <span class="title_text" :index="item.index">{{ item.title }}</span>
+          </template>
+            <el-menu-item style="padding: 0 22px 0 32px;" v-for="subItem in item.children" :key="subItem.index"
+              :index="subItem.index">
+              {{ subItem.title }}
+            </el-menu-item>
+        </el-submenu>
+      </div>
   </el-menu>
+</transition>
+
 </template>
 <script>
+import SvgIcon1 from '@/components/SvgIcon1.vue';
+import GuipToolTip from '@/components/GuipToolTip.vue';
 export default {
   name: 'SliderMenu',
+  components:{
+    SvgIcon1,
+    GuipToolTip
+  },
+  props: {
+    menuData: {
+      type: Array,
+      default: () => []
+    },
+  },
   data() {
     return {
       isCollapse: false,
       activeMenu: '',
       routerList: [],
-      menuData: [
-        {
-          index: '1',
-          title: '父级菜单1',
-          icon: 'el-icon-location',
-          children: [
-            { index: '1-1', title: '子级菜单1-1', path: '/' },
-            { index: '1-2', title: 'ui页面', path: '/ui' }
-          ]
-        },
-        {
-          index: '2',
-          title: '父级菜单2',
-          icon: 'el-icon-menu',
-          children: [
-            { index: '2-1', title: '子级菜单2-1', path: '/about' },
-            { index: '2-2', title: '加盟耶main', path: '/franchise' }
-          ]
-        }
-      ]
+      // menuData: [
+      //   {
+      //     index: '1',
+      //     title: '父级菜单1',
+      //     icon: 'el-icon-location',
+      //     children: [
+      //       { index: '1-1', title: '子级菜单1-1', path: '/' },
+      //       { index: '1-2', title: 'ui页面', path: '/ui' }
+      //     ]
+      //   },
+      //   {
+      //     index: '2',
+      //     title: '父级菜单2',
+      //     icon: 'el-icon-menu',
+      //     children: [
+      //       { index: '2-1', title: '子级菜单2-1', path: '/about' },
+      //       { index: '2-2', title: '加盟耶main', path: '/franchise' }
+      //     ]
+      //   }
+      // ]
     };
   },
   methods: {
     changeMenuStatus(flag) {
       this.isCollapse = flag;
     },
+    // handleSelect(index) {
+    //   this.activeMenu = index;
+    // },
+    handleOpen(key, keyPath) {
+        console.log(key, keyPath);
+      },
+      handleClose(key, keyPath) {
+        console.log(key, keyPath);
+      },
     handleSelect(index) {
       this.activeMenu = index;
+      console.log(index,'---index');
+      // 找到被点击的 menu 项对应的 path
+      const allItems = this.menuData.flatMap(menu => menu.children);
+      const targetItem = allItems.find(item => item.index === index);
+
+      if (targetItem && this.$route.path !== targetItem.path) {
+        this.$router.push(targetItem.path);
+      }
     },
     handleMenuItemClick(item) {
       this.$router.push(item.path);
@@ -63,22 +105,103 @@ export default {
     }
   },
   mounted() {
-    this.routerList = this.$router.options.router;//配置路由
-    console.log(this.$route.path, this.$router.options.router, 'this.$route.path===');
-    // 初始化时设置默认激活的菜单项
-    this.activeMenu = this.$route.path;
+    const allItems = this.menuData.flatMap(menu => menu.children.map(child => ({ ...child, parentIndex: menu.index })));
+    const current = allItems.find(item => item.path === this.$route.path);
+    this.activeMenu = current ? current.index : '';
+    this.defaultOpeneds = current ? [current.parentIndex] : [];
+    // this.routerList = this.$router.options.router;//配置路由
+    // console.log(this.$route.path, this.$router.options.router, 'this.$route.path===');
+    // // 初始化时设置默认激活的菜单项
+    // this.activeMenu = this.$route.path;
   }
 }
 </script>
 <style lang="scss" scoped>
+.menu-collapse-leave-active,
+.menu-collapse-enter-active {
+  transition: all 0.7s;
+}
+
+.menu-collapse-enter,
+.menu-collapse-leave-to {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.el-menu--vertical{
+  .el-menu-item{
+    height: 40px;
+    line-height: 40px;
+  }
+  .el-menu-item.is-active{
+    font-weight: bold;
+  }
+}
+// .slide-fade-enter-active, .slide-fade-leave-active {
+//   transition: all 1.5s ease;
+// }
+// .slide-fade-enter, .slide-fade-leave-to {
+//   opacity: 0;
+//   transition: all 1.5s ease;
+//   transform: translateX(-10px);
+// }
+
+// .slide-enter-active, .slide-leave-active {
+//   transition: all 1.5s ease;
+//   max-height: 200px;
+// }
+
+/* 添加收起时的过渡效果 */
+// .el-menu--collapse .el-submenu .el-menu {
+//   transition: all 0.3s ease-in-out;
+//   overflow: hidden;
+// }
+
+// .el-menu--collapse .el-submenu > .el-menu {
+//   display: none;
+//   opacity: 0;
+//   transform: translateY(-10px);
+// }
+
+// .el-menu:not(.el-menu--collapse) .el-submenu > .el-menu {
+//   transition: all 0.3s ease-in-out;
+//   opacity: 1;
+//   transform: translateY(0);
+// }
+
+// .slide-enter, .slide-leave-to {
+//   opacity: 0;
+//   max-height: 0;
+// }
+.title_img {
+  width: 16px;
+  margin-right: 4px;
+}
+
+.title_text {
+  margin-left: 4px;
+  font-size: 12px;
+  font-weight: bold;
+  display: block;
+
+}
+.el-menu--collapse .title_text{
+  display: none;
+}
+.el-menu--collapse ::v-deep .el-submenu__icon-arrow{
+  display: none;
+}
+
 .el-menu-vertical-demo:not(.el-menu--collapse) {
   width: 158px;
   min-width: 158px;
   min-height: calc(100vh - 62px);
+  overflow-y: auto;
 }
 
 .el-menu-item {
   padding: 0 22px;
+  font-size: 12px;
 }
 
 .menu-top {
@@ -91,18 +214,23 @@ export default {
   padding: 15px 0px;
   margin: 0 22px;
   display: flex;
-  font-size: 16px;
+  font-size: 14px;
   color: #1E2226;
   font-weight: bold;
   line-height: normal;
   letter-spacing: 0.08em;
   justify-content: space-between;
   align-items: center;
+  img{
+    width: 14px;
+    height: 14px;
+
+  }
 }
 
 ::v-deep .el-submenu {
-  width: 16px;
-  font-size: 16px;
+  // width: 16px;
+  font-size: 12px;
 }
 
 ::v-deep .el-submenu .el-menu-item {
@@ -118,11 +246,11 @@ export default {
 
 ::v-deep .el-submenu__title:hover {
   background-color: transparent;
-  cursor: not-allowed;
+  // cursor: not-allowed;
 }
 
 ::v-deep .el-submenu__title .el-submenu__icon-arrow.el-icon-arrow-down {
-  display: none;
+  // display: none;
 }
 
 ::v-deep .el-submenu .el-menu-item {
@@ -150,4 +278,21 @@ export default {
   color: #006AFF;
   font-weight: bold;
 }
+// .el-submenu .el-menu {
+//   transition: all 0.3s ease;
+// }
+
+// .el-menu--collapse .el-submenu > .el-menu {
+//   display: block !important;
+//   overflow: hidden;
+//   transition: all 0.3s ease;
+//   opacity: 0;
+//   height: 0;
+//   transform: translateY(-10px);
+// }
+
+// .el-menu--collapse .el-submenu.is-opened > .el-menu {
+//   opacity: 0;
+//   height: 0;
+// }
 </style>
\ No newline at end of file

From cb88f58d869cb5e49179b69c12e325d10f89b794 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 11:38:19 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/menu/littleTitleIcon1.svg      |   1 +
 src/views/Register.vue                    |   6 +-
 src/views/super/Ranking/RankBatchList.vue | 257 +++---------------------------
 3 files changed, 24 insertions(+), 240 deletions(-)
 create mode 100644 src/assets/menu/littleTitleIcon1.svg

diff --git a/src/assets/menu/littleTitleIcon1.svg b/src/assets/menu/littleTitleIcon1.svg
new file mode 100644
index 0000000..2535f2d
--- /dev/null
+++ b/src/assets/menu/littleTitleIcon1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_501_026603"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_501_026603)"><g><path d="M7.33333,6L7.33333,2.666667Q7.33333,2.114383,6.94281,1.72386Q6.55229,1.333333,6,1.333333L2.666667,1.333333Q2.114382,1.333333,1.723858,1.723858Q1.333333,2.114382,1.333333,2.666667L1.333333,6Q1.333333,6.55229,1.72386,6.94281Q2.114383,7.33333,2.666667,7.33333L6,7.33333Q6.55229,7.33333,6.94281,6.94281Q7.33333,6.55229,7.33333,6ZM2.666667,2.666667L6,2.666667L6,6L2.666667,6L2.666667,2.666667Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M7.33333,13.333333015441895L7.33333,10.000000015441895Q7.33333,9.447708015441895,6.94281,9.057187015441894Q6.55229,8.666666015441894,6,8.666666015441894L2.666667,8.666666015441894Q2.114382,8.666666015441894,1.72386,9.057184015441894Q1.333333,9.447707015441894,1.333333,10.000000015441895L1.333333,13.333333015441895Q1.333333,13.885623015441894,1.72386,14.276153015441896Q2.114382,14.666663015441895,2.666667,14.666663015441895L6,14.666663015441895Q6.55229,14.666663015441895,6.94281,14.276143015441894Q7.33333,13.885623015441894,7.33333,13.333333015441895ZM2.666667,10.000000015441895L6,10.000000015441895L6,13.333333015441895L2.666667,13.333333015441895L2.666667,10.000000015441895Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M9.545345015441894,2.212014Q8.666667015441895,3.09069,8.666667015441895,4.33333Q8.666666015441894,5.5759799999999995,9.545345015441894,6.45465Q10.424023015441895,7.33333,11.666663015441895,7.33333Q12.909313015441894,7.33333,13.787993015441895,6.45465Q14.666663015441895,5.5759799999999995,14.666663015441895,4.33333Q14.666663015441895,3.09069,13.787993015441895,2.212014Q12.909313015441894,1.333333,11.666663015441895,1.333333Q10.424023015441895,1.333333,9.545345015441894,2.212014ZM10.488153015441895,5.51185Q10.000000015441895,5.02369,10.000000015441895,4.33333Q10.000000015441895,3.64298,10.488153015441895,3.15482Q10.976313015441894,2.666667,11.666663015441895,2.666667Q12.357023015441895,2.666667,12.845183015441894,3.15482Q13.333333015441895,3.64298,13.333333015441895,4.33333Q13.333333015441895,5.02369,12.845183015441894,5.51185Q12.357023015441895,6,11.666663015441895,6Q10.976313015441894,6,10.488153015441895,5.51185Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M14.666663015441895,13.333333015441895L14.666663015441895,10.000000015441895Q14.666663015441895,9.447707015441894,14.276143015441894,9.057187015441894Q13.885623015441894,8.666666015441894,13.333333015441895,8.666666015441894L10.000000015441895,8.666666015441894Q9.447707015441894,8.666666015441894,9.057187015441894,9.057187015441894Q8.666666015441894,9.447707015441894,8.666666015441894,10.000000015441895L8.666666015441894,13.333333015441895Q8.666666015441894,13.885623015441894,9.057187015441894,14.276143015441894Q9.447707015441894,14.666663015441895,10.000000015441895,14.666663015441895L13.333333015441895,14.666663015441895Q13.885623015441894,14.666663015441895,14.276143015441894,14.276143015441894Q14.666663015441895,13.885623015441894,14.666663015441895,13.333333015441895ZM10.000000015441895,10.000000015441895L13.333333015441895,10.000000015441895L13.333333015441895,13.333333015441895L10.000000015441895,13.333333015441895L10.000000015441895,10.000000015441895Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/views/Register.vue b/src/views/Register.vue
index 8b410df..9a3814b 100755
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -327,9 +327,8 @@
     </div>
     <div class="step3-wrap min-flex" v-if="activeStep == 3">
       <div class="step3-top flex-common">
-        <h3>
-          <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                          :hoverColor="'#006AFF'" />
+        <h3 class="flex gap8">
+          <img src="@/assets/menu/littleTitleIcon1.svg" alt="">
           服务列表</h3>
         <div class="btngroup">
           <GuipButton type="ignore" :btnstyle="{ width: '97px', height: '33px' }" @click="showDomainModal">添加查重服务
@@ -1332,6 +1331,7 @@ export default {
       display: flex;
       justify-content: space-between;
       padding-bottom: 0;
+      align-items: end;
       h3{
         margin: 0;
       }
diff --git a/src/views/super/Ranking/RankBatchList.vue b/src/views/super/Ranking/RankBatchList.vue
index 1ed2705..66d433e 100644
--- a/src/views/super/Ranking/RankBatchList.vue
+++ b/src/views/super/Ranking/RankBatchList.vue
@@ -524,243 +524,26 @@ export default {
         getTypeRanking() {
             //产品排行
             const that = this
-            that.tableData = [
-              
-                {
-                    id
-                        :
-                        6,
-                    name
-                        :
-                        "维普大学生版",
-                    sort
-                        :
-                        1,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "479,820.85"
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "0"
-
-                },
-                {
-                    id
-                        :
-                        6,
-                    name
-                        :
-                        "维普大学生版",
-                    sort
-                        :
-                        1,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "479,820.85"
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "0"
-
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "569,820.85"
-
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "569,820.85"
-
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "569,820.85"
-
-                },
-                {
-                    id
-                        :
-                        94,
-                    name
-                        :
-                        "ai中文大学生版",
-                    sort
-                        :
-                        2,
-                    value_1
-                        :
-                        "23,754.25",
-                    value_2
-                        :
-                        "43,012.15",
-                    value_3
-                        :
-                        "61,869.09",
-                    value_4
-                        :
-                        "569,820.85"
-
-                }
-            ]
-            that.top_list = {
-                94: {
-                    id
-                        :
-                        "94",
-                    name
-                        :
-                        "尚志教育",
-                    value_1
-                        :
-                        "156409.50"
-                },
-                6: {
-                    id
-                        :
-                        "6",
-                    name
-                        :
-                        "千校论文查重平台",
-                    value_1
-                        :
-                        "238081.00"
-                }
-            }
-            // that.tableData = []
-            // that.top_list = []
-            // this.loading = true;
-            // this.$http('POST', '/supernew/ajax_get_type_batch_list', {
-            //     date: that.text,
-            //     rank_type: that.dataRank,
-            //     sort_by: that.sort_by,
-            //     sort_order: that.sort_order,
-            //     cur_page: that.currentPage,
-            //     page_size: that.pageSize,
-            // }).then(response => {
-            //     this.loading = false;
-            //     this.$nextTick(() => {
-            //         that.tableData = response.data.list
-            //         that.top_list = response.data.top_list
-            //         that.total = response.data.total
-            //     })
-            // }).catch(error => {
-            //     console.error(error, 'error')
-            // })
+            that.tableData = []
+            that.top_list = []
+            this.loading = true;
+            this.$http('POST', '/supernew/ajax_get_type_batch_list', {
+                date: that.text,
+                rank_type: that.dataRank,
+                sort_by: that.sort_by,
+                sort_order: that.sort_order,
+                cur_page: that.currentPage,
+                page_size: that.pageSize,
+            }).then(response => {
+                this.loading = false;
+                this.$nextTick(() => {
+                    that.tableData = response.data.list
+                    that.top_list = response.data.top_list
+                    that.total = response.data.total
+                })
+            }).catch(error => {
+                console.error(error, 'error')
+            })
         },
         getRankingDetail(obj) {
             const that = this

From b60d15a3f3fc887f272ed295f12e0df97384c0b5 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 14:26:15 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SliderMenu.vue | 195 +++++++++++++++++++-----------------------
 src/store/index.js            |   8 --
 src/style/theme/index.css     |   2 +
 3 files changed, 92 insertions(+), 113 deletions(-)

diff --git a/src/components/SliderMenu.vue b/src/components/SliderMenu.vue
index 8e6e316..8a5769c 100644
--- a/src/components/SliderMenu.vue
+++ b/src/components/SliderMenu.vue
@@ -1,36 +1,43 @@
 <template>
-      <transition name="menu-collapse">
-  <el-menu :default-active="activeMenu" class="el-menu-vertical-demo custom-menu"  @open="handleOpen"
-   @close="handleClose" @select="handleSelect" :collapse="isCollapse" :collapse-transition="true"
-    :default-openeds="['1', '2']">
-      <div style="height: 100%;padding: 0 0 20px;box-sizing: border-box;" >
+  <transition name="menu-collapse">
+    <!-- :default-active="activeMenu" -->
+    <el-menu class="el-menu-vertical-demo custom-menu" @open="handleOpen"
+    :default-active="currentMenuItem?.index"
+      @close="handleClose" @select="handleSelect" :collapse="isCollapse" :collapse-transition="true"
+      >
+      <div style="height: 100%;padding: 0 0 20px;box-sizing: border-box;">
         <div class="menu-top">
           <span v-show="!isCollapse">
             导航
           </span>
           <GuipToolTip :content="isCollapse ? '展开' : '收起'">
-            <img v-if="!isCollapse" class="point" src="../assets/menu-close.svg" @click="changeMenuStatus(true)" alt="" >
+            <img v-if="!isCollapse" class="point" src="../assets/menu-close.svg" @click="changeMenuStatus(true)" alt="">
             <img v-else class="point" src="../assets/menu-open.svg" @click="changeMenuStatus(false)" alt="">
           </GuipToolTip>
         </div>
-        <el-submenu v-for="item in menuData" :key="item.index" :index="item.index">
-          <template slot="title">
-            <SvgIcon1
-              :iconPath="require(`@/assets/menu/${item.icon}.svg`)"
-              defaultColor="#8A9099"
-              activeColor="#006AFF"
-              :isActive="item.index == activeMenu.substr(0,1) && isCollapse"
-              />
-            <span class="title_text" :index="item.index">{{ item.title }}</span>
-          </template>
+        <template v-for="item in menuData" >
+          <el-submenu v-if="item.children"  :key="item.index" :index="item.index">
+            <template slot="title">
+              <SvgIcon1 :iconPath="require(`@/assets/menu/${item.icon}.svg`)" defaultColor="#8A9099"
+                activeColor="#006AFF" :isActive="item.index == currentMenuItem?.index.substr(0,1) && isCollapse" />
+              <span class="title_text" >{{ item.title }}</span>
+            </template>
             <el-menu-item style="padding: 0 22px 0 32px;" v-for="subItem in item.children" :key="subItem.index"
-              :index="subItem.index">
+              :index="subItem.index" @click="handleSelect(subItem.index, [item.index, subItem.index], subItem)">
               {{ subItem.title }}
             </el-menu-item>
-        </el-submenu>
+          </el-submenu>
+          <el-menu-item v-else :index="item.index"  :key="item.index" @click="handleSelect(item.index, [item.index], item)">
+              <div class="flex">
+                <SvgIcon1 :iconPath="require(`@/assets/menu/${item.icon}.svg`)" defaultColor="#8A9099"
+                  activeColor="#006AFF" :isActive="item.index == currentMenuItem?.index" />
+                <span class="title_text" slot="title">{{ item.title }}</span>
+              </div>
+          </el-menu-item>
+        </template>
       </div>
-  </el-menu>
-</transition>
+    </el-menu>
+  </transition>
 
 </template>
 <script>
@@ -38,7 +45,7 @@ import SvgIcon1 from '@/components/SvgIcon1.vue';
 import GuipToolTip from '@/components/GuipToolTip.vue';
 export default {
   name: 'SliderMenu',
-  components:{
+  components: {
     SvgIcon1,
     GuipToolTip
   },
@@ -53,66 +60,74 @@ export default {
       isCollapse: false,
       activeMenu: '',
       routerList: [],
-      // menuData: [
-      //   {
-      //     index: '1',
-      //     title: '父级菜单1',
-      //     icon: 'el-icon-location',
-      //     children: [
-      //       { index: '1-1', title: '子级菜单1-1', path: '/' },
-      //       { index: '1-2', title: 'ui页面', path: '/ui' }
-      //     ]
-      //   },
-      //   {
-      //     index: '2',
-      //     title: '父级菜单2',
-      //     icon: 'el-icon-menu',
-      //     children: [
-      //       { index: '2-1', title: '子级菜单2-1', path: '/about' },
-      //       { index: '2-2', title: '加盟耶main', path: '/franchise' }
-      //     ]
-      //   }
-      // ]
+      currentMenuItem:'',
+      currentMenuParent:''
     };
   },
+  watch: {
+    "$route.path"() {
+      this.updateCurrentMenu();
+    },
+  },
   methods: {
     changeMenuStatus(flag) {
       this.isCollapse = flag;
     },
-    // handleSelect(index) {
-    //   this.activeMenu = index;
-    // },
     handleOpen(key, keyPath) {
-        console.log(key, keyPath);
-      },
-      handleClose(key, keyPath) {
-        console.log(key, keyPath);
-      },
-    handleSelect(index) {
-      this.activeMenu = index;
-      console.log(index,'---index');
-      // 找到被点击的 menu 项对应的 path
-      const allItems = this.menuData.flatMap(menu => menu.children);
-      const targetItem = allItems.find(item => item.index === index);
+      console.log(key, keyPath);
+    },
+    handleClose(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    // handleSelect(index,indexPath) {
+    //   this.activeMenu = index;
+    //   console.log(index,indexPath, '---index');
+    //   // 找到被点击的 menu 项对应的 path
+    //   const allItems = this.menuData.flatMap(menu => menu.children);
+    //   const targetItem = allItems.find(item => item.index === index);
 
-      if (targetItem && this.$route.path !== targetItem.path) {
-        this.$router.push(targetItem.path);
+    //   if (targetItem && this.$route.path !== targetItem.path) {
+    //     this.$router.push(targetItem.path);
+    //   }
+    // },
+    handleSelect(index, indexPath, menuItem) {
+      if (menuItem.path && this.$route.path !== menuItem.path) {
+        this.$router.push(menuItem.path);
+      }
+    },
+    updateCurrentMenu() {
+      const result = this.findMenuItemByPath(this.menuData, this.$route.path);
+      this.currentMenuItem = result?.item;
+      console.log(this.currentMenuItem,'currentMenuItem==');
+    },
+    findMenuItemByPath(menuItems, targetPath, parent = null) {
+      for (const item of menuItems) {
+        if (item.path === targetPath) return { item, parent };
+        if (item.children?.length) {
+          const found = this.findMenuItemByPath(item.children, targetPath, item);
+          if (found) return found;
+        }
       }
+      return null;
     },
     handleMenuItemClick(item) {
       this.$router.push(item.path);
       this.activeMenu = item.index;
-    }
+    },
   },
   mounted() {
-    const allItems = this.menuData.flatMap(menu => menu.children.map(child => ({ ...child, parentIndex: menu.index })));
-    const current = allItems.find(item => item.path === this.$route.path);
-    this.activeMenu = current ? current.index : '';
-    this.defaultOpeneds = current ? [current.parentIndex] : [];
+    // console.log(this.$route.path,'this.$route.path----');
+    // const allItems = this.menuData.flatMap(menu =>menu.children ? menu.children?.map(child => ({ ...child, parentIndex: menu.index })) : menu.children);
+    // console.log(allItems,'=====');
+    // const current = allItems.find(item => item.path === this.$route.path);
+    // this.activeMenu = current ? current.index : '';
+    // this.defaultOpeneds = current ? [current.parentIndex] : [];
+    
     // this.routerList = this.$router.options.router;//配置路由
     // console.log(this.$route.path, this.$router.options.router, 'this.$route.path===');
     // // 初始化时设置默认激活的菜单项
     // this.activeMenu = this.$route.path;
+    this.updateCurrentMenu();
   }
 }
 </script>
@@ -128,51 +143,18 @@ export default {
   transform: translateX(-30px);
 }
 
-.el-menu--vertical{
-  .el-menu-item{
+.el-menu--vertical {
+  .el-menu-item {
     height: 40px;
     line-height: 40px;
+   
   }
-  .el-menu-item.is-active{
+
+  .el-menu-item.is-active {
     font-weight: bold;
   }
 }
-// .slide-fade-enter-active, .slide-fade-leave-active {
-//   transition: all 1.5s ease;
-// }
-// .slide-fade-enter, .slide-fade-leave-to {
-//   opacity: 0;
-//   transition: all 1.5s ease;
-//   transform: translateX(-10px);
-// }
-
-// .slide-enter-active, .slide-leave-active {
-//   transition: all 1.5s ease;
-//   max-height: 200px;
-// }
 
-/* 添加收起时的过渡效果 */
-// .el-menu--collapse .el-submenu .el-menu {
-//   transition: all 0.3s ease-in-out;
-//   overflow: hidden;
-// }
-
-// .el-menu--collapse .el-submenu > .el-menu {
-//   display: none;
-//   opacity: 0;
-//   transform: translateY(-10px);
-// }
-
-// .el-menu:not(.el-menu--collapse) .el-submenu > .el-menu {
-//   transition: all 0.3s ease-in-out;
-//   opacity: 1;
-//   transform: translateY(0);
-// }
-
-// .slide-enter, .slide-leave-to {
-//   opacity: 0;
-//   max-height: 0;
-// }
 .title_img {
   width: 16px;
   margin-right: 4px;
@@ -185,10 +167,12 @@ export default {
   display: block;
 
 }
-.el-menu--collapse .title_text{
+
+.el-menu--collapse .title_text {
   display: none;
 }
-.el-menu--collapse ::v-deep .el-submenu__icon-arrow{
+
+.el-menu--collapse ::v-deep .el-submenu__icon-arrow {
   display: none;
 }
 
@@ -221,7 +205,8 @@ export default {
   letter-spacing: 0.08em;
   justify-content: space-between;
   align-items: center;
-  img{
+
+  img {
     width: 14px;
     height: 14px;
 
@@ -278,6 +263,7 @@ export default {
   color: #006AFF;
   font-weight: bold;
 }
+
 // .el-submenu .el-menu {
 //   transition: all 0.3s ease;
 // }
@@ -294,5 +280,4 @@ export default {
 // .el-menu--collapse .el-submenu.is-opened > .el-menu {
 //   opacity: 0;
 //   height: 0;
-// }
-</style>
\ No newline at end of file
+// }</style>
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 401fd33..b23964e 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -100,14 +100,6 @@ export default new Vuex.Store({
         path:'/',
         icon: 'Totalprofit',
       },
-      // {
-      //   name: '用户管理',
-      //   icon: 'el-icon-user',
-      //   children: [
-      //     { name: '用户列表', path: '/user/list' },
-      //     { name: '角色管理', path: '/user/role' }
-      //   ]
-      // },
       {
         index: '2',
         title: '父级菜单1',
diff --git a/src/style/theme/index.css b/src/style/theme/index.css
index d20537a..e674b75 100644
--- a/src/style/theme/index.css
+++ b/src/style/theme/index.css
@@ -5022,6 +5022,8 @@ border-color:#006AFF !important;
     height: 56px;
     line-height: 56px;
     font-size: 14px;
+    display: flex;
+    align-items: center;
     color: #1e2226;
     padding: 0 20px;
     list-style: none;

From d0bb20547c918b7ceb5c0037023de1b2ea7f094b Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 15:15:27 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=80=BB=E5=92=8C=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SetLeftMenu.vue | 198 +++++++++++++++++++++--------------------
 src/components/SliderMenu.vue  |  21 +++--
 src/style/theme/common.scss    |   2 +-
 src/views/SiteSetting.vue      |  13 ++-
 4 files changed, 126 insertions(+), 108 deletions(-)

diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue
index b9180ec..fbc3bd7 100644
--- a/src/components/SetLeftMenu.vue
+++ b/src/components/SetLeftMenu.vue
@@ -4,9 +4,9 @@
       <li v-for="(item, index) in menuList" :key="item.path">
         <div :class="[$route.path == item.path ? 'active' : '', 'flex', $route.path == item.path ? curIndex = index : '']"
           @click="gotoPath(item.path,index)">
-          <img v-if="$route.path == item.path" :src="item.imgActive" alt="">
-          <img v-else :src="item.img" alt="">
-          {{ item.name }}
+          <SvgIcon1 :iconPath="require(`@/assets/${item.img}`)" defaultColor="#8A9099" :size="16"
+                activeColor="#006AFF" :isActive="$route.path == item.path" />
+          <span class="title_text" >{{ item.name }}</span>
         </div>
         <p :class="['flex', activeFloor == item1.desc ? 'curActive' : '']"
           v-for="(item1) in item.list" @click="setActiveCur(item1.desc,item)" :key="item1.name">{{ item1.name }}</p>
@@ -16,16 +16,17 @@
 </template>
 
 <script>
+import SvgIcon1 from '@/components/SvgIcon1.vue';
 // :class="[$route.path != item.path ? 'not-point' : '', 'flex', activeFloor == item1.desc ? 'curActive' : '']"
 import { mapState } from 'vuex';
 import store from '../store';
 export default {
   name: 'Sidebar',
   props: {
-    // menuList: {
-    //   type: Array,
-    //   required: true
-    // },
+    menuList: {
+      type: Array,
+      required: true
+    },
     // activeFloor:{
     //   type:String
     // },
@@ -33,97 +34,100 @@ export default {
     //   type:Number
     // }
   },
+  components: {
+    SvgIcon1,
+  },
   data() {
     return {
       activeFloor: null,
       curIndex: 0,
       scrollLock: false,
-      menuList: [
-        {
-          name: '基本设置',
-          path: '/siteSetting/siteBaseSetting',
-          img: require('@/assets/site/sitebase.svg'),
-          imgActive: require('@/assets/site/sitebase_active.svg'),
-          list: [
-            {
-              name: '站点信息',
-              desc: 'siteMessage1'
-            },
-            {
-              name: '域名设置',
-              desc: 'siteMessage2'
-            },
-            {
-              name: '收款方式',
-              desc: 'siteMessage3'
-            },
-          ]
-        },
-        {
-          name: '个性化设置',
-          path: '/siteSetting/sitePersonalization',
-          img: require('@/assets/site/gexinghua.svg'),
-          imgActive: require('@/assets/site/sitebase_active.svg'),
-          list: [
-            {
-              name: '网页模板',
-              desc: 'siteMessage4'
-            },
-            {
-              name: '客服设置',
-              desc: 'siteMessage5'
-            },
-            {
-              name: '功能显隐',
-              desc: 'siteMessage6'
-            },
-            {
-              name: '安全提交',
-              desc: 'siteMessage7'
-            },
-            {
-              name: '初始订单数',
-              desc: 'siteMessage8'
-            },
-          ]
-        },
-        {
-          name: '移动端设置',
-          path: '/siteSetting/siteH5',
-          img: require('@/assets/site/siteh5.svg'),
-          imgActive: require('@/assets/site/sitebase_active.svg'),
-          list: [
-            {
-              name: '微信H5',
-              desc: 'siteMessage9'
-            },
-            {
-              name: '小程序',
-              desc: 'siteMessage10'
-            },
-          ]
-        },
-        {
-          name: '营销推广',
-          path: '/siteSetting/siteSem',
-          img: require('@/assets/site/sitesem.svg'),
-          imgActive: require('@/assets/site/sitebase_active.svg'),
-          list: [
-            {
-              name: 'SEO设置',
-              desc: 'siteMessage11'
-            },
-            {
-              name: 'SEM设置',
-              desc: 'siteMessage12'
-            },
-            {
-              name: '访问统计',
-              desc: 'siteMessage13'
-            },
-          ]
-        }
-      ]
+      // menuList: [
+      //   {
+      //     name: '基本设置',
+      //     path: '/siteSetting/siteBaseSetting',
+      //     img: require('@/assets/site/sitebase.svg'),
+      //     imgActive: require('@/assets/site/sitebase_active.svg'),
+      //     list: [
+      //       {
+      //         name: '站点信息',
+      //         desc: 'siteMessage1'
+      //       },
+      //       {
+      //         name: '域名设置',
+      //         desc: 'siteMessage2'
+      //       },
+      //       {
+      //         name: '收款方式',
+      //         desc: 'siteMessage3'
+      //       },
+      //     ]
+      //   },
+      //   {
+      //     name: '个性化设置',
+      //     path: '/siteSetting/sitePersonalization',
+      //     img: require('@/assets/site/gexinghua.svg'),
+      //     imgActive: require('@/assets/site/sitebase_active.svg'),
+      //     list: [
+      //       {
+      //         name: '网页模板',
+      //         desc: 'siteMessage4'
+      //       },
+      //       {
+      //         name: '客服设置',
+      //         desc: 'siteMessage5'
+      //       },
+      //       {
+      //         name: '功能显隐',
+      //         desc: 'siteMessage6'
+      //       },
+      //       {
+      //         name: '安全提交',
+      //         desc: 'siteMessage7'
+      //       },
+      //       {
+      //         name: '初始订单数',
+      //         desc: 'siteMessage8'
+      //       },
+      //     ]
+      //   },
+      //   {
+      //     name: '移动端设置',
+      //     path: '/siteSetting/siteH5',
+      //     img: require('@/assets/site/siteh5.svg'),
+      //     imgActive: require('@/assets/site/sitebase_active.svg'),
+      //     list: [
+      //       {
+      //         name: '微信H5',
+      //         desc: 'siteMessage9'
+      //       },
+      //       {
+      //         name: '小程序',
+      //         desc: 'siteMessage10'
+      //       },
+      //     ]
+      //   },
+      //   {
+      //     name: '营销推广',
+      //     path: '/siteSetting/siteSem',
+      //     img: require('@/assets/site/sitesem.svg'),
+      //     imgActive: require('@/assets/site/sitebase_active.svg'),
+      //     list: [
+      //       {
+      //         name: 'SEO设置',
+      //         desc: 'siteMessage11'
+      //       },
+      //       {
+      //         name: 'SEM设置',
+      //         desc: 'siteMessage12'
+      //       },
+      //       {
+      //         name: '访问统计',
+      //         desc: 'siteMessage13'
+      //       },
+      //     ]
+      //   }
+      // ]
     }
   },
   mounted() {
@@ -219,6 +223,9 @@ export default {
 .ceshi {
   // animation: fadeInOut 2s infinite;
 }
+.title_text{
+  margin-left: 6px;
+}
 
 ul {
   list-style: none;
@@ -240,7 +247,8 @@ li {
   div {
     letter-spacing: 0.08em;
     color: #1E2226;
-    margin: 11px 0;
+    // margin: 12px 0;
+    height: 40px;
     cursor: pointer;
 
     img {
@@ -249,9 +257,9 @@ li {
   }
 
   p {
-    margin: 9px 0;
     letter-spacing: 0.08em;
     line-height: 18px;
+    height: 36px;
     color: #8A9099;
     cursor: pointer;
 
diff --git a/src/components/SliderMenu.vue b/src/components/SliderMenu.vue
index 8a5769c..ef4ddba 100644
--- a/src/components/SliderMenu.vue
+++ b/src/components/SliderMenu.vue
@@ -1,7 +1,6 @@
 <template>
   <transition name="menu-collapse">
-    <!-- :default-active="activeMenu" -->
-    <el-menu class="el-menu-vertical-demo custom-menu" @open="handleOpen"
+    <el-menu v-if="!customize" class="el-menu-vertical-demo custom-menu" @open="handleOpen"
     :default-active="currentMenuItem?.index"
       @close="handleClose" @select="handleSelect" :collapse="isCollapse" :collapse-transition="true"
       >
@@ -19,7 +18,7 @@
           <el-submenu v-if="item.children"  :key="item.index" :index="item.index">
             <template slot="title">
               <SvgIcon1 :iconPath="require(`@/assets/menu/${item.icon}.svg`)" defaultColor="#8A9099"
-                activeColor="#006AFF" :isActive="item.index == currentMenuItem?.index.substr(0,1) && isCollapse" />
+                activeColor="#006AFF" :isActive="item.index == currentMenuItem?.index?.substring(0,1) && isCollapse" />
               <span class="title_text" >{{ item.title }}</span>
             </template>
             <el-menu-item style="padding: 0 22px 0 32px;" v-for="subItem in item.children" :key="subItem.index"
@@ -37,28 +36,36 @@
         </template>
       </div>
     </el-menu>
+
+    <SetLeftMenu v-else :menuList="menuData"/>
+<!-- <div v-else>---akjshdjka</div> -->
   </transition>
 
 </template>
 <script>
+import SetLeftMenu from '@/components/SetLeftMenu.vue'
 import SvgIcon1 from '@/components/SvgIcon1.vue';
 import GuipToolTip from '@/components/GuipToolTip.vue';
 export default {
   name: 'SliderMenu',
   components: {
     SvgIcon1,
-    GuipToolTip
+    GuipToolTip,
+    SetLeftMenu
   },
   props: {
     menuData: {
       type: Array,
       default: () => []
     },
+    customize:{
+      type:Boolean,
+      default:false
+    }
   },
   data() {
     return {
       isCollapse: false,
-      activeMenu: '',
       routerList: [],
       currentMenuItem:'',
       currentMenuParent:''
@@ -110,10 +117,6 @@ export default {
       }
       return null;
     },
-    handleMenuItemClick(item) {
-      this.$router.push(item.path);
-      this.activeMenu = item.index;
-    },
   },
   mounted() {
     // console.log(this.$route.path,'this.$route.path----');
diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss
index 8738e46..01734ca 100644
--- a/src/style/theme/common.scss
+++ b/src/style/theme/common.scss
@@ -756,7 +756,7 @@ body {
     overflow: hidden;
     text-overflow: ellipsis;
   }
-  .svg-icon-wrapper{
+  .el-table .svg-icon-wrapper{
     width: 12px !important;
     height: 12px !important;
   }
diff --git a/src/views/SiteSetting.vue b/src/views/SiteSetting.vue
index 46b1187..d5ec1fa 100644
--- a/src/views/SiteSetting.vue
+++ b/src/views/SiteSetting.vue
@@ -1,6 +1,8 @@
 <template>
     <div class="siteSetting-wrap">
-        <SetLeftMenu />
+        <!-- <SetLeftMenu /> -->
+        <SliderMenu :menuData="siteSettingData" :customize="true"></SliderMenu>
+
         <!--:menuList="menuList" :activeFloor="activeFloor" :curIndex="curIndex" -->
         <!-- 主内容区域 -->
         <main class="main-content" ref="scrollContainer" id="main-content">
@@ -17,7 +19,9 @@
 // import SiteBaseSetting from './SiteBaseSetting.vue';
 import PageTitle from '@/components/PageTitle.vue';
 import Footer from '@/components/Footer.vue';
-import SetLeftMenu from '@/components/SetLeftMenu.vue'
+import { mapState } from 'vuex';
+
+import SliderMenu from '@/components/SliderMenu.vue'
 export default {
     // 站点设置
     name: '',
@@ -25,7 +29,7 @@ export default {
     components: {
         PageTitle,
         Footer,
-        SetLeftMenu,
+        SliderMenu,
         // SiteBaseSetting
     },
     data() {
@@ -38,6 +42,9 @@ export default {
         console.log(this.$route.path,'090-9090');
         // this.$refs.scrollContainer.scrollTo(0)
     },
+    computed: {
+    ...mapState(['siteSettingData']) // 从Vuex映射showSidebar状态到组件的计算属性中
+  },
     methods: {
     }
 }

From f102de0f0a59f3b7908bf4f2e4852b630f2cbf55 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 15:15:53 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/src/store/index.js b/src/store/index.js
index b23964e..9567471 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -132,6 +132,92 @@ export default new Vuex.Store({
           }
         ]
       }
+    ],
+    siteSettingData:[
+      {
+        name: '基本设置',
+        path: '/siteSetting/siteBaseSetting',
+        img:'site/sitebase.svg',
+        imgActive: require('@/assets/site/sitebase_active.svg'),
+        list: [
+          {
+            name: '站点信息',
+            desc: 'siteMessage1'
+          },
+          {
+            name: '域名设置',
+            desc: 'siteMessage2'
+          },
+          {
+            name: '收款方式',
+            desc: 'siteMessage3'
+          },
+        ]
+      },
+      {
+        name: '个性化设置',
+        path: '/siteSetting/sitePersonalization',
+        img: 'site/gexinghua.svg',
+        imgActive: require('@/assets/site/sitebase_active.svg'),
+        list: [
+          {
+            name: '网页模板',
+            desc: 'siteMessage4'
+          },
+          {
+            name: '客服设置',
+            desc: 'siteMessage5'
+          },
+          {
+            name: '功能显隐',
+            desc: 'siteMessage6'
+          },
+          {
+            name: '安全提交',
+            desc: 'siteMessage7'
+          },
+          {
+            name: '初始订单数',
+            desc: 'siteMessage8'
+          },
+        ]
+      },
+      {
+        name: '移动端设置',
+        path: '/siteSetting/siteH5',
+        img: 'site/siteh5.svg',
+        imgActive: require('@/assets/site/sitebase_active.svg'),
+        list: [
+          {
+            name: '微信H5',
+            desc: 'siteMessage9'
+          },
+          {
+            name: '小程序',
+            desc: 'siteMessage10'
+          },
+        ]
+      },
+      {
+        name: '营销推广',
+        path: '/siteSetting/siteSem',
+        img: 'site/sitesem.svg',
+        imgActive: require('@/assets/site/sitebase_active.svg'),
+        list: [
+          {
+            name: 'SEO设置',
+            desc: 'siteMessage11'
+          },
+          {
+            name: 'SEM设置',
+            desc: 'siteMessage12'
+          },
+          {
+            name: '访问统计',
+            desc: 'siteMessage13'
+          },
+        ]
+      }
     ]
   },
   actions: {

From 907f617e40569933a5d19c03e93e84b10ab4b13f Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 12 Jun 2025 15:39:36 +0800
Subject: [PATCH 7/8] =?UTF-8?q?ui=E9=A1=B5=E9=9D=A2=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/style/theme/common.scss          |   3 +
 src/views/ConfigureServicePrices.vue |   6 +-
 src/views/elementGroups.vue          | 742 ++++++++++++++++++-----------------
 3 files changed, 378 insertions(+), 373 deletions(-)

diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss
index 01734ca..83578d3 100644
--- a/src/style/theme/common.scss
+++ b/src/style/theme/common.scss
@@ -34,6 +34,9 @@ body {
     font-weight: normal;
     letter-spacing: 0.08em;
 }
+.main-content12{
+    padding: 12px;
+}
 // 变小手
 .point{
     cursor: pointer;
diff --git a/src/views/ConfigureServicePrices.vue b/src/views/ConfigureServicePrices.vue
index da3cc40..29c1ab2 100644
--- a/src/views/ConfigureServicePrices.vue
+++ b/src/views/ConfigureServicePrices.vue
@@ -44,7 +44,7 @@
                                         <div class="left-pay-item ">
                                             <div class="flex-between">
                                                 <span>微信收款</span>
-                                                <GuipSwitch v-model="form.weixinFlag" activeText="开启" inactiveText="关闭"
+                                                <GuipSwitch :modelValue="form.weixinFlag" activeText="开启" inactiveText="关闭"
                                                     @change="onSwitchChange">
                                                 </GuipSwitch>
                                             </div>
@@ -53,7 +53,7 @@
                                         <div class="left-pay-item ">
                                             <div class="flex-between">
                                                 <span>支付宝收款</span>
-                                                <GuipSwitch v-model="form.zhifubaoFlag" activeText="开启"
+                                                <GuipSwitch :modelValue="form.zhifubaoFlag" activeText="开启"
                                                     inactiveText="关闭" @change="onSwitchChange">
                                                 </GuipSwitch>
                                             </div>
@@ -91,7 +91,7 @@
                                         <div class="left-pay-item ">
                                             <div class="flex-between">
                                                 <span>淘宝收款</span>
-                                                <GuipSwitch v-model="form.weixinFlag" activeText="开启" inactiveText="关闭"
+                                                <GuipSwitch :modelValue="form.weixinFlag" activeText="开启" inactiveText="关闭"
                                                     @change="onSwitchChange">
                                                 </GuipSwitch>
                                             </div>
diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue
index 3175aab..97512f6 100644
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@@ -1,388 +1,390 @@
 <template>
-    <div class="elementWrap">
-        <!-- 以 ele-item 为类名的这种div、 label 、 h3 仅在此页面进行布局使用，复制时无需复制此元素 -->
-        <el-form :model="form" :rules="rules" class="el-row demo-ruleForm" ref="formRef">
-
-            <div class="ele-item">
-                <label for="">单选框11：</label>
-                <GuipRadio v-model="form.language" :options="languageOptions" label="选择语言" prop="language"
-                    @change="radioChange" :rules="rules.language" />
-            </div>
-            <div class="ele-item">
-                <label for="">下拉框：</label>
-                <GuipSelect width="600px" v-model="form.card" label="卡片" prop="card" :options="options"
-                    defaultValue="选项1" />
-            </div>
-            <div>
-                <h3 for="">表格：(表头自定义、自定义渲染、固定列)</h3>
-                <GuipButton type="primary" @click="toggleAllSelection">全选按钮</GuipButton>
-
-                <el-form>
-                    <GuipTable :tableData="tableData" ref="multipleTable" @selectChange="handleSelectionChange"
-                        :multiple="true" autoColumn="true" :loading="tableLoading">
-                        <!-- <template slot="header"> -->
-                        <el-table-column width="180" fixed="left" label="名称(固定左)"></el-table-column>
-                        <!-- <el-table-column prop="type">
-                            <template slot="header">
-                                <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
-                                    defaultValue="全部检测类型" @change="changeSelectType" />
-                            </template>
+     <div class="main-content12">
+        <div class="elementWrap">
+            <!-- 以 ele-item 为类名的这种div、 label 、 h3 仅在此页面进行布局使用，复制时无需复制此元素 -->
+            <el-form :model="form" :rules="rules" class="el-row demo-ruleForm" ref="formRef">
+
+                <div class="ele-item">
+                    <label for="">单选框11：</label>
+                    <GuipRadio v-model="form.language" :options="languageOptions" label="选择语言" prop="language"
+                        @change="radioChange" :rules="rules.language" />
+                </div>
+                <div class="ele-item">
+                    <label for="">下拉框：</label>
+                    <GuipSelect width="600px" v-model="form.card" label="卡片" prop="card" :options="options"
+                        defaultValue="选项1" />
+                </div>
+                <div>
+                    <h3 for="">表格：(表头自定义、自定义渲染、固定列)</h3>
+                    <GuipButton type="primary" @click="toggleAllSelection">全选按钮</GuipButton>
+
+                    <el-form>
+                        <GuipTable :tableData="tableData" ref="multipleTable" @selectChange="handleSelectionChange"
+                            :multiple="true" autoColumn="true" :loading="tableLoading">
+                            <!-- <template slot="header"> -->
+                            <el-table-column width="180" fixed="left" label="名称(固定左)"></el-table-column>
+                            <!-- <el-table-column prop="type">
+                                <template slot="header">
+                                    <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
+                                        defaultValue="全部检测类型" @change="changeSelectType" />
+                                </template>
+
+                                <template slot-scope="scope">
+                                    {{ type2name[scope.row.type] }}
+                                </template>
+                            </el-table-column> -->
+
+                            <el-table-column prop="created_at" label="时间" width="200">
+                                <template slot-scope="scope">
+                                    <div class="flex cell_render">
+                                        <GuipToolTip content="文字居中">
+                                            <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
+                                                scope.row.payment
+                                                    ==
+                                                '0' ? '文字居中' : '文字居中' }}</span>
+                                        </GuipToolTip>
+                                        <GuipToolTip content="图标居中">
+                                            <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                            :hoverColor="'#006AFF'" />
+                                        </GuipToolTip>
 
-                            <template slot-scope="scope">
-                                {{ type2name[scope.row.type] }}
-                            </template>
-                        </el-table-column> -->
-
-                        <el-table-column prop="created_at" label="时间" width="200">
-                            <template slot-scope="scope">
-                                <div class="flex cell_render">
-                                    <GuipToolTip content="文字居中">
-                                        <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
-                                            scope.row.payment
-                                                ==
-                                            '0' ? '文字居中' : '文字居中' }}</span>
-                                    </GuipToolTip>
-                                    <GuipToolTip content="图标居中">
-                                        <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                        :hoverColor="'#006AFF'" />
-                                    </GuipToolTip>
-
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="unit_num" label="数量" width="180">
-                            <template slot-scope="scope">
-                                <GuipToolTip content="单元格局中">
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="unit_num" label="数量" width="180">
+                                <template slot-scope="scope">
+                                    <GuipToolTip content="单元格局中">
+                                        <div class="flex">
+                                            <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
+                                                scope.row.payment
+                                                    ==
+                                                '0' ? '单元格局中' : '单元格局中' }}</span>
+                                                <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                                :hoverColor="'#006AFF'" />
+                                        </div>
+
+                                        </GuipToolTip>
+                                </template>
+
+                            </el-table-column>
+                            <el-table-column prop="name2" label="姓名" width="150"></el-table-column>
+                            <el-table-column prop="price" label="价格" width="150">
+                                <!-- <template slot-scope="scope">
+                                <span @click="handlePriceClick(scope.row)">{{ scope.row.price }}</span>
+                            </template> -->
+                                <!-- 气泡弹出框  后期样式自定义-->
+                                <!-- <template slot-scope="scope">
+                                    <el-popover trigger="click" placement="top">
+                                        <input type="text">
+                                        <div slot="reference" class="name-wrapper">
+                                            <el-tag size="medium">{{ scope.row.price }}</el-tag>
+                                        </div>
+                                    </el-popover>
+                                </template> -->
+                            </el-table-column>
+                            <el-table-column prop="address" label="地址1" width="150"> </el-table-column>
+                            <el-table-column prop="address" label="地址2"  width="250"> </el-table-column>
+                            <el-table-column prop="address" label="地址3"  width="150"> </el-table-column>
+                            <el-table-column prop="address1" label="地址测试" width="100"></el-table-column>
+                            <el-table-column prop="price2" label="价格" width="300">
+                                <template slot-scope="scope">
+                                    <GuipSelect width="200px" @change="changeSelect(scope.row)" v-model="form.card"
+                                        prop="card" :options="options" defaultValue="选项1" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="操作(固定右)" width="200" fixed="right">
+                                <template slot-scope="scope">
                                     <div class="flex">
-                                        <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
-                                            scope.row.payment
-                                                ==
-                                            '0' ? '单元格局中' : '单元格局中' }}</span>
-                                             <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                             :hoverColor="'#006AFF'" />
+                                        <el-button @click="handleClick(scope.row)" type="text">查看</el-button>
+                                        <el-button type="text">编辑</el-button>
                                     </div>
-
-                                    </GuipToolTip>
+                                </template>
+                            </el-table-column>
+                        </GuipTable>
+                        <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
+                            :current-page="currentPage" :page-size=pageSize layout="prev, pager, next,jumper"
+                            :total="total">
+                        </el-pagination>
+                    </el-form>
+                </div>
+
+                <div>
+                    <h3 for="">表格(带气泡框),内容自定义：</h3>
+                    <el-form>
+                        <GuipTable :tableData="tableData2" :key="random()" ref="multipleTable"
+                            @selectChange="handleSelectionChange" :multiple="true" autoColumn="true" width="900px"
+                            :columns="columns" @confirm="onConfirm" @cancel="onCancel">
+                            <!-- 自定义姓名列的气泡框内容 -->
+                            <template #popover-content-name="{ row, column }">
+                                <div>
+                                    <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="排序"
+                                        :prop="column.label" placeholder="这是" />
+                                </div>
                             </template>
-
-                        </el-table-column>
-                        <el-table-column prop="name2" label="姓名" width="150"></el-table-column>
-                        <el-table-column prop="price" label="价格" width="150">
-                            <!-- <template slot-scope="scope">
-                            <span @click="handlePriceClick(scope.row)">{{ scope.row.price }}</span>
-                        </template> -->
-                            <!-- 气泡弹出框  后期样式自定义-->
-                            <!-- <template slot-scope="scope">
-                                <el-popover trigger="click" placement="top">
-                                    <input type="text">
-                                    <div slot="reference" class="name-wrapper">
-                                        <el-tag size="medium">{{ scope.row.price }}</el-tag>
-                                    </div>
-                                </el-popover>
-                            </template> -->
-                        </el-table-column>
-                        <el-table-column prop="address" label="地址1" width="150"> </el-table-column>
-                        <el-table-column prop="address" label="地址2"  width="250"> </el-table-column>
-                        <el-table-column prop="address" label="地址3"  width="150"> </el-table-column>
-                        <el-table-column prop="address1" label="地址测试" width="100"></el-table-column>
-                        <el-table-column prop="price2" label="价格" width="300">
-                            <template slot-scope="scope">
-                                <GuipSelect width="200px" @change="changeSelect(scope.row)" v-model="form.card"
-                                    prop="card" :options="options" defaultValue="选项1" />
+                            <template #popover-content-age="{ row, column }">
+                                <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="年龄"
+                                    :prop="column.label" placeholder="这是" unit="岁">
+                                </GuipInput>
                             </template>
-                        </el-table-column>
-                        <el-table-column label="操作(固定右)" width="200" fixed="right">
-                            <template slot-scope="scope">
-                                <div class="flex">
-                                    <el-button @click="handleClick(scope.row)" type="text">查看</el-button>
-                                    <el-button type="text">编辑</el-button>
+                            <!-- 自定义地址列的气泡框内容 -->
+                            <template #popover-content-address="{ row, column }">
+                                <div>
+                                    <p>自定义内容：{{ column.label }}</p>
+                                    <el-select v-model="row[`edit_${column.prop}`]" placeholder="请选择">
+                                        <el-option label="北京市" value="北京市" />
+                                        <el-option label="上海市" value="上海市" />
+                                        <el-option label="广州市" value="广州市" />
+                                    </el-select>
                                 </div>
                             </template>
-                        </el-table-column>
-                    </GuipTable>
-                    <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
-                        :current-page="currentPage" :page-size=pageSize layout="prev, pager, next,jumper"
-                        :total="total">
-                    </el-pagination>
-                </el-form>
-            </div>
-
-            <div>
-                <h3 for="">表格(带气泡框),内容自定义：</h3>
-                <el-form>
-                    <GuipTable :tableData="tableData2" :key="random()" ref="multipleTable"
-                        @selectChange="handleSelectionChange" :multiple="true" autoColumn="true" width="900px"
-                        :columns="columns" @confirm="onConfirm" @cancel="onCancel">
-                        <!-- 自定义姓名列的气泡框内容 -->
-                        <template #popover-content-name="{ row, column }">
-                            <div>
-                                <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="排序"
-                                    :prop="column.label" placeholder="这是" />
-                            </div>
-                        </template>
-                        <template #popover-content-age="{ row, column }">
-                            <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="年龄"
-                                :prop="column.label" placeholder="这是" unit="岁">
-                            </GuipInput>
-                        </template>
-                        <!-- 自定义地址列的气泡框内容 -->
-                        <template #popover-content-address="{ row, column }">
-                            <div>
-                                <p>自定义内容：{{ column.label }}</p>
-                                <el-select v-model="row[`edit_${column.prop}`]" placeholder="请选择">
-                                    <el-option label="北京市" value="北京市" />
-                                    <el-option label="上海市" value="上海市" />
-                                    <el-option label="广州市" value="广州市" />
-                                </el-select>
-                            </div>
-                        </template>
-                    </GuipTable>
-
-                </el-form>
+                        </GuipTable>
+
+                    </el-form>
+                </div>
+
+                <div class="ele-item">
+                    <label for="">文本域：</label>
+                    <GuipTextarea disabled :styleObject="styleObject" />
+                </div>
+
+
+                <div class="ele-item">
+                    <label for="">输入框：</label>
+                    <GuipInput ref="GuipInput" width="200px" height="30px" disabled placeholder="这是自定义默认提示语" />
+
+                    <div style="width: 20px;height: 10px;"></div>
+
+                    <GuipInput ref="GuipInput" :styleObject="styleObject1" defaultValue="爱吃麻辣烫" :maxlength="100"
+                        @change="handleInput" @blur="handleInput" @input="handleInput" @focus="handleInput"
+                        placeholder="这是自定义默认提示语" />
+
+                    <div style="width: 20px;height: 10px;"></div>
+
+                    <GuipInput :defaultValue="defaultValue" @clear="handleClear" width="400px">
+                        <span slot="prependshow">http:</span>
+                        <img slot="prefix" src="../assets/radio_checked.svg" alt="">
+                        <!-- 输入框后面小图标 -事件自定义 -->
+                        <i slot="suffix" class="el-icon-close" @click="handleClear"></i>
+                        <!-- <img slot="suffix" src="../assets/radio_nochecked.svg" alt="" @click="handleClear"> -->
+
+                        <!-- 这个 appendshow 宽度 居中方式 自定义添加类名修改-->
+                        <!-- <GuipButton slot="appendshow" size="mini">默认按钮</GuipButton> -->
+
+                        <!-- 这个 appendshow 宽度 居中方式 自定义添加类名修改-->
+                        <span slot="appendshow">.checkcopy.com</span>
+                    </GuipInput>
+                    <!-- <el-input placeholder="oieuwroieuwi" style="width:400px;height:60px"></el-input> -->
+                </div>
+                <div class="ele-item">
+                    <label for="">单选框：</label>
+                    <el-radio v-model="radio1" :label="1">选项一</el-radio>
+                    <el-radio v-model="radio1" :label="2">选项二</el-radio>
+                </div>
+
+                <div class="ele-item">
+                    <label for="">单选框组：</label>
+                    <el-radio-group v-model="radio" @input="radioChange">
+                        <el-radio :label="3">备选项</el-radio>
+                        <el-radio :label="6">备选项</el-radio>
+                        <el-radio :label="9">备选项</el-radio>
+                    </el-radio-group>
+                </div>
+                <div class="ele-item">
+                    <label for="">按钮尺寸：</label>
+                    <GuipButton size="superBig">加盟并进入后台</GuipButton>
+                    <GuipButton size="big">准备完毕，验证自有域名</GuipButton>
+                    <GuipButton size="page">下一步</GuipButton>
+                    <GuipButton size="primary">保存</GuipButton>
+                    <GuipButton size="table">新增站点</GuipButton>
+                    <GuipButton size="form">前往添加</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">强按钮：</label>
+                    <!-- 默认 type= primary  normal 样式 -->
+                    <GuipButton>默认</GuipButton>
+                    <GuipButton loading>按钮</GuipButton>
+                    <GuipButton disabled>按钮</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">弱按钮：</label>
+                    <GuipButton type="ignore">按钮</GuipButton>
+                    <GuipButton type="ignore" loading>按钮</GuipButton>
+                    <GuipButton type="ignore" disabled>按钮</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">中按钮：</label>
+                    <GuipButton type="system">按钮</GuipButton>
+                    <GuipButton type="system" loading>按钮</GuipButton>
+                    <GuipButton type="system" disabled>按钮</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">文字按钮：</label>
+                    <GuipButton type="text" >强引导</GuipButton>
+                    <GuipButton type="grey" >弱引导</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">独特按钮：可以自定义划过时 图标图片、文字颜色</label>
+                    <hover-button button-text="上传文件" :default-icon="require('../assets/upLoad_grey.svg')"
+                        :hover-icon="require('../assets/upLoad_active.svg')" default-text-color="#23242B"
+                        hover-text-color="#006AFF" @click="btnClick" />
+                </div>
+                <div class="ele-item">
+                    <label for="">独特按钮单独写样式：</label>
+                    <div class="btn1">创建首个网站</div>
+                </div>
+                <!-- 暂时废弃 -->
+                <!-- <div class="ele-item">
+                    <label for="">常规按钮：</label>
+                    <GuipButton>默认按钮</GuipButton>
+                    <GuipButton type="mild" size="medium">轻度按钮</GuipButton>
+                    <GuipButton type="primary">按钮</GuipButton>
+                    <GuipButton type="reverseMild">按钮</GuipButton>
+                    <GuipButton type="primary" loading>按钮</GuipButton>
+                    <GuipButton type="success" :plain="plain">按钮</GuipButton>
+                    <GuipButton type="info" :plain="plain">按钮</GuipButton>
+                    <GuipButton type="warning" :plain="plain">按钮</GuipButton>
+                    <GuipButton type="danger" :plain="plain">按钮</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">禁用按钮：</label>
+                    <GuipButton disabled>默认按钮</GuipButton>
+                    <GuipButton type="mild" disabled size="medium">轻度按钮</GuipButton>
+                    <GuipButton type="reverseMild" disabled>按钮</GuipButton>
+                    <GuipButton type="primary" size="medium" disabled>按钮</GuipButton>
+                    <GuipButton type="success" disabled>按钮</GuipButton>
+                    <GuipButton type="info" disabled>按钮</GuipButton>
+                    <GuipButton type="warning" disabled>按钮</GuipButton>
+                    <GuipButton type="danger" disabled>按钮</GuipButton>
+                </div>
+                <div class="ele-item">
+                    <label for="">三种尺寸按钮：</label>
+                    <GuipButton type="primary">默认按钮</GuipButton>
+                    <GuipButton type="primary" size="medium">中等按钮</GuipButton>
+                    <GuipButton type="primary" size="small">小的按钮</GuipButton>
+                    <GuipButton type="primary" size="mini">迷你按钮</GuipButton>
+                </div> -->
+                <div class="ele-item">
+                    <label for="">自定义宽高按钮：</label>
+                    <GuipButton type="primary" :btnstyle="btnstyleObj">宽高自定义</GuipButton>
+                </div>
+
+                <div class="ele-item">
+                    <label for="">提示：</label>
+                    <GuipButton type="system" @click="openMessage('success')">成功提示</GuipButton>
+                    <GuipButton type="system" @click="openMessage('error')"> 失败提示</GuipButton>
+                    <GuipButton type="system"  @click="openMessage('info')">警告提示</GuipButton>
+                </div>
+
+                <div style="width: 600px;">
+                    <h3>表单左右布局（直接使用封装好的input）</h3>
+                    <!-- 表单左右布局 -->
+                    <GuipInput ref="GuipInput" addClass="w510" v-model="form.username" label="Username" prop="username"
+                        :rules="usernameRules" placeholder="这是自定义默认提11示语" />
+                </div>
+
+                <div style="width: 800px;height: 150px;">
+                    <h3>表单上下布局 (宽度 510 388 用的最多 已有这2种宽度类名设置)</h3>
+                    <GuipInput ref="GuipInput" column="column" addClass="w510" label="age" desc="这是是右侧文案" v-model="form.age"
+                        prop="age" placeholder="这是自定义默认提示语" />
+                </div>
+
+                <div class="ele-item">
+                    <label for="">开关L</label>
+                    <GuipSwitch :modelValue="switchValue" activeText="开启" inactiveText="关闭" @change="onSwitchChange">
+                    </GuipSwitch>
+                </div>
+                <el-table
+        :data="tableData3"
+        :span-method="objectSpanMethod"
+        :border="true"
+        style="width: 100%; margin-top: 20px">
+        <el-table-column
+            prop="id"
+            label="ID"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            prop="name"
+            label="姓名">
+        </el-table-column>
+        <el-table-column
+            prop="amount1"
+            label="数值 1（元）">
+        </el-table-column>
+        <el-table-column
+            prop="amount2"
+            label="数值 2（元）">
+        </el-table-column>
+        <el-table-column
+            prop="amount3"
+            label="数值 3（元）">
+        </el-table-column>
+        </el-table>
+                <el-button type="primary" @click="submitForm">Submit</el-button>
+
+            </el-form>
+            <div style="width: 100%;margin: 20px 0;height: 20px;background-color: antiquewhite;">
+                --------------------分割线0------------------------------</div>
+
+            <div style="display: flex;" class="ele-item">
+                <label for="">日期选择器</label>
+                <el-date-picker v-model="date1" type="daterange" range-separator="至" start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                </el-date-picker>
             </div>
 
-            <div class="ele-item">
-                <label for="">文本域：</label>
-                <GuipTextarea disabled :styleObject="styleObject" />
+            <div ref="ScaleBox" class="ScaleBox">
+                <!-- Form  组件-->
+                <!-- @headdenForm="headdenForm" -->
+                <!-- @changeSelect="changeSelect" -->
+                <!-- <GuipForm
+                    :fromItem="fromItem"
+                    :formNewList="formList"
+                    :detail="edit"
+                    :disabled="edit"
+                    ref="VabForm"
+                />
+                <div class="cardfooter" style="display: flex;">
+                    <el-button @click="cancellation">取消</el-button>
+                    <el-button @click="save" type="primary">保存</el-button>
+                </div> -->
             </div>
-
-
-            <div class="ele-item">
-                <label for="">输入框：</label>
-                <GuipInput ref="GuipInput" width="200px" height="30px" disabled placeholder="这是自定义默认提示语" />
-
-                <div style="width: 20px;height: 10px;"></div>
-
-                <GuipInput ref="GuipInput" :styleObject="styleObject1" defaultValue="爱吃麻辣烫" :maxlength="100"
-                    @change="handleInput" @blur="handleInput" @input="handleInput" @focus="handleInput"
-                    placeholder="这是自定义默认提示语" />
-
-                <div style="width: 20px;height: 10px;"></div>
-
-                <GuipInput :defaultValue="defaultValue" @clear="handleClear" width="400px">
-                    <span slot="prependshow">http:</span>
-                    <img slot="prefix" src="../assets/radio_checked.svg" alt="">
-                    <!-- 输入框后面小图标 -事件自定义 -->
-                    <i slot="suffix" class="el-icon-close" @click="handleClear"></i>
-                    <!-- <img slot="suffix" src="../assets/radio_nochecked.svg" alt="" @click="handleClear"> -->
-
-                    <!-- 这个 appendshow 宽度 居中方式 自定义添加类名修改-->
-                    <!-- <GuipButton slot="appendshow" size="mini">默认按钮</GuipButton> -->
-
-                    <!-- 这个 appendshow 宽度 居中方式 自定义添加类名修改-->
-                    <span slot="appendshow">.checkcopy.com</span>
-                </GuipInput>
-                <!-- <el-input placeholder="oieuwroieuwi" style="width:400px;height:60px"></el-input> -->
+            <div class="flex ele-item">
+                <label for="">一些功能集合</label>
+                <GuipButton type="primary" @click="openDialog">打开弹框</GuipButton>
+                <GuipButton type="primary" @click="openLoading" size="page">展示加载动画 2s</GuipButton>
             </div>
-            <div class="ele-item">
-                <label for="">单选框：</label>
-                <el-radio v-model="radio1" :label="1">选项一</el-radio>
-                <el-radio v-model="radio1" :label="2">选项二</el-radio>
+            <div class="flex ele-item">
+                <label for="">提示信息</label>
+                <GuipToolTip content="这是一个提示">
+                    <GuipButton type="primary" size="page">悬停查看提示</GuipButton>
+                </GuipToolTip>
+
+                <GuipToolTip placement="bottom" effect="light">
+                    <GuipButton type="primary" size="page">自定义提示内容</GuipButton>
+                    <template #content>
+                        <div style="max-width: 200px">
+                            <h4>自定义标题</h4>
+                            <p>这里可以放任何HTML内容</p>
+                            <el-button size="mini">甚至按钮</el-button>
+                        </div>
+                    </template>
+                </GuipToolTip>
+                <GuipToolTip placement="bottom" effect="light" content="点击进入编辑">
+                    <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+                                            :hoverColor="'#006AFF'" />
+                </GuipToolTip>
             </div>
 
-            <div class="ele-item">
-                <label for="">单选框组：</label>
-                <el-radio-group v-model="radio" @input="radioChange">
-                    <el-radio :label="3">备选项</el-radio>
-                    <el-radio :label="6">备选项</el-radio>
-                    <el-radio :label="9">备选项</el-radio>
-                </el-radio-group>
-            </div>
-            <div class="ele-item">
-                <label for="">按钮尺寸：</label>
-                <GuipButton size="superBig">加盟并进入后台</GuipButton>
-                <GuipButton size="big">准备完毕，验证自有域名</GuipButton>
-                <GuipButton size="page">下一步</GuipButton>
-                <GuipButton size="primary">保存</GuipButton>
-                <GuipButton size="table">新增站点</GuipButton>
-                <GuipButton size="form">前往添加</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">强按钮：</label>
-                <!-- 默认 type= primary  normal 样式 -->
-                <GuipButton>默认</GuipButton>
-                <GuipButton loading>按钮</GuipButton>
-                <GuipButton disabled>按钮</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">弱按钮：</label>
-                <GuipButton type="ignore">按钮</GuipButton>
-                <GuipButton type="ignore" loading>按钮</GuipButton>
-                <GuipButton type="ignore" disabled>按钮</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">中按钮：</label>
-                <GuipButton type="system">按钮</GuipButton>
-                <GuipButton type="system" loading>按钮</GuipButton>
-                <GuipButton type="system" disabled>按钮</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">文字按钮：</label>
-                <GuipButton type="text" >强引导</GuipButton>
-                <GuipButton type="grey" >弱引导</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">独特按钮：可以自定义划过时 图标图片、文字颜色</label>
-                <hover-button button-text="上传文件" :default-icon="require('../assets/upLoad_grey.svg')"
-                    :hover-icon="require('../assets/upLoad_active.svg')" default-text-color="#23242B"
-                    hover-text-color="#006AFF" @click="btnClick" />
-            </div>
-            <div class="ele-item">
-                <label for="">独特按钮单独写样式：</label>
-                <div class="btn1">创建首个网站</div>
-            </div>
-            <!-- 暂时废弃 -->
-            <!-- <div class="ele-item">
-                <label for="">常规按钮：</label>
-                <GuipButton>默认按钮</GuipButton>
-                <GuipButton type="mild" size="medium">轻度按钮</GuipButton>
-                <GuipButton type="primary">按钮</GuipButton>
-                <GuipButton type="reverseMild">按钮</GuipButton>
-                <GuipButton type="primary" loading>按钮</GuipButton>
-                <GuipButton type="success" :plain="plain">按钮</GuipButton>
-                <GuipButton type="info" :plain="plain">按钮</GuipButton>
-                <GuipButton type="warning" :plain="plain">按钮</GuipButton>
-                <GuipButton type="danger" :plain="plain">按钮</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">禁用按钮：</label>
-                <GuipButton disabled>默认按钮</GuipButton>
-                <GuipButton type="mild" disabled size="medium">轻度按钮</GuipButton>
-                <GuipButton type="reverseMild" disabled>按钮</GuipButton>
-                <GuipButton type="primary" size="medium" disabled>按钮</GuipButton>
-                <GuipButton type="success" disabled>按钮</GuipButton>
-                <GuipButton type="info" disabled>按钮</GuipButton>
-                <GuipButton type="warning" disabled>按钮</GuipButton>
-                <GuipButton type="danger" disabled>按钮</GuipButton>
-            </div>
-            <div class="ele-item">
-                <label for="">三种尺寸按钮：</label>
-                <GuipButton type="primary">默认按钮</GuipButton>
-                <GuipButton type="primary" size="medium">中等按钮</GuipButton>
-                <GuipButton type="primary" size="small">小的按钮</GuipButton>
-                <GuipButton type="primary" size="mini">迷你按钮</GuipButton>
-            </div> -->
-            <div class="ele-item">
-                <label for="">自定义宽高按钮：</label>
-                <GuipButton type="primary" :btnstyle="btnstyleObj">宽高自定义</GuipButton>
-            </div>
-
-            <div class="ele-item">
-                <label for="">提示：</label>
-                <GuipButton type="system" @click="openMessage('success')">成功提示</GuipButton>
-                <GuipButton type="system" @click="openMessage('error')"> 失败提示</GuipButton>
-                <GuipButton type="system"  @click="openMessage('info')">警告提示</GuipButton>
-            </div>
-
-            <div style="width: 600px;">
-                <h3>表单左右布局（直接使用封装好的input）</h3>
-                <!-- 表单左右布局 -->
-                <GuipInput ref="GuipInput" addClass="w510" v-model="form.username" label="Username" prop="username"
-                    :rules="usernameRules" placeholder="这是自定义默认提11示语" />
-            </div>
-
-            <div style="width: 800px;height: 150px;">
-                <h3>表单上下布局 (宽度 510 388 用的最多 已有这2种宽度类名设置)</h3>
-                <GuipInput ref="GuipInput" column="column" addClass="w510" label="age" desc="这是是右侧文案" v-model="form.age"
-                    prop="age" placeholder="这是自定义默认提示语" />
-            </div>
-
-            <div class="ele-item">
-                <label for="">开关L</label>
-                <GuipSwitch v-model="switchValue" activeText="开启" inactiveText="关闭" @change="onSwitchChange">
-                </GuipSwitch>
-            </div>
-            <el-table
-      :data="tableData3"
-      :span-method="objectSpanMethod"
-      :border="true"
-      style="width: 100%; margin-top: 20px">
-      <el-table-column
-        prop="id"
-        label="ID"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="姓名">
-      </el-table-column>
-      <el-table-column
-        prop="amount1"
-        label="数值 1（元）">
-      </el-table-column>
-      <el-table-column
-        prop="amount2"
-        label="数值 2（元）">
-      </el-table-column>
-      <el-table-column
-        prop="amount3"
-        label="数值 3（元）">
-      </el-table-column>
-    </el-table>
-            <el-button type="primary" @click="submitForm">Submit</el-button>
-
-        </el-form>
-        <div style="width: 100%;margin: 20px 0;height: 20px;background-color: antiquewhite;">
-            --------------------分割线0------------------------------</div>
-
-        <div style="display: flex;" class="ele-item">
-            <label for="">日期选择器</label>
-            <el-date-picker v-model="date1" type="daterange" range-separator="至" start-placeholder="开始日期"
-                end-placeholder="结束日期">
-            </el-date-picker>
+            <GuipDialog :dialogVisible="dialogVisible" title="自定义标题" :show-close-button="false"
+                :show-cancel-button="showCancelButton" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
+                @dialogVisibleChange="dialogVisibleChange">
+                <!-- 自定义内容 -->
+                <div>
+                    <p>这是一个自定义内容的弹框。</p>
+                </div>
+            </GuipDialog>
         </div>
-
-        <div ref="ScaleBox" class="ScaleBox">
-            <!-- Form  组件-->
-            <!-- @headdenForm="headdenForm" -->
-            <!-- @changeSelect="changeSelect" -->
-            <!-- <GuipForm
-                :fromItem="fromItem"
-                :formNewList="formList"
-                :detail="edit"
-                :disabled="edit"
-                ref="VabForm"
-            />
-            <div class="cardfooter" style="display: flex;">
-                <el-button @click="cancellation">取消</el-button>
-                <el-button @click="save" type="primary">保存</el-button>
-            </div> -->
-        </div>
-        <div class="flex ele-item">
-            <label for="">一些功能集合</label>
-            <GuipButton type="primary" @click="openDialog">打开弹框</GuipButton>
-            <GuipButton type="primary" @click="openLoading" size="page">展示加载动画 2s</GuipButton>
-        </div>
-        <div class="flex ele-item">
-            <label for="">提示信息</label>
-            <GuipToolTip content="这是一个提示">
-                <GuipButton type="primary" size="page">悬停查看提示</GuipButton>
-            </GuipToolTip>
-
-            <GuipToolTip placement="bottom" effect="light">
-                <GuipButton type="primary" size="page">自定义提示内容</GuipButton>
-                <template #content>
-                    <div style="max-width: 200px">
-                        <h4>自定义标题</h4>
-                        <p>这里可以放任何HTML内容</p>
-                        <el-button size="mini">甚至按钮</el-button>
-                    </div>
-                </template>
-            </GuipToolTip>
-            <GuipToolTip placement="bottom" effect="light" content="点击进入编辑">
-                <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                        :hoverColor="'#006AFF'" />
-            </GuipToolTip>
-        </div>
-
-        <GuipDialog :dialogVisible="dialogVisible" title="自定义标题" :show-close-button="false"
-            :show-cancel-button="showCancelButton" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
-            @dialogVisibleChange="dialogVisibleChange">
-            <!-- 自定义内容 -->
-            <div>
-                <p>这是一个自定义内容的弹框。</p>
-            </div>
-        </GuipDialog>
     </div>
 </template>
 

From 7fa729c32832b1642792cbfc13e35208f956f988 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Mon, 16 Jun 2025 15:18:05 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 babel.config.js                 |   2 +-
 package-lock.json               |   8 +
 package.json                    |   1 +
 src/assets/menu/home.svg        |   1 +
 src/assets/menu/orderList.svg   |   1 +
 src/components/GuipButton.vue   |   1 +
 src/components/GuipDialog.vue   |   1 +
 src/components/GuipInput.vue    |  13 +-
 src/components/GuipRadio.vue    |   1 +
 src/components/GuipSelect.vue   |   3 +-
 src/components/GuipSwitch.vue   |   3 +-
 src/components/GuipTextarea.vue |   8 +-
 src/components/SetLeftMenu.vue  |   2 +-
 src/router/admin-routes.json    |   0
 src/router/client-routes.json   |   0
 src/store/index.js              |   6 +-
 src/style/theme/common.scss     |  12 +-
 src/style/theme/index.css       |   3 +
 src/views/Register.vue          |   3 +-
 src/views/elementGroups.vue     | 449 ++++++++++++++++++++--------------------
 vue.config.js                   |  17 ++
 21 files changed, 294 insertions(+), 241 deletions(-)
 create mode 100644 src/assets/menu/home.svg
 create mode 100644 src/assets/menu/orderList.svg
 create mode 100644 src/router/admin-routes.json
 create mode 100644 src/router/client-routes.json

diff --git a/babel.config.js b/babel.config.js
index e396c26..67657de 100755
--- a/babel.config.js
+++ b/babel.config.js
@@ -20,6 +20,6 @@ module.exports = {
   plugins: [
     // 可以添加其他Babel插件
     '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-transform-runtime',
+    '@babel/plugin-transform-runtime'
   ],
 };
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index a97fcfd..d9d620d 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,6 +30,7 @@
         "@vue/cli-plugin-vuex": "~5.0.0",
         "@vue/cli-service": "~5.0.0",
         "babel-loader": "^9.2.1",
+        "babel-plugin-transform-remove-console": "^6.9.4",
         "eslint": "^7.32.0",
         "eslint-plugin-vue": "^8.0.3",
         "sass": "^1.32.7",
@@ -3837,6 +3838,13 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/babel-plugin-transform-remove-console": {
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+      "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
diff --git a/package.json b/package.json
index b0f119b..9e024cc 100755
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "babel-loader": "^9.2.1",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "sass": "^1.32.7",
diff --git a/src/assets/menu/home.svg b/src/assets/menu/home.svg
new file mode 100644
index 0000000..d385bd5
--- /dev/null
+++ b/src/assets/menu/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16.0999755859375" height="16.2783203125" viewBox="0 0 16.0999755859375 16.2783203125"><g><g><path d="M14.799951124191285,8.740126200208664L14.799951124191285,8.528216200208664Q14.799951124191285,8.454346200208663,14.785551124191285,8.381896200208665Q14.771151124191285,8.309446200208665,14.742951124191285,8.241206200208664Q14.714651124191285,8.172956200208663,14.673551124191285,8.111536200208665Q14.632551124191284,8.050116200208663,14.580351124191283,7.997886200208664Q14.528051124191284,7.945656200208664,14.466651124191284,7.904616200208664Q14.405251124191285,7.863576200208664,14.337051124191284,7.835306200208664Q14.268751124191285,7.807036200208664,14.196351124191285,7.792626200208664Q14.123851124191285,7.778216200208664,14.049951124191285,7.778216200208664Q13.822751124191285,7.778216200208664,13.633651124191283,7.904386200208664Q13.556651124191283,7.9557662002086635,13.494451124191285,8.024316200208663Q13.432351124191284,8.092876200208664,13.388651124191284,8.174486200208664Q13.345051124191285,8.256106200208663,13.322551124191284,8.345886200208664Q13.299951124191285,8.435666200208663,13.299951124191285,8.528216200208664L13.299951124191285,13.528266200208664Q13.299951124191285,13.602066200208665,13.314451124191285,13.674566200208664Q13.328851124191285,13.746966200208664,13.357051124191285,13.815266200208663Q13.385351124191285,13.883466200208664,13.426351124191283,13.944866200208663Q13.467451124191284,14.006266200208664,13.519651124191284,14.058566200208665Q13.571851124191284,14.110766200208664,13.633351124191284,14.151866200208664Q13.694751124191285,14.192866200208664,13.762951124191284,14.221166200208664Q13.831251124191285,14.249366200208664,13.903651124191285,14.263766200208664Q13.976151124191285,14.278266200208664,14.049951124191285,14.278266200208664Q14.123851124191285,14.278266200208664,14.196351124191285,14.263766200208664Q14.268751124191285,14.249366200208664,14.337051124191284,14.221166200208664Q14.405251124191285,14.192866200208664,14.466651124191284,14.151866200208664Q14.528051124191284,14.110766200208664,14.580351124191283,14.058566200208665Q14.632551124191284,14.006266200208664,14.673551124191285,13.944866200208663Q14.714651124191285,13.883466200208664,14.742951124191285,13.815266200208663Q14.771151124191285,13.746966200208664,14.785551124191285,13.674566200208664Q14.799951124191285,13.602066200208665,14.799951124191285,13.528266200208664L14.799951124191285,8.740126200208664ZM2.4662811241912843,7.904346200208664Q2.277251124191284,7.778216200208664,2.0500011241912843,7.778216200208664Q1.9761311241912842,7.778216200208664,1.903681124191284,7.792626200208664Q1.8312311241912842,7.807036200208664,1.7629911241912841,7.835306200208664Q1.6947411241912842,7.863576200208664,1.6333211241912842,7.904616200208664Q1.5719011241912841,7.945656200208664,1.5196711241912841,7.997886200208664Q1.4674411241912841,8.050116200208663,1.4264011241912842,8.111536200208665Q1.3853611241912842,8.172956200208663,1.3570911241912842,8.241206200208664Q1.3288211241912842,8.309446200208665,1.3144111241912841,8.381896200208665Q1.300001124191284,8.454346200208663,1.300001124191284,8.528216200208664L1.300001124191284,13.528266200208664Q1.300001124191284,15.123066200208664,2.5725711241912843,15.809566200208664Q3.441171124191284,16.278266200208662,5.050001124191284,16.278266200208662L11.049951124191285,16.278266200208662Q11.123851124191285,16.278266200208662,11.196351124191285,16.263766200208664Q11.268751124191285,16.249366200208662,11.337051124191284,16.221166200208664Q11.405251124191285,16.192866200208663,11.466651124191284,16.151866200208666Q11.528051124191284,16.110766200208666,11.580351124191283,16.058566200208666Q11.632551124191284,16.006266200208664,11.673651124191284,15.944866200208663Q11.714651124191285,15.883466200208664,11.742951124191285,15.815266200208663Q11.771151124191285,15.746966200208664,11.785551124191285,15.674566200208664Q11.799951124191285,15.602066200208665,11.799951124191285,15.528266200208664Q11.799951124191285,15.379066200208664,11.742951124191285,15.241166200208664Q11.685851124191284,15.103366200208663,11.580351124191283,14.997866200208664Q11.474851124191284,14.892366200208665,11.337051124191284,14.835266200208665Q11.199151124191284,14.778266200208664,11.049951124191285,14.778266200208664L5.050001124191284,14.778266200208664Q3.8199911241912843,14.778266200208664,3.284791124191284,14.489466200208664Q2.8000011241912843,14.227966200208664,2.8000011241912843,13.528266200208664L2.8000011241912843,8.528216200208664Q2.8000011241912843,8.435656200208664,2.7774911241912843,8.345866200208665Q2.7549911241912843,8.256076200208664,2.7113311241912843,8.174456200208663Q2.6676711241912843,8.092836200208664,2.605471124191284,8.024286200208664Q2.543271124191284,7.955726200208664,2.4662811241912843,7.904346200208664ZM2.262331124191284,6.785086200208664L8.049951124191285,2.130356200208664L13.837551124191284,6.785086200208664L14.879551124191284,7.6230662002086635L14.879951124191285,7.623396200208664Q14.962551124191284,7.689886200208664,15.060451124191284,7.730836200208664Q15.158351124191284,7.7717862002086635,15.263751124191284,7.7839862002086635Q15.369151124191283,7.796186200208664,15.473751124191285,7.778666200208664Q15.578451124191284,7.761156200208664,15.674051124191283,7.715306200208664Q15.789651124191284,7.659916200208664,15.880251124191284,7.569286200208664L15.883751124191285,7.565766200208664Q15.910551124191285,7.538666200208664,15.934351124191284,7.508996200208664Q15.977451124191283,7.455416200208664,16.010151124191285,7.394896200208664Q16.042751124191284,7.334376200208664,16.063851124191284,7.268926200208664Q16.084951124191285,7.203486200208664,16.093751124191286,7.135296200208664Q16.102551124191283,7.067106200208664,16.098851124191285,6.998456200208664Q16.095151124191283,6.929796200208664,16.079051124191285,6.862956200208664Q16.062851124191283,6.796126200208664,16.034851124191285,6.733336200208664Q16.006851124191286,6.670546200208664,15.967851124191284,6.613896200208664Q15.928851124191285,6.557246200208664,15.880251124191284,6.508626200208664L15.876751124191284,6.505126200208664Q15.849651124191285,6.478386200208664,15.819951124191284,6.454526200208664L15.819551124191284,6.454196200208664L8.519991124191284,0.583456200208664Q8.470391124191284,0.5435642002086639,8.414771124191285,0.5126023002086639Q8.359161124191283,0.48164020020866394,8.299121124191284,0.4604932002086639Q8.239081124191284,0.43934620020866394,8.176341124191284,0.42861930020866396Q8.113601124191284,0.41789240550866397,8.049951124191285,0.41789240550866397Q7.986301124191284,0.41789240550866397,7.923561124191284,0.42861930020866396Q7.860811124191284,0.43934620020866394,7.8007811241912846,0.4604932002086639Q7.740741124191284,0.48164020020866394,7.685131124191284,0.5126023002086639Q7.629511124191284,0.5435642002086639,7.579911124191284,0.583456200208664L0.2799751241912842,6.4544762002086635L0.27991512419128417,6.454526200208664Q0.24830512419128417,6.479946200208664,0.21962112419128418,6.508626200208664Q0.19974712419128418,6.528506200208664,0.18141612419128417,6.549806200208664Q0.13888112419128418,6.599246200208664,0.10551812419128417,6.655286200208664Q0.07215522419128417,6.7113262002086636,0.04896552419128418,6.772276200208664Q0.02577582419128418,6.833236200208664,0.01345552419128418,6.897276200208664Q0.0011351941912841796,6.961316200208664,0.00005417519128417969,7.026526200208664Q-0.0010268468087158203,7.091736200208664,0.00916385419128418,7.156156200208664Q0.01935452419128418,7.220566200208664,0.04051102419128418,7.282256200208664Q0.06166762419128418,7.343946200208664,0.09315482419128418,7.401066200208664Q0.12464212419128418,7.458176200208664,0.16551512419128417,7.508996200208664Q0.19093712419128417,7.540606200208664,0.21962112419128418,7.569286200208664Q0.2394951241912842,7.5891662002086635,0.2608011241912842,7.607496200208664Q0.3362001241912842,7.672366200208664,0.4259021241912842,7.715346200208664Q0.5215741241912841,7.761176200208664,0.6262041241912841,7.778676200208664Q0.7308351241912842,7.796186200208664,0.8362161241912842,7.7839862002086635Q0.9415961241912841,7.771776200208664,1.0394611241912841,7.730826200208664Q1.1373211241912842,7.689886200208664,1.2199911241912842,7.623396200208664L1.2200511241912841,7.623346200208664L2.262331124191284,6.785086200208664Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M8.050000190734863,11.97893238067627Q9.027080190734864,11.97893238067627,9.966030190734863,11.35297038067627Q10.043080190734862,11.30160338067627,10.105320190734863,11.233037380676269Q10.167560190734864,11.16447238067627,10.211260190734864,11.08282638067627Q10.254950190734863,11.001180380676269,10.277480190734863,10.911358380676269Q10.300000190734863,10.82153738067627,10.300000190734863,10.728933380676269L10.299970190734863,10.72220038067627Q10.297960190734862,10.49879748067627,10.174040190734864,10.31290738067627Q10.122670190734864,10.23585638067627,10.054110190734864,10.17361438067627Q9.985540190734863,10.11137238067627,9.903890190734863,10.06767638067627Q9.822250190734863,10.02398138067627,9.732430190734863,10.00145738067627Q9.642600190734864,9.97893238067627,9.550000190734863,9.97893238067627L9.543270190734862,9.97896238067627Q9.319870190734864,9.980967380676269,9.133970190734864,10.104894380676269Q8.572920190734862,10.47893238067627,8.050000190734863,10.47893238067627Q7.5270821907348635,10.47893238067627,6.966025190734864,10.104894380676269Q6.7770821907348635,9.97893238067627,6.550000454971864,9.97893238067627L6.547120570734863,9.97893838067627Q6.454883490734863,9.97929238067627,6.365481190734863,10.00198538067627Q6.2760781907348635,10.024678380676269,6.194838190734863,10.06835738067627Q6.113598190734863,10.112036380676269,6.045362190734863,10.17409838067627Q5.977127190734864,10.236160380676269,5.925962190734864,10.31290738067627Q5.800000190734863,10.50185068067627,5.800000190734863,10.72893238067627L5.800005190734863,10.731812380676269Q5.800360190734863,10.82404938067627,5.823053190734863,10.91345138067627Q5.845746190734864,11.00285438067627,5.889425190734864,11.08409438067627Q5.933104190734864,11.165334380676269,5.995166190734864,11.23357038067627Q6.057228190734863,11.301805380676269,6.133975190734863,11.35297038067627Q7.072918190734863,11.97893238067627,8.050000190734863,11.97893238067627Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/menu/orderList.svg b/src/assets/menu/orderList.svg
new file mode 100644
index 0000000..fc0717f
--- /dev/null
+++ b/src/assets/menu/orderList.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><g><g></g><g><path d="M6.32635,2.7327339999999998Q6.38859,2.719143,6.44764,2.695249Q6.5067,2.671355,6.56088,2.637843Q6.61506,2.604331,6.66281,2.562161Q6.71056,2.519991,6.75051,2.470371Q6.79046,2.420751,6.82148,2.365103Q6.85249,2.309455,6.87367,2.249374Q6.89485,2.189292,6.9056,2.126499Q6.91634,2.063706,6.91634,2Q6.91634,1.9261314999999999,6.90193,1.853682Q6.88752,1.781233,6.85925,1.712987Q6.83098,1.644742,6.78995,1.583322Q6.74891,1.521903,6.69667,1.46967Q6.64444,1.417437,6.58302,1.376398Q6.5216,1.335359,6.45336,1.30709Q6.38511,1.278822,6.31266,1.264411Q6.24021,1.25,6.16634,1.25Q6.08541,1.25,6.00634,1.267267Q3.5139,1.811539,1.8938359999999999,3.79988Q0.25,5.817410000000001,0.25,8.42431Q0.25,11.45871,2.39565,13.6044Q4.54129,15.75,7.57569,15.75Q10.18259,15.75,12.2001,14.1062Q14.1875,12.4869,14.7322,9.99616L14.7326,9.99411L14.7327,9.99366L13.2673,9.67365L6.32635,2.7327339999999998Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g><g><path d="M7.25,1L7.25,8Q7.25,8.07387,7.264411,8.14632Q7.278822,8.21877,7.30709,8.28701Q7.335359,8.355260000000001,7.376398,8.41668Q7.417437,8.478100000000001,7.46967,8.53033Q7.521903,8.58256,7.583322,8.6236Q7.644742,8.66464,7.712987,8.692910000000001Q7.781233,8.72118,7.853682,8.73559Q7.9261315,8.75,8,8.75L15,8.75Q15.07387,8.75,15.14632,8.73559Q15.21877,8.72118,15.28701,8.692910000000001Q15.355260000000001,8.66464,15.41668,8.6236Q15.478100000000001,8.58256,15.53033,8.53033Q15.58256,8.478100000000001,15.6236,8.41668Q15.66464,8.355260000000001,15.692910000000001,8.28701Q15.72118,8.21877,15.73559,8.14632Q15.75,8.07387,15.75,8Q15.75,4.7898499999999995,13.480080000000001,2.51992Q11.21016,0.25,8,0.25Q7.9261315,0.25,7.853682,0.26441099999999995Q7.781233,0.278822,7.712987,0.30709Q7.644742,0.33535899999999996,7.583322,0.376398Q7.521903,0.41743699999999995,7.46967,0.46967000000000003Q7.417437,0.521903,7.376398,0.583322Q7.335359,0.6447419999999999,7.30709,0.712987Q7.278822,0.7812330000000001,7.264411,0.853682Q7.25,0.9261315,7.25,1ZM8.75,7.25L14.209869999999999,7.25Q13.97896,5.14012,12.419419999999999,3.58058Q10.85988,2.02104,8.75,1.7901310000000001L8.75,7.25Z" fill-rule="evenodd" fill="#626573" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
diff --git a/src/components/GuipButton.vue b/src/components/GuipButton.vue
index c2faa7e..a7f03d9 100644
--- a/src/components/GuipButton.vue
+++ b/src/components/GuipButton.vue
@@ -1,6 +1,7 @@
 <template>
   <el-button 
   :type="type" 
+  v-bind="$attrs"
   :plain="plain" 
   :loading="loading" 
   :size="size" 
diff --git a/src/components/GuipDialog.vue b/src/components/GuipDialog.vue
index 30e6161..630ad65 100644
--- a/src/components/GuipDialog.vue
+++ b/src/components/GuipDialog.vue
@@ -2,6 +2,7 @@
     <el-dialog
         :visible.sync="dialogShow"
         :title="title"
+        v-bind="$attrs"
         append-to-body
         :width="width"
         :show-close="showCloseButton"
diff --git a/src/components/GuipInput.vue b/src/components/GuipInput.vue
index a20eb62..a6465fb 100644
--- a/src/components/GuipInput.vue
+++ b/src/components/GuipInput.vue
@@ -6,6 +6,8 @@
   <p v-if="desc" class="desc_right">{{ desc }}</p>
     <el-input
       :type="type"
+
+      v-bind="$attrs"
       :placeholder="placeholder1"
       :disabled="disabled"
       :maxlength="maxlength1"
@@ -13,6 +15,7 @@
       :minLength="minLength1"
       :show-word-limit="showWordLimit"
       @input="$emit('input', $event)"
+       @keydown="handleKeydown"
       @change="$emit('change', $event)"
       @blur="$emit('blur', inputValue)"
       @focus="$emit('focus', inputValue)"
@@ -116,9 +119,9 @@
           // })
         })
         // console.log(el,'====9999');
-        // if(el&& this.styleObject){
+        // if(els&& this.styleObject){
         //   for(var key in this.styleObject){
-        //     el.style[key] = this.styleObject[key]
+        //     els.style[key] = this.styleObject[key]
         //   }
         // }
        })
@@ -132,6 +135,12 @@
     //   console.log('清除---');
     //   this.$emit('clear', '清楚逻辑')
     // }
+    handleKeydown(e) {
+      console.log(e);
+      // if (e.key === '1') {
+        e.preventDefault(); // 阻止默认行为
+      // }
+    },
    }
  }
  </script>
diff --git a/src/components/GuipRadio.vue b/src/components/GuipRadio.vue
index e40b28e..bfbdb64 100644
--- a/src/components/GuipRadio.vue
+++ b/src/components/GuipRadio.vue
@@ -4,6 +4,7 @@
     :label="label" :prop="prop" :rules="rules">
       <el-radio-group
         v-model="selectedValue"
+        v-bind="$attrs"
         @change="handleChange"
       >
         <el-radio
diff --git a/src/components/GuipSelect.vue b/src/components/GuipSelect.vue
index dfecbbf..4610e72 100644
--- a/src/components/GuipSelect.vue
+++ b/src/components/GuipSelect.vue
@@ -4,8 +4,7 @@
     :prop="prop" :rules="rules">
 
     <p v-if="desc" class="desc_right">{{ desc }}</p>
-
-    <el-select :style="{ width: width }" :placeholder="placeholder1" @change="handleChange" v-model="selectedValue">
+        <el-select :style="{ width: width }" :placeholder="placeholder1" @change="handleChange" v-model="selectedValue" v-bind="$attrs">
       <el-option v-for="item in options" :key="item.value" :label="item.label" :disabled="item.disabled"
         :value="item.value">
       </el-option>
diff --git a/src/components/GuipSwitch.vue b/src/components/GuipSwitch.vue
index 5852152..99043c2 100644
--- a/src/components/GuipSwitch.vue
+++ b/src/components/GuipSwitch.vue
@@ -3,7 +3,8 @@
         <div class="flex switchWrap">
             <span class="switchDesc" v-if="activeText || inactiveText">{{ internalValue ? activeText : inactiveText
                 }}</span>
-            <el-switch v-model="internalValue" :active-color="activeColor" :inactive-color="inactiveColor"
+
+            <el-switch v-model="internalValue" :active-color="activeColor" :inactive-color="inactiveColor" v-bind="$attrs"
                 :disabled="disabled || loading" @change="handleChange">
                 <!-- 自定义开启时的图标 -->
                 <template #active-icon>
diff --git a/src/components/GuipTextarea.vue b/src/components/GuipTextarea.vue
index 5320390..313d472 100644
--- a/src/components/GuipTextarea.vue
+++ b/src/components/GuipTextarea.vue
@@ -1,17 +1,19 @@
 <template>
    <el-input
     type="textarea"
+    v-bind="$attrs"
     :style="{...styleObject}"
-    :rows="2"
-    placeholder="请输入内容"
+    :rows="rows"
+    :placeholder="placeholder"
     v-model="textarea">
     </el-input>
   </template>
    
   <script>
+  // autosize 自适应高度
   export default {
     name: 'GuipTextarea',
-    props:['styleObject'],
+    props:['styleObject','rows','placeholder'],
     data() {
         return {
             textarea: ''
diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue
index fbc3bd7..727c21f 100644
--- a/src/components/SetLeftMenu.vue
+++ b/src/components/SetLeftMenu.vue
@@ -136,8 +136,8 @@ export default {
     this.calculateFloorOffsets();
     this.$nextTick(() => {
       // console.log(this.$parent.$refs.scrollContainer, 'this.$refs.scrollContainer--');
+      this.$parent.$refs.scrollContainer.addEventListener('scroll', this.handleScroll);
     })
-    this.$parent.$refs.scrollContainer.addEventListener('scroll', this.handleScroll);
   },
   created() {
     // console.log(this.$parent.$refs.scrollContainer,'this.$refs.sc--rollContainer--');
diff --git a/src/router/admin-routes.json b/src/router/admin-routes.json
new file mode 100644
index 0000000..e69de29
diff --git a/src/router/client-routes.json b/src/router/client-routes.json
new file mode 100644
index 0000000..e69de29
diff --git a/src/store/index.js b/src/store/index.js
index 9567471..87e4954 100755
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -98,12 +98,12 @@ export default new Vuex.Store({
         index: '1',
         title: '首页',
         path:'/',
-        icon: 'Totalprofit',
+        icon: 'home',
       },
       {
         index: '2',
-        title: '父级菜单1',
-        icon: 'Totalprofit',
+        title: '订单列表',
+        icon: 'orderList',
         children: [{
             index: '2-1',
             title: '子级菜单2-1',
diff --git a/src/style/theme/common.scss b/src/style/theme/common.scss
index 83578d3..4449eaf 100644
--- a/src/style/theme/common.scss
+++ b/src/style/theme/common.scss
@@ -13,6 +13,14 @@ body {
         padding: 0;
     }
 }
+/* 隐藏全局滚动条 */
+::-webkit-scrollbar {
+    display: none;
+  }
+  body {
+    scrollbar-width: none;
+    -ms-overflow-style: none;
+  }
 .element {
     overflow: hidden; /* 通用方法 */
     scrollbar-width: none; /* Firefox */
@@ -505,7 +513,7 @@ body {
 }
 
 .el-input__inner {
-    height: 39px;
+    height: 100%;
     padding: 10px 12px;
     border-radius: 4px;
 }
@@ -550,6 +558,7 @@ body {
     background: #F6F7FA !important;
     border-color: #DFE2E6 !important;
     color: #BABDC2 !important;
+    height: 100% !important;
 }
 
 .hoverclass {
@@ -675,6 +684,7 @@ body {
 .el-form-item__content {
     // width: 100%;
     flex: 1;
+    line-height: normal;
     position: relative;
 
     .desc_right {
diff --git a/src/style/theme/index.css b/src/style/theme/index.css
index e674b75..7114bd6 100644
--- a/src/style/theme/index.css
+++ b/src/style/theme/index.css
@@ -11204,6 +11204,9 @@ border-color:#006AFF !important;
     border-color: #006aff
 }
 
+.el-range-editor.el-input__inner:hover {
+    border-color: #006aff
+}
 .el-range-editor.is-active:hover {
     border-color: #006aff
 }
diff --git a/src/views/Register.vue b/src/views/Register.vue
index 9a3814b..f442a7c 100755
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -1217,7 +1217,8 @@ export default {
 
 
 .shortspan {
-  display: inline-block;
+  display: flex;
+  align-items: center;
   height: 38px;
   margin: 0 12px;
 }
diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue
index 97512f6..f0bd2f3 100644
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@@ -1,5 +1,5 @@
 <template>
-     <div class="main-content12">
+    <div class="main-content12">
         <div class="elementWrap">
             <!-- 以 ele-item 为类名的这种div、 label 、 h3 仅在此页面进行布局使用，复制时无需复制此元素 -->
             <el-form :model="form" :rules="rules" class="el-row demo-ruleForm" ref="formRef">
@@ -18,151 +18,130 @@
                     <h3 for="">表格：(表头自定义、自定义渲染、固定列)</h3>
                     <GuipButton type="primary" @click="toggleAllSelection">全选按钮</GuipButton>
 
-                    <el-form>
-                        <GuipTable :tableData="tableData" ref="multipleTable" @selectChange="handleSelectionChange"
-                            :multiple="true" autoColumn="true" :loading="tableLoading">
-                            <!-- <template slot="header"> -->
-                            <el-table-column width="180" fixed="left" label="名称(固定左)"></el-table-column>
-                            <!-- <el-table-column prop="type">
-                                <template slot="header">
-                                    <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
-                                        defaultValue="全部检测类型" @change="changeSelectType" />
-                                </template>
-
-                                <template slot-scope="scope">
-                                    {{ type2name[scope.row.type] }}
-                                </template>
-                            </el-table-column> -->
-
-                            <el-table-column prop="created_at" label="时间" width="200">
-                                <template slot-scope="scope">
-                                    <div class="flex cell_render">
-                                        <GuipToolTip content="文字居中">
-                                            <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
-                                                scope.row.payment
-                                                    ==
+
+                    <GuipTable :tableData="tableData2" ref="multipleTable" @selectChange="handleSelectionChange"
+                        :multiple="true" autoColumn="true" :loading="tableLoading" :border="true">
+                        <!-- <template slot="header"> -->
+                        <el-table-column width="180" fixed="left" label="名称(固定左)"></el-table-column>
+                        <el-table-column prop="created_at" label="时间" width="200">
+                            <template slot-scope="scope">
+                                <div class="flex cell_render">
+                                    <GuipToolTip content="文字居中">
+                                        <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
+                                            scope.row.payment
+                                                ==
                                                 '0' ? '文字居中' : '文字居中' }}</span>
-                                        </GuipToolTip>
-                                        <GuipToolTip content="图标居中">
-                                            <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                            :hoverColor="'#006AFF'" />
-                                        </GuipToolTip>
+                                    </GuipToolTip>
+                                    <GuipToolTip content="图标居中">
+                                        <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')"
+                                            :color="'#8A9099'" :hoverColor="'#006AFF'" />
+                                    </GuipToolTip>
 
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="unit_num" label="数量" width="180">
-                                <template slot-scope="scope">
-                                    <GuipToolTip content="单元格局中">
-                                        <div class="flex">
-                                            <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
-                                                scope.row.payment
-                                                    ==
-                                                '0' ? '单元格局中' : '单元格局中' }}</span>
-                                                <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                                :hoverColor="'#006AFF'" />
-                                        </div>
-
-                                        </GuipToolTip>
-                                </template>
-
-                            </el-table-column>
-                            <el-table-column prop="name2" label="姓名" width="150"></el-table-column>
-                            <el-table-column prop="price" label="价格" width="150">
-                                <!-- <template slot-scope="scope">
-                                <span @click="handlePriceClick(scope.row)">{{ scope.row.price }}</span>
-                            </template> -->
-                                <!-- 气泡弹出框  后期样式自定义-->
-                                <!-- <template slot-scope="scope">
-                                    <el-popover trigger="click" placement="top">
-                                        <input type="text">
-                                        <div slot="reference" class="name-wrapper">
-                                            <el-tag size="medium">{{ scope.row.price }}</el-tag>
-                                        </div>
-                                    </el-popover>
-                                </template> -->
-                            </el-table-column>
-                            <el-table-column prop="address" label="地址1" width="150"> </el-table-column>
-                            <el-table-column prop="address" label="地址2"  width="250"> </el-table-column>
-                            <el-table-column prop="address" label="地址3"  width="150"> </el-table-column>
-                            <el-table-column prop="address1" label="地址测试" width="100"></el-table-column>
-                            <el-table-column prop="price2" label="价格" width="300">
-                                <template slot-scope="scope">
-                                    <GuipSelect width="200px" @change="changeSelect(scope.row)" v-model="form.card"
-                                        prop="card" :options="options" defaultValue="选项1" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作(固定右)" width="200" fixed="right">
-                                <template slot-scope="scope">
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="unit_num" label="数量" width="180">
+                            <template slot-scope="scope">
+                                <GuipToolTip content="单元格局中">
                                     <div class="flex">
-                                        <el-button @click="handleClick(scope.row)" type="text">查看</el-button>
-                                        <el-button type="text">编辑</el-button>
+                                        <span :class="(scope.row.payment == '0' ? 'normal_payment' : 'self_payment')">{{
+                                            scope.row.payment
+                                                ==
+                                                '0' ? '单元格局中' : '单元格局中' }}</span>
+                                        <svg-icon :size="16" :path="require('@/assets/register/tableEdit.svg')"
+                                            :color="'#8A9099'" :hoverColor="'#006AFF'" />
                                     </div>
-                                </template>
-                            </el-table-column>
-                        </GuipTable>
-                        <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
-                            :current-page="currentPage" :page-size=pageSize layout="prev, pager, next,jumper"
-                            :total="total">
-                        </el-pagination>
-                    </el-form>
-                </div>
 
-                <div>
-                    <h3 for="">表格(带气泡框),内容自定义：</h3>
-                    <el-form>
-                        <GuipTable :tableData="tableData2" :key="random()" ref="multipleTable"
-                            @selectChange="handleSelectionChange" :multiple="true" autoColumn="true" width="900px"
-                            :columns="columns" @confirm="onConfirm" @cancel="onCancel">
-                            <!-- 自定义姓名列的气泡框内容 -->
-                            <template #popover-content-name="{ row, column }">
-                                <div>
-                                    <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="排序"
-                                        :prop="column.label" placeholder="这是" />
-                                </div>
+                                </GuipToolTip>
                             </template>
-                            <template #popover-content-age="{ row, column }">
-                                <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" label="年龄"
-                                    :prop="column.label" placeholder="这是" unit="岁">
-                                </GuipInput>
+
+                        </el-table-column>
+                        <el-table-column prop="name2" label="姓名" width="150"></el-table-column>
+                        <el-table-column prop="price" label="价格" width="150">
+                            <template slot-scope="scope">
+                                <span @click="handlePriceClick(scope.row)">{{ scope.row.price }}元</span>
                             </template>
-                            <!-- 自定义地址列的气泡框内容 -->
-                            <template #popover-content-address="{ row, column }">
-                                <div>
-                                    <p>自定义内容：{{ column.label }}</p>
-                                    <el-select v-model="row[`edit_${column.prop}`]" placeholder="请选择">
-                                        <el-option label="北京市" value="北京市" />
-                                        <el-option label="上海市" value="上海市" />
-                                        <el-option label="广州市" value="广州市" />
-                                    </el-select>
+                        </el-table-column>
+                        <el-table-column prop="address" label="地址1" width="150"> </el-table-column>
+                        <el-table-column prop="address" label="地址2" width="250"> </el-table-column>
+                        <el-table-column prop="address" label="地址3" width="150"> </el-table-column>
+                        <el-table-column prop="address1" label="地址测试" width="100"></el-table-column>
+                        <el-table-column prop="price" label="价格" width="300">
+                            <template slot-scope="scope">
+                                <GuipSelect width="200px" @change="changeSelect(scope.row)" v-model="form.card"
+                                    prop="card" :options="options" defaultValue="选项1" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作(固定右)" width="200" fixed="right">
+                            <template slot-scope="scope">
+                                <div class="flex">
+                                    <el-button @click="handleClick(scope.row)" type="text">查看</el-button>
+                                    <el-button type="text">编辑</el-button>
                                 </div>
                             </template>
-                        </GuipTable>
-
-                    </el-form>
+                        </el-table-column>
+                    </GuipTable>
+                    <el-pagination background @size-change='handleSizeChange' @current-change='handleCurrentChange'
+                        :current-page="currentPage" :page-size=pageSize layout="prev, pager, next,jumper"
+                        :total="total">
+                    </el-pagination>
+                </div>
+                <div class="flex">
+                    <h3 for="">表格(带气泡框),内容自定义：</h3>
+                    <a href="/register">点击一下跳转参照页面</a>
+                    <!-- 暂时废弃此版本 -->
+                    <!-- <GuipTable :tableData="tableData4" :key="random()" ref="multipleTable"
+                        @selectChange="handleSelectionChange" :multiple="true" autoColumn="true" width="900px"
+                        :columns="columns" @confirm="onConfirm" @cancel="onCancel">
+                        <template #popover-content-name="{ row, column }">
+                            <div>
+                                <GuipInput ref="GuipInput" width="252px" type="text"
+                                    v-model="row[`edit_${column.prop}`]" label="排序" :prop="column.label"
+                                    placeholder="这是" />
+                            </div>
+                        </template>
+                        <template #popover-content-age="{ row, column }">
+                            <GuipInput ref="GuipInput" width="252px" v-model="row[`edit_${column.prop}`]" type="text"
+                                label="年龄" :prop="column.label" placeholder="这是" unit="岁">
+                            </GuipInput>
+                        </template>
+                        <template #popover-content-address="{ row, column }">
+                            <div>
+                                <p>自定义内容：{{ column.label }}</p>
+                                <el-select v-model="row[`edit_${column.prop}`]" placeholder="请选择">
+                                    <el-option label="北京市" value="北京市" />
+                                    <el-option label="上海市" value="上海市" />
+                                    <el-option label="广州市" value="广州市" />
+                                </el-select>
+                            </div>
+                        </template>
+                    </GuipTable> -->
                 </div>
 
                 <div class="ele-item">
-                    <label for="">文本域：</label>
-                    <GuipTextarea disabled :styleObject="styleObject" />
+                    <label for="">文本域：固定行数</label>
+                    <GuipTextarea :styleObject="{ width: '450px' }" placeholder="固定行数" :rows="4" />
+                </div>
+                <div class="ele-item">
+                    <label for="">文本域：自适应高度</label>
+                    <GuipTextarea :styleObject="{ width: '450px' }" placeholder="自适应高度" autosize />
                 </div>
-
 
                 <div class="ele-item">
                     <label for="">输入框：</label>
-                    <GuipInput ref="GuipInput" width="200px" height="30px" disabled placeholder="这是自定义默认提示语" />
+                    <GuipInput ref="GuipInput" v-model="form.input1" width="200px" height="30px"
+                        placeholder="这是自定义默认提示语" />
 
                     <div style="width: 20px;height: 10px;"></div>
 
-                    <GuipInput ref="GuipInput" :styleObject="styleObject1" defaultValue="爱吃麻辣烫" :maxlength="100"
-                        @change="handleInput" @blur="handleInput" @input="handleInput" @focus="handleInput"
-                        placeholder="这是自定义默认提示语" />
+                    <GuipInput ref="GuipInput" v-model="form.input2" :maxlength="100" @change="handleInput"
+                        @blur="handleInput" @input="handleInput" @focus="handleInput" placeholder="这是自定义默认提示语" />
 
                     <div style="width: 20px;height: 10px;"></div>
 
-                    <GuipInput :defaultValue="defaultValue" @clear="handleClear" width="400px">
+                    <GuipInput v-model="form.input3" width="400px">
                         <span slot="prependshow">http:</span>
-                        <img slot="prefix" src="../assets/radio_checked.svg" alt="">
+                        <!-- <img slot="prefix" src="../assets/radio_checked.svg" alt=""> -->
                         <!-- 输入框后面小图标 -事件自定义 -->
                         <i slot="suffix" class="el-icon-close" @click="handleClear"></i>
                         <!-- <img slot="suffix" src="../assets/radio_nochecked.svg" alt="" @click="handleClear"> -->
@@ -219,8 +198,8 @@
                 </div>
                 <div class="ele-item">
                     <label for="">文字按钮：</label>
-                    <GuipButton type="text" >强引导</GuipButton>
-                    <GuipButton type="grey" >弱引导</GuipButton>
+                    <GuipButton type="text">强引导</GuipButton>
+                    <GuipButton type="grey">弱引导</GuipButton>
                 </div>
                 <div class="ele-item">
                     <label for="">独特按钮：可以自定义划过时 图标图片、文字颜色</label>
@@ -272,7 +251,7 @@
                     <label for="">提示：</label>
                     <GuipButton type="system" @click="openMessage('success')">成功提示</GuipButton>
                     <GuipButton type="system" @click="openMessage('error')"> 失败提示</GuipButton>
-                    <GuipButton type="system"  @click="openMessage('info')">警告提示</GuipButton>
+                    <GuipButton type="system" @click="openMessage('info')">警告提示</GuipButton>
                 </div>
 
                 <div style="width: 600px;">
@@ -284,8 +263,8 @@
 
                 <div style="width: 800px;height: 150px;">
                     <h3>表单上下布局 (宽度 510 388 用的最多 已有这2种宽度类名设置)</h3>
-                    <GuipInput ref="GuipInput" column="column" addClass="w510" label="age" desc="这是是右侧文案" v-model="form.age"
-                        prop="age" placeholder="这是自定义默认提示语" />
+                    <GuipInput ref="GuipInput" column="column" addClass="w510" label="age" desc="这是是右侧文案"
+                        v-model="form.age" prop="age" placeholder="这是自定义默认提示语" />
                 </div>
 
                 <div class="ele-item">
@@ -293,33 +272,6 @@
                     <GuipSwitch :modelValue="switchValue" activeText="开启" inactiveText="关闭" @change="onSwitchChange">
                     </GuipSwitch>
                 </div>
-                <el-table
-        :data="tableData3"
-        :span-method="objectSpanMethod"
-        :border="true"
-        style="width: 100%; margin-top: 20px">
-        <el-table-column
-            prop="id"
-            label="ID"
-            width="180">
-        </el-table-column>
-        <el-table-column
-            prop="name"
-            label="姓名">
-        </el-table-column>
-        <el-table-column
-            prop="amount1"
-            label="数值 1（元）">
-        </el-table-column>
-        <el-table-column
-            prop="amount2"
-            label="数值 2（元）">
-        </el-table-column>
-        <el-table-column
-            prop="amount3"
-            label="数值 3（元）">
-        </el-table-column>
-        </el-table>
                 <el-button type="primary" @click="submitForm">Submit</el-button>
 
             </el-form>
@@ -372,13 +324,13 @@
                 </GuipToolTip>
                 <GuipToolTip placement="bottom" effect="light" content="点击进入编辑">
                     <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
-                                            :hoverColor="'#006AFF'" />
+                        :hoverColor="'#006AFF'" />
                 </GuipToolTip>
             </div>
 
             <GuipDialog :dialogVisible="dialogVisible" title="自定义标题" :show-close-button="false"
-                :show-cancel-button="showCancelButton" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
-                @dialogVisibleChange="dialogVisibleChange">
+                :show-cancel-button="showCancelButton" @confirm="handleConfirm" @cancel="handleCancel"
+                @close="handleClose" @dialogVisibleChange="dialogVisibleChange">
                 <!-- 自定义内容 -->
                 <div>
                     <p>这是一个自定义内容的弹框。</p>
@@ -425,36 +377,36 @@ export default {
     data() {
         return {
             tableData3: [{
-          id: '12987122',
-          name: '王小虎',
-          amount1: '234',
-          amount2: '3.2',
-          amount3: 10
-        }, {
-          id: '12987123',
-          name: '王小虎',
-          amount1: '165',
-          amount2: '4.43',
-          amount3: 12
-        }, {
-          id: '12987124',
-          name: '王小虎',
-          amount1: '324',
-          amount2: '1.9',
-          amount3: 9
-        }, {
-          id: '12987125',
-          name: '王小虎',
-          amount1: '621',
-          amount2: '2.2',
-          amount3: 17
-        }, {
-          id: '12987126',
-          name: '王小虎',
-          amount1: '539',
-          amount2: '4.1',
-          amount3: 15
-        }],
+                id: '12987122',
+                name: '王小虎',
+                amount1: '234',
+                amount2: '3.2',
+                amount3: 10
+            }, {
+                id: '12987123',
+                name: '王小虎',
+                amount1: '165',
+                amount2: '4.43',
+                amount3: 12
+            }, {
+                id: '12987124',
+                name: '王小虎',
+                amount1: '324',
+                amount2: '1.9',
+                amount3: 9
+            }, {
+                id: '12987125',
+                name: '王小虎',
+                amount1: '621',
+                amount2: '2.2',
+                amount3: 17
+            }, {
+                id: '12987126',
+                name: '王小虎',
+                amount1: '539',
+                amount2: '4.1',
+                amount3: 15
+            }],
             tableWidth: 0,
             currentPage: 1,    //当前页
             pageSize: 5,   //每页的容量
@@ -469,6 +421,9 @@ export default {
             form: {
                 username: '',
                 language: '',
+                input1: '',
+                input2: '',
+                input3: '',
             },
             languageOptions: [
                 { label: 'JavaScript', value: 'js', selectedLabel: 'JavaScripthhhhhhhhhh' },
@@ -563,6 +518,44 @@ export default {
                 name: '王小虎',
                 address: '上海市普陀区金沙江路 1518 弄'
             }],
+            tableData4: [{
+                date: '2016-05-03',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄',
+                price: '20',
+                age: 20,
+                // 在支持修改的项目中，需要主动保留一份原始数据
+                edit_name: '王小虎', edit_address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+                date: '2016-05-02',
+                name: '王小虎11',
+                address: '上海市普陀区金沙江路 151811 弄',
+                price: '10',
+                age: 30,
+                edit_name: '王小虎11', edit_address: '上海市普陀区金沙江路 151811 弄'
+
+            }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄',
+                price: '200',
+            }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+                date: '2016-05-08',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+                date: '2016-05-06',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+                date: '2016-05-07',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+            }],
             // 表格列配置
             columns: [
                 { prop: 'name', label: '姓名（带气泡）', popover: true }, // 支持气泡框
@@ -617,7 +610,7 @@ export default {
                     label: "广州",
                 }
             ],
-            tableData:[],
+            tableData: [],
             input: 'hahhahah',
             defaultValue: 'asdasda',
             radio: 3,
@@ -634,8 +627,9 @@ export default {
                 borderRadius: '4px',
             },
             styleObject: {
-                width: '200px',
-                height: '40px'
+                minWidth: '200px',
+                maxWidth: '400px',
+                // height: '40px'
             },
             styleObject1: {
                 width: '600px',
@@ -681,47 +675,50 @@ export default {
 
     },
     methods: {
+        changeInputtest(e) {
+            console.log(e, '---000changeInputtest');
+        },
         arraySpanMethod({ row, column, rowIndex, columnIndex }) {
             console.log(row, column);
-        if (rowIndex % 2 === 0) {
-          if (columnIndex === 0) {
-            return [1, 2];
-          } else if (columnIndex === 1) {
-            return [0, 0];
-          }
-        }
-      },
-
-      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        console.log(row, column);
-
-        if (columnIndex === 0) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            };
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            };
-          }
-        }
-      },
+            if (rowIndex % 2 === 0) {
+                if (columnIndex === 0) {
+                    return [1, 2];
+                } else if (columnIndex === 1) {
+                    return [0, 0];
+                }
+            }
+        },
+
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            console.log(row, column);
+
+            if (columnIndex === 0) {
+                if (rowIndex % 2 === 0) {
+                    return {
+                        rowspan: 2,
+                        colspan: 1
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 0
+                    };
+                }
+            }
+        },
         openMessage(type) {
             console.log(type);
             // 单独指定方法调用
-            switch(type){
+            switch (type) {
                 case 'success':
                     this.$Message.success('成功，文案自定义')
-                break;
+                    break;
                 case 'error':
                     this.$Message.error('失败，文案自定义')
-                break;
+                    break;
                 case 'info':
                     this.$Message.info('提示，文案自定义')
-                break;
+                    break;
             }
             // 自定义选项
             // this.$Message({
@@ -755,8 +752,8 @@ export default {
                 type: 0,
                 cur_page: 1,
                 page_size: 5,
-            },{
-                headers:{
+            }, {
+                headers: {
                     'AUTH': '3c901fa4a19a7ad9d01238890863d499'
                 }
             }).then(response => {
@@ -829,8 +826,8 @@ export default {
         onConfirm(row, prop) {
             console.log('确认修改:', row, prop);
             this.$message.success('修改成功');
-            this.$set(this.tableData, row)
-            console.log(this.tableData, 'this.tableData=====');
+            this.$set(this.tableData4, row)
+            console.log(this.tableData4, 'this.tableData=====');
         },
         // 取消事件
         onCancel(row, prop) {
@@ -877,7 +874,7 @@ export default {
             console.log(value, 'value===输入框输入得知');
         },
         handleClear(value) {
-            this.defaultValue = '这是我清除后给的文案'
+            this.form.input3 = '这是我清除后给的文案'
             // this.handleInput('')
             console.log(value, 'value===qinghcu');
         },
diff --git a/vue.config.js b/vue.config.js
index d32f54a..5cd9a96 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const TerserPlugin = require('terser-webpack-plugin');
 module.exports = {
   // publicPath: '/new/',
   devServer: {
@@ -25,6 +26,22 @@ module.exports = {
         },
       ],
     },
+    optimization: {
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            format: {
+              comments: /^\**!|@preserve|@license|@cc_on/i // 保留特定注释
+            }
+          },
+          extractComments: false // 不提取注释到单独文件
+        })
+      ]
+    },
+    output: {
+      filename: '[name].[contenthash:8].js',
+      chunkFilename: '[name].[contenthash:8].js'
+    },
     resolve:{
       alias:{
         '@':path.resolve(__dirname, 'src/')