会员bug修复

src/views/member/user/index.vue

@@ -113,7 +113,11 @@
       <el-table :data="operationLogList">
         <el-table-column label="标题" prop="title"></el-table-column>
         <el-table-column label="操作内容" prop="content"></el-table-column>
-        <el-table-column label="操作人" prop="userId"></el-table-column>
+        <el-table-column label="操作人" prop="userId">
+          <template v-slot="{row}">
+            {{list.find(i => i.id == row.userId).identityName}}
+          </template>
+        </el-table-column>
         <el-table-column label="操作时间">
           <template v-slot:default ="scope">
             {{parseTime(scope.row.createTime) }}
@@ -533,6 +537,7 @@ export default {
         if(valid && this.IdDetails.status === 3){
        let res = await new Promise((resolve)=>{
          this.$confirm('是否要将当前状态修改为审核成功？', '状态修改', {
+           distinguishCancelAndClose: true,
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            type: 'warning'
@@ -542,7 +547,8 @@ export default {
            resolve(r)
          })
        })
-          p.auditPass = res === 'confirm' ? true : false;
+          if(res === 'close') return
+         else p.auditPass = res === 'confirm' ? true : false;
         } else if(valid) {
           p.auditPass =  false;
         } else {
@@ -572,12 +578,14 @@ export default {
         if(valid && this.enterpriseFrom.status === 3){
           let res = await  new Promise((resolve)=>{
             this.$confirm('是否要将当前状态修改为审核成功?', '状态修改', {
+              distinguishCancelAndClose: true,
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
             }).then(r =>resolve(r)).catch(r => resolve(r))
           })
-          p.auditPass = res === 'confirm' ? true : false;
+          if (res === 'close') return
+          else p.auditPass = res === 'confirm' ? true : false;
         }else if(valid){
           p.auditPass = false;
         }else {