From c3f74a89ea1f6a03858c4a8e42e5ceedee807273 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 13:28:43 +0800
Subject: [PATCH] bug修复

---
 src/views/article/components/publicSignUpChild.vue |   91 +++++++++++++++++----------------------------
 src/views/article/components/deitDiscussion.vue    |    7 +++
 2 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index cc2ca15..8d81e53 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -358,6 +358,11 @@
           const data = res.data.data
           this.userPage.total = data.total
           this.userData = data.records
+          this.userData.forEach(item => {
+            if (item.avatar.length > 0) {
+              item.avatar = website.minioUrl + item.avatar
+            }
+          })
         })
       },
 
@@ -379,4 +384,4 @@
   }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/article/components/publicSignUpChild.vue b/src/views/article/components/publicSignUpChild.vue
index aa1d301..b0d1ebe 100644
--- a/src/views/article/components/publicSignUpChild.vue
+++ b/src/views/article/components/publicSignUpChild.vue
@@ -1,34 +1,8 @@
 <template>
-  <!-- <basicContainer> -->
-  <!-- <avue-crud :data="data" ref="crud" :table-loading="loading" @current-change="currentChange"
-            @search-change="searchChange" @search-reset="searchReset" @size-change="sizeChange" :option="option"
-            v-model="data" :page="page" @selection-change="selectionChange" @row-del="rowDel"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template slot="menuLeft">
-                <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
-                    @click="handleDelete">批量删除
-                </el-button>
-            </template>
-
-            <template slot-scope="scope" slot="menu">
-                <el-button type="text" icon="el-icon-s-custom" size="small" @click.stop="openDilog(scope.row, 0)">
-                    编辑
-                </el-button>
-                <el-button type="primary" icon="el-icon-s-custom" size="small" @click.stop="openUser(scope.row, 0)">
-                    参与用户
-                </el-button>
-            </template>
-        </avue-crud> -->
-
-  <!--  <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
-            <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
-            </avue-form>
-        </el-dialog> -->
-
 
   <div>
     <el-dialog title="" append-to-body :visible.sync="dialogVisiblesUser" width="50%" :before-close="userHandleClose">
-      <avue-crud ref="DataUser" :option="option1" v-model="dataUser" :page="pageUser"></avue-crud>
+      <avue-crud ref="DataUser" :option="userOption" :data="dataUser" v-model="dataUser" :page="pageUser"></avue-crud>
     </el-dialog>
   </div>
 
@@ -54,6 +28,8 @@
   import {
     getDictionary
   } from '@/api/system/dict'
+
+  import website from '@/config/website'
 
   export default {
     data() {
@@ -135,41 +111,36 @@
         form: {},
         // 选择行
         selectionList: [],
-        // 表单配置
-        option: {
-          selection: true,
-          height: "auto",
-          calcHeight: 54,
-          align: 'center',
-          menuAlign: 'center',
+        userOption: {
           addBtn: false,
-          editBtn: false,
-          searchMenuSpan: 3,
-          searchBtn: true,
-          menuWidth: 500,
+          menu: false,
           column: [{
-              label: 'ID',
-              prop: 'id',
-              searchSpan: 4,
-              // search: true,
+              label: '姓名',
+              prop: 'name'
+            }, {
+              label: '头像',
+              type: 'upload',
+              listType: "picture-img",
+              prop: 'avatar'
             },
             {
-              label: '标题',
-              prop: 'title',
-              searchSpan: 4,
-              search: true,
+              label: '签名',
+              type: 'upload',
+              listType: "picture-img",
+              prop: 'signaturePath'
             },
             {
-              label: '参与人数',
-              prop: 'enrollCount',
-              searchSpan: 4,
-              search: true,
-            },
-            {
-              label: '截止时间',
-              prop: 'endTime',
-              searchSpan: 4,
-              search: true,
+              label: '手机',
+              prop: 'phone'
+            }, {
+              label: '小区',
+              prop: 'aoiName'
+            }, {
+              label: '地址',
+              prop: 'addressName'
+            }, {
+              label: '时间',
+              prop: 'createTime'
             }
           ]
         },
@@ -202,6 +173,14 @@
           const data = res.data.data
           this.pageUser.total = data.total
           this.dataUser = data.records
+          this.dataUser.forEach(item => {
+            if (item.avatar.length > 0) {
+              item.avatar = website.minioUrl + item.avatar
+            }
+            if (item.signaturePath.length > 0) {
+              item.signaturePath = website.minioUrl + item.signaturePath
+            }
+          })
           this.loading = false
           // this.selectionClear()
         })

--
Gitblit v1.9.3