direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Conversation 0 Commits 85 Files Changed 94 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79e039c975 - Show all commits

4
src/modules/other/operateguide/OperateguideListView.vue
View File

@ -41,6 +41,7 @@ async function load() {
} catch { list.value = []; total.value = 0 } finally { loading.value = false } } catch { list.value = []; total.value = 0 } finally { loading.value = false }
} }
function onPageChange(p: number) { query.page = p; load() } function onPageChange(p: number) { query.page = p; load() }
function onLimitChange(l: number) { query.limit = l; query.page = 1; load() }
onMounted(load) onMounted(load)
</script> </script>
@ -48,7 +49,8 @@ onMounted(load)
<div class="rr-page"> <div class="rr-page">
<PageHeader title="操作指南" :sub="`操作指南内容 (共 ${total} 条)`" /> <PageHeader title="操作指南" :sub="`操作指南内容 (共 ${total} 条)`" />
<div class="rr-card"> <div class="rr-card">
<DataTable :columns="columns" :data="list" :loading="loading" :total="total" :page="query.page" :limit="query.limit" :show-pagination="true" row-key="id" empty-text="暂无内容" @page-change="onPageChange" /> <DataTable :columns="columns" :data="list" :loading="loading" :total="total" :page="query.page" :limit="query.limit" :show-pagination="true" row-key="id" empty-text="暂无内容" @page-change="onPageChange"
@limit-change="onLimitChange" />
</div> </div>
</div> </div>
</template> </template>

6
src/modules/user/UserListView.vue
View File

@ -52,7 +52,7 @@ const columns: any[] = [
{ {
prop: 'isEnterprise', prop: 'isEnterprise',
label: '是否企业认证', label: '是否企业认证',
width: 130, width: 140,
formatter: (row: FrontUser) => row.isEnterprise === 1 ? '是' : '否' formatter: (row: FrontUser) => row.isEnterprise === 1 ? '是' : '否'
}, },
{ {
@ -149,6 +149,7 @@ function onTabChange(key: string) {
} }
function onPageChange(p: number) { query.page = p; load() } function onPageChange(p: number) { query.page = p; load() }
function onLimitChange(l: number) { query.limit = l; query.page = 1; load() }
function onSearch() { query.page = 1; load() } function onSearch() { query.page = 1; load() }
function onReset() { function onReset() {
query.userId = ''; query.nickName = ''; query.mobile = '' query.userId = ''; query.nickName = ''; query.mobile = ''
@ -211,7 +212,7 @@ onMounted(load)
{ key: 'userId', label: '用户ID', type: 'text', placeholder: '用户ID' }, { key: 'userId', label: '用户ID', type: 'text', placeholder: '用户ID' },
{ key: 'nickName', label: '用户昵称', type: 'text', placeholder: '用户昵称' }, { key: 'nickName', label: '用户昵称', type: 'text', placeholder: '用户昵称' },
{ key: 'mobile', label: '手机号', type: 'text', placeholder: '手机号' }, { key: 'mobile', label: '手机号', type: 'text', placeholder: '手机号' },
{ key: 'isEnterprise', label: '是否企业认证', type: 'select', placeholder: '所有认证', { key: 'isEnterprise', label: '是否企业认证', type: 'select', placeholder: '所有状态', width: '160px',
options: [{ label: '已认证', value: '1' }, { label: '未认证', value: '0' }] }, options: [{ label: '已认证', value: '1' }, { label: '未认证', value: '0' }] },
{ key: 'enterpriseName', label: '企业名称', type: 'text', placeholder: '企业名称' } { key: 'enterpriseName', label: '企业名称', type: 'text', placeholder: '企业名称' }
]" ]"
@ -232,6 +233,7 @@ onMounted(load)
row-key="id" row-key="id"
empty-text="暂无用户" empty-text="暂无用户"
@page-change="onPageChange" @page-change="onPageChange"
@limit-change="onLimitChange"
> >
<template #enabled="{ row }"> <template #enabled="{ row }">
<el-tag v-if="row.enabled === 1" type="success" size="small" effect="light" round>正常</el-tag> <el-tag v-if="row.enabled === 1" type="success" size="small" effect="light" round>正常</el-tag>