feature: 修改权限。

src/components/NavMenu.vue

@@ -7,6 +7,7 @@
     <div v-for="(item, key) in menus" :key="key">
       <el-sub-menu v-if="item.show && item.name != 'R-Shop'" teleported :index="key + ''">
         <template #title>
+          <!--          <el-icon v-if="item.icon"> <component :is="item.icon" /> </el-icon>-->
           <i class="iconfont" :class="item.icon"></i>
           <span class="title">{{ $t(item.name) }}</span>
         </template>

src/components/TabMenu.vue

@@ -17,7 +17,8 @@
       >
         <template #label>
           <span>
-            <i v-if="tab.icon" :class="tab.icon"></i>
+            <el-icon v-if="tab.icon"> <component :is="tab.icon" /> </el-icon>
+            <!--            <i v-if="tab.icon" :class="tab.icon"></i>-->
             {{ tab.title }}
           </span>
         </template>

src/config/index.ts

@@ -41,7 +41,7 @@ switch (c) {
     Host05 = 'http://103.171.34.61:8705'
     Host80 = 'http://192.168.0.30:8000'
     // Host85 = 'http://192.168.0.18:8500' // 高超本地
-    Host85 = 'http://192.168.0.24:8888' // 孔向阳本地
+    Host85 = 'http://192.168.0.24:8080' // 孔向阳本地
     // Host85 = 'http://103.158.191.66:8501' // 测试
     // Host85="http://192.168.0.30:8500"
     break

src/service/login.ts

@@ -13,10 +13,19 @@ class LoginService extends Service {
     return await this.post('/user/login', params)
   }
 
+  //登录
+  async LoginUser(params = {}) {
+    return await this.post('/api/admin/user/login', params)
+  }
+
   // 获取登录信息
   async CustomLoginInfo(params = {}) {
     return await this.post('/user/info', params)
   }
+  // 获取登录信息
+  async LoginInfo(params = {}) {
+    return await this.get('/api/permission/current-user', params)
+  }
 
   //登出
   async Logout(params = {}) {

src/views/home2/Home.vue

@@ -56,9 +56,9 @@
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
-            <el-icon class="crm-cursor" style="font-size: 20px; margin-left: 20px"
-              ><Bell
-            /></el-icon>
+            <el-icon class="crm-cursor" style="font-size: 20px; margin-left: 20px">
+              <Bell />
+            </el-icon>
             <i class="crm-cursor iconquanping iconfont icon" @click="fullScreen"></i>
             <el-dropdown trigger="click" class="username crm-cursor">
               <span class="el-dropdown-link">
@@ -253,16 +253,30 @@
   const initDisplay = () => {
     let display = {}
     const userData = safeGetUser(session)
-    if (userData && userData.display) {
-      userData.display.forEach((item) => {
+    // if (userData && userData.display) {
+    //   userData.display.forEach((item) => {
+    //     item.children.forEach((item1) => {
+    //       item1.children = Object.values(item1.btns)
+    //       item1.children.forEach((item2) => {
+    //         display[item2.code] = item2
+    //       })
+    //     })
+    //   })
+    // }
+    if (userData && userData.menuTree) {
+      userData.menuTree.forEach((item) => {
+        console.log(item, 'item')
         item.children.forEach((item1) => {
-          item1.children = Object.values(item1.btns)
-          item1.children.forEach((item2) => {
-            display[item2.code] = item2
+          console.log('item1', item1)
+          item1.children = Object.values(item1.buttons)
+          item1.children?.forEach((item2) => {
+            console.log('item2', item2)
+            display[item2.component] = item2
           })
         })
       })
     }
+    console.log(display, 'display')
     session.Set('display', JSON.stringify(display), true)
   }
 

src/views/login/index.vue

@@ -2,13 +2,15 @@
   <div id="signin" v-loading="loading">
     <div class="title">
       <i class="el-icon-unlock"></i>
-      <span v-t="'signin.title'"></span>
+      <span>
+        {{ t('signin.title') }}
+      </span>
     </div>
     <el-form ref="paramsRef" :model="params" :rules="rules" label-width="0" class="form">
       <el-form-item prop="loginName">
         <el-input
-          :prefix-icon="Message"
           v-model.trim="params.loginName"
+          :prefix-icon="Message"
           class="m-input"
           :placeholder="$t('signin.form.email')"
           @keyup.enter="login"
@@ -269,20 +271,22 @@
         dialogCheck_type.value === 1
           ? {
               loginName: params.loginName,
+              username: params.loginName,
               password: params.password,
               gaCode: dialogCheck_form.gaCode,
             }
           : {
               loginName: params.loginName,
+              username: params.loginName,
               password: params.password,
               emailCode: dialogCheck_form.emailCode,
             }
 
-      const res = await Service.Login(data)
+      const res = await Service.LoginUser(data)
       if (res.code === Code.StatusOK) {
         dialogCheck.value = false
-        sessionStorage.setItem('access_token', res.data)
-        axios.defaults.headers.common['Access-Token'] = res.data
+        sessionStorage.setItem('access_token', res.data.token)
+        axios.defaults.headers.common['Access-Token'] = res.data.token
         await getLoginInfo()
       } else {
         pigeon.MessageError(res.msg)
@@ -298,7 +302,7 @@
   // 获取登录信息
   const getLoginInfo = async () => {
     try {
-      const res = await Service.CustomLoginInfo()
+      const res = await Service.LoginInfo()
       if (res.code === Code.StatusOK) {
         store.commit('InitInfo', res.data)
         store.commit('InfoExpire', false)

src/views/page/Page.vue

@@ -4,8 +4,8 @@
       <router-view></router-view>
     </keep-alive>
     <!-- 高风险客户内转提醒 -->
-    <div class="financeRisk" v-if="financeRisk.length">
-      <div class="financeRisk_box" v-for="item in financeRisk" :key="item.id">
+    <div v-if="financeRisk.length" class="financeRisk">
+      <div v-for="item in financeRisk" :key="item.id" class="financeRisk_box">
         <div style="margin-top: 5px">
           <span>
             {{ $t('Dashboard.item1') }}
@@ -26,10 +26,10 @@
           <span>{{ item.depositLogin }}</span>
         </div>
         <div class="dialog-footer">
-          <el-button size="mini" type="primary" @click="toVerified(item.id, item)">
+          <el-button size="small" type="primary" @click="toVerified(item.id, item)">
             {{ $t('Dashboard.item4') }}
           </el-button>
-          <el-button size="mini" @click="cancel(item)">
+          <el-button size="small" @click="cancel(item)">
             {{ $t('Dashboard.item5') }}
           </el-button>
         </div>