wuyajie/daoyou_manage_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化反馈、积分和商品管理界面及逻辑

Browse Source
This commit is contained in:
钊钊 2024-12-19 14:39:17 +08:00
parent 2f4b21493d
commit 1759dbb28d
11 changed files with 527 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/manage/feedback/types.ts
View File

@ -23,7 +23,6 @@ export interface FeedbackVO {
* 创建时间 * 创建时间
*/ */
createTime: string; createTime: string;
} }
export interface FeedbackForm extends BaseEntity { export interface FeedbackForm extends BaseEntity {
@ -46,26 +45,22 @@ export interface FeedbackForm extends BaseEntity {
* 联系方式 * 联系方式
*/ */
contact?: string; contact?: string;
} }
export interface FeedbackQuery extends PageQuery { export interface FeedbackQuery extends PageQuery {
/** /**
* 用户id * 用户id
*/ */
userId?: string | number; userId?: string | number;
nickName?: string;
remark?: string;
/** /**
* 联系方式 * 联系方式
*/ */
contact?: string; contact?: string;
/** /**
* 日期范围参数 * 日期范围参数
*/ */
params?: any; params?: any;
} }

13
src/api/manage/scenic/index.ts
View File

@ -81,3 +81,16 @@ export const listByTagIdNotebook = (query: any): AxiosPromise<ArticleVO[]> => {
params: query params: query
}); });
}; };
/**
*
* @param query 查询评论列表
* @returns
*/
export const commentList = (query: any): AxiosPromise<ArticleVO[]> => {
return request({
url: '/manage/comment/list',
method: 'get',
params: query
});
};

28
src/api/manage/userScore/types.ts
View File

