From 1759dbb28d86a0d6d3f82a32f8bde79f0c0f29d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=8A=E9=92=8A?= <13512071256@163.com>
Date: Thu, 19 Dec 2024 14:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8D=E9=A6=88=E3=80=81?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=92=8C=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8F=8A=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage/feedback/types.ts      |  17 +-
 src/api/manage/scenic/index.ts        |  13 ++
 src/api/manage/userScore/types.ts     |  28 ++-
 src/components/ImageUpload/index.vue  |  23 +--
 src/components/noteList/index.vue     |  63 +++++-
 src/layout/components/Navbar.vue      |  24 +--
 src/views/manage/bannedUser/index.vue | 265 ++++++++++++++++++++++++++
 src/views/manage/feedback/index.vue   | 177 +++++------------
 src/views/manage/product/index.vue    |  44 +++--
 src/views/manage/scenic/index.vue     |   4 +-
 src/views/manage/userScore/index.vue  | 140 ++++++++------
 11 files changed, 527 insertions(+), 271 deletions(-)

diff --git a/src/api/manage/feedback/types.ts b/src/api/manage/feedback/types.ts
index cfceb86..344b25a 100644
--- a/src/api/manage/feedback/types.ts
+++ b/src/api/manage/feedback/types.ts
@@ -23,7 +23,6 @@ export interface FeedbackVO {
    * 创建时间
    */
   createTime: string;
-
 }
 
 export interface FeedbackForm extends BaseEntity {
@@ -46,26 +45,22 @@ export interface FeedbackForm extends BaseEntity {
    * 联系方式
    */
   contact?: string;
-
 }
 
 export interface FeedbackQuery extends PageQuery {
-
   /**
    * 用户id
    */
   userId?: string | number;
-
+  nickName?: string;
+  remark?: string;
   /**
    * 联系方式
    */
   contact?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/api/manage/scenic/index.ts b/src/api/manage/scenic/index.ts
index 546e135..115433a 100644
--- a/src/api/manage/scenic/index.ts
+++ b/src/api/manage/scenic/index.ts
@@ -81,3 +81,16 @@ export const listByTagIdNotebook = (query: any): AxiosPromise<ArticleVO[]> => {
     params: query
   });
 };
