From 0cfae1ec9fd4c02e1002805547de3a772ce8f6a0 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 20 Oct 2023 17:47:55 +0800
Subject: [PATCH] 1

---
 src/components/merchantManagement/memberInfo.vue |  7 ++-
 src/style/index.less                             | 59 ++++++++++++++++++++++--
 src/views/main.vue                               |  5 +-
 src/views/merchantBack.vue                       | 10 ++--
 4 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 262f276..cad2596 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -19,7 +19,9 @@
         </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}}</a-menu-item>
+            <a-menu-item :key="item.teamName" @click="selectGroup(item)">{{item.teamName}}
+              <i></i>
+            </a-menu-item>
           </template>
         </a-menu>
       </div>
@@ -56,7 +58,7 @@
           <div slot="bigScreen">
             <a-switch default-checked @change="onChange" />
           </div>
-          <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #f40">
+          <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #1890FF">
             <a @click="showDetail('detail', record)">详情</a>
             <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a>
             <a v-if="loginUserInfo.agencyRole != 3" @click="deleteMemeber(record)">删除</a>
@@ -786,6 +788,7 @@ export default {
     flex: 1;
     padding-left: 16px;
     .addmemeber {
+      border: 0;
       padding: 0 12px;
       height: 32px;
       line-height: 32px;
diff --git a/src/style/index.less b/src/style/index.less
index 895d5bc..be48519 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -364,13 +364,13 @@ i {
 	font-size: 6px;
 }
 .f10 {
-	font-size: 10px;
+	font-size: 10px !important;
 }
 .f22 {
 	font-size: 22px;
 }
 .f12 {
-	font-size: 12px;
+	font-size: 12px !important;
 }
 .f14 {
 	font-size: 14px;
@@ -617,7 +617,7 @@ i {
 .logindropdown {
 	// left: 0;
 	// left: calc((100vw - 1200px) / 2 + 1013px) !important;
-	.loginbox {
+	.loginbox:not(.backTable) {
 		width: 180px;
 		// height: 114px;
 		overflow: hidden;
@@ -668,7 +668,60 @@ i {
 		}
 	}
 }
+.loginbox.backTable {
+  width: 180px;
+  // 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: 0 16px 16px 16px;
+  > div {
+    padding: 16px;
+    text-align: center;
+    font-size: 16px;
+    font-weight: bold;
+    border-bottom: 1px solid #eee;
+  }
+  > a {
+    > div {
+      display: flex;
+      padding: 16px 0;
+      font-size: 14px;
+      // font-weight: bold;
+      justify-content: space-between;
+      border-bottom: 1px solid #eee;
+      &:hover {
+        color: #1890ff;
+      }
+      span {
+        line-height: 18px;
+        i {
+          font-size: 18px;
+          margin-right: 5px;
+          vertical-align: baseline;
+        }
+      }
+    }
+  }
+  button {
+    width: 130px;
+    height: 32px;
+    margin-top: 24px;
+    border: 1px solid rgba(77, 87, 94, 0.1);
+    border-radius: 17px;
+    color: #1890ff;
+    font-size: 14px;
+    line-height: 32px;
+    background-color: #fff;
+    cursor: pointer;
+    &:hover{
+    border: 1px solid #1890ff;
 
+    }
+  }
+}
 .beforeblock {
 	display: inline-block;
 	vertical-align: middle;
diff --git a/src/views/main.vue b/src/views/main.vue
index 986dece..53f65f6 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -155,7 +155,7 @@
                 <i class="iconfont icon-youjiantou"></i>
               </div>
             </router-link>
-            <router-link to="/merchantBack">
+            <router-link to="/merchantBack" v-if="loginValue.agencyName == '郑州一才工作'">
               <div>
                 <span>
                   <i class="iconfont icon-zhanghaoshezhi"></i>商家后台
@@ -417,7 +417,7 @@ export default {
    */
   mounted() {
     this.loginValue = localStorage.getItem('LOGIN_DATA') !== null ? JSON.parse(localStorage.getItem('LOGIN_DATA')) : { tel: '' }
-    // console.log(this.loginValue);
+    console.log(this.loginValue)
     // console.log(document.querySelector(".ant-pagination-options-quick-jumper"));
   },
   // 组件方法
@@ -1070,6 +1070,5 @@ export default {
       border-color: #ff4400;
     }
   }
-
 }
 </style>
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 10ef20f..e749b18 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -17,7 +17,7 @@
             <template v-for="(item, index) in roles">
               <a-menu-item :key="item.name" v-if="item.path != '' && item.level < 3">
                 <router-link :to="{ name: item.name }">
-                  <a-icon :type="item.icon" />
+                  <i class="iconfont f12 mr8" :class="item.icon"/>
                   <a-badge dot v-if="myStatisticRedDot && item.name == 'myStatistic'">
                     <span class="nav-text" v-text="item.title"></span>
                   </a-badge>
@@ -26,7 +26,7 @@
               </a-menu-item>
               <a-sub-menu :key="item.name" v-if="item.path == ''">
                 <span slot="title">
-                  <a-icon :type="item.icon" />
+                  <i class="iconfont f12 mr8" :class="item.icon"/>
                   <span v-text="item.title"></span>
                 </span>
                 <a-menu-item-group>
@@ -52,7 +52,7 @@
                 <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:24px;height:24px;" alt v-else />
                 {{ userbaseInfo.userName }}
               </span>
-              <div class="loginbox" slot="overlay">
+              <div class="loginbox backTable" slot="overlay">
                 <div class="tal">
                   <img :src="userbaseInfo.imgSrc" alt v-if="userbaseInfo.imgSrc !== ''" style="border-radius:50%;width:24px;height:24px;" />
                   <span v-else class="iconfont icon-morentouxiang avatar"></span>
@@ -117,7 +117,7 @@ export default {
           parentId: '',
           name: ' dashboard',
           url: ' ',
-          icon: 'dashboard',
+          icon: 'icon-yibiaopan',
           component: '',
           path: '',
           title: '仪表盘',
@@ -157,7 +157,7 @@ export default {
           parentId: '',
           name: ' teammanagement',
           url: ' ',
-          icon: 'dashboard',
+          icon: 'icon-tuanduiguanli',
           component: '',
           path: '',
           title: '团队管理',