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

修改bug

Browse Source
This commit is contained in:
helen 2024-12-27 17:25:22 +08:00
parent a02c8656c6
commit 9026b27169
11 changed files with 103 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/components/commentRows/index.vue
View File

@ -7,7 +7,7 @@
<!-- <img :src="comment.avatar" alt="用户昵称" class="avatar"> --> <!-- <img :src="comment.avatar" alt="用户昵称" class="avatar"> -->
<image-preview :src="comment.avatar" :width="25" :height="25" /> <image-preview :src="comment.avatar" :width="25" :height="25" />
<div class="username"> <div class="username">
<div style="margin-right: 5px;"> <div style="margin-right: 5px">
{{ comment.nickName }} {{ comment.nickName }}
</div> </div>
<!-- <div v-if="comment.parentId" class="reply-to"></div> <!-- <div v-if="comment.parentId" class="reply-to"></div>
@ -18,7 +18,7 @@
<div class="comment-content">{{ comment.content }}</div> <div class="comment-content">{{ comment.content }}</div>
<div class="comment-info"> <div class="comment-info">
<span class="comment-time">{{ comment.createTime }}</span> <span class="comment-time">{{ comment.createTime }}</span>
<span class="ip-address">IP: {{ comment.address?comment.address:'未知' }}</span> <span class="ip-address">IP: {{ comment.address ? comment.address : '未知' }}</span>
</div> </div>
</div> </div>
<div v-if="comment.daList && comment.daList.length" class="replies"> <div v-if="comment.daList && comment.daList.length" class="replies">
@ -32,10 +32,10 @@
<div class="reply-to"></div> <div class="reply-to"></div>
<span>{{ reply.replyNickName }}</span> <span>{{ reply.replyNickName }}</span>
</div> </div>
<div class="comment-content" style="margin-left: 10px;">{{ reply.content }}</div> <div class="comment-content" style="margin-left: 10px">{{ reply.content }}</div>
<div class="comment-info" style="margin-left: 10px;"> <div class="comment-info" style="margin-left: 10px">
<span class="comment-time">{{ reply.createTime }}</span> <span class="comment-time">{{ reply.createTime }}</span>
<span class="ip-address">IP: {{ reply.address?reply.address:'未知' }}</span> <span class="ip-address">IP: {{ reply.address ? reply.address : '未知' }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -43,27 +43,37 @@
</div> </div>
</div> </div>
</div> </div>
<pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum" <pagination
v-model:limit="queryParams.pageSize" @pagination="getCommentList" /> v-show="total > 0"
id="table_page"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getCommentList"
/>
</div> </div>
</template> </template>
<script setup lang="ts" name="commentList"> <script setup lang="ts" name="commentList">
import { ref, reactive, onMounted, nextTick } from 'vue'; import { ref, reactive, onMounted, nextTick } from 'vue';
import {commentList } from '@/api/manage/scenic'; import { commentList } from '@/api/manage/scenic';
//导入父组件传递的值 //导入父组件传递的值
const props = defineProps({ const props = defineProps({
bizId:{ bizId: {
type: Number, type: Number,
default: null, default: null
},
type: {
type: Number,
default: null
} }
}); });
const queryParams = reactive({ const queryParams = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
bizId: null, bizId: null,
status: 0, type: props.type
}); });
// 监听父组件传递的tagIds,当tagIds发生变化时，重新获取数据 // 监听父组件传递的tagIds,当tagIds发生变化时，重新获取数据
watch( watch(
@ -80,7 +90,7 @@ watch(
}, },
{ immediate: true } { immediate: true }
); );
const total=ref(0) const total = ref(0);
const loading = ref(false); const loading = ref(false);
const commentListData = ref([]); const commentListData = ref([]);
// 导入父组件定义的函数 // 导入父组件定义的函数
@ -90,11 +100,11 @@ const emit = defineEmits(['hideDialog']);
*/ */
const getCommentList = async () => { const getCommentList = async () => {
loading.value = true; loading.value = true;
let res=await commentList(queryParams).finally(() => (loading.value = false)); let res = await commentList(queryParams).finally(() => (loading.value = false));
console.log('评论列表：',res); console.log('评论列表：', res);
total.value=res.total; total.value = res.total;
commentListData.value = res.rows; commentListData.value = res.rows;
} };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.commentList { .commentList {
@ -147,7 +157,6 @@ const getCommentList = async () => {
} }
} }
.ip-address { .ip-address {
margin-left: 15px; margin-left: 15px;
} }
@ -167,4 +176,4 @@ const getCommentList = async () => {
padding-bottom: 0px !important; padding-bottom: 0px !important;
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
</style> </style>

2
src/views/manage/activity/index.vue
View File

@ -467,7 +467,7 @@ const saveupdate = async (row?: ActivityVO, type) => {
form.value.status = type == 0 ? 1 : 0; form.value.status = type == 0 ? 1 : 0;
const test = type == 0 ? '发布' : '撤销发布'; const test = type == 0 ? '发布' : '撤销发布';
const _ids = row?.activityName || ids.value; const _ids = row?.activityName || ids.value;
await proxy?.$modal.confirm('是否确认' + test + '活动名称 为' + _ids + '的数据项？').finally(() => (loading.value = false)); await proxy?.$modal.confirm('是否确认' + test + '活动名称为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await updateActivity(form.value).finally(() => (buttonLoading.value = false)); await updateActivity(form.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess(test + '成功'); proxy?.$modal.msgSuccess(test + '成功');
await getList(); await getList();

47
src/views/manage/mkJigsaw/index.vue
View File

@ -222,6 +222,21 @@
<el-table-column prop="joinCount" label="获得人数" /> <el-table-column prop="joinCount" label="获得人数" />
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 拼图参与人数-->
<el-dialog v-model="mkpeoplenum.visible" :title="mkpeoplenum.title" width="50%" append-to-body>
<el-table :data="mkpeoplenumdata" border style="width: 100%">
<el-table-column prop="nickName" label="用户昵称" width="180" />
<el-table-column prop="avatar" label="用户图片" width="180" />
<el-table-column prop="createTime" label="参与时间" />
</el-table>
<pagination
v-show="mkpeopletotal > 0"
v-model:page="mkpeoplenumParams.pageNum"
v-model:limit="mkpeoplenumParams.pageSize"
:total="mkpeopletotal"
@pagination="getList"
/>
</el-dialog>
<!-- 获奖人员 --> <!-- 获奖人员 -->
<el-dialog v-model="mkReward.visible" title="获奖人员" width="600px" append-to-body> <el-dialog v-model="mkReward.visible" title="获奖人员" width="600px" append-to-body>
<div> <div>
@ -292,8 +307,9 @@ import {
updateMkJigsaw, updateMkJigsaw,
productall, productall,
mkJigsawDetaillist, mkJigsawDetaillist,
productCategoryall, mkJoinlist productCategoryall,
} from "@/api/manage/mkJigsaw"; mkJoinlist
} from '@/api/manage/mkJigsaw';
import { MkJigsawVO, MkJigsawQuery, MkJigsawForm } from '@/api/manage/mkJigsaw/types'; import { MkJigsawVO, MkJigsawQuery, MkJigsawForm } from '@/api/manage/mkJigsaw/types';
import { mkRewardUserList } from '@/api/manage/mkConfig'; import { mkRewardUserList } from '@/api/manage/mkConfig';
import { listProductCategory } from '@/api/manage/productCategory'; import { listProductCategory } from '@/api/manage/productCategory';
@ -310,12 +326,14 @@ 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 mkpeopletotal = ref(0);
const value2 = ref(''); const value2 = ref('');
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const mkJigsawFormRef = ref<ElFormInstance>(); const mkJigsawFormRef = ref<ElFormInstance>();
const imagegoodsoptions = ref([]); const imagegoodsoptions = ref([]);
const goodsdata = ref([]); const goodsdata = ref([]);
const imagelistdata = ref([]); const imagelistdata = ref([]);
const mkpeoplenumdata = ref([]);
const note_publish_list = ref([ const note_publish_list = ref([
{ label: '已发布', value: 2 }, { label: '已发布', value: 2 },
{ label: '审核中', value: 1 }, { label: '审核中', value: 1 },
@ -332,6 +350,7 @@ const mkRewardUserParams = reactive({
pageSize: 10, pageSize: 10,
bizId: null bizId: null
}); });
const taskid = ref('');
const mkReward = reactive({ const mkReward = reactive({
visible: false visible: false
}); });
@ -345,10 +364,21 @@ const productInfo = reactive({
productShows: null productShows: null
} }
}); });
const mkpeoplenumParams = reactive({
pageNum: 1,
pageSize: 10,
bizId: null,
type: 2
});
const mksave = reactive<DialogOption>({ const mksave = reactive<DialogOption>({
visible: false, visible: false,
title: '拼图详情' title: '拼图详情'
}); });
const mkpeoplenum = reactive<DialogOption>({
visible: false,
title: '参与人数'
});
const imagedialog = reactive<DialogOption>({ const imagedialog = reactive<DialogOption>({
visible: false, visible: false,
title: '拼图碎片获得人数' title: '拼图碎片获得人数'
@ -652,9 +682,18 @@ const mkdatetime = () => {
} }
}; };
//参与人数 //参与人数
const handleJoin = async () => { const handleJoin = async (row) => {
const res = await mkJoinlist() taskid.value = row.id;
getmkpeoplenlist();
}; };
const getmkpeoplenlist = async () => {
mkpeoplenumParams.bizId = taskid;
const res = await mkJoinlist(mkpeoplenumParams);
mkpeoplenumdata.value = res.rows;
mkpeopletotal.value = res.total;
mkpeoplenum.visible = true;
};
//关闭奖品详情 //关闭奖品详情
const cancelProductInfo = () => { const cancelProductInfo = () => {
productInfo.visible = false; productInfo.visible = false;

2
src/views/manage/noteManage/index.vue
View File

@ -162,7 +162,7 @@
<!-- 评论详情 --> <!-- 评论详情 -->
<el-dialog v-model="comment.visible" title="评论详情" width="600px" append-to-body> <el-dialog v-model="comment.visible" title="评论详情" width="600px" append-to-body>
<div class="commentList"> <div class="commentList">
<commentRows :biz-id="comment.bizId"></commentRows> <commentRows :biz-id="comment.bizId" :type="1"></commentRows>
</div> </div>
<template #footer> <template #footer>
<div class="dialog-footer noTopPadding"> <div class="dialog-footer noTopPadding">

10
src/views/system/client/index.vue
View File

@ -28,11 +28,11 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:client:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button> <el-button v-hasPermi="['system:client:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:client:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"> <!-- <el-button v-hasPermi="['system:client:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">-->
修改 <!-- 修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:client:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> <el-button v-hasPermi="['system:client:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
删除 删除

10
src/views/system/config/index.vue
View File

@ -40,11 +40,11 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:config:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button> <el-button v-hasPermi="['system:config:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:config:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"> <!-- <el-button v-hasPermi="['system:config:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">-->
修改 <!-- 修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> <el-button v-hasPermi="['system:config:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
删除 删除

6
src/views/system/dict/index.vue
View File

@ -35,9 +35,9 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button> <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button> <!-- <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
删除 删除

10
src/views/system/notice/index.vue
View File

@ -30,11 +30,11 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:notice:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button> <el-button v-hasPermi="['system:notice:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:notice:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" <!-- <el-button v-hasPermi="['system:notice:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"-->
>修改</el-button <!-- >修改</el-button-->
> <!-- >-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:notice:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> <el-button v-hasPermi="['system:notice:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
删除 删除

10
src/views/system/post/index.vue
View File

@ -68,11 +68,11 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:post:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button> <el-button v-hasPermi="['system:post:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:post:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" <!-- <el-button v-hasPermi="['system:post:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"-->
>修改</el-button <!-- >修改</el-button-->
> <!-- >-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:post:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> <el-button v-hasPermi="['system:post:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
删除 删除

6
src/views/system/role/index.vue
View File

@ -42,9 +42,9 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button> <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button> <!-- <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button> <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">删除</el-button>
</el-col> </el-col>

10
src/views/system/user/index.vue
View File

@ -62,11 +62,11 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button> <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()"> <!-- <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">-->
修改 <!-- 修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()"> <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
删除 删除