Merge branch 'sqlsugar-dev' into sqlsugar

2022-05-08 14:46:35 +08:00
parent 7f4c7f607d d252229777
commit 47e6e48729
22 changed files with 150 additions and 263 deletions
--- a/WebFirst/database/sqlite.db
+++ b/WebFirst/database/sqlite.db
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
--- a/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
@@ -42,7 +42,7 @@ namespace Yi.Framework.Core

            foreach (var m in menus)
            {
-                claims.Add(new Claim("permission", m.PermissionCode));
+                claims.Add(new Claim("permission", m.PermissionCode.ToString()));
            }

            if (isRefresh)
--- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs
@@ -32,7 +32,7 @@ namespace Yi.Framework.Model.Models
        /// <summary>
        ///  
        ///</summary>
-         [SugarColumn(ColumnName= "PermissionCode")]
+         [SugarColumn(ColumnName="PermissionCode"    )]
         public string PermissionCode { get; set; }
        /// <summary>
        ///  
@@ -69,5 +69,15 @@ namespace Yi.Framework.Model.Models
        ///</summary>
         [SugarColumn(ColumnName="TenantId"    )]
         public long? TenantId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="MenuIcon"    )]
+         public string MenuIcon { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="Router"    )]
+         public string Router { get; set; }
    }
 }
--- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/RoleEntity.cs
@@ -54,5 +54,10 @@ namespace Yi.Framework.Model.Models
        ///</summary>
         [SugarColumn(ColumnName="ModifyUser"    )]
         public long? ModifyUser { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
+         [SugarColumn(ColumnName="RoleCode"    )]
+         public string RoleCode { get; set; }
    }
 }
--- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
@@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="NEST" Version="7.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.7.5" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.7.8" />
  </ItemGroup>

  <ItemGroup>
--- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
@@ -1,6 +1,7 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Yi.Framework.Common.Helper;
@@ -112,7 +113,7 @@ namespace Yi.Framework.Service
            //首先获取到该用户全部信息，导航到角色、菜单，(菜单需要去重,完全交给Set来处理即可)

            //得到用户
-            var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles, r => r.Menus).InSingleAsync(userId);
+            var user = await _repository._Db.Queryable<UserEntity>().Includes(u => u.Roles.Where(r=>r.IsDeleted==false).ToList(), r => r.Menus.Where(m=>m.IsDeleted==false).ToList()).InSingleAsync(userId);

            //得到角色集合
            var roleList = user.Roles;
--- a/Yi.Vue2.x/src/api/userApi.js
+++ b/Yi.Vue2.x/src/api/userApi.js
@@ -19,4 +19,12 @@ export default {
            method: 'get'
        })
    },
+    GiveUserSetRole(UserIds,RoleIds)
+    {
+        return myaxios({
+            url: `/User/GiveUserSetRole`,
+            method: 'put',
+            data:{UserIds,RoleIds}
+        })
+    }
 }
--- a/Yi.Vue2.x/src/components/ccAvatar.vue
+++ b/Yi.Vue2.x/src/components/ccAvatar.vue
@@ -2,7 +2,7 @@
        <v-avatar  :size="size" >
              <!-- <img src="https://z3.ax1x.com/2021/05/09/gJadhD.jpg" /> -->
              <img
-                :src="baseurl +'/image/'+$store.state.user.user.icon"
+                :src="baseurl +'/image/'+$store.state.user.user.user.icon"
              />
            </v-avatar>
 </template>
