fix: record view

src/api/spring/blessing/generateRecord/index.js

@@ -7,19 +7,3 @@ export function getList(data) {
     params: data,
   })
 }
-
-export function getShareList(data) {
-  return request({
-    url: '/management/api/spring/blessing/share-record/list',
-    method: 'get',
-    params: data,
-  })
-}
-
-export function getViewList(data) {
-  return request({
-    url: '/management/api/spring/blessing/view-record/list',
-    method: 'get',
-    params: data,
-  })
-}

src/api/spring/user/index.js

@@ -7,3 +7,27 @@ export function getUserList(data) {
     params: data,
   })
 }
+
+export function getShareList(data) {
+  return request({
+    url: '/management/api/spring/system/share-record/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function getViewList(data) {
+  return request({
+    url: '/management/api/spring/system/view-record/list',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function getSaveList(data) {
+  return request({
+    url: '/management/api/spring/system/save-record/list',
+    method: 'get',
+    params: data,
+  })
+}

src/api/spring/wallpaper/type.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getList(data) {
   return request({
-    url: '/management/api/spring/wallpaper/type/list',
+    url: '/management/api/spring/wallpaper/category/list',
     method: 'get',
     params: data,
   })
@@ -10,14 +10,14 @@ export function getList(data) {
 
 export function getAllList() {
   return request({
-    url: '/management/api/spring/wallpaper/type/list/all',
+    url: '/management/api/spring/wallpaper/category/list/all',
     method: 'get',
   })
 }
 
 export function doAdd(data) {
   return request({
-    url: '/management/api/spring/wallpaper/type',
+    url: '/management/api/spring/wallpaper/category',
     method: 'post',
     data,
   })
@@ -25,7 +25,7 @@ export function doAdd(data) {
 
 export function doEdit(id, data) {
   return request({
-    url: `/management/api/spring/wallpaper/type/${id}`,
+    url: `/management/api/spring/wallpaper/category/${id}`,
     method: 'put',
     data,
   })
@@ -33,7 +33,7 @@ export function doEdit(id, data) {
 
 export function doDelete(data) {
   return request({
-    url: '/management/api/spring/wallpaper/type/delete',
+    url: '/management/api/spring/wallpaper/category/delete',
     method: 'put',
     data,
   })
@@ -41,21 +41,21 @@ export function doDelete(data) {
 
 export function doMoveUp(id) {
   return request({
-    url: `/management/api/spring/wallpaper/type/moveUp/${id}`,
+    url: `/management/api/spring/wallpaper/category/moveUp/${id}`,
     method: 'patch',
   })
 }
 
 export function doMoveDown(id) {
   return request({
-    url: `/management/api/spring/wallpaper/type/moveDown/${id}`,
+    url: `/management/api/spring/wallpaper/category/moveDown/${id}`,
     method: 'patch',
   })
 }
 
 export function toggleEnable(id, isEnabled) {
   return request({
-    url: `/management/api/spring/wallpaper/type/enable/${id}`,
+    url: `/management/api/spring/wallpaper/category/enable/${id}`,
     method: 'patch',
     data: { isEnabled },
   })

src/components/BatchImageAdd/index.vue

@@ -25,7 +25,18 @@
         </el-dialog>
       </el-form-item>
       <el-form-item v-if="hasType" label="类型">
-        <el-input v-model.trim="type" placeholder="请输入类型" />
+        <el-select
+          v-if="typeList && typeList.length > 0"
+          v-model="type"
+          allow-create
+          default-first-option
+          filterable
+          placeholder="请选择类型"
+          style="width: 100%"
+        >
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+        <el-input v-else 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" />
@@ -52,6 +63,10 @@
         type: Boolean,
         default: false,
       },
+      typeList: {
+        type: Array,
+        default: () => [],
+      },
     },
     data() {
       return {

src/router/index.js

@@ -192,13 +192,19 @@ export const asyncRoutes = [
           {
             path: 'shareRecord',
             name: 'ShareRecord',
-            component: () => import('@/views/spring/blessing/shareRecord/index'),
+            component: () => import('@/views/spring/user/shareRecord/index'),
             meta: { title: '分享记录' },
           },
+          {
+            path: 'saveRecord',
+            name: 'SaveRecord',
+            component: () => import('@/views/spring/user/saveRecord/index'),
+            meta: { title: '保存记录' },
+          },
           {
             path: 'viewRecord',
             name: 'ViewRecord',
-            component: () => import('@/views/spring/blessing/viewRecord/index'),
+            component: () => import('@/views/spring/user/viewRecord/index'),
             meta: { title: '查看记录' },
           },
         ],

src/views/spring/user/saveRecord/index.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="save-record-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-delete" type="danger" @click="handleDelete">批量删除</el-button> -->
+      <!-- </vab-query-form-left-panel> -->
+      <vab-query-form-left-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-select v-model="queryForm.scene" clearable placeholder="请选择保存场景" @change="queryData">
+              <el-option label="祝福卡片" value="card_generate" />
+              <el-option label="抽签" value="fortune_draw" />
+              <el-option label="壁纸" value="wallpaper_download" />
+              <el-option label="头像" value="avatar_download" />
+            </el-select>
+          </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-left-panel>
+    </vab-query-form>
+
+    <el-table v-loading="listLoading" :data="list" :element-loading-text="elementLoadingText" @selection-change="setSelectRows">
+      <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 }">
+          {{ row.type === 1 ? '祝福卡片' : row.type === 2 ? '抽签' : row.type === 3 ? '壁纸' : '头像' }}
+        </template>
+      </el-table-column>
+      <el-table-column align="left" label="信息" show-overflow-tooltip>
+        <template #default="{ row }">
+          <div>
+            <!-- <div>
+              <strong>保存Token：</strong>
+              {{ row.shareToken }}
+            </div>
+            <div>
+              <strong>保存渠道：</strong>
+              {{ row.shareChannel || '--' }}
+            </div> -->
+            <div>
+              <strong>设备：</strong>
+              <template v-if="row.deviceId">
+                <el-link type="primary" :underline="false" @click="goToDevice(row.deviceId)">{{ row.deviceModel || row.deviceId }}</el-link>
+              </template>
+              <template v-else>--</template>
+            </div>
+            <div>
+              <strong>内容id：</strong>
+              <template v-if="row.cardId">
+                <el-link type="primary" :underline="false" @click="goToContent(row)">{{ row.cardId }}</el-link>
+              </template>
+              <template v-else>--</template>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="left" label="作者信息" show-overflow-tooltip>
+        <template #default="{ row }">
+          <div class="author-cell">
+            <img alt="avatar" class="author-avatar" :src="row?.fromUser?.avatar" />
+            <div class="author-meta">
+              <div>
+                <strong>id：</strong>
+                {{ row?.fromUser?.id || '--' }}
+              </div>
+              <div>
+                <strong>昵称：</strong>
+                {{ row?.fromUser?.nickname || '--' }}
+              </div>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="创建时间" show-overflow-tooltip>
+        <template #default="{ row }">
+          {{ formatTime(row.createdAt) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="操作" show-overflow-tooltip width="200">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(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"
+    />
+  </div>
+</template>
+
+<script>
+  import { getSaveList } from '@/api/spring/user'
+  import { formatTime } from '@/utils'
+
+  export default {
+    name: 'SaveRecord',
+    data() {
+      return {
+        host: 'https://file.lihailezzc.com/',
+        list: null,
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 10,
+          scene: '',
+          keyword: '',
+        },
+        timeOutID: null,
+      }
+    },
+    created() {
+      this.fetchData()
+    },
+
+    beforeDestroy() {
+      clearTimeout(this.timeOutID)
+    },
+    methods: {
+      formatTime,
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleEdit(row) {
+        if (row.id) {
+          this.$refs['edit'].showEdit(row)
+        } else {
+          this.$refs['edit'].showEdit()
+        }
+      },
+      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()
+      },
+      goToDevice(deviceId) {
+        this.$router.push({ path: '/spring/user/userChat', query: { deviceId } })
+      },
+      goToContent(row) {
+        if (row.scene === 'card_generate') {
+          this.$router.push({ path: '/spring/blessing/generateRecord', query: { id: row.cardId } })
+        } else if (row.scene === 'fortune_draw') {
+          this.$router.push({ path: '/spring/blessing/viewRecord', query: { id: row.cardId } })
+        } else if (row.scene === 'wallpaper_download') {
+          this.$router.push({ path: '/spring/blessing/shareRecord', query: { id: row.cardId } })
+        } else {
+          this.$router.push({ path: '/spring/user/avatar', query: { id: row.cardId } })
+        }
+      },
+      async fetchData() {
+        this.listLoading = true
+        const { data } = await getSaveList(this.queryForm)
+        this.list = data.list
+        this.total = data.totalCount
+        this.timeOutID = setTimeout(() => {
+          this.listLoading = false
+        }, 300)
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  .author-option {
+    display: flex;
+    align-items: center;
+  }
+  .author-avatar {
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    object-fit: cover;
+    margin-right: 8px;
+  }
+  .author-name {
+    font-size: 14px;
+  }
+  .author-cell {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+  .author-avatar {
+    width: 50px;
+    height: 50px;
+    object-fit: cover;
+    border-radius: 50%;
+  }
+  .author-meta {
+    display: flex;
+    flex-direction: column;
+  }
+  .image-grid {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  .grid-image {
+    width: 80px;
+    height: 80px;
+    object-fit: cover;
+    border-radius: 8px;
+  }
+</style>

src/views/spring/user/shareRecord/index.vue

@@ -11,11 +11,11 @@
             <el-input v-model.trim="queryForm.keyword" clearable placeholder="请输入查询条件" />
           </el-form-item>
           <el-form-item>
-            <el-select v-model="queryForm.type" clearable placeholder="请选择分享类型" @change="queryData">
-              <el-option label="祝福卡片" :value="1" />
-              <el-option label="抽签" :value="2" />
-              <el-option label="壁纸" :value="3" />
-              <el-option label="头像" :value="4" />
+            <el-select v-model="queryForm.scene" clearable placeholder="请选择分享场景" @change="queryData">
+              <el-option label="祝福卡片" value="card_generate" />
+              <el-option label="抽签" value="fortune_draw" />
+              <el-option label="壁纸" value="wallpaper_download" />
+              <el-option label="头像" value="avatar_download" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -108,7 +108,7 @@
 </template>
 
 <script>
-  import { getShareList } from '@/api/spring/blessing/generateRecord'
+  import { getShareList } from '@/api/spring/user'
   import { formatTime } from '@/utils'
 
   export default {
@@ -125,7 +125,7 @@
         queryForm: {
           pageNo: 1,
           pageSize: 10,
-          type: '',
+          scene: '',
           keyword: '',
         },
         timeOutID: null,

src/views/spring/user/viewRecord/index.vue

@@ -124,11 +124,11 @@
 </template>
 
 <script>
-  import { getList } from '@/api/spring/blessing/generateRecord'
+  import { getViewList } from '@/api/spring/user'
   import { formatTime } from '@/utils'
 
   export default {
-    name: 'GenerateRecord',
+    name: 'ViewRecord',
     data() {
       return {
         host: 'https://file.lihailezzc.com/',
@@ -209,7 +209,7 @@
       },
       async fetchData() {
         this.listLoading = true
-        const { data } = await getList(this.queryForm)
+        const { data } = await getViewList(this.queryForm)
         this.list = data.list
         this.total = data.totalCount
         this.timeOutID = setTimeout(() => {

src/views/spring/wallpaper/system/components/AppManagementEdit.vue

@@ -2,8 +2,8 @@
   <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-select v-model="form.type" placeholder="请选择壁纸类型" style="width: 100%">
-          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.name" />
+        <el-select v-model="form.type" allow-create default-first-option filterable placeholder="请选择壁纸类型" style="width: 100%">
+          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="壁纸图片" prop="imageUrl">

src/views/spring/wallpaper/system/index.vue

@@ -3,6 +3,7 @@
     <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>
@@ -18,7 +19,7 @@
 
     <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="类型" prop="categoryName" 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">
@@ -54,18 +55,23 @@
       @size-change="handleSizeChange"
     />
     <edit ref="edit" @fetch-data="fetchData" />
+    <batch-image-add ref="batchAdd" :do-add="doAdd" :has-type="true" :type-list="typeList" @fetch-data="fetchData" />
   </div>
 </template>
 
 <script>
-  import { doDelete, getList, toggleEnable, doMoveUp, doMoveDown } from '@/api/spring/wallpaper/system'
+  import { doDelete, getList, toggleEnable, doMoveUp, doMoveDown, doAdd } from '@/api/spring/wallpaper/system'
+  import { getAllList } from '@/api/spring/wallpaper/type'
   import Edit from './components/AppManagementEdit'
+  import BatchImageAdd from '@/components/BatchImageAdd'
 
   export default {
     name: 'SystemWallpaper',
-    components: { Edit },
+    components: { Edit, BatchImageAdd },
     data() {
       return {
+        doAdd,
+        typeList: [],
         list: null,
         listLoading: true,
         layout: 'total, sizes, prev, pager, next, jumper',
@@ -82,12 +88,20 @@
     },
     created() {
       this.fetchData()
+      this.fetchTypeList()
     },
 
     beforeDestroy() {
       clearTimeout(this.timeOutID)
     },
     methods: {
+      async fetchTypeList() {
+        const { data } = await getAllList()
+        this.typeList = data || []
+      },
+      handleBatchAdd() {
+        this.$refs['batchAdd'].show()
+      },
       setSelectRows(val) {
         this.selectRows = val
       },