init

.env.development

@@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 西瓜后台管理系统
+VUE_APP_TITLE = 遇见良缘管理系统
 
 # 开发环境配置
 ENV = 'development'
 
 # process.env.VUE_APP_SYSTEM_HOME
-VUE_APP_SYSTEM_HOME = '西瓜'
+VUE_APP_SYSTEM_HOME = '遇见良缘'
 
 # 若依管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'

.env.production

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 麻瓜后台管理系统
+VUE_APP_TITLE = 遇见良缘管理系统
 
 # 生产环境配置
 ENV = 'production'
 
-VUE_APP_SYSTEM_HOME = '麻瓜'
+VUE_APP_SYSTEM_HOME = '遇见良缘'
 
 # 若依管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

src/api/xq/userPictures.js

@@ -9,6 +9,15 @@ export function listUserPictures(query) {
   })
 }
 
+// 查询用户相册管理列表合集
+export function listUserPicturesMerge(query) {
+  return request({
+    url: '/xq/userPictures/list/merge',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询用户相册管理详细
 export function getUserPictures(id) {
   return request({

src/views/login.vue

@@ -70,7 +70,7 @@ export default {
   name: "Login",
   data() {
     return {
-      systemTitleHome: process.env.VUE_APP_SYSTEM_HOME + '后台管理系统',
+      systemTitleHome: process.env.VUE_APP_SYSTEM_HOME + '管理系统',
       codeUrl: "",
       loginForm: {
         username: "admin",

src/views/register.vue

@@ -80,7 +80,7 @@ export default {
       }
     };
     return {
-      systemTitleHome: process.env.VUE_APP_SYSTEM_HOME + '后台管理系统',
+      systemTitleHome: process.env.VUE_APP_SYSTEM_HOME + '管理系统',
       codeUrl: "",
       registerForm: {
         username: "",

src/views/xq/dynamic/index.vue

@@ -73,7 +73,7 @@
         <template v-slot="scope">
            <span v-for='val in scope.row.imageList'>
               <image-preview :src="val" height="40px" width="40px"  /> &nbsp;
-            </span>
+           </span>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="auditStatus">

src/views/xq/userPictures/index.vue

@@ -129,7 +129,6 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
     />
-    <add-user-picture-dialog v-if="addUserPictureDialogVisible" ref="addUserPictureDialog" @refreshDataList="getList"/>
   </div>
 </template>
 
@@ -141,11 +140,10 @@ import {
   userPicturesAuditSuccess
 } from '@/api/xq/userPictures'
 import { auditStatusList } from '@/constant/statusMap'
-import AddUserPictureDialog from '@/views/xq/userPictures/add-user-picture-dialog.vue'
 
 export default {
   name: 'UserPictures',
-  components: { AddUserPictureDialog },
+  components: {  },
   data() {
     return {
       auditStatusList,

src/views/xq/userPicturesManager/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户编号" prop="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入用户编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="昵称" prop="nickname">
+        <el-input
+            v-model="queryParams.nickname"
+            placeholder="请输入昵称"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="userPicturesList" @selection-change="handleSelectionChange">
+      <el-table-column label="用户编号" align="center" prop="usercode"/>
+      <el-table-column label="昵称" align="center" prop="nickname" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="头像" align="center" prop="avatar">
+        <template v-slot="scope">
+          <image-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="相册" align="center" prop="userPictureList">
+        <template v-slot="scope">
+           <span v-for='val in scope.row.userPictureList'>
+              <image-preview :src="val.picture" height="40px" width="40px"  /> &nbsp;
+           </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              @click="handleEdit(scope.row)"
+              v-hasPermi="['xq:userPictures:edit']"
+          >修改
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+    <add-or-update-user-picture-dialog v-if="addOrUpdateUserPictureDialogVisible" ref="addOrUpdateUserPictureDialog" @refreshDataList="getList" />
+  </div>
+</template>
+
+<script>
+import { listUserPicturesMerge } from '@/api/xq/userPictures'
+import { auditStatusList } from '@/constant/statusMap'
+import AddOrUpdateUserPictureDialog from '@/views/xq/userPicturesManager/add-or-update-user-picture-dialog.vue'
+
+export default {
+  name: 'UserPictures',
+  components: { AddOrUpdateUserPictureDialog },
+  data() {
+    return {
+      auditStatusList,
+      addOrUpdateUserPictureDialogVisible : false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户相册管理表格数据
+      userPicturesList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        usercode: undefined,
+        nickname: undefined,
+        auditStatus: undefined,
+        mobile: undefined
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询用户相册管理列表 */
+    getList() {
+      this.loading = true
+      listUserPicturesMerge(this.queryParams).then(response => {
+        this.userPicturesList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    handleEdit(row) {
+      this.addOrUpdateUserPictureDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdateUserPictureDialog.init(row.userId)
+      })
+    },
+  }
+}
+</script>

src/views/xq/userWithdraw/index.vue

@@ -94,11 +94,10 @@
 import { delUserWithdraw, listUserWithdraw, userWithdrawAuditFail } from '@/api/xq/userWithdraw'
 import { auditStatusList } from '@/constant/statusMap'
 import WithdrawSuccessDialog from '@/views/xq/userWithdraw/withdraw-success-dialog.vue'
-import AddUserPictureDialog from '@/views/xq/userPictures/add-user-picture-dialog.vue'
 
 export default {
   name: "UserWithdraw",
-  components: { AddUserPictureDialog, WithdrawSuccessDialog},
+  components: { WithdrawSuccessDialog},
   data() {
     return {
       auditStatusList,