+
+/**
+ *
+ * @param query 查询评论列表
+ * @returns
+ */
+export const commentList = (query: any): AxiosPromise<ArticleVO[]> => {
+  return request({
+    url: '/manage/comment/list',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/manage/userScore/types.ts b/src/api/manage/userScore/types.ts
index df92158..ac7d6c8 100644
--- a/src/api/manage/userScore/types.ts
+++ b/src/api/manage/userScore/types.ts
@@ -15,7 +15,7 @@ export interface UserScoreVO {
   sourceId: string | number;
 
   /**
-   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) 
+   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
    */
   source: number;
 
@@ -23,7 +23,6 @@ export interface UserScoreVO {
    * 积分
    */
   score: number;
-
 }
 
 export interface UserScoreForm extends BaseEntity {
@@ -31,7 +30,7 @@ export interface UserScoreForm extends BaseEntity {
    * ID
    */
   id?: string | number;
-
+  bizName?: string;
   /**
    * 用户ID
    */
@@ -43,7 +42,7 @@ export interface UserScoreForm extends BaseEntity {
   sourceId?: string | number;
 
   /**
-   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) 
+   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
    */
   source?: number;
 
@@ -51,23 +50,25 @@ export interface UserScoreForm extends BaseEntity {
    * 积分
    */
   score?: number;
-
 }
 
 export interface UserScoreQuery extends PageQuery {
-
   /**
    * 用户ID
    */
   userId?: string | number;
-
+  bizName?: string;
+  nickName?: string;
+  bizType: string;
+  endTime?: string;
+  startTime?: string;
   /**
    * 业务id
    */
   sourceId?: string | number;
 
   /**
-   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) 
+   * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
    */
   source?: number;
 
@@ -76,11 +77,8 @@ export interface UserScoreQuery extends PageQuery {
    */
   score?: number;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 1c6dcd1..8d2cccd 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,22 +1,9 @@
 <template>
   <div class="component-upload-image">
-    <el-upload
-      ref="imageUpload"
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :before-remove="handleDelete"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{ hide: fileList.length >= limit }"
-    >
+    <el-upload ref="imageUpload" multiple :action="uploadImgUrl" list-type="picture-card"
+      :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload" :limit="limit" :on-error="handleUploadError"
+      :on-exceed="handleExceed" :before-remove="handleDelete" :show-file-list="true" :headers="headers"
+      :file-list="fileList" :on-preview="handlePictureCardPreview" :class="{ hide: fileList.length >= limit }">
       <el-icon class="avatar-uploader-icon">
         <plus />
       </el-icon>
@@ -52,7 +39,7 @@ const props = defineProps({
     default: () => []
   },
   // 图片数量限制
-  limit: propTypes.number.def(5),
+  limit: propTypes.number.def(1),
   // 大小限制(MB)
   fileSize: propTypes.number.def(5),
   // 文件类型, 例如['png', 'jpg', 'jpeg']
diff --git a/src/components/noteList/index.vue b/src/components/noteList/index.vue
index 653ec11..119164a 100644
--- a/src/components/noteList/index.vue
+++ b/src/components/noteList/index.vue
@@ -19,7 +19,11 @@
           <el-button link type="primary" @click="handleDetail(scope.row)">查看详情</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="评论数" align="center" prop="commentCount" width="80px" />
+      <el-table-column label="评论数" align="center" prop="commentCount" width="80px">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleComment(scope.row)">12</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="点赞数" align="center" prop="agreeCount" width="80px" />
       <el-table-column label="发布状态" align="center" prop="">
         <template #default="scope">
@@ -48,13 +52,38 @@
     </el-table>
     <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getTableList" />
+    <!-- 笔记详情弹层 -->
+    <el-dialog title="笔记详情" v-model="noteDetail.visible" width="500px" append-to-body>
+      <div>
+        <div style="font-size: 18px;font-weight: bold;">{{ noteDetail.title  }}</div>
+        <div v-html="noteDetail.content" class="ql-editor"
+          style="height: 500px; overflow-y: auto;font-size: 16px;padding: 0px;padding-top: 15px;text-align: justify;">
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 评论详情 -->
+    <el-dialog title="评论详情" v-model="comment.visible" width="700px" append-to-body>
+      <div>
+        11
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts" name="noteList">
 import { ref, reactive, onMounted, nextTick } from 'vue';
 import { string } from 'vue-types';
-import { listByTagIdNotebook } from '@/api/manage/scenic';
+import { listByTagIdNotebook,commentList } from '@/api/manage/scenic';
 
 //导入父组件传递的值
 const props = defineProps({
@@ -78,13 +107,25 @@ const props = defineProps({
 const total = ref(0);
 const loading = ref(false);
 const tableList = ref([]);
-
+const noteDetail = reactive({
+  visible: false,
+  title: '',
+  content: ''
+})
+const comment = reactive({
+  visible: false,
+  title: '',
+  content: ''
+})
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   tagIds: null
 });
-
+const cancel = () => {
+    comment.visible = false;
+    noteDetail.visible = false;
+}
 // 获取笔记列表
 const getTableList = async () => {
   loading.value = true;
@@ -92,6 +133,20 @@ const getTableList = async () => {
   tableList.value = res.rows;
   total.value = res.total;
 };
+// 查看笔记详情
+const handleDetail = (row: any) => {
+  noteDetail.visible = true;
+  noteDetail.title = row.title;
+  noteDetail.content = row.content;
+}
+// 查看评论详情
+const handleComment = async (row: any) => {
+  loading.value = true;
+  let res=await commentList({bizId:row.id,status:0}).finally(() => (loading.value = false));
+  console.log('评论列表：',res);
+  
+  comment.visible = true;
+}
 // 监听父组件传递的tagIds,当tagIds发生变化时，重新获取数据
 watch(
   () => props.noteBookTagIds,
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 31845f3..3d9ef10 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggle-click="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
+      @toggle-click="toggleSideBar" />
     <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
     <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
+        <!-- <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyName"
           class="min-w-244px"
@@ -19,7 +20,7 @@
         >
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
+</el-select> -->
 
         <!-- <header-search id="header-search" class="right-menu-item" /> -->
         <search-menu ref="searchMenuRef" />
@@ -140,16 +141,16 @@ const dynamicClearEvent = async () => {
 };
 
 /** 租户列表 */
-const initTenantList = async () => {
-  const { data } = await getTenantList();
-  tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
-  if (tenantEnabled.value) {
-    tenantList.value = data.voList;
-  }
-};
+// const initTenantList = async () => {
+//   const { data } = await getTenantList();
+//   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
+//   if (tenantEnabled.value) {
+//     tenantList.value = data.voList;
+//   }
+// };
 
 defineExpose({
-  initTenantList
+  // initTenantList
 });
 
 const toggleSideBar = () => {
@@ -272,6 +273,7 @@ watch(
 
     .avatar-container {
       margin-right: 40px;
+      margin-left: 10px;
 
       .avatar-wrapper {
         margin-top: 5px;
diff --git a/src/views/manage/bannedUser/index.vue b/src/views/manage/bannedUser/index.vue
index e69de29..2bcbd35 100644
--- a/src/views/manage/bannedUser/index.vue
+++ b/src/views/manage/bannedUser/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]" id="search_div">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="用户ID" prop="userId">
+              <el-input v-model="queryParams.userId" class="inputWidth" placeholder="请输入用户ID" clearable
+                @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="业务id" prop="sourceId">
+              <el-input v-model="queryParams.sourceId" class="inputWidth" placeholder="请输入业务id" clearable
+                @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
+              <el-input v-model="queryParams.source" class="inputWidth"
+                placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable
+                @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="积分" prop="score">
+              <el-input v-model="queryParams.score" class="inputWidth" placeholder="请输入积分" clearable
+                @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                v-hasPermi="['manage:userScore:add']">新增</el-button>
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                v-hasPermi="['manage:userScore:edit']">修改</el-button>
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                v-hasPermi="['manage:userScore:remove']">删除</el-button> -->
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <el-table v-loading="loading" :height="autoTableHeight" :data="userScoreList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="用户昵称" align="center" prop="nickName" />
+        <el-table-column label="业务id" align="center" prop="sourceId" />
+        <el-table-column label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " align="center" prop="source" />
+        <el-table-column label="积分" align="center" prop="score" />
+        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['manage:userScore:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['manage:userScore:remove']"></el-button>
+            </el-tooltip>
+          </template>
+</el-table-column> -->
+      </el-table>
+
+      <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改积分记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="userScoreFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="业务id" prop="sourceId">
+          <el-input v-model="form.sourceId" placeholder="请输入业务id" />
+        </el-form-item>
+        <el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
+          <el-input v-model="form.source" placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " />
+        </el-form-item>
+        <el-form-item label="积分" prop="score">
+          <el-input v-model="form.score" placeholder="请输入积分" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="UserScore" lang="ts">
+import { listUserScore, getUserScore, delUserScore, addUserScore, updateUserScore } from '@/api/manage/userScore';
+import { UserScoreVO, UserScoreQuery, UserScoreForm } from '@/api/manage/userScore/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const autoTableHeight = ref(750);
+const userScoreList = ref<UserScoreVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const userScoreFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: UserScoreForm = {
+  id: undefined,
+  userId: undefined,
+  sourceId: undefined,
+  source: undefined,
+  score: undefined,
+}
+const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    sourceId: undefined,
+    source: undefined,
+    score: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "ID不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户ID不能为空", trigger: "blur" }
+    ],
+    sourceId: [
+      { required: true, message: "业务id不能为空", trigger: "blur" }
+    ],
+    source: [
+      { required: true, message: "来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) 不能为空", trigger: "blur" }
+    ],
+    score: [
+      { required: true, message: "积分不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询积分记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listUserScore(queryParams.value);
+  userScoreList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  userScoreFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: UserScoreVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加积分记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: UserScoreVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getUserScore(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改积分记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  userScoreFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateUserScore(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addUserScore(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: UserScoreVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除积分记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delUserScore(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('manage/userScore/export', {
+    ...queryParams.value
+  }, `userScore_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+  nextTick(() => {
+    autoTableHeight.value = proxy?.autoTableHeight();
+  });
+  window.onresize = () => {
+    autoTableHeight.value = proxy?.autoTableHeight();
+  };
+});
+</script>
+<style lang="scss" scoped>
+.el-card :deep(.el-card__body) {
+  padding-bottom: 0px !important;
+}
+
+#table_page {
+  height: 50px !important;
+  margin-top: 10px !important;
+  padding-bottom: 10px !important;
+}
+</style>
diff --git a/src/views/manage/feedback/index.vue b/src/views/manage/feedback/index.vue
index 48d2332..7cc884b 100644
--- a/src/views/manage/feedback/index.vue
+++ b/src/views/manage/feedback/index.vue
@@ -1,14 +1,21 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]" id="search_div">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="用户id" prop="userId">
-              <el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="反馈内容" prop="remark">
+              <el-input class="inputWidth" v-model="queryParams.remark" placeholder="请输入反馈内容" clearable
+                @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="用户昵称" prop="userId">
+              <el-input v-model="queryParams.nickName" class="inputWidth" placeholder="请输入用户昵称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="联系方式" prop="contact">
-              <el-input v-model="queryParams.contact" placeholder="请输入联系方式" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.contact" class="inputWidth" placeholder="请输入联系方式" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -19,70 +26,22 @@
       </div>
     </transition>
 
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:feedback:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:feedback:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:feedback:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:feedback:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+    <el-table v-loading="loading" :data="feedbackList" :height="autoTableHeight" border
+      @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="反馈内容" align="center" prop="remark" />
+      <el-table-column label="用户id" align="center" prop="userId" width="120px" />
+      <el-table-column label="用户昵称" align="center" prop="nickName" width="180px" />
+      <el-table-column label="联系方式" align="center" prop="contact" width="120px" />
+      <el-table-column label="反馈时间" align="center" prop="updateTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="ID" align="center" prop="id" v-if="true" />
-        <el-table-column label="用户id" align="center" prop="userId" />
-        <el-table-column label="反馈内容" align="center" prop="remark" />
-        <el-table-column label="联系方式" align="center" prop="contact" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:feedback:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:feedback:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改App反馈对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="feedbackFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="反馈内容" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入反馈内容" />
-        </el-form-item>
-        <el-form-item label="联系方式" prop="contact">
-          <el-input v-model="form.contact" placeholder="请输入联系方式" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
 
@@ -91,7 +50,7 @@ import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } f
 import { FeedbackVO, FeedbackQuery, FeedbackForm } from '@/api/manage/feedback/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const autoTableHeight = ref<number>(750);
 const feedbackList = ref<FeedbackVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -122,22 +81,11 @@ const data = reactive<PageData<FeedbackForm, FeedbackQuery>>({
     pageSize: 10,
     userId: undefined,
     contact: undefined,
+    remark: undefined,
     params: {
     }
   },
   rules: {
-    id: [
-      { required: true, message: "ID不能为空", trigger: "blur" }
-    ],
-    userId: [
-      { required: true, message: "用户id不能为空", trigger: "blur" }
-    ],
-    remark: [
-      { required: true, message: "反馈内容不能为空", trigger: "blur" }
-    ],
-    contact: [
-      { required: true, message: "联系方式不能为空", trigger: "blur" }
-    ],
   }
 });
 
@@ -183,57 +131,24 @@ const handleSelectionChange = (selection: FeedbackVO[]) => {
   multiple.value = !selection.length;
 }
 
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = "添加App反馈";
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: FeedbackVO) => {
-  reset();
-  const _id = row?.id || ids.value[0]
-  const res = await getFeedback(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改App反馈";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  feedbackFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateFeedback(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await addFeedback(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: FeedbackVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除App反馈编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
-  await delFeedback(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('manage/feedback/export', {
-    ...queryParams.value
-  }, `feedback_${new Date().getTime()}.xlsx`)
-}
-
 onMounted(() => {
   getList();
+  nextTick(() => {
+    autoTableHeight.value = proxy?.autoTableHeight();
+  });
+  window.onresize = () => {
+    autoTableHeight.value = proxy?.autoTableHeight();
+  };
 });
 </script>
+<style lang="scss" scoped>
+.el-card :deep(.el-card__body) {
+  padding-bottom: 0px !important;
+}
+
+#table_page {
+  height: 50px !important;
+  margin-top: 10px !important;
+  padding-bottom: 10px !important;
+}
+</style>
diff --git a/src/views/manage/product/index.vue b/src/views/manage/product/index.vue
index 58ad7bd..6b08db2 100644
--- a/src/views/manage/product/index.vue
+++ b/src/views/manage/product/index.vue
@@ -34,26 +34,29 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" v-if="true" />
-      <el-table-column label="商品类别id" align="center" prop="categoryId" />
       <el-table-column label="商品名称" align="center" prop="productName" />
+      <el-table-column label="商品类别" align="center" prop="categoryId" />
       <el-table-column label="商品图片" align="center" prop="productImageUrl" width="100">
         <template #default="scope">
           <image-preview :src="scope.row.productImageUrl" :width="50" :height="50" />
         </template>
       </el-table-column>
       <el-table-column label="商品说明" align="center" prop="productShows" />
-      <el-table-column label="供应商id" align="center" prop="vendorId" />
+      <el-table-column label="供应商" align="center" prop="vendorId" />
       <el-table-column label="排序" align="center" prop="sortOrder" />
       <el-table-column label="商品状态" align="center" prop="productStatus" />
-      <el-table-column label="更新者" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column label="操作者" align="center" prop="updateBy" />
+      <el-table-column label="操作时间" align="center" prop="updateTime" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
+          <el-button link type="primary" @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:product:edit']">上架</el-button>
+          <el-button link type="primary" @click="handleUpdate(scope.row)"
+            v-hasPermi="['manage:product:edit']">下架</el-button>
           <el-tooltip content="修改" placement="top">
             <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
               v-hasPermi="['manage:product:edit']"></el-button>
@@ -71,26 +74,29 @@
     <!-- 添加或修改商品信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="productFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商品类别id" prop="categoryId">
-          <el-input v-model="form.categoryId" placeholder="请输入商品类别id" />
-        </el-form-item>
         <el-form-item label="商品名称" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入商品名称" />
         </el-form-item>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="商品类别" prop="categoryId">
+              <el-input v-model="form.categoryId" placeholder="请输入商品类别id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="sortOrder">
+              <el-input-number v-model="form.sortOrder" :min="1" :max="10000" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="供应商" prop="vendorId">
+          <el-input v-model="form.vendorId" placeholder="请输入供应商id" />
+        </el-form-item>
         <el-form-item label="商品图片" prop="productImage">
           <image-upload v-model="form.productImage" />
         </el-form-item>
         <el-form-item label="商品说明" prop="productShows">
-          <el-input v-model="form.productShows" placeholder="请输入商品说明" />
-        </el-form-item>
-        <el-form-item label="供应商id" prop="vendorId">
-          <el-input v-model="form.vendorId" placeholder="请输入供应商id" />
-        </el-form-item>
-        <el-form-item label="排序" prop="sortOrder">
-          <el-input v-model="form.sortOrder" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.productShows" type="textarea" :rows="5" placeholder="请输入商品说明" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -133,7 +139,7 @@ const initFormData: ProductForm = {
   productImage: undefined,
   productShows: undefined,
   vendorId: undefined,
-  sortOrder: undefined,
+  sortOrder: 0,
   productStatus: undefined,
   remark: undefined
 }
diff --git a/src/views/manage/scenic/index.vue b/src/views/manage/scenic/index.vue
index 327697d..160f489 100644
--- a/src/views/manage/scenic/index.vue
+++ b/src/views/manage/scenic/index.vue
@@ -135,11 +135,11 @@
             v-hasPermi="['system:article:edit']">发布</el-button>
           <el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')"
             v-hasPermi="['system:article:edit']">撤销发布</el-button>
-          <el-tooltip content="修改" placement="top">
+          <el-tooltip content="修改" placement="top" v-if="scope.row.status == 0">
             <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
               v-hasPermi="['system:article:edit']"></el-button>
           </el-tooltip>
-          <el-tooltip content="删除" placement="top">
+          <el-tooltip content="删除" placement="top" v-if="scope.row.status == 0">
             <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
               v-hasPermi="['system:article:remove']"></el-button>
           </el-tooltip>
diff --git a/src/views/manage/userScore/index.vue b/src/views/manage/userScore/index.vue
index 86e8fc3..bce0cf1 100644
--- a/src/views/manage/userScore/index.vue
+++ b/src/views/manage/userScore/index.vue
@@ -5,32 +5,32 @@
       <div v-show="showSearch" class="mb-[10px]" id="search_div">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="用户ID" prop="userId">
-              <el-input v-model="queryParams.userId" class="inputWidth" placeholder="请输入用户ID" clearable
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="queryParams.nickName" class="inputWidth" placeholder="请输入用户昵称" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="业务id" prop="sourceId">
-              <el-input v-model="queryParams.sourceId" class="inputWidth" placeholder="请输入业务id" clearable
+            <el-form-item label="操作内容" prop="bizName">
+              <el-input v-model="queryParams.bizName" class="inputWidth" placeholder="请输入操作内容" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
+            <el-form-item label="获得类型" prop="bizType">
+              <el-select class="inputWidth" v-model="queryParams.bizType" placeholder="请选择类型" clearable>
+                <el-option v-for="dict in dy_source" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="时间范围" prop="">
+              <el-date-picker v-model="timeGroup" type="daterange" unlink-panels range-separator="至"
+                @change="timeChange" start-placeholder="开始时间" end-placeholder="结束时间" value-format="YYYY-MM-DD"
+                :shortcuts="shortcuts" size="small" />
+            </el-form-item>
+            <!-- <el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
               <el-input v-model="queryParams.source" class="inputWidth"
                 placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable
                 @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="积分" prop="score">
-              <el-input v-model="queryParams.score" class="inputWidth" placeholder="请输入积分" clearable
-                @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd"
-                v-hasPermi="['manage:userScore:add']">新增</el-button>
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-                v-hasPermi="['manage:userScore:edit']">修改</el-button>
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-                v-hasPermi="['manage:userScore:remove']">删除</el-button> -->
             </el-form-item>
           </el-form>
         </el-card>
@@ -41,51 +41,26 @@
       <el-table v-loading="loading" :height="autoTableHeight" :data="userScoreList"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="ID" align="center" prop="id" v-if="true" />
-        <el-table-column label="用户ID" align="center" prop="userId" />
-        <el-table-column label="业务id" align="center" prop="sourceId" />
-        <el-table-column label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " align="center" prop="source" />
-        <el-table-column label="积分" align="center" prop="score" />
-        <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="用户昵称" align="center" prop="nickName" />
+        <el-table-column label="积分获得时间" align="center" prop="updateTime" />
+        <el-table-column label="获得类型" align="center" prop="bizType">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['manage:userScore:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['manage:userScore:remove']"></el-button>
-            </el-tooltip>
+            <dict-tag :options="dy_source" :value="scope.row.bizType" />
           </template>
-</el-table-column> -->
+        </el-table-column>
+        <el-table-column label="操作内容" align="center" prop="bizName" />
+        <!-- <el-table-column label="业务id" align="center" prop="sourceId" /> -->
+        <!-- <el-table-column label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " align="center" prop="source" /> -->
+        <el-table-column label="积分" align="center" prop="score">
+          <template #default="scope">
+            <span>{{ scope.row.score > 0 ? '+' + scope.row.score+' 积分' : scope.row.score}}</span>
+          </template>
+        </el-table-column>
       </el-table>
 
       <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改积分记录对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="userScoreFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="业务id" prop="sourceId">
-          <el-input v-model="form.sourceId" placeholder="请输入业务id" />
-        </el-form-item>
-        <el-form-item label="来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " prop="source">
-          <el-input v-model="form.source" placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " />
-        </el-form-item>
-        <el-form-item label="积分" prop="score">
-          <el-input v-model="form.score" placeholder="请输入积分" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -103,7 +78,9 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const { dy_source } = toRefs<any>(
+  proxy?.useDict('dy_source')
+);
 const queryFormRef = ref<ElFormInstance>();
 const userScoreFormRef = ref<ElFormInstance>();
 
@@ -119,15 +96,21 @@ const initFormData: UserScoreForm = {
   source: undefined,
   score: undefined,
 }
+const timeGroup = ref<string[]>([]);
 const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    userId: undefined,
-    sourceId: undefined,
-    source: undefined,
+    bizName: undefined,
+    nickName: undefined,
+    bizType:undefined,
     score: undefined,
+    startTime:undefined,
+    endTime:undefined,
+    // userId: undefined,
+    // sourceId: undefined,
+    // source: undefined,
     params: {
     }
   },
@@ -151,7 +134,35 @@ const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
+const shortcuts = [
+  {
+    text: '过去一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '过去一月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '前三月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
 /** 查询积分记录列表 */
 const getList = async () => {
   loading.value = true;
@@ -241,7 +252,16 @@ const handleExport = () => {
     ...queryParams.value
   }, `userScore_${new Date().getTime()}.xlsx`)
 }
-
+// 时间范围改变
+const timeChange = (dates: any) => {
+  if (dates) {
+    queryParams.value.startTime = dates[0]+' 00:00:00';
+    queryParams.value.endTime = dates[1]+' 23:59:59';
+  }else{
+    queryParams.value.startTime=undefined;
+    queryParams.value.endTime=undefined;
+  }
+}
 onMounted(() => {
   getList();
   nextTick(() => {