From 1d2d47dc1c7b3184201395ddd9ea270b3a059800 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 20 Oct 2023 18:11:49 +0800
Subject: [PATCH] 1

---
 src/components/merchantManagement/memberInfo.vue | 35 ++++++++++++++++++++++--
 src/style/index.less                             |  2 +-
 src/views/main.vue                               |  4 +--
 src/views/merchantBack.vue                       |  4 +--
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index cad2596..161dedd 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -19,8 +19,17 @@
         </div>
         <a-menu :selectedKeys="selectedKeys" :openKeys.sync="openKeys" @click="handleClick" class mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
           <template v-for="(item, index) in groupList">
-            <a-menu-item :key="item.teamName" @click="selectGroup(item)">{{item.teamName}}
-              <i></i>
+            <a-menu-item :key="item.teamName" class="fsa" @click="selectGroup(item)">
+              {{item.teamName}}
+              <a-dropdown overlayClassName="groupdropdown" trigger="['click']" placement="bottomCenter">
+                <i class="iconfont icon-gengduo3" @click.stop></i>
+                <div class="groupdropdownbox backTable" slot="overlay">
+                  <div>修改名称</div>
+                  <div @click="">删除</div>
+                  <div>上移</div>
+                  <div>下移</div>
+                </div>
+              </a-dropdown>
             </a-menu-item>
           </template>
         </a-menu>
@@ -925,7 +934,6 @@ export default {
         }
       }
     }
-
   }
 }
 .groupSelectDrop {
@@ -956,4 +964,25 @@ export default {
   display: flex;
   // justify-content: center;
 }
+.groupdropdown {
+  .groupdropdownbox {
+    width: 102px;
+    // height: 114px;
+    overflow: hidden;
+    background-color: #fff;
+    border-radius: 4px;
+    text-align: center;
+    box-shadow: 0px 0px 10px rgba(128, 128, 128, 0.4);
+    padding: 8px 0;
+    > div {
+      height: 32px;
+      line-height: 32px;
+      cursor: pointer;
+      &:hover {
+        background: #e7f3ff;
+        color: #1890ff;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/style/index.less b/src/style/index.less
index be48519..7008016 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/c/font_3135652_geqc7dg5evd.css";
+@import "http://at.alicdn.com/t/c/font_3135652_hpjxyx26ogf.css";
 
 // 初始化页面样式
 body,
diff --git a/src/views/main.vue b/src/views/main.vue
index 53f65f6..2bfae13 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -72,7 +72,7 @@
                     <i class="iconfont icon-youjiantou"></i>
                   </div>
                 </router-link>
-                <router-link to="/merchantBack">
+                <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
                   <div>
                     <span>
                       <i class="iconfont icon-zhanghaoshezhi"></i>商家后台
@@ -155,7 +155,7 @@
                 <i class="iconfont icon-youjiantou"></i>
               </div>
             </router-link>
-            <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作'">
+            <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
               <div>
                 <span>
                   <i class="iconfont icon-zhanghaoshezhi"></i>商家后台
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 3efd7ac..c11d0bd 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -219,7 +219,7 @@ export default {
 		  parentId: '',
 		  name: 'group',
 		  url: ' ',
-		  icon: 'bar-chart',
+		  icon: 'icon-shujutongji',
 		  component: '',
 		  path: '',
 		  title: '数据统计',
@@ -248,7 +248,7 @@ export default {
 		  parentId: '',
 		  name: 'container',
 		  url: ' ',
-		  icon: 'container',
+		  icon: 'icon-neirongguanli',
 		  component: '',
 		  path: '',
 		  title: '内容管理',