fix: fortune type

.env.development

@@ -1,2 +1,3 @@
 VUE_APP_API_BASE_URL=http://127.0.0.1:3999
+VUE_APP_FILE_BASE_URL=https://file.lihailezzc.com
 # VUE_APP_API_BASE_URL=https://apis.lihailezzc.com

.env.production

@@ -1 +1,2 @@
 VUE_APP_API_BASE_URL=https://api.ai-meng.com
+VUE_APP_FILE_BASE_URL=https://file.lihailezzc.com

src/api/spring/avatar/decor.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+export function getList(data) {
+  return request({
+    url: '/management/api/spring/avatar/decor/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function doAdd(data) {
+  return request({
+    url: '/management/api/spring/avatar/decor',
+    method: 'post',
+    data,
+  })
+}
+
+export function doEdit(id, data) {
+  return request({
+    url: `/management/api/spring/avatar/decor/${id}`,
+    method: 'put',
+    data,
+  })
+}
+
+export function doDelete(data) {
+  return request({
+    url: '/management/api/spring/avatar/decor/delete',
+    method: 'put',
+    data,
+  })
+}
+
+export function doMoveUp(id) {
+  return request({
+    url: `/management/api/spring/avatar/decor/moveUp/${id}`,
+    method: 'patch',
+  })
+}
+
+export function doMoveDown(id) {
+  return request({
+    url: `/management/api/spring/avatar/decor/moveDown/${id}`,
+    method: 'patch',
+  })
+}
+
+export function toggleEnable(id, isEnabled) {
+  return request({
+    url: `/management/api/spring/avatar/decor/enable/${id}`,
+    method: 'patch',
+    data: { isEnabled },
+  })
+}

src/api/spring/avatar/frame.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+export function getList(data) {
+  return request({
+    url: '/management/api/spring/avatar/frame/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function doAdd(data) {
+  return request({
+    url: '/management/api/spring/avatar/frame',
+    method: 'post',
+    data,
+  })
+}
+
+export function doEdit(id, data) {
+  return request({
+    url: `/management/api/spring/avatar/frame/${id}`,
+    method: 'put',
+    data,
+  })
+}
+
+export function doDelete(data) {
+  return request({
+    url: '/management/api/spring/avatar/frame/delete',
+    method: 'put',
+    data,
+  })
+}
+
+export function doMoveUp(id) {
+  return request({
+    url: `/management/api/spring/avatar/frame/moveUp/${id}`,
+    method: 'patch',
+  })
+}
+
+export function doMoveDown(id) {
+  return request({
+    url: `/management/api/spring/avatar/frame/moveDown/${id}`,
+    method: 'patch',
+  })
+}
+
+export function toggleEnable(id, isEnabled) {
+  return request({
+    url: `/management/api/spring/avatar/frame/enable/${id}`,
+    method: 'patch',
+    data: { isEnabled },
+  })
+}

src/api/spring/avatar/index.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+export function getList(data) {
+  return request({
+    url: '/management/api/spring/avatar/system/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function doAdd(data) {
+  return request({
+    url: '/management/api/spring/avatar/system',
+    method: 'post',
+    data,
+  })
+}
+
+export function doEdit(id, data) {
+  return request({
+    url: `/management/api/spring/avatar/system/${id}`,
+    method: 'put',
+    data,
+  })
+}
+
+export function doDelete(data) {
+  return request({
+    url: '/management/api/spring/avatar/system/delete',
+    method: 'put',
+    data,
+  })
+}
+
+export function doMoveUp(id) {
+  return request({
+    url: `/management/api/spring/avatar/system/moveUp/${id}`,
+    method: 'patch',
+  })
+}
+
+export function doMoveDown(id) {
+  return request({
+    url: `/management/api/spring/avatar/system/moveDown/${id}`,
+    method: 'patch',
+  })
+}
+
+export function toggleEnable(id, isEnabled) {
+  return request({
+    url: `/management/api/spring/avatar/system/enable/${id}`,
+    method: 'patch',
+    data: { isEnabled },
+  })
+}

src/components/BatchImageAdd/index.vue

@@ -0,0 +1,132 @@
+<template>
+  <el-dialog title="批量添加" :visible.sync="dialogVisible" width="600px" @close="close">
+    <el-form ref="form" label-width="80px">
+      <el-form-item label="图片上传">
+        <el-upload
+          ref="upload"
+          accept="image/*"
+          :action="uploadUrl"
+          :file-list="fileList"
+          :headers="uploadHeaders"
+          list-type="picture-card"
+          :multiple="true"
+          :on-preview="handlePreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccess"
+        >
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog append-to-body :visible.sync="previewVisible">
+          <img alt="" :src="previewImageUrl" width="100%" />
+        </el-dialog>
+      </el-form-item>
+      <el-form-item v-if="hasType" label="类型">
+        <el-input v-model.trim="type" placeholder="请输入类型" />
+      </el-form-item>
+      <el-form-item label="是否启用">
+        <el-switch v-model="isEnabled" active-text="启用" :active-value="true" inactive-text="禁用" :inactive-value="false" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { getAccessToken } from '@/utils/accessToken'
+
+  export default {
+    name: 'BatchImageAdd',
+    props: {
+      doAdd: {
+        type: Function,
+        required: true,
+      },
+      hasType: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        isEnabled: true,
+        type: '',
+        loading: false,
+        fileList: [],
+        previewVisible: false,
+        previewImageUrl: '',
+      }
+    },
+    computed: {
+      uploadUrl() {
+        return `${process.env.VUE_APP_API_BASE_URL}/management/api/common/upload`
+      },
+      uploadHeaders() {
+        return {
+          Authorization: getAccessToken() || '',
+          'x-user-id': this.$store.state.user.userId || '',
+          'x-app-id': this.$store.state.user.appId || '',
+        }
+      },
+    },
+    methods: {
+      show() {
+        this.dialogVisible = true
+        this.fileList = []
+      },
+      close() {
+        this.isEnabled = true
+        this.type = ''
+        this.loading = false
+        this.fileList = []
+        this.dialogVisible = false
+      },
+      handleSuccess(response, file, fileList) {
+        if (response.code !== 200) {
+          this.$baseMessage(response.msg || '上传失败', 'error')
+        }
+        this.fileList = fileList
+      },
+      handleRemove(file, fileList) {
+        this.fileList = fileList
+      },
+      handlePreview(file) {
+        this.previewImageUrl = file.url || file.thumbUrl
+        this.previewVisible = true
+      },
+      async save() {
+        const urls = this.fileList
+          .filter((f) => f.status === 'success' && f.response && f.response.code === 200)
+          .map((f) => `https://file.lihailezzc.com/${f.response.data.key}`)
+
+        if (urls.length === 0) {
+          this.$baseMessage('请至少上传一张图片', 'warning')
+          return
+        }
+
+        this.loading = true
+        try {
+          let successCount = 0
+          for (const url of urls) {
+            const data = { imageUrl: url, isEnabled: this.isEnabled }
+            if (this.hasType) {
+              data.type = this.type
+            }
+            await this.doAdd(data)
+            successCount++
+          }
+          this.$emit('fetch-data')
+          this.close()
+        } catch (error) {
+          console.error('批量添加失败:', error)
+          this.$baseMessage('部分或全部添加失败', 'error')
+        } finally {
+          this.loading = false
+        }
+      },
+    },
+  }
+</script>

src/router/index.js

@@ -87,6 +87,38 @@ export const asyncRoutes = [
           },
         ],
       },
+      {
+        path: 'avatar',
+        component: EmptyLayout,
+        alwaysShow: true,
+        redirect: 'noRedirect',
+        name: 'Avatar',
+        meta: {
+          title: '头像',
+          icon: 'user',
+          permissions: ['admin'],
+        },
+        children: [
+          {
+            path: 'systemAvatar',
+            name: 'SystemAvatar',
+            component: () => import('@/views/spring/avatar/systemAvatar/index'),
+            meta: { title: '系统头像' },
+          },
+          {
+            path: 'avatarFrame',
+            name: 'AvatarFrame',
+            component: () => import('@/views/spring/avatar/avatarFrame/index'),
+            meta: { title: '头像框' },
+          },
+          {
+            path: 'avatarDecor',
+            name: 'AvatarDecor',
+            component: () => import('@/views/spring/avatar/avatarDecor/index'),
+            meta: { title: '头像挂饰' },
+          },
+        ],
+      },
       {
         path: 'fortune',
         component: EmptyLayout,

src/views/spring/avatar/avatarDecor/components/AppManagementEdit.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+      <el-form-item label="类型" prop="type">
+        <el-input v-model.trim="form.type" placeholder="请输入类型" />
+      </el-form-item>
+      <el-form-item label="挂饰图片" prop="imageUrl">
+        <single-upload
+          v-model="form.imageUrl"
+          style="width: 100px; height: 100px"
+          :upload-url="uploadUrl"
+          @upload-success="handleUploadSuccess"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-switch v-model="form.isEnabled" active-text="启用" :active-value="true" inactive-text="禁用" :inactive-value="false" />
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit, doAdd } from '@/api/spring/avatar/decor'
+  import SingleUpload from '@/components/SingleUpload'
+
+  export default {
+    name: 'AppManagementEdit',
+    components: { SingleUpload },
+    data() {
+      return {
+        id: '',
+        form: {
+          imageUrl: '',
+          type: '',
+          isEnabled: true,
+        },
+        rules: {
+          imageUrl: [{ required: true, trigger: 'blur', message: '请上传挂饰图片' }],
+          isEnabled: [{ required: true, trigger: 'blur', message: '请选择是否启用' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    computed: {
+      uploadUrl() {
+        return `${process.env.VUE_APP_API_BASE_URL}/management/api/common/upload`
+      },
+    },
+    created() {},
+    methods: {
+      handleUploadSuccess(url) {
+        this.form.imageUrl = url
+      },
+      showEdit(row) {
+        if (!row) {
+          this.title = '添加'
+        } else {
+          this.title = '编辑'
+          this.form = {
+            imageUrl: row.imageUrl,
+            type: row.type,
+            isEnabled: row.isEnabled,
+          }
+          this.id = row.id
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        this.$refs['form'].resetFields()
+        this.form = this.$options.data().form
+        this.id = ''
+        this.dialogFormVisible = false
+      },
+      save() {
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            if (this.id) {
+              const { msg } = await doEdit(this.id, this.form)
+              this.$baseMessage(msg, 'success')
+            } else {
+              const { msg } = await doAdd(this.form)
+              this.$baseMessage(msg, 'success')
+            }
+            this.$emit('fetch-data')
+            this.close()
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>

src/views/spring/avatar/avatarDecor/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="appManagement-container">
+    <vab-query-form>
+      <vab-query-form-left-panel :span="12">
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit">添加</el-button>
+        <el-button icon="el-icon-plus" type="primary" @click="handleBatchAdd">批量添加</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="12">
+        <el-form :inline="true" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model.trim="queryForm.keyword" clearable placeholder="请输入查询条件" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form>
+
+    <el-table v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText">
+      <el-table-column align="center" label="排序" prop="sort" show-overflow-tooltip />
+      <el-table-column align="center" label="类型" prop="type" show-overflow-tooltip />
+
+      <el-table-column align="center" label="挂饰" width="100">
+        <template slot-scope="scope">
+          <el-tooltip class="item" :content="scope.row.id" effect="dark" placement="top">
+            <el-image fit="cover" :preview-src-list="[scope.row.imageUrl]" :src="scope.row.imageUrl" style="width: 50px; height: 50px" />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="是否启用" show-overflow-tooltip>
+        <template #default="{ row }">
+          <el-switch active-color="#13ce66" inactive-color="#ff4949" :value="row.isEnabled" @change="handleToggleEnable(row, $event)" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button :disabled="!scope.row.isEnabled || isFirstEnabled(scope.row)" type="text" @click="handleMoveUp(scope.row)">
+            上移
+          </el-button>
+          <el-button :disabled="!scope.row.isEnabled || isLastEnabled(scope.row)" type="text" @click="handleMoveDown(scope.row)">
+            下移
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <edit ref="edit" @fetch-data="fetchData" />
+    <batch-image-add ref="batchAdd" :do-add="doAdd" has-type @fetch-data="fetchData" />
+  </div>
+</template>
+
+<script>
+  import { doDelete, getList, toggleEnable, doMoveUp, doMoveDown, doAdd } from '@/api/spring/avatar/decor'
+  import Edit from './components/AppManagementEdit'
+  import BatchImageAdd from '@/components/BatchImageAdd'
+
+  export default {
+    name: 'AvatarDecor',
+    components: { Edit, BatchImageAdd },
+    data() {
+      return {
+        doAdd: doAdd,
+        list: null,
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 10,
+          keyword: '',
+        },
+        timeOutID: null,
+      }
+    },
+    created() {
+      this.fetchData()
+    },
+
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    methods: {
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleEdit(row) {
+        if (row && row.id) {
+          this.$refs['edit'].showEdit(row)
+        } else {
+          this.$refs['edit'].showEdit()
+        }
+      },
+      handleBatchAdd() {
+        this.$refs['batchAdd'].show()
+      },
+      handleDelete(row) {
+        if (row.id) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await doDelete({ ids: [row.id] })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } else {
+          if (this.selectRows.length > 0) {
+            const ids = this.selectRows.map((item) => item.id).join()
+            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+              const { msg } = await doDelete({ ids: ids.split(',') })
+              this.$baseMessage(msg, 'success')
+              this.fetchData()
+            })
+          } else {
+            this.$baseMessage('未选中任何行', 'error')
+            return false
+          }
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      queryData() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data } = await getList(this.queryForm)
+        this.list = data.list
+        this.total = data.totalCount
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 300)
+      },
+      async handleToggleEnable(row, val) {
+        const prev = row.isEnabled
+        row.isEnabled = val
+        try {
+          const { msg } = await toggleEnable(row.id, val)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          row.isEnabled = prev
+          this.$baseMessage('更新失败', 'error')
+        }
+      },
+      async handleMoveUp(row) {
+        try {
+          const { msg } = await doMoveUp(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      async handleMoveDown(row) {
+        try {
+          const { msg } = await doMoveDown(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      isFirstEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[0].id === row.id
+      },
+      isLastEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[enabled.length - 1].id === row.id
+      },
+    },
+  }
+</script>

src/views/spring/avatar/avatarFrame/components/AppManagementEdit.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+      <el-form-item label="类型" prop="type">
+        <el-input v-model.trim="form.type" placeholder="请输入类型" />
+      </el-form-item>
+      <el-form-item label="头像框" prop="imageUrl">
+        <single-upload
+          v-model="form.imageUrl"
+          style="width: 100px; height: 100px"
+          :upload-url="uploadUrl"
+          @upload-success="handleUploadSuccess"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-switch v-model="form.isEnabled" active-text="启用" :active-value="true" inactive-text="禁用" :inactive-value="false" />
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit, doAdd } from '@/api/spring/avatar/frame'
+  import SingleUpload from '@/components/SingleUpload'
+
+  export default {
+    name: 'AppManagementEdit',
+    components: { SingleUpload },
+    data() {
+      return {
+        id: '',
+        form: {
+          imageUrl: '',
+          type: '',
+          isEnabled: true,
+        },
+        rules: {
+          imageUrl: [{ required: true, trigger: 'blur', message: '请上传头像框图片' }],
+          isEnabled: [{ required: true, trigger: 'blur', message: '请选择是否启用' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    computed: {
+      uploadUrl() {
+        return `${process.env.VUE_APP_API_BASE_URL}/management/api/common/upload`
+      },
+    },
+    created() {},
+    methods: {
+      handleUploadSuccess(url) {
+        this.form.imageUrl = url
+      },
+      showEdit(row) {
+        if (!row) {
+          this.title = '添加'
+        } else {
+          this.title = '编辑'
+          this.form = {
+            imageUrl: row.imageUrl,
+            type: row.type,
+            isEnabled: row.isEnabled,
+          }
+          this.id = row.id
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        this.$refs['form'].resetFields()
+        this.form = this.$options.data().form
+        this.id = ''
+        this.dialogFormVisible = false
+      },
+      save() {
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            if (this.id) {
+              const { msg } = await doEdit(this.id, this.form)
+              this.$baseMessage(msg, 'success')
+            } else {
+              const { msg } = await doAdd(this.form)
+              this.$baseMessage(msg, 'success')
+            }
+            this.$emit('fetch-data')
+            this.close()
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>

src/views/spring/avatar/avatarFrame/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="appManagement-container">
+    <vab-query-form>
+      <vab-query-form-left-panel :span="12">
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit">添加</el-button>
+        <el-button icon="el-icon-plus" type="primary" @click="handleBatchAdd">批量添加</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="12">
+        <el-form :inline="true" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model.trim="queryForm.keyword" clearable placeholder="请输入查询条件" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form>
+
+    <el-table v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText">
+      <el-table-column align="center" label="排序" prop="sort" show-overflow-tooltip />
+      <el-table-column align="center" label="类型" prop="type" show-overflow-tooltip />
+
+      <el-table-column align="center" label="头像框" width="100">
+        <template slot-scope="scope">
+          <el-tooltip class="item" :content="scope.row.id" effect="dark" placement="top">
+            <el-image fit="cover" :preview-src-list="[scope.row.imageUrl]" :src="scope.row.imageUrl" style="width: 50px; height: 50px" />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="是否启用" show-overflow-tooltip>
+        <template #default="{ row }">
+          <el-switch active-color="#13ce66" inactive-color="#ff4949" :value="row.isEnabled" @change="handleToggleEnable(row, $event)" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button :disabled="!scope.row.isEnabled || isFirstEnabled(scope.row)" type="text" @click="handleMoveUp(scope.row)">
+            上移
+          </el-button>
+          <el-button :disabled="!scope.row.isEnabled || isLastEnabled(scope.row)" type="text" @click="handleMoveDown(scope.row)">
+            下移
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <edit ref="edit" @fetch-data="fetchData" />
+    <batch-image-add ref="batchAdd" :do-add="doAdd" has-type @fetch-data="fetchData" />
+  </div>
+</template>
+
+<script>
+  import { doDelete, getList, toggleEnable, doMoveUp, doMoveDown, doAdd } from '@/api/spring/avatar/frame'
+  import Edit from './components/AppManagementEdit'
+  import BatchImageAdd from '@/components/BatchImageAdd'
+
+  export default {
+    name: 'AvatarFrame',
+    components: { Edit, BatchImageAdd },
+    data() {
+      return {
+        doAdd: doAdd,
+        list: null,
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 10,
+          keyword: '',
+        },
+        timeOutID: null,
+      }
+    },
+    created() {
+      this.fetchData()
+    },
+
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    methods: {
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleEdit(row) {
+        if (row && row.id) {
+          this.$refs['edit'].showEdit(row)
+        } else {
+          this.$refs['edit'].showEdit()
+        }
+      },
+      handleBatchAdd() {
+        this.$refs['batchAdd'].show()
+      },
+      handleDelete(row) {
+        if (row.id) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await doDelete({ ids: [row.id] })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } else {
+          if (this.selectRows.length > 0) {
+            const ids = this.selectRows.map((item) => item.id).join()
+            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+              const { msg } = await doDelete({ ids: ids.split(',') })
+              this.$baseMessage(msg, 'success')
+              this.fetchData()
+            })
+          } else {
+            this.$baseMessage('未选中任何行', 'error')
+            return false
+          }
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      queryData() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data } = await getList(this.queryForm)
+        this.list = data.list
+        this.total = data.totalCount
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 300)
+      },
+      async handleToggleEnable(row, val) {
+        const prev = row.isEnabled
+        row.isEnabled = val
+        try {
+          const { msg } = await toggleEnable(row.id, val)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          row.isEnabled = prev
+          this.$baseMessage('更新失败', 'error')
+        }
+      },
+      async handleMoveUp(row) {
+        try {
+          const { msg } = await doMoveUp(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      async handleMoveDown(row) {
+        try {
+          const { msg } = await doMoveDown(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      isFirstEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[0].id === row.id
+      },
+      isLastEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[enabled.length - 1].id === row.id
+      },
+    },
+  }
+</script>

src/views/spring/avatar/systemAvatar/components/AppManagementEdit.vue

@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogFormVisible" width="500px" @close="close">
+    <el-form ref="form" label-width="80px" :model="form" :rules="rules">
+      <el-form-item label="头像图片" prop="imageUrl">
+        <single-upload
+          v-model="form.imageUrl"
+          style="width: 100px; height: 100px"
+          :upload-url="uploadUrl"
+          @upload-success="handleUploadSuccess"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-input v-model.trim="form.type" placeholder="请输入类型" />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="isEnabled">
+        <el-switch v-model="form.isEnabled" active-text="启用" :active-value="true" inactive-text="禁用" :inactive-value="false" />
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit, doAdd } from '@/api/spring/avatar'
+  import SingleUpload from '@/components/SingleUpload'
+
+  export default {
+    name: 'AppManagementEdit',
+    components: { SingleUpload },
+    data() {
+      return {
+        id: '',
+        form: {
+          imageUrl: '',
+          type: '',
+          isEnabled: true,
+        },
+        rules: {
+          imageUrl: [{ required: true, trigger: 'blur', message: '请上传头像图片' }],
+          isEnabled: [{ required: true, trigger: 'blur', message: '请选择是否启用' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+      }
+    },
+    computed: {
+      uploadUrl() {
+        return `${process.env.VUE_APP_API_BASE_URL}/management/api/common/upload`
+      },
+    },
+    created() {},
+    methods: {
+      handleUploadSuccess(url) {
+        this.form.imageUrl = url
+      },
+      showEdit(row) {
+        if (!row) {
+          this.title = '添加'
+        } else {
+          this.title = '编辑'
+          this.form = {
+            imageUrl: row.imageUrl,
+            type: row.type,
+            isEnabled: row.isEnabled,
+          }
+          this.id = row.id
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        this.$refs['form'].resetFields()
+        this.form = this.$options.data().form
+        this.id = ''
+        this.dialogFormVisible = false
+      },
+      save() {
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            if (this.id) {
+              const { msg } = await doEdit(this.id, this.form)
+              this.$baseMessage(msg, 'success')
+            } else {
+              const { msg } = await doAdd(this.form)
+              this.$baseMessage(msg, 'success')
+            }
+            this.$emit('fetch-data')
+            this.close()
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>

src/views/spring/avatar/systemAvatar/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="appManagement-container">
+    <vab-query-form>
+      <vab-query-form-left-panel :span="12">
+        <el-button icon="el-icon-plus" type="primary" @click="handleEdit">添加</el-button>
+        <el-button icon="el-icon-plus" type="primary" @click="handleBatchAdd">批量添加</el-button>
+      </vab-query-form-left-panel>
+      <vab-query-form-right-panel :span="12">
+        <el-form :inline="true" :model="queryForm" @submit.native.prevent>
+          <el-form-item>
+            <el-input v-model.trim="queryForm.keyword" clearable placeholder="请输入查询条件" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </vab-query-form-right-panel>
+    </vab-query-form>
+
+    <el-table v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText">
+      <el-table-column align="center" label="排序" prop="sort" show-overflow-tooltip />
+
+      <el-table-column align="center" label="类型" prop="type" show-overflow-tooltip />
+      <el-table-column align="center" label="头像" width="100">
+        <template slot-scope="scope">
+          <el-tooltip class="item" :content="scope.row.id" effect="dark" placement="top">
+            <el-image fit="cover" :preview-src-list="[scope.row.imageUrl]" :src="scope.row.imageUrl" style="width: 50px; height: 50px" />
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="是否启用" show-overflow-tooltip>
+        <template #default="{ row }">
+          <el-switch active-color="#13ce66" inactive-color="#ff4949" :value="row.isEnabled" @change="handleToggleEnable(row, $event)" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button :disabled="!scope.row.isEnabled || isFirstEnabled(scope.row)" type="text" @click="handleMoveUp(scope.row)">
+            上移
+          </el-button>
+          <el-button :disabled="!scope.row.isEnabled || isLastEnabled(scope.row)" type="text" @click="handleMoveDown(scope.row)">
+            下移
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      background
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    />
+    <edit ref="edit" @fetch-data="fetchData" />
+    <batch-image-add ref="batchAdd" :do-add="doAdd" has-type @fetch-data="fetchData" />
+  </div>
+</template>
+
+<script>
+  import { doDelete, getList, toggleEnable, doMoveUp, doMoveDown, doAdd } from '@/api/spring/avatar'
+  import Edit from './components/AppManagementEdit'
+  import BatchImageAdd from '@/components/BatchImageAdd'
+
+  export default {
+    name: 'SystemAvatar',
+    components: { Edit, BatchImageAdd },
+    data() {
+      return {
+        doAdd: doAdd,
+        list: null,
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 10,
+          keyword: '',
+        },
+        timeOutID: null,
+      }
+    },
+    created() {
+      this.fetchData()
+    },
+
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    methods: {
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleEdit(row) {
+        if (row && row.id) {
+          this.$refs['edit'].showEdit(row)
+        } else {
+          this.$refs['edit'].showEdit()
+        }
+      },
+      handleBatchAdd() {
+        this.$refs['batchAdd'].show()
+      },
+      handleDelete(row) {
+        if (row.id) {
+          this.$baseConfirm('你确定要删除当前项吗', null, async () => {
+            const { msg } = await doDelete({ ids: [row.id] })
+            this.$baseMessage(msg, 'success')
+            this.fetchData()
+          })
+        } else {
+          if (this.selectRows.length > 0) {
+            const ids = this.selectRows.map((item) => item.id).join()
+            this.$baseConfirm('你确定要删除选中项吗', null, async () => {
+              const { msg } = await doDelete({ ids: ids.split(',') })
+              this.$baseMessage(msg, 'success')
+              this.fetchData()
+            })
+          } else {
+            this.$baseMessage('未选中任何行', 'error')
+            return false
+          }
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      queryData() {
+        this.queryForm.pageNo = 1
+        this.fetchData()
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data } = await getList(this.queryForm)
+        this.list = data.list
+        this.total = data.totalCount
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 300)
+      },
+      async handleToggleEnable(row, val) {
+        const prev = row.isEnabled
+        row.isEnabled = val
+        try {
+          const { msg } = await toggleEnable(row.id, val)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          row.isEnabled = prev
+          this.$baseMessage('更新失败', 'error')
+        }
+      },
+      async handleMoveUp(row) {
+        try {
+          const { msg } = await doMoveUp(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      async handleMoveDown(row) {
+        try {
+          const { msg } = await doMoveDown(row.id)
+          if (msg) this.$baseMessage(msg, 'success')
+          this.fetchData()
+        } catch (e) {
+          this.$baseMessage('操作失败', 'error')
+        }
+      },
+      isFirstEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[0].id === row.id
+      },
+      isLastEnabled(row) {
+        if (!this.list || this.list.length === 0) return false
+        const enabled = this.list.filter((item) => item.isEnabled)
+        if (enabled.length === 0) return false
+        return enabled[enabled.length - 1].id === row.id
+      },
+    },
+  }
+</script>

src/views/spring/fortune/card/index.vue

@@ -12,8 +12,11 @@
           </el-form-item>
           <el-form-item>
             <el-select v-model="queryForm.fortuneLevel" clearable placeholder="请选择幸运等级" @change="queryData">
-              <el-option label="吉祥" value="1" />
-              <el-option label="大吉" value="2" />
+              <el-option label="吉签" value="1" />
+              <el-option label="中吉签" value="2" />
+              <el-option label="上吉签" value="3" />
+              <el-option label="上上签" value="4" />
+              <el-option label="大吉签" value="5" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -36,7 +39,17 @@
       <el-table-column align="center" label="标题" prop="title" show-overflow-tooltip />
       <el-table-column align="center" label="幸运等级" show-overflow-tooltip>
         <template #default="{ row }">
-          {{ row.fortuneLevel === '1' ? '吉祥' : row.fortuneLevel === '2' ? '大吉' : '普通' }}
+          {{
+            row.fortuneLevel === '1'
+              ? '吉签'
+              : row.fortuneLevel === '2'
+              ? '中吉签'
+              : row.fortuneLevel === '3'
+              ? '上吉签'
+              : row.fortuneLevel === '4'
+              ? '上上签'
+              : '大吉签'
+          }}
         </template>
       </el-table-column>
       <el-table-column align="center" label="是否启用" show-overflow-tooltip>