Merge branch 'developer'

src/views/admin/settings/accounts/index.vue

@@ -104,7 +104,7 @@ export default {
     fetchUserList() {
       fetchUserList(this.listQuery).then((res) => {
         console.log(res)
-        this.list = [...this.list, ...res.data.list]
+        this.list = res.data.list
       })
     },
     // 删除用户

src/views/admin/settings/roles/index.vue

@@ -61,10 +61,10 @@ export default {
     }
   },
   created() {
-    this.fetchRoleList()
+    this.getList()
   },
   activated() {
-    this.fetchRoleList()
+    this.getList()
   },
   methods: {
     indexMethod(index) {
@@ -78,7 +78,7 @@ export default {
     // 获取角色列表
     fetchRoleList() {
       fetchRoleList(this.listQuery).then(res => {
-        this.list = [...this.list, ...res.data.list]
+        this.list = res.data.list
       })
     },
     // 删除角色

src/views/normal/activity/video/club-list.vue

@@ -87,7 +87,7 @@
       <img :src="certificationUrl" class="certification">
     </el-dialog>
 
-    <el-dialog title="机构资质" :visible.sync="showVideoListDialog" width="1000px" center :close-on-click-modal="false">
+    <el-dialog title="视频列表" :visible.sync="showVideoListDialog" width="1000px" center :close-on-click-modal="false">
       <VideoList :list="videoList" :is-loading="videoListLoading" @delete="onDeleteVideo" @preview="onPlayVideo" />
       <!-- 视频播放 -->
       <el-dialog

src/views/normal/settings/accounts/index.vue

@@ -103,8 +103,7 @@ export default {
     // 获取用户列表
     fetchUserList() {
       fetchUserList(this.listQuery).then((res) => {
-        console.log(res)
-        this.list = [...this.list, ...res.data.list]
+        this.list = res.data.list
       })
     },
     // 删除用户

src/views/normal/settings/roles/index.vue

@@ -61,10 +61,10 @@ export default {
     }
   },
   created() {
-    this.fetchRoleList()
+    this.getList()
   },
   activated() {
-    this.fetchRoleList()
+    this.getList()
   },
   methods: {
     indexMethod(index) {
@@ -78,7 +78,7 @@ export default {
     // 获取角色列表
     fetchRoleList() {
       fetchRoleList(this.listQuery).then(res => {
-        this.list = [...this.list, ...res.data.list]
+        this.list = res.data.list
       })
     },
     // 删除角色