--- a/Yi.Vue2.x/src/components/ccCombobox.vue
+++ b/Yi.Vue2.x/src/components/ccCombobox.vue
@@ -58,6 +58,8 @@ export default {
  watch:{
     select:{//深度监听，可监听到对象、数组的变化
         handler(val, oldVal){
+             console.log(oldVal)
+           console.log(val)
              this.$emit("select",val);
         },
         deep:true
--- a/Yi.Vue2.x/src/components/ccTreeview.vue
+++ b/Yi.Vue2.x/src/components/ccTreeview.vue
@@ -52,10 +52,15 @@
      hoverable
      item-text="menuName"
    >
+        <template v-slot:prepend="{ item }">
+      <v-icon>
+        {{ item.menuIcon }}
+      </v-icon>
+    </template>
      <template v-slot:append="{ item }">
        <v-btn v-show="item.menuType==1" class="mr-2">权限:{{ item.permissionCode }}</v-btn>
        <!-- <v-btn class="mr-2">图标:{{ item.icon }}</v-btn> -->
-        <!-- <v-btn class="mr-2">路由:{{ item.router }}</v-btn> -->
+        <v-btn v-show="item.menuType!=1" class="mr-2">路由:{{ item.router }}</v-btn>
        <!-- <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
        <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn> -->
        <!-- <ccCombobox
@@ -101,9 +106,10 @@ export default {
    editedItem: {},
    editedIndex: -1,
    defaultItem: {
-      // icon: "mdi-start",
+      menuIcon: "mdi-view-dashboard",
      permissionCode: "test",
      menuName: "管理",
+      router:"/",
      parentId: 0,
      MenuType:0
    },
@@ -121,21 +127,16 @@ export default {
      this.$refs.tree.updateAll(true);
    },

-    // setMould(item) {
-    //   menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
-    //     this.$dialog.notify.info(resp.msg, {
-    //       position: "top-right",
-    //       timeout: 5000,
-    //     });
-    //     this.init();
-    //   });
-    // },

    getSelect(data) {
      this.mouldSelect = data;
    },
    async deleteItem(item) {
-      this.editedIndex = 1;
+      if(item!=null)
+      {
+   this.editedIndex = 1;
+      }
+   
      this.editedItem = Object.assign({}, item);
      var p = await this.$dialog.warning({
        text: "你确定要删除此条记录吗？?",
@@ -154,7 +155,7 @@ export default {
      if (this.editedIndex > -1) {
        Ids.push(this.editedItem.id);
      } else {
-        this.selection.forEach(function (item) {
+        this.selection.forEach( (item) =>{
          Ids.push(item.id);
        });
      }
@@ -200,6 +201,7 @@ export default {
    selection: {
      //深度监听，可监听到对象、数组的变化
      handler(val, oldVal) {
+
        this.$emit("selection", val);
      },
      deep: true,
--- a/Yi.Vue2.x/src/layouts/default/Drawer.vue
+++ b/Yi.Vue2.x/src/layouts/default/Drawer.vue
@@ -49,180 +49,16 @@
 <script>
 // Utilities
 // import { get, sync } from 'vuex-pathify'
-import userApi from "@/api/userApi";
+import store from "@/store/index.js";
+import { toTree } from "@/util/menuHandle";
 export default {
  methods: {
    init() {
-      //这里动态获取菜单，暂时写死
-      // userApi.GetMenuByHttpUser().then((resp) => {
-      //   this.items = resp.data.children;
-      // });
-      this.items = 
-      
-       [
-          {
-            icon: "mdi-view-dashboard",
-            router: "/",
-            menu_name: "首页",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: null,
-            id: 2,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-account-box-multiple",
-            router: null,
-            menu_name: "用户角色管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-account-box",
-                router: "/AdmUser/",
-                menu_name: "用户管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 3,
-                children: null,
-                id: 4,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-account-circle",
-                router: "/admrole/",
-                menu_name: "角色管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 3,
-                children: null,
-                id: 9,
-                is_delete: 0,
-              },
-            ],
-            id: 3,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-account-cash",
-            router: null,
-            menu_name: "角色接口管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-clipboard-check-multiple",
-                router: "/AdmMenu/",
-                menu_name: "菜单管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 15,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-circle-slice-8",
-                router: "/admMould/",
-                menu_name: "接口管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 20,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-clipboard-account",
-                router: "/admRoleMenu/",
-                menu_name: "角色菜单分配管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 14,
-                children: null,
-                id: 25,
-                is_delete: 0,
-              },
-            ],
-            id: 14,
-            is_delete: 0,
-          },
-          {
-            icon: "mdi-clipboard-flow-outline",
-            router: null,
-            menu_name: "路由管理",
-            roles: null,
-            mould: null,
-            is_top: 0,
-            sort: 0,
-            is_show: 1,
-            parentId: 1,
-            children: [
-              {
-                icon: "mdi-account-eye",
-                router: "/userinfo/",
-                menu_name: "用户信息",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 26,
-                children: null,
-                id: 27,
-                is_delete: 0,
-              },
-              {
-                icon: "mdi-account-eye",
-                router: "/pan",
-                menu_name: "云盘管理",
-                roles: null,
-                mould: null,
-                is_top: 0,
-                sort: 0,
-                is_show: 1,
-                parentId: 26,
-                children: null,
-                id: 28,
-                is_delete: 0,
-              },
-            ],
-            id: 26,
-            is_delete: 0,
-          },
-        ]
-
+      this.items=toTree( store.state.user.user.menus);
    },
    logout() {
-      this.$store.dispatch("Logout");
-      this.$router.push({ path: "/login" });
+      this.$store.dispatch("Logout")
+   this.$router.push({ path: "/login/" });
    },
  },
  created() {
--- a/Yi.Vue2.x/src/layouts/default/ListGroup.vue
+++ b/Yi.Vue2.x/src/layouts/default/ListGroup.vue
@@ -1,8 +1,8 @@
 <template>
-  <v-list-group :group="group" :prepend-icon="item.icon" eager v-bind="$attrs">
+  <v-list-group :group="group" :prepend-icon="item.menuIcon" eager v-bind="$attrs">
    <template v-slot:activator>
      <v-list-item-icon
-        v-if="!item.icon && !item.avatar"
+        v-if="!item.menuIcon && !item.avatar"
        class="text-caption text-uppercase text-center my-2 align-self-center"
        style="margin-top: 14px"
      >
@@ -13,8 +13,8 @@
        <v-img :src="item.avatar" />
      </v-list-item-avatar>

-      <v-list-item-content v-if="item.menu_name">
-        <v-list-item-title v-text="item.menu_name" />
+      <v-list-item-content v-if="item.menuName">
+        <v-list-item-title v-text="item.menuName" />
      </v-list-item-content>
    </template>

@@ -57,7 +57,7 @@ export default {
      return this.genGroup(this.item.children);
    },
    title() {
-      const matches = this.item.menu_name.match(/\b(\w)/g);
+      const matches = this.item.menuName.match(/\b(\w)/g);
      if (matches != null) {
        return matches.join("");
      }
--- a/Yi.Vue2.x/src/layouts/default/ListItem.vue
+++ b/Yi.Vue2.x/src/layouts/default/ListItem.vue
@@ -11,7 +11,7 @@
    v-on="$listeners"
  >
    <v-list-item-icon
-      v-if="!item.icon"
+      v-if="!item.menuIcon"
      class="text-caption text-uppercase justify-center ml-1 my-2 align-self-center"
    >
      {{ title }}
@@ -22,14 +22,14 @@
    </v-list-item-avatar>

    <v-list-item-icon
-      v-if="item.icon"
+      v-if="item.menuIcon"
      class="my-2 align-self-center"
    >
-      <v-icon v-text="item.icon" />
+      <v-icon v-text="item.menuIcon" />
    </v-list-item-icon>

-    <v-list-item-content v-if="item.menu_name">
-      <v-list-item-title v-text="item.menu_name" />
+    <v-list-item-content v-if="item.menuName">
+      <v-list-item-title v-text="item.menuName" />
    </v-list-item-content>
  </v-list-item>
 </template>
@@ -47,7 +47,7 @@

    computed: {
      title () {
-        const matches = this.item.menu_name.match(/\b(\w)/g)
+        const matches = this.item.menuName.match(/\b(\w)/g)
 if(matches!=null)
 {
        return matches.join('')
--- a/Yi.Vue2.x/src/permission.js
+++ b/Yi.Vue2.x/src/permission.js
@@ -4,6 +4,10 @@ import store from './store/index'


 router.beforeEach((to, from, next) => {
+
+    // console.log(to)
+    // console.log(from)
+    // console.log(next)
    const user = store.state.user.user; //获取是有user
    if (!user) { //如果没有登入
        if (to.path == '/login/' || to.path == '/register/' || to.path == '/reset_password/' || to.path == '/qq/') {
--- a/Yi.Vue2.x/src/store/modules/user.js
+++ b/Yi.Vue2.x/src/store/modules/user.js
@@ -38,7 +38,6 @@ const mutations = { //变化//载荷
    },
    SET_USER(state, user) {
        state.user = user
-        console.log(user)
        setUser(user)
    },
    SetGradient(state, gradient) {
@@ -87,19 +86,21 @@ const actions = { //动作
     

                    accountApi.getUserAllInfo().then(resp2=>{
-                        commit('SET_USER', resp2.data.user)
+                        commit('SET_USER', resp2.data)

                        var code=[];
                        resp2.data.menus.forEach(element => {
                            code.push(element.permissionCode)
                        });
                        commit('SET_PER', code)
+
                        resolv(resp)
                    })
-
-
                }
-           
+                else
+                {
+                    resolv(resp)
+                }
            }).catch(error => {
                reject(error)
            })
--- a/Yi.Vue2.x/src/util/menuDic.js
+++ b/Yi.Vue2.x/src/util/menuDic.js
@@ -27,3 +27,5 @@ export default {menuDic,btnDic};


 //如果查询找到的是user:*，可以先把*全部替换成get:list再进行比对即可
+
+//等待持续更新中
--- a/Yi.Vue2.x/src/util/menuHandle.js
+++ b/Yi.Vue2.x/src/util/menuHandle.js
@@ -1,29 +1,26 @@
-export function setTreeMenu(menuList) {
-    if (menuList != null && menuList.length > 0) {
+export function toTree(data) {
+    // 删除 所有 children,以防止多次调用
+    data.forEach(function (item) {
+        delete item.children;
+    });

-        //结果
-        var res;
-        //获取最小的parentId
-        var minParentId = 0;
-        //获取id=最小的parentId的菜单列表
-        var menuList1=menuList.filter((item)=>{item.parentId==minParentId}) ;
-
-        menuList1.forEach(element=>{
-            res.push(element)
-            var children=menuList.filter((item)=>{item.parentId==element.id}) ;
-            if (children.length > 0) {
-                setTreeChildren(menuList, children,element)
-            }
-        })
-    }
-}
-
-function setTreeChildren(menuList, childrenList,model) {
-    childrenList.forEach(element => {
-        model.Childs.push(element);
-        var childrenList2=menuList.filter((item)=>{item.parentId==element.id}) ;
-        if (childrenList2.length > 0) {
-            setTreeChildren(menuList, childrenList2,element)
+    // 将数据存储为 以 id 为 KEY 的 map 索引数据列
+    var map = {};
+    data.forEach(function (item) {
+        map[item.id] = item;
+    });
+//        console.log(map);
+    var val = [];
+    data.forEach(function (item) {
+        // 以当前遍历项，的pid,去map对象中找到索引的id
+        var parent = map[item.parentId];
+        // 好绕啊，如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中
+        if (parent) {
+            (parent.children || ( parent.children = [] )).push(item);
+        } else {
+            //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级
+            val.push(item);
        }
    });
+    return val;
 }
--- a/Yi.Vue2.x/src/util/myaxios.js
+++ b/Yi.Vue2.x/src/util/myaxios.js
@@ -31,14 +31,14 @@ myaxios.interceptors.request.use(function(config) {
 // 响应拦截器
 myaxios.interceptors.response.use(async function(response) {
    const resp = response.data
-    if (resp.code == undefined && resp.msg == undefined) {
+    if (resp.code == undefined && resp.message == undefined) {
        vm.$dialog.notify.error("错误代码：无，原因：与服务器失去连接", {
            position: "top-right",
            timeout: 5000,
        });
    } else if (resp.code == 401) {
        const res = await vm.$dialog.error({
-            text: `错误代码：${resp.code}，原因：${resp.msg}<br>是否重新进行登录？`,
+            text: `错误代码：${resp.code}，原因：${resp.message}<br>是否重新进行登录？`,
            title: '错误',
            actions: {
                'false': '取消',
@@ -50,7 +50,7 @@ myaxios.interceptors.response.use(async function(response) {
        }

    } else if (resp.code !== 200) {
-        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.msg}`, {
+        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.message}`, {
            position: "top-right",
            timeout: 5000,
        });
@@ -60,14 +60,14 @@ myaxios.interceptors.response.use(async function(response) {
    return resp;
 }, async function(error) {
    const resp = error.response.data
-    if (resp.code == undefined && resp.msg == undefined) {
+    if (resp.code == undefined && resp.message == undefined) {
        vm.$dialog.notify.error("错误代码：无，原因：与服务器失去连接", {
            position: "top-right",
            timeout: 5000,
        });
    } else if (resp.code == 401) {
        const res = await vm.$dialog.error({
-            text: `错误代码：${resp.code}，原因：${resp.msg}<br>是否重新进行登录？`,
+            text: `错误代码：${resp.code}，原因：${resp.message}<br>是否重新进行登录？`,
            title: '错误',
            actions: {
                'false': '取消',
@@ -81,7 +81,7 @@ myaxios.interceptors.response.use(async function(response) {
        }

    } else if (resp.code !== 200) {
-        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.msg}`, {
+        vm.$dialog.notify.error(`错误代码：${resp.code}，原因：${resp.message}`, {
            position: "top-right",
            timeout: 5000,
        });
--- a/Yi.Vue2.x/src/views/AdmRole.vue
+++ b/Yi.Vue2.x/src/views/AdmRole.vue
@@ -31,7 +31,8 @@ export default {
    axiosUrls: {
    },
    headers: [
-      { text: "编号", align: "start", value: "id" },
+      // { text: "编号", align: "start", value: "id" },
+           { text: "角色编号", value: "roleCode", sortable: false },
      { text: "角色名", value: "roleName", sortable: false },
      // { text: "云盘地址", value: "file_path", sortable: false },
      // { text: "简介", value: "introduce", sortable: false },
--- a/Yi.Vue2.x/src/views/AdmUser.vue
+++ b/Yi.Vue2.x/src/views/AdmUser.vue
@@ -7,7 +7,7 @@
      headers="设置角色"
      :items="roleItems"
      @select="getSelect"
-      itemText="role_name"
+      itemText="roleName"
    >
      <template v-slot:save>
        <v-btn @click="setRole" color="blue darken-1" text> 保存</v-btn>
@@ -27,6 +27,7 @@
 </template>
 <script>
 import userApi from "../api/userApi";
+import roleApi from "../api/roleApi";
 export default {
  created() {
    this.init();
@@ -59,8 +60,7 @@ export default {
      });
    },
    init() {
-
-//这里可以遍历后台的菜单code，根据对应的菜单code来给axiosUrls的增删改查赋值即可
+      //这里可以遍历后台的菜单code，根据对应的菜单code来给axiosUrls的增删改查赋值即可

      this.axiosUrls = {
        get: "/user/GetList",
@@ -69,9 +69,10 @@ export default {
        add: "/user/Add",
      };

-      // roleApi.getRole().then((resp) => {
-      //   this.roleItems = resp.data;
-      // });
+      roleApi.getList().then((resp) => {
+        console.log(resp.data)
+        this.roleItems=JSON.parse(JSON.stringify(resp.data));
+      });
    },
    setRole() {
      var userIds = [];
@@ -82,8 +83,8 @@ export default {
      this.select.forEach((item) => {
        roleIds.push(item.id);
      });
-      userApi.SetRoleByUser(userIds, roleIds).then((resp) => {
-        this.$dialog.notify.success(resp.msg, {
+      userApi.GiveUserSetRole(userIds, roleIds).then((resp) => {
+        this.$dialog.notify.success(resp.message, {
          position: "top-right",
          timeout: 5000,
        });
--- a/Yi.Vue2.x/src/views/login.vue
+++ b/Yi.Vue2.x/src/views/login.vue
@@ -52,7 +52,16 @@
          <a href="javascript:void(0)" class="mt-1"> 忘记密码? </a>
        </div>

-        <v-btn block color="primary" @click="login" class="mt-6" :loading="loader" :disabled="btn_dis"> 登录 </v-btn>
+        <v-btn
+          block
+          color="primary"
+          @click="login"
+          class="mt-6"
+          :loading="loader"
+          :disabled="btn_dis"
+        >
+          登录
+        </v-btn>
      </v-form>
    </v-card-text>

@@ -70,7 +79,7 @@
    </v-card-text>

    <!-- social links -->
-    <v-card-actions class="d-flex justify-center ">
+    <v-card-actions class="d-flex justify-center">
      <v-btn v-for="link in socialLink" :key="link.icon" icon class="ms-1">
        <v-icon :color="$vuetify.theme.dark ? link.colorInDark : link.color">
          {{ link.icon }}
@@ -81,11 +90,11 @@
 </template>
 <script>
 export default {
-  created(){
+  created() {
    this.enterSearch();
  },
  data: () => ({
-        btn_dis:false,
+    btn_dis: false,
    loader: null,
    socialLink: [
      {
@@ -122,8 +131,7 @@ export default {
    },
  }),
  methods: {
-      enterSearch() {
-     
+    enterSearch() {
      document.onkeydown = (e) => {
        //13表示回车键，baseURI是当前页面的地址，为了更严谨，也可以加别的，可以打印e看一下
        if (e.keyCode === 13 && e.target.baseURI.match("/")) {
@@ -133,20 +141,29 @@ export default {
      };
    },
    login() {
-         this.loader = true;
-      this.btn_dis=true;
-      this.$store.dispatch("Login", this.form).then((resp) => {
-        if (resp.status) {
-          this.$router.push("/");
-        } else {
-                  this.loader=null;
-             this.btn_dis=false;
-          this.$dialog.notify.error(resp.msg, {
-            position: "top-right",
-            timeout: 5000,
-          });
-        }
-      });
+      this.loader = true;
+      this.btn_dis = true;
+      this.$store
+        .dispatch("Login", this.form)
+        .then((resp) => {
+          if (resp.status) {
+           
+            this.$router.push("/");
+          } else {
+
+            this.loader = null;
+            this.btn_dis = false;
+            this.$dialog.notify.error(resp.message, {
+              position: "top-right",
+              timeout: 5000,
+            });
+          }
+        })
+        .catch((error) => {
+                
+          this.loader = false;
+          this.btn_dis = false;
+        });
    },
  },
 };