From 8c048f6ba1366b9384e043d53251fe20e6cdd0c3 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 18 Apr 2023 14:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91loading=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/parner/staff.vue          | 2 +-
 src/views/parnerOperation/editor.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/parner/staff.vue b/src/views/parner/staff.vue
index 1f9550b..5a58fce 100644
--- a/src/views/parner/staff.vue
+++ b/src/views/parner/staff.vue
@@ -127,7 +127,7 @@
               <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="120"></el-table-column>
               <el-table-column label="操作" align="center" width="300">
                 <template slot-scope="scope">
-                  <el-button v-if="scope.row.isTeam == 1" type="text" v-auth="'/parner:账号管理:重置密码'" @click="edit(scope.row)">编辑</el-button>
+                  <el-button v-if="!type" type="text" v-auth="'/parner:账号管理:重置密码'" @click="edit(scope.row)">编辑</el-button>
                   <el-button type="text" v-auth="'/parner:账号管理:重置密码'" @click="resetPassword(scope.row)">重置密码</el-button>
                   <el-button v-if="type" type="text" v-auth="'/parner:账号管理:删除合伙人'" @click="del(scope.row)">删除</el-button>
                   <el-button v-else-if="scope.row.isTeam == 1" type="text" v-auth="'/parner:账号管理:转让超管'" @click="transfer(scope.row)">转让超管</el-button>
diff --git a/src/views/parnerOperation/editor.js b/src/views/parnerOperation/editor.js
index 513c13e..c0cc56c 100644
--- a/src/views/parnerOperation/editor.js
+++ b/src/views/parnerOperation/editor.js
@@ -2,6 +2,7 @@ import Axios from 'axios'
 import Api from '@/utils/api'
 import Setting from '@/setting'
 import Util from '@/libs/util'
+import { Loading } from 'element-ui'
 export default {
   //skin:'oxide-dark',
   language:'zh_CN',
@@ -347,6 +348,7 @@ export default {
         let file = this.files[0];
         let fd = new FormData();
         fd.append("file", file);
+        const load = Loading.service()
         Axios({
           method: 'post',
           url: Api.fileUploadNakadai,
@@ -356,8 +358,11 @@ export default {
             token: Util.local.get(Setting.tokenKey)
           },
         }).then(({ data }) => {
+          load.close()
           callback(data.filesResult.fileUrl)
-        }).catch(res => {})
+        }).catch(res => {
+          load.close()
+        })
       }
       //触发点击
       input.click();