d

iview-admin/src/components/tables/tables.vue

@@ -252,7 +252,8 @@ export default {
               "Button",
               "Button",
               {
               {
                 props: {
                 props: {
-                  type: btninfo.type
+                  type: btninfo.type,
+                  disabled:params.row.isSystem  && btninfo.key=="delete"?true:false
                 },
                 },
                 on: {
                 on: {
                   click: () => {
                   click: () => {

iview-admin/src/store/module/user.js

@@ -85,7 +85,7 @@ export default {
           console.log(rtn)
           console.log(rtn)
           if(rtn.status==0){
           if(rtn.status==0){
              commit('setToken', rtn.data.token)
              commit('setToken', rtn.data.token)
-             commit('setAvatar', "https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png")
+             commit('setAvatar', (rtn.data.headUrl  && rtn.data.headUrl!="")?rtn.data.headUrl:"https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png")
              commit('setUserName', rtn.data.user.userName)
              commit('setUserName', rtn.data.user.userName)
              commit('setUserId', rtn.data.user.id)
              commit('setUserId', rtn.data.user.id)
              commit('setAccess',  ['super_admin', 'admin'])
              commit('setAccess',  ['super_admin', 'admin'])
@@ -106,7 +106,7 @@ export default {
           getUserInfo(state.token).then(res => {
           getUserInfo(state.token).then(res => {
             const rtn = res.data
             const rtn = res.data
             if(rtn.status==0){
             if(rtn.status==0){
-               commit('setAvatar', "https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png")
+               commit('setAvatar', (rtn.data.headUrl  && rtn.data.headUrl!="")?rtn.data.headUrl:"https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png")
                commit('setUserName', rtn.data.userName)
                commit('setUserName', rtn.data.userName)
                commit('setUserId', rtn.data.id)
                commit('setUserId', rtn.data.id)
                commit('setAccess',  ['super_admin', 'admin'])
                commit('setAccess',  ['super_admin', 'admin'])