@ -15,7 +15,7 @@ export interface UserScoreVO {
sourceId: string | number; sourceId: string | number;
/** /**
* 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
*/ */
source: number; source: number;
@ -23,7 +23,6 @@ export interface UserScoreVO {
* 积分 * 积分
*/ */
score: number; score: number;
} }
export interface UserScoreForm extends BaseEntity { export interface UserScoreForm extends BaseEntity {
@ -31,7 +30,7 @@ export interface UserScoreForm extends BaseEntity {
* ID * ID
*/ */
id?: string | number; id?: string | number;
bizName?: string;
/** /**
* 用户ID * 用户ID
*/ */
@ -43,7 +42,7 @@ export interface UserScoreForm extends BaseEntity {
sourceId?: string | number; sourceId?: string | number;
/** /**
* 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
*/ */
source?: number; source?: number;
@ -51,23 +50,25 @@ export interface UserScoreForm extends BaseEntity {
* 积分 * 积分
*/ */
score?: number; score?: number;
} }
export interface UserScoreQuery extends PageQuery { export interface UserScoreQuery extends PageQuery {
/** /**
* 用户ID * 用户ID
*/ */
userId?: string | number; userId?: string | number;
bizName?: string;
nickName?: string;
bizType: string;
endTime?: string;
startTime?: string;
/** /**
* 业务id * 业务id
*/ */
sourceId?: string | number; sourceId?: string | number;
/** /**
* 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) * 来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮)
*/ */
source?: number; source?: number;
@ -76,11 +77,8 @@ export interface UserScoreQuery extends PageQuery {
*/ */
score?: number; score?: number;
/** /**
* 日期范围参数 * 日期范围参数
*/ */
params?: any; params?: any;
} }

23
src/components/ImageUpload/index.vue
View File

@ -1,22 +1,9 @@
<template> <template>
<div class="component-upload-image"> <div class="component-upload-image">
<el-upload <el-upload ref="imageUpload" multiple :action="uploadImgUrl" list-type="picture-card"
ref="imageUpload" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload" :limit="limit" :on-error="handleUploadError"
multiple :on-exceed="handleExceed" :before-remove="handleDelete" :show-file-list="true" :headers="headers"
:action="uploadImgUrl" :file-list="fileList" :on-preview="handlePictureCardPreview" :class="{ hide: fileList.length >= limit }">
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"> <el-icon class="avatar-uploader-icon">
<plus /> <plus />
</el-icon> </el-icon>
@ -52,7 +39,7 @@ const props = defineProps({
default: () => [] default: () => []
}, },
// 图片数量限制 // 图片数量限制
limit: propTypes.number.def(5), limit: propTypes.number.def(1),
// 大小限制(MB) // 大小限制(MB)
fileSize: propTypes.number.def(5), fileSize: propTypes.number.def(5),
// 文件类型, 例如['png', 'jpg', 'jpeg'] // 文件类型, 例如['png', 'jpg', 'jpeg']

63
src/components/noteList/index.vue
View File

@ -19,7 +19,11 @@
<el-button link type="primary" @click="handleDetail(scope.row)">查看详情</el-button> <el-button link type="primary" @click="handleDetail(scope.row)">查看详情</el-button>
</template> </template>
</el-table-column> </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="agreeCount" width="80px" />
<el-table-column label="发布状态" align="center" prop=""> <el-table-column label="发布状态" align="center" prop="">
<template #default="scope"> <template #default="scope">
@ -48,13 +52,38 @@
</el-table> </el-table>
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum" <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getTableList" /> 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> </div>
</template> </template>
<script setup lang="ts" name="noteList"> <script setup lang="ts" name="noteList">
import { ref, reactive, onMounted, nextTick } from 'vue'; import { ref, reactive, onMounted, nextTick } from 'vue';
import { string } from 'vue-types'; import { string } from 'vue-types';
import { listByTagIdNotebook } from '@/api/manage/scenic'; import { listByTagIdNotebook,commentList } from '@/api/manage/scenic';
//导入父组件传递的值 //导入父组件传递的值
const props = defineProps({ const props = defineProps({
@ -78,13 +107,25 @@ const props = defineProps({
const total = ref(0); const total = ref(0);
const loading = ref(false); const loading = ref(false);
const tableList = ref([]); const tableList = ref([]);
const noteDetail = reactive({
visible: false,
title: '',
content: ''
})
const comment = reactive({
visible: false,
title: '',
content: ''
})
const queryParams = reactive({ const queryParams = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
tagIds: null tagIds: null
}); });
const cancel = () => {
comment.visible = false;
noteDetail.visible = false;
}
// 获取笔记列表 // 获取笔记列表
const getTableList = async () => { const getTableList = async () => {
loading.value = true; loading.value = true;
@ -92,6 +133,20 @@ const getTableList = async () => {
tableList.value = res.rows; tableList.value = res.rows;
total.value = res.total; 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发生变化时，重新获取数据 // 监听父组件传递的tagIds,当tagIds发生变化时，重新获取数据
watch( watch(
() => props.noteBookTagIds, () => props.noteBookTagIds,

24
src/layout/components/Navbar.vue
View File

@ -1,12 +1,13 @@
<template> <template>
<div class="navbar"> <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" /> <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
<top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" /> <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />
<div class="right-menu flex align-center"> <div class="right-menu flex align-center">
<template v-if="appStore.device !== 'mobile'"> <template v-if="appStore.device !== 'mobile'">
<el-select <!-- <el-select
v-if="userId === 1 && tenantEnabled" v-if="userId === 1 && tenantEnabled"
v-model="companyName" v-model="companyName"
class="min-w-244px" 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> <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> <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" /> --> <!-- <header-search id="header-search" class="right-menu-item" /> -->
<search-menu ref="searchMenuRef" /> <search-menu ref="searchMenuRef" />
@ -140,16 +141,16 @@ const dynamicClearEvent = async () => {
}; };
/** 租户列表 */ /** 租户列表 */
const initTenantList = async () => { // const initTenantList = async () => {
const { data } = await getTenantList(); // const { data } = await getTenantList();
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; // tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) { // if (tenantEnabled.value) {
tenantList.value = data.voList; // tenantList.value = data.voList;
} // }
}; // };
defineExpose({ defineExpose({
initTenantList // initTenantList
}); });
const toggleSideBar = () => { const toggleSideBar = () => {
@ -272,6 +273,7 @@ watch(
.avatar-container { .avatar-container {
margin-right: 40px; margin-right: 40px;
margin-left: 10px;
.avatar-wrapper { .avatar-wrapper {
margin-top: 5px; margin-top: 5px;

265
src/views/manage/bannedUser/index.vue
View File

@ -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>

177
src/views/manage/feedback/index.vue
View File

@ -1,14 +1,21 @@
<template> <template>
<div class="p-2"> <div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
<div v-show="showSearch" class="mb-[10px]"> :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="用户id" prop="userId"> <el-form-item label="反馈内容" prop="remark">
<el-input v-model="queryParams.userId" placeholder="请输入用户id" clearable @keyup.enter="handleQuery" /> <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>
<el-form-item label="联系方式" prop="contact"> <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-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -19,70 +26,22 @@
</div> </div>
</transition> </transition>
<el-card shadow="never"> <el-table v-loading="loading" :data="feedbackList" :height="autoTableHeight" border
<template #header> @selection-change="handleSelectionChange">
<el-row :gutter="10" class="mb8"> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-col :span="1.5"> <el-table-column label="反馈内容" align="center" prop="remark" />
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:feedback:add']">新增</el-button> <el-table-column label="用户id" align="center" prop="userId" width="120px" />
</el-col> <el-table-column label="用户昵称" align="center" prop="nickName" width="180px" />
<el-col :span="1.5"> <el-table-column label="联系方式" align="center" prop="contact" width="120px" />
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:feedback:edit']">修改</el-button> <el-table-column label="反馈时间" align="center" prop="updateTime" width="180">
</el-col> <template #default="scope">
<el-col :span="1.5"> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:feedback:remove']">删除</el-button> </template>
</el-col> </el-table-column>
<el-col :span="1.5"> </el-table>
<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" @selection-change="handleSelectionChange"> <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
<el-table-column type="selection" width="55" align="center" /> v-model:limit="queryParams.pageSize" @pagination="getList" />
<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>
</div> </div>
</template> </template>
@ -91,7 +50,7 @@ import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback } f
import { FeedbackVO, FeedbackQuery, FeedbackForm } from '@/api/manage/feedback/types'; import { FeedbackVO, FeedbackQuery, FeedbackForm } from '@/api/manage/feedback/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const autoTableHeight = ref<number>(750);
const feedbackList = ref<FeedbackVO[]>([]); const feedbackList = ref<FeedbackVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
const loading = ref(true); const loading = ref(true);
@ -122,22 +81,11 @@ const data = reactive<PageData<FeedbackForm, FeedbackQuery>>({
pageSize: 10, pageSize: 10,
userId: undefined, userId: undefined,
contact: undefined, contact: undefined,
remark: undefined,
params: { params: {
} }
}, },
rules: { 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; 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(() => { onMounted(() => {
getList(); getList();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
window.onresize = () => {
autoTableHeight.value = proxy?.autoTableHeight();
};
}); });
</script> </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>

44
src/views/manage/product/index.vue
View File

@ -34,26 +34,29 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="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="productName" />
<el-table-column label="商品类别" align="center" prop="categoryId" />
<el-table-column label="商品图片" align="center" prop="productImageUrl" width="100"> <el-table-column label="商品图片" align="center" prop="productImageUrl" width="100">
<template #default="scope"> <template #default="scope">
<image-preview :src="scope.row.productImageUrl" :width="50" :height="50" /> <image-preview :src="scope.row.productImageUrl" :width="50" :height="50" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品说明" align="center" prop="productShows" /> <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="sortOrder" />
<el-table-column label="商品状态" align="center" prop="productStatus" /> <el-table-column label="商品状态" align="center" prop="productStatus" />
<el-table-column label="更新者" align="center" prop="updateBy" /> <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="updateTime" width="180">
<template #default="scope"> <template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <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-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['manage:product:edit']"></el-button> 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-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 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-form-item label="商品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入商品名称" /> <el-input v-model="form.productName" placeholder="请输入商品名称" />
</el-form-item> </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"> <el-form-item label="商品图片" prop="productImage">
<image-upload v-model="form.productImage" /> <image-upload v-model="form.productImage" />
</el-form-item> </el-form-item>
<el-form-item label="商品说明" prop="productShows"> <el-form-item label="商品说明" prop="productShows">
<el-input v-model="form.productShows" placeholder="请输入商品说明" /> <el-input v-model="form.productShows" type="textarea" :rows="5" 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-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@ -133,7 +139,7 @@ const initFormData: ProductForm = {
productImage: undefined, productImage: undefined,
productShows: undefined, productShows: undefined,
vendorId: undefined, vendorId: undefined,
sortOrder: undefined, sortOrder: 0,
productStatus: undefined, productStatus: undefined,
remark: undefined remark: undefined
} }

4
src/views/manage/scenic/index.vue
View File

@ -135,11 +135,11 @@
v-hasPermi="['system:article:edit']">发布</el-button> v-hasPermi="['system:article:edit']">发布</el-button>
<el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')" <el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')"
v-hasPermi="['system:article:edit']">撤销发布</el-button> 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)" <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:article:edit']"></el-button> v-hasPermi="['system:article:edit']"></el-button>
</el-tooltip> </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)" <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"></el-button> v-hasPermi="['system:article:remove']"></el-button>
</el-tooltip> </el-tooltip>

140
src/views/manage/userScore/index.vue
View File

@ -5,32 +5,32 @@
<div v-show="showSearch" class="mb-[10px]" id="search_div"> <div v-show="showSearch" class="mb-[10px]" id="search_div">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="用户ID" prop="userId"> <el-form-item label="用户昵称" prop="nickName">
<el-input v-model="queryParams.userId" class="inputWidth" placeholder="请输入用户ID" clearable <el-input v-model="queryParams.nickName" class="inputWidth" placeholder="请输入用户昵称" clearable
@keyup.enter="handleQuery" /> @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="业务id" prop="sourceId"> <el-form-item label="操作内容" prop="bizName">
<el-input v-model="queryParams.sourceId" class="inputWidth" placeholder="请输入业务id" clearable <el-input v-model="queryParams.bizName" class="inputWidth" placeholder="请输入操作内容" clearable
@keyup.enter="handleQuery" /> @keyup.enter="handleQuery" />
</el-form-item> </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" <el-input v-model="queryParams.source" class="inputWidth"
placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable placeholder="请输入来源类型(0=签到 1=发笔记 2=扔瓶子 3=评论 4=点赞 5=分享 6=收藏 7=地图点亮) " clearable
@keyup.enter="handleQuery" /> @keyup.enter="handleQuery" />
</el-form-item> </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 type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</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-item>
</el-form> </el-form>
</el-card> </el-card>
@ -41,51 +41,26 @@
<el-table v-loading="loading" :height="autoTableHeight" :data="userScoreList" <el-table v-loading="loading" :height="autoTableHeight" :data="userScoreList"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="userId" /> <el-table-column label="积分获得时间" align="center" prop="updateTime" />
<el-table-column label="业务id" align="center" prop="sourceId" /> <el-table-column label="获得类型" align="center" prop="bizType">
<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"> <template #default="scope">
<el-tooltip content="修改" placement="top"> <dict-tag :options="dy_source" :value="scope.row.bizType" />
<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> </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> </el-table>
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum" <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" /> v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </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> </div>
</template> </template>
@ -103,7 +78,9 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true); const single = ref(true);
const multiple = ref(true); const multiple = ref(true);
const total = ref(0); const total = ref(0);
const { dy_source } = toRefs<any>(
proxy?.useDict('dy_source')
);
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const userScoreFormRef = ref<ElFormInstance>(); const userScoreFormRef = ref<ElFormInstance>();
@ -119,15 +96,21 @@ const initFormData: UserScoreForm = {
source: undefined, source: undefined,
score: undefined, score: undefined,
} }
const timeGroup = ref<string[]>([]);
const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({ const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({
form: {...initFormData}, form: {...initFormData},
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userId: undefined, bizName: undefined,
sourceId: undefined, nickName: undefined,
source: undefined, bizType:undefined,
score: undefined, score: undefined,
startTime:undefined,
endTime:undefined,
// userId: undefined,
// sourceId: undefined,
// source: undefined,
params: { params: {
} }
}, },
@ -151,7 +134,35 @@ const data = reactive<PageData<UserScoreForm, UserScoreQuery>>({
}); });
const { queryParams, form, rules } = toRefs(data); 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 () => { const getList = async () => {
loading.value = true; loading.value = true;
@ -241,7 +252,16 @@ const handleExport = () => {
...queryParams.value ...queryParams.value
}, `userScore_${new Date().getTime()}.xlsx`) }, `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(() => { onMounted(() => {
getList(); getList();
nextTick(() => { nextTick(() => {