Browse Source

Merge remote-tracking branch 'origin/会员关联项目' into 会员关联项目

yfh 2 weeks ago
parent
commit
d2f915d7f4
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/views/user/darkRoom/index.vue

+ 4 - 3
src/views/user/darkRoom/index.vue

@@ -32,6 +32,7 @@
     <el-table  height="500" border v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户id" align="center" prop="userId" />
+      <el-table-column label="项目" align="center" prop="projectName" />
       <el-table-column label="用户昵称" align="center" prop="nickname" />
       <el-table-column label="用户头像" align="center" prop="avatar">
         <template slot-scope="scope">
@@ -73,7 +74,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -83,7 +84,7 @@
 <!--            v-if="scope.row.isRepeatFans !== 1"-->
 <!--          >启用</el-button>-->
 <!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -122,7 +123,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         keyword: null,
-        isBlack: true
+        status: 0
       },
     };
   },