diff --git a/src/components/Common/TableDialog.vue b/src/components/Common/TableDialog.vue
new file mode 100644
index 0000000..4e3a72c
--- /dev/null
+++ b/src/components/Common/TableDialog.vue
@@ -0,0 +1,23 @@
+<template>
+    <el-dialog :model-value="visible" :title="title" :width="width" append-to-body destroy-on-close
+        @update:model-value="$emit('update:visible', $event)">
+        <slot />
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+interface Props {
+    visible: boolean;
+    title?: string;
+    width?: string | number;
+}
+
+withDefaults(defineProps<Props>(), {
+    title: '',
+    width: '640px',
+});
+
+defineEmits<{
+    'update:visible': [val: boolean];
+}>();
+</script>
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 62ca76a..e85345c 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -74,7 +74,8 @@ const pageSize = computed<number | undefined>({
 });
 
 function handleSizeChange(val: number) {
-  emit('pagination', { page: currentPage, limit: val });
+  emit('update:page', 1);
+  emit('pagination', { page: 1, limit: val });
   if (props.autoScroll) {
     scrollTo(0, 800);
   }
diff --git a/src/components/Store/StoreAccountDialog.vue b/src/components/Store/StoreAccountDialog.vue
new file mode 100644
index 0000000..0945b5d
--- /dev/null
+++ b/src/components/Store/StoreAccountDialog.vue
@@ -0,0 +1,147 @@
+<template>
+    <el-dialog :model-value="visible" :title="isEdit ? '修改用户账号' : '添加用户账号'" width="640px"
+        append-to-body @update:model-value="$emit('update:visible', $event)" @closed="onClosed">
+        <el-form ref="formRef" :model="form" :rules="formRules" label-width="120px">
+            <el-form-item label="账号" prop="account">
+                <el-input v-model="form.account" placeholder="请输入账号" />
+            </el-form-item>
+            <el-form-item label="密码" prop="password">
+                <el-input v-model="form.password" :placeholder="isEdit ? '留空不修改' : '请输入密码'" type="password"
+                    show-password />
+            </el-form-item>
+            <el-form-item v-if="!isEdit" label="确认密码" prop="confirm_password">
+                <el-input v-model="form.confirm_password" placeholder="请确认密码" type="password" show-password />
+            </el-form-item>
+            <el-form-item label="门店" prop="store_id">
+                <el-select v-model="form.store_id" placeholder="请选择门店" style="width: 100%">
+                    <el-option v-for="item in storeList" :key="item.id" :label="item.store_name"
+                        :value="Number(item.id)" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button @click="$emit('update:visible', false)">取消</el-button>
+            <el-button type="primary" :loading="loading" @click="submit">确定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, computed, watch } from 'vue';
+import { addStoreAccount, editStoreAccount } from '@/api/store/index';
+import { ElMessage } from 'element-plus';
+
+interface StoreItem {
+    id: number;
+    store_name: string;
+}
+
+interface Props {
+    visible: boolean;
+    storeList: StoreItem[];
+    editId?: number;
+    editData?: {
+        id: number;
+        account: string;
+        store_id: number;
+    };
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits<{
+    'update:visible': [val: boolean];
+    success: [];
+}>();
+
+const loading = ref(false);
+const formRef = ref();
+const form = reactive({
+    id: undefined as number | undefined,
+    account: '',
+    password: '',
+    confirm_password: '',
+    store_id: undefined as number | undefined,
+});
+
+const isEdit = computed(() => !!props.editId);
+
+const formRules = computed(() => {
+    if (isEdit.value) {
+        return {
+            account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+            password: [{ required: false }],
+            confirm_password: [
+                {
+                    validator: (_rule: any, value: string, cb: any) => {
+                        if (value && value !== form.password) cb(new Error('两次密码不一致'));
+                        else cb();
+                    },
+                },
+            ],
+            store_id: [{ required: true, message: '请选择门店', trigger: 'change' }],
+        };
+    }
+    return {
+        account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        confirm_password: [
+            { required: true, message: '请确认密码', trigger: 'blur' },
+            {
+                validator: (_rule: any, value: string, cb: any) => {
+                    value !== form.password ? cb(new Error('两次密码不一致')) : cb();
+                },
+            },
+        ],
+        store_id: [{ required: true, message: '请选择门店', trigger: 'change' }],
+    };
+});
+
+watch(
+    () => props.visible,
+    (val) => {
+        if (val) {
+            if (isEdit.value && props.editData) {
+                form.id = props.editData.id;
+                form.account = props.editData.account;
+                form.store_id = Number(props.editData.store_id);
+            } else {
+                formRef.value?.resetFields();
+                form.id = undefined;
+                form.store_id = undefined;
+            }
+            form.password = '';
+            form.confirm_password = '';
+        }
+    }
+);
+
+function onClosed() {
+    formRef.value?.resetFields();
+}
+
+const submit = async () => {
+    const valid = await formRef.value?.validate().catch(() => false);
+    if (!valid) return;
+
+    const payload: any = { ...form };
+    if (!payload.password) delete payload.password;
+    if (!payload.confirm_password) delete payload.confirm_password;
+
+    loading.value = true;
+    try {
+        if (isEdit.value) {
+            await editStoreAccount(payload);
+            ElMessage.success('修改成功');
+        } else {
+            await addStoreAccount(payload);
+            ElMessage.success('添加成功');
+        }
+        emit('update:visible', false);
+        emit('success');
+    } catch {
+        ElMessage.error(isEdit.value ? '修改失败' : '添加失败');
+    } finally {
+        loading.value = false;
+    }
+};
+</script>
diff --git a/src/components/User/UserArchiveDialog.vue b/src/components/User/UserArchiveDialog.vue
new file mode 100644
index 0000000..c0dc898
--- /dev/null
+++ b/src/components/User/UserArchiveDialog.vue
@@ -0,0 +1,91 @@
+<template>
+    <el-dialog :model-value="visible" title="用户档案" width="640px" append-to-body destroy-on-close
+        @update:model-value="$emit('update:visible', $event)">
+        <el-table v-loading="loading" :data="list" border stripe style="width: 100%">
+            <el-table-column label="图片" align="center" width="120">
+                <template #default="{ row }">
+                    <el-image v-if="row.cover" :src="row.cover" :preview-src-list="[row.cover]" fit="cover"
+                        class="dialog-cover" preview-teleported hide-on-click-modal>
+                        <template #error>
+                            <span class="image-slot">--</span>
+                        </template>
+                    </el-image>
+                    <span v-else>--</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="create_time" label="时间" align="center" min-width="160" />
+            <el-table-column label="操作" align="center" width="100">
+                <template #default="{ row }">
+                    <el-button type="primary" link @click="handleDetail(row)">详情</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="params.page" v-model:limit="params.size" @pagination="loadList" />
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from 'vue';
+import { getUserarchive, getUserarchiveDetail } from '@/api/user';
+import { ElMessage } from 'element-plus';
+
+interface Props {
+    visible: boolean;
+    userId: number;
+}
+
+const props = defineProps<Props>();
+defineEmits<{ 'update:visible': [val: boolean] }>();
+
+const loading = ref(false);
+const list = ref<any[]>([]);
+const total = ref(0);
+const params = reactive({ page: 1, size: 10 });
+
+function loadList() {
+    if (!props.userId) return;
+    loading.value = true;
+    getUserarchive({ user_id: props.userId, ...params })
+        .then(({ data }: any) => {
+            const arr = Array.isArray(data) ? data : data?.data ?? data?.list ?? [];
+            list.value = arr;
+            total.value = typeof data?.total === 'number' ? data.total : arr.length;
+        })
+        .catch((err: any) => ElMessage.error(err.message || '获取用户档案失败'))
+        .finally(() => (loading.value = false));
+}
+
+async function handleDetail(row: any) {
+    await getUserarchiveDetail({ id: row.id });
+}
+
+watch(
+    () => props.visible,
+    (val) => {
+        if (val) {
+            params.page = 1;
+            loadList();
+        }
+    }
+);
+</script>
+
+<style lang="scss" scoped>
+.dialog-cover {
+    width: 80px;
+    height: 80px;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.image-slot {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 80px;
+    height: 80px;
+    font-size: 12px;
+    color: var(--el-text-color-placeholder);
+    background: var(--el-fill-color-light);
+}
+</style>
diff --git a/src/components/User/UserAuthStoreDialog.vue b/src/components/User/UserAuthStoreDialog.vue
new file mode 100644
index 0000000..c31ffce
--- /dev/null
+++ b/src/components/User/UserAuthStoreDialog.vue
@@ -0,0 +1,57 @@
+<template>
+    <el-dialog :model-value="visible" title="用户授权门店列表" width="940px" append-to-body destroy-on-close
+        @update:model-value="$emit('update:visible', $event)">
+        <el-table v-loading="loading" :data="list" border stripe style="width: 100%">
+            <el-table-column prop="name" label="门店名称" align="center" />
+            <el-table-column prop="user_name" label="管理门店的用户名" align="center" />
+            <el-table-column prop="user_mobile" label="电话" align="center" />
+            <el-table-column prop="district_text" label="地区" align="center" />
+            <el-table-column prop="validity_time" label="授权到期时间" align="center" />
+            <el-table-column prop="status" label="状态" align="center">
+                <template #default="{ row }">
+                    <el-tag>{{ statusData[row.status] }}</el-tag>
+                </template>
+            </el-table-column>
+        </el-table>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+import { getUserAuthStoreList } from '@/api/user';
+import { ElMessage } from 'element-plus';
+
+interface Props {
+    visible: boolean;
+    userId: number;
+}
+
+const props = defineProps<Props>();
+defineEmits<{ 'update:visible': [val: boolean] }>();
+
+const statusData: Record<number, string> = {
+    1: '授权中',
+    2: '已过期',
+};
+
+const loading = ref(false);
+const list = ref<any[]>([]);
+
+watch(
+    () => props.visible,
+    (val) => {
+        if (val) loadList();
+    }
+);
+
+function loadList() {
+    if (!props.userId) return;
+    loading.value = true;
+    getUserAuthStoreList({ user_id: props.userId })
+        .then(({ data }: any) => {
+            list.value = Array.isArray(data) ? data : [];
+        })
+        .catch((err: any) => ElMessage.error(err.message || '获取用户授权门店列表失败'))
+        .finally(() => (loading.value = false));
+}
+</script>
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 98e5ce8..1de36c0 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -38,19 +38,23 @@ onMounted(() => {
   // scrollWrapper.value.addEventListener('scroll', emitScroll, true);
 });
 onBeforeUnmount(() => {
-  scrollWrapper.value.removeEventListener('scroll', emitScroll);
+  scrollWrapper.value?.removeEventListener('scroll', emitScroll);
 });
 
 function handleScroll(e: WheelEvent) {
+  const wrap = scrollWrapper.value;
+  if (!wrap) return;
   const eventDelta = (e as any).wheelDelta || -e.deltaY * 40;
-  scrollWrapper.value.scrollLeft =
-    scrollWrapper.value.scrollLeft + eventDelta / 4;
+  wrap.scrollLeft = wrap.scrollLeft + eventDelta / 4;
 }
 
 function moveToTarget(currentTag: TagView) {
-  const $container = proxy.$refs.scrollContainer.$el;
-  const $containerWidth = $container.offsetWidth;
   const $scrollWrapper = scrollWrapper.value;
+  if (!$scrollWrapper) return;
+
+  const $container = proxy.$refs.scrollContainer?.$el;
+  if (!$container) return;
+  const $containerWidth = $container.offsetWidth;
 
   let firstTag = null;
   let lastTag = null;
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index e7efed8..39053cb 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -160,7 +160,7 @@ function moveToCurrentTag() {
   nextTick(() => {
     for (const r of visitedViews.value) {
       if (r.path === route.path) {
-        scrollPaneRef.value.moveToTarget(r);
+        scrollPaneRef.value?.moveToTarget(r);
         // when query is different then update
         if (r.fullPath !== route.fullPath) {
           tagsView.updateVisitedView(route);
diff --git a/src/styles/element-plus.scss b/src/styles/element-plus.scss
index ac96595..dbe38db 100644
--- a/src/styles/element-plus.scss
+++ b/src/styles/element-plus.scss
@@ -50,39 +50,29 @@
 }
 
 
-// fix: 内核较旧的浏览器不支持:not(selector list)
-.el-button:not(.is-text),
-.el-button:not(.is-link),
-.el-button:not(.el-button--text) {
+// 仅对「实心按钮」补边框/背景；text、link 需同时排除（逗号分隔的 :not 会误伤 link）
+.el-button:not(.is-text):not(.is-link):not(.el-button--text) {
   background-color: var(--el-button-bg-color);
   border: var(--el-border);
   border-color: var(--el-button-border-color)
 }
 
-.el-button:not(.is-text):focus,
-.el-button:not(.is-link):focus,
-.el-button:not(.el-button--text):focus,
-.el-button:not(.is-text):hover,
-.el-button:not(.is-link):hover,
-.el-button:not(.el-button--text):hover {
+.el-button:not(.is-text):not(.is-link):not(.el-button--text):focus,
+.el-button:not(.is-text):not(.is-link):not(.el-button--text):hover {
   color: var(--el-button-hover-text-color);
   border-color: var(--el-button-hover-border-color);
   background-color: var(--el-button-hover-bg-color);
   outline: 0
 }
 
-.el-button:not(.is-text):active,
-.el-button:not(.is-link):active,
-.el-button:not(.el-button--text):active {
+.el-button:not(.is-text):not(.is-link):not(.el-button--text):active {
   color: var(--el-button-active-text-color);
   border-color: var(--el-button-active-border-color);
   background-color: var(--el-button-active-bg-color);
   outline: 0
 }
 
-.el-button:not(.is-text):focus-visible,
-.el-button:not(.is-link):focus-visible,
-.el-button:not(.el-button--text):focus-visible {
+.el-button:not(.is-text):not(.is-link):not(.el-button--text):focus-visible {
   border-color: transparent;
   outline: 2px solid var(--el-button-border-color);
   outline-offset: 1px
diff --git a/src/views/store/index.vue b/src/views/store/index.vue
deleted file mode 100644
index f3c676d..0000000
--- a/src/views/store/index.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-    <div class="app-container">
-        <el-card class="box-card">
-            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="关键词" prop="keyword">
-                    <el-select v-model="queryParams.store_id" placeholder="请选择门店" style="width: 100%">
-                        <el-option v-for="item in storeLists" :key="item.store_id" :label="`${item.account}`"
-                            :value="item.store_id" />
-                    </el-select>
-                </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-form-item>
-            </el-form>
-
-            <el-table v-loading="loading" :data="userList" border stripe style="width: 100%">
-                <el-table-column prop="account" label="用户账号" align="center" />
-                <el-table-column prop="username" label="用户名" align="center" />
-                <el-table-column prop="nickname" label="昵称" align="center" />
-                <!--头像可点击查看大图-->
-                <el-table-column prop="avatar" label="头像" align="center" width="80">
-                    <template #default="{ row }">
-                        <el-image v-if="row.avatar" :src="row.avatar" :preview-src-list="[row.avatar]"
-                            preview-teleported fit="cover" class="avatar-thumb" hide-on-click-modal />
-                        <span v-else>--</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="mobile" label="手机号" align="center" />
-                <el-table-column prop="district_text" label="地区" align="center" />
-                <el-table-column prop="gender_text" label="性别" align="center" />
-                <el-table-column prop="birthday" label="生日" align="center" />
-                <el-table-column prop="age" label="年龄" align="center" />
-                <el-table-column prop="validity_time" label="授权到期时间" align="center" />
-            </el-table>
-
-            <pagination v-if="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
-                @pagination="handleQuery" />
-        </el-card>
-
-        <!-- 用户档案弹窗 -->
-        <el-dialog v-model="archiveDialogVisible" title="用户档案" width="640px">
-            <el-table v-loading="archiveLoading" :data="archiveList" border stripe style="width: 100%">
-                <el-table-column label="图片" align="center" width="120">
-                    <template #default="{ row }">
-                        <el-image v-if="row.cover" :src="row.cover" :preview-src-list="[row.cover]" preview-teleported
-                            fit="cover" class="archive-cover" hide-on-click-modal />
-                        <span v-else>--</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="create_time" label="时间" align="center" min-width="160" />
-                <el-table-column label="操作" align="center" width="150">
-                    <template #default="{ row }">
-                        <el-button text @click="archiveDetail(row)">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-if="archiveTotal > 0" :total="archiveTotal" v-model:page="archiveParams.page"
-                v-model:limit="archiveParams.size" @pagination="loadArchive" />
-        </el-dialog>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue';
-import { getUserList, getUserarchive, getUserarchiveDetail } from '@/api/user';
-import { getStoreAccountList, getStoreUserList } from '@/api/store/index';
-import { ElMessage } from 'element-plus';
-import { Search, Refresh } from '@element-plus/icons-vue';
-const storeLists = ref<any[]>([]);
-const getStoreLists = async () => {
-    const { data } = await getStoreAccountList({});
-    storeLists.value = data || [];
-    console.log(data, '门店账号列表')
-};
-getStoreLists();
-
-const loading = ref(false);
-const total = ref(0);
-const userList = ref<any[]>([]);
-const queryFormRef = ref();
-
-// 档案弹窗相关
-const archiveDialogVisible = ref(false);
-const archiveLoading = ref(false);
-const archiveTotal = ref(0);
-const archiveList = ref<any[]>([]);
-const currentUserId = ref<number | null>(null);
-const archiveParams = reactive({
-    page: 1,
-    size: 10
-});
-
-// 打开档案弹窗
-function openArchiveDialog(row: any) {
-    currentUserId.value = row.id;
-    archiveDialogVisible.value = true;
-    archiveParams.page = 1;
-    archiveParams.size = 10;
-    loadArchive();
-}
-
-// 加载档案列表
-function loadArchive() {
-    if (!currentUserId.value) return;
-    archiveLoading.value = true;
-    getUserarchive({ user_id: currentUserId.value, ...archiveParams })
-        .then(({ data }: any) => {
-            const list = Array.isArray(data) ? data : data?.data ?? data?.list ?? [];
-            archiveList.value = list;
-            archiveTotal.value =
-                typeof data?.total === 'number' ? data.total : Array.isArray(data) ? data.length : list.length;
-        })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户档案失败');
-        })
-        .finally(() => {
-            archiveLoading.value = false;
-        });
-}
-
-const queryParams = reactive({
-    page: 1,
-    size: 10,
-    store_id: 128
-});
-
-function handleQuery() {
-    loading.value = true;
-    getStoreUserList(queryParams)
-        .then(({ data }: any) => {
-            userList.value = data;
-        })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取授权列表');
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-}
-//用户档案详情
-const archiveDetail = async (row) => {
-    const res = await getUserarchiveDetail({ id: row.id });
-    console.log(res, 'res用户档案详情')
-}
-function resetQuery() {
-    queryFormRef.value?.resetFields();
-    queryParams.page = 1;
-    handleQuery();
-}
-
-function handleSizeChange(size: number) {
-    queryParams.size = size;
-    queryParams.page = 1;
-    handleQuery();
-}
-
-function handleCurrentChange(page: number) {
-    queryParams.page = page;
-    handleQuery();
-}
-
-onMounted(() => {
-    handleQuery();
-});
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-    padding: 20px;
-}
-
-.avatar-thumb {
-    cursor: pointer;
-}
-
-.archive-cover {
-    width: 80px;
-    height: 80px;
-    border-radius: 4px;
-    cursor: pointer;
-}
-</style>
diff --git a/src/views/store/storeAccountList.vue b/src/views/store/storeAccountList.vue
index 7ed745b..3aebbcc 100644
--- a/src/views/store/storeAccountList.vue
+++ b/src/views/store/storeAccountList.vue
@@ -4,11 +4,11 @@
             <el-form ref="queryFormRef" :model="queryParams" inline>
                 <el-form-item label="关键词" prop="keyword">
                     <el-input v-model="queryParams.keyword" placeholder="门店名称" clearable style="width: 200px"
-                        @keyup.enter="handleQuery" />
+                        @keyup.enter="loadList" />
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
-                    <el-button type="primary" @click="addList">添加</el-button>
+                    <el-button type="primary" :icon="Search" @click="loadList">搜索</el-button>
+                    <el-button type="primary" @click="handleAdd">添加</el-button>
                     <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-form-item>
             </el-form>
@@ -23,81 +23,76 @@
                 <el-table-column prop="qrcode" label="分享二维码" align="center" width="80">
                     <template #default="{ row }">
                         <el-image v-if="row.qrcode" :src="row.qrcode" :preview-src-list="[row.qrcode]" fit="cover"
-                            class="avatar-thumb" hide-on-click-modal />
+                            class="avatar-thumb" preview-teleported hide-on-click-modal>
+                            <template #error>
+                                <span class="image-slot">--</span>
+                            </template>
+                        </el-image>
                         <span v-else>--</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" align="center" width="150">
+                <el-table-column label="操作" align="center" width="240">
                     <template #default="{ row }">
-                        <el-button text @click="handleEdit(row)" type="primary">修改</el-button>
-                        <el-button text @click="handleDelete(row)" type="danger">删除</el-button>
+                        <div class="op-links">
+                            <el-button type="primary" link @click="handleEdit(row)">修改</el-button>
+                            <el-button type="primary" link @click="handleDelete(row)">删除</el-button>
+                            <el-button type="primary" link @click="openAuthDialog(row)">授权列表</el-button>
+                        </div>
                     </template>
                 </el-table-column>
             </el-table>
 
-            <pagination v-if="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
-                @pagination="handleQuery" />
+            <pagination :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
+                @pagination="loadList" />
         </el-card>
 
-        <!-- 添加弹窗 -->
-        <el-dialog v-model="addListDialogVisible" title="添加用户账号" width="640px">
-            <el-form ref="addFormRef" :model="addForm" :rules="addFormRules" label-width="120px">
-                <el-form-item label="账号" prop="account">
-                    <el-input v-model="addForm.account" placeholder="请输入账号" />
-                </el-form-item>
-                <el-form-item label="密码" prop="password">
-                    <el-input v-model="addForm.password" placeholder="请输入密码" type="password" />
-                </el-form-item>
-                <el-form-item label="确认密码" prop="confirm_password">
-                    <el-input v-model="addForm.confirm_password" placeholder="请确认密码" type="password" />
-                </el-form-item>
-                <el-form-item label="门店" prop="store_id">
-                    <el-select v-model="addForm.store_id" placeholder="请选择门店" style="width: 100%"
-                        @change="handleStoreChangeAdd">
-                        <el-option v-for="item in addStoreList" :key="item.id" :label="`${item.store_name}`"
-                            :value="Number(item.id)" />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <el-button @click="addListDialogVisible.value = false">取消</el-button>
-                <el-button type="primary" @click="addListSubmit">确定</el-button>
-            </template>
-        </el-dialog>
+        <!-- 添加/编辑弹窗 -->
+        <StoreAccountDialog v-model:visible="accountDialogVisible" :store-list="addStoreList" :edit-id="editId"
+            :edit-data="editRow" @success="loadList" />
 
-        <!-- 修改弹窗 -->
-        <el-dialog v-model="editListDialogVisible" title="修改用户账号" width="640px" :key="editForm.id">
-            <el-form ref="editFormRef" :model="editForm" :rules="editFormRules" label-width="120px">
-                <el-form-item label="账号" prop="account">
-                    <el-input v-model="editForm.account" placeholder="请输入账号" />
+        <!-- 授权用户列表弹窗 -->
+        <el-dialog v-model="authDialogVisible" title="授权用户列表" width="1240px" append-to-body destroy-on-close>
+            <el-form ref="authQueryFormRef" :model="authQueryParams" inline>
+                <el-form-item label="关键词" prop="keyword">
+                    <el-input v-model="authQueryParams.keyword" placeholder="用户名/昵称" clearable style="width: 200px"
+                        @keyup.enter="loadAuthList" />
                 </el-form-item>
-                <el-form-item label="密码" prop="password">
-                    <el-input v-model="editForm.password" placeholder="留空不修改" type="password" />
-                </el-form-item> 
-                <el-form-item label="确认密码" prop="confirm_password">
-                    <el-input v-model="editForm.confirm_password" placeholder="留空不修改" type="password" />
-                </el-form-item>
-                <el-form-item label="门店" prop="store_id">
-                    <el-select v-model="editForm.store_id" placeholder="请选择门店" style="width: 100%"
-                        @change="handleStoreChangeEdit">
-                        <el-option v-for="item in addStoreList" :key="item.id" :label="`${item.store_name}`"
-                            :value="Number(item.id)" />
-                    </el-select>
+                <el-form-item>
+                    <el-button type="primary" @click="loadAuthList">搜索</el-button>
+                    <el-button @click="resetAuthQuery">重置</el-button>
                 </el-form-item>
             </el-form>
-            <template #footer>
-                <el-button @click="editListDialogVisible.value = false">取消</el-button>
-                <el-button type="primary" @click="editListSubmit">确定</el-button>
-            </template>
+            <el-table v-loading="authLoading" :data="authList" border stripe style="width: 100%">
+                <el-table-column prop="username" label="用户名" align="center" />
+                <el-table-column prop="nickname" label="昵称" align="center" />
+                <el-table-column prop="avatar" label="头像" align="center" width="80">
+                    <template #default="{ row }">
+                        <el-image v-if="row.avatar" :src="row.avatar" :preview-src-list="[row.avatar]" fit="cover"
+                            class="avatar-thumb" preview-teleported hide-on-click-modal>
+                            <template #error>
+                                <span class="image-slot">--</span>
+                            </template>
+                        </el-image>
+                        <span v-else>--</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="mobile" label="手机号" align="center" />
+                <el-table-column prop="district_text" label="地区" align="center" />
+                <el-table-column prop="gender_text" label="性别" align="center" />
+                <el-table-column prop="validity_time" label="授权到期时间" align="center" />
+            </el-table>
+            <pagination :total="authTotal" v-model:page="authQueryParams.page" v-model:limit="authQueryParams.size"
+                @pagination="loadAuthList" />
         </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, onMounted, nextTick } from 'vue';
-import { getStoreAccountList, addStoreAccount, editStoreAccount, deleteStoreAccount, getADdStoreList } from '@/api/store/index';
+import { reactive, ref } from 'vue';
+import { getStoreAccountList, deleteStoreAccount, getADdStoreList, getStoreUserList } from '@/api/store/index';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { Search, Refresh } from '@element-plus/icons-vue';
+import StoreAccountDialog from '@/components/Store/StoreAccountDialog.vue';
 
 // 列表
 const loading = ref(false);
@@ -110,126 +105,54 @@ const queryParams = reactive({
     keyword: '',
 });
 
-// 添加时选择的门店
+// 门店列表（添加/编辑共用）
 const addStoreList = ref<any[]>([]);
-const getAddStoreLists = async () => {
-    const { data } = await getADdStoreList({});
-    console.log(data,'dataaa1111')
-    addStoreList.value = data || [];
+
+// 添加/编辑弹窗
+const accountDialogVisible = ref(false);
+const editId = ref<number | undefined>(undefined);
+const editRow = ref<{ id: number; account: string; store_id: number } | undefined>(undefined);
+
+const handleAdd = () => {
+    editId.value = undefined;
+    editRow.value = undefined;
+    accountDialogVisible.value = true;
 };
-getAddStoreLists();
-// 添加
-const addListDialogVisible = ref(false);
-const addFormRef = ref();
-const addForm = reactive({
-    account: '',
-    password: '',
-    confirm_password: '',
+
+const handleEdit = (row: any) => {
+    editId.value = row.id;
+    editRow.value = { id: row.id, account: row.account, store_id: Number(row.store_id) };
+    accountDialogVisible.value = true;
+};
+
+// 授权用户列表弹窗
+const authDialogVisible = ref(false);
+const authLoading = ref(false);
+const authList = ref<any[]>([]);
+const authTotal = ref(0);
+const authQueryFormRef = ref();
+const authQueryParams = reactive({
+    page: 1,
+    size: 10,
+    keyword: '',
     store_id: undefined as number | undefined,
 });
 
-// 编辑
-const editListDialogVisible = ref(false);
-const editFormRef = ref();
-const editForm = reactive({
-    id: undefined as number | undefined,
-    account: '',
-    password: '',
-    confirm_password: '',
-    store_id: undefined as number | undefined,
-});
+function normalizePageData(data: any): { list: any[]; total: number } {
+    if (Array.isArray(data)) return { list: data, total: data.length };
+    const list = data?.list ?? data?.data ?? [];
+    const total = Number(data?.total);
+    return { list, total: Number.isFinite(total) ? total : list.length };
+}
 
-// 添加校验
-const addFormRules = reactive({
-    account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
-    password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-    confirm_password: [
-        { required: true, message: '请确认密码', trigger: 'blur' },
-        {
-            validator: (rule: any, value: string, cb: any) => {
-                value !== addForm.password ? cb(new Error('两次密码不一致')) : cb();
-            },
-        },
-    ],
-    store_id: [{ required: true, message: '请选择门店', trigger: 'change' }],
-});
-
-// 编辑校验
-const editFormRules = reactive({
-    account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
-    password: [{ required: false }],
-    confirm_password: [
-        {
-            validator: (rule: any, value: string, cb: any) => {
-                if (value && value !== editForm.password) cb(new Error('两次密码不一致'));
-                else cb();
-            },
-        },
-    ],
-    store_id: [{ required: true, message: '请选择门店', trigger: 'change' }],
-});
-
-// 🔥 强制更新视图（解决无法切换）
-const handleStoreChangeAdd = () => { };
-const handleStoreChangeEdit = () => { };
-
-// 打开添加
-const addList = () => {
-    addListDialogVisible.value = true;
-    nextTick(() => addFormRef.value?.resetFields());
-    addForm.store_id = undefined;
-};
-
-// 打开编辑
-const handleEdit = async (row: any) => {
-    editListDialogVisible.value = true;
-    await nextTick();
-    editFormRef.value?.resetFields();
-
-    editForm.id = row.id;
-    editForm.account = row.account;
-    editForm.store_id = Number(row.store_id);
-    editForm.password = '';
-    editForm.confirm_password = '';
-};
-
-// 添加提交
-const addListSubmit = async () => {
-    addFormRef.value?.validate(async (valid) => {
-        if (!valid) return;
-        try {
-            await addStoreAccount(addForm);
-            ElMessage.success('添加成功');
-            addListDialogVisible.value = false;
-            handleQuery();
-        } catch (err) {
-            ElMessage.error('添加失败');
-        }
-    });
-};
-
-// 编辑提交
-const editListSubmit = async () => {
-    editFormRef.value?.validate(async (valid) => {
-        if (!valid) return;
-        try {
-            await editStoreAccount(editForm);
-            ElMessage.success('修改成功');
-            editListDialogVisible.value = false;
-            handleQuery();
-        } catch (err) {
-            ElMessage.error('修改失败');
-        }
-    });
-};
-
-// 获取列表
-const handleQuery = () => {
+// 加载列表
+const loadList = () => {
     loading.value = true;
     getStoreAccountList(queryParams)
         .then(({ data }) => {
-            storeList.value = data?.list || data || [];
-            total.value = data?.total || 0;
+            const { list, total: t } = normalizePageData(data);
+            storeList.value = list;
+            total.value = t;
         })
         .catch(() => ElMessage.error('获取列表失败'))
         .finally(() => (loading.value = false));
@@ -239,24 +162,58 @@ const handleQuery = () => {
 const resetQuery = () => {
     queryFormRef.value?.resetFields();
     queryParams.page = 1;
-    handleQuery();
+    loadList();
+};
+
+// 打开授权用户列表弹窗
+const openAuthDialog = (row: any) => {
+    authQueryParams.store_id = row.store_id;
+    authQueryParams.page = 1;
+    authQueryParams.keyword = '';
+    authQueryFormRef.value?.resetFields();
+    authDialogVisible.value = true;
+    loadAuthList();
+};
+
+// 加载授权用户列表
+const loadAuthList = () => {
+    authLoading.value = true;
+    getStoreUserList(authQueryParams)
+        .then(({ data }: any) => {
+            const { list, total: t } = normalizePageData(data);
+            authList.value = list;
+            authTotal.value = t;
+        })
+        .catch((err: any) => ElMessage.error(err.message || '获取授权用户列表失败'))
+        .finally(() => (authLoading.value = false));
+};
+
+// 重置授权列表查询
+const resetAuthQuery = () => {
+    authQueryFormRef.value?.resetFields();
+    authQueryParams.page = 1;
+    loadAuthList();
 };
 
 // 删除
 const handleDelete = async (row: any) => {
-    await ElMessageBox.confirm('确认删除？', '提示');
     try {
+        await ElMessageBox.confirm('确认删除？', '提示', { type: 'warning' });
         await deleteStoreAccount({ id: row.id });
         ElMessage.success('删除成功');
-        handleQuery();
-    } catch (err) {
-        ElMessage.error('删除失败');
+        loadList();
+    } catch (err: any) {
+        if (err !== 'cancel') ElMessage.error(err?.message || '删除失败');
     }
 };
 
-onMounted(() => {
-    handleQuery();
-});
+// 初始化
+const init = async () => {
+    const { data } = await getADdStoreList({});
+    addStoreList.value = data || [];
+    loadList();
+};
+init();
 </script>
 
 <style lang="scss" scoped>
@@ -269,4 +226,28 @@ onMounted(() => {
     height: 50px;
     cursor: pointer;
 }
-</style>
\ No newline at end of file
+
+.op-links {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+}
+
+.image-slot {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 50px;
+    height: 50px;
+    font-size: 12px;
+    color: var(--el-text-color-placeholder);
+    background: var(--el-fill-color-light);
+}
+</style>
+
+<style lang="scss">
+.el-image-viewer__wrapper {
+    z-index: 4100 !important;
+}
+</style>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index b57c5ca..ed236dc 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -4,22 +4,20 @@
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
                 <el-form-item label="关键词" prop="keyword">
                     <el-input v-model="queryParams.keyword" placeholder="用户名/昵称" clearable style="width: 200px"
-                        @keyup.enter="handleQuery" />
+                        @keyup.enter="loadList" />
                 </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" :icon="Search" @click="loadList">搜索</el-button>
+                    <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-form-item>
             </el-form>
 
             <el-table v-loading="loading" :data="userList" border stripe style="width: 100%">
-                <el-table-column prop="username" label="用户名" align="center" />
-                <el-table-column prop="nickname" label="昵称" align="center" />
-                <!--头像可点击查看大图-->
+                <el-table-column prop="username" label="用户名" align="center">
+                    <template #default="{ row }">
+                        {{ row.username || row.nickname }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="avatar" label="头像" align="center" width="80">
                     <template #default="{ row }">
                         <el-image v-if="row.avatar" :src="row.avatar" :preview-src-list="[row.avatar]"
@@ -30,186 +28,112 @@
                 <el-table-column prop="district_text" label="地区" align="center" />
                 <el-table-column prop="gender_text" label="性别" align="center" />
                 <el-table-column prop="mobile" label="手机号" align="center" />
-                <el-table-column prop="birthday" label="生日" align="center" />
-                <el-table-column prop="age" label="年龄" align="center" />
+                <el-table-column label="生日/年龄" align="center">
+                    <template #default="{ row }">
+                        <span>{{ row.birthday || row.age || '--' }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="status" label="状态" align="center">
                     <template #default="{ row }">
-                        <el-tag>
-                            {{ statusData[row.status] }}
-                        </el-tag>
+                        <el-tag>{{ statusData[row.status] }}</el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column prop="detection_number" label="总检测次数" align="center" />
                 <el-table-column prop="created_at" label="创建时间" align="center" />
-                <el-table-column label="操作" align="center" width="150">
+                <el-table-column label="操作" align="center" width="180">
                     <template #default="{ row }">
-                        <el-button text @click="openArchiveDialog(row)">用户档案</el-button>
-                        <el-button text @click="authStoreUserList(row)">授权门店列表</el-button>
+                        <div class="op-links">
+                            <el-button type="primary" link @click="openArchiveDialog(row)">档案</el-button>
+                            <el-button type="primary" link @click="openAuthStoreDialog(row)">授权列表</el-button>
+                        </div>
                     </template>
                 </el-table-column>
             </el-table>
 
-            <pagination v-if="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
-                @pagination="handleQuery" />
+            <pagination :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
+                @pagination="loadList" />
         </el-card>
 
         <!-- 用户档案弹窗 -->
-        <el-dialog v-model="archiveDialogVisible" title="用户档案" width="640px">
-            <el-table v-loading="archiveLoading" :data="archiveList" border stripe style="width: 100%">
-                <el-table-column label="图片" align="center" width="120">
-                    <template #default="{ row }">
-                        <el-image v-if="row.cover" :src="row.cover" :preview-src-list="[row.cover]" preview-teleported
-                            fit="cover" class="archive-cover" hide-on-click-modal />
-                        <span v-else>--</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="create_time" label="时间" align="center" min-width="160" />
-                <el-table-column label="操作" align="center" width="150">
-                    <template #default="{ row }">
-                        <el-button text @click="archiveDetail(row)">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-if="archiveTotal > 0" :total="archiveTotal" v-model:page="archiveParams.page"
-                v-model:limit="archiveParams.size" @pagination="loadArchive" />
-        </el-dialog>
+        <UserArchiveDialog v-model:visible="archiveDialogVisible" :user-id="currentUserId" />
+
         <!-- 用户授权门店列表弹窗 -->
-        <el-dialog v-model="authStoreUserListDialogVisible" title="用户授权门店列表" width="940px">
-            <el-table v-loading="authStoreUserListLoading" :data="authStorelists" border stripe style="width: 100%">
-                <el-table-column prop="name" label="门店名称" align="center" />
-                <el-table-column prop="user_name" label="管理门店的用户名" align="center" />
-                <el-table-column prop="user_mobile" label="电话" align="center" />
-                <el-table-column prop="district_text" label="地区" align="center" />
-                <el-table-column prop="validity_time" label="授权到期时间" align="center" />
-                <el-table-column prop="status" label="状态" align="center"><template #default="{ row }">
-                        <el-tag>
-                            {{ authStatusData[row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
+        <UserAuthStoreDialog v-model:visible="authStoreDialogVisible" :user-id="currentUserId" />
     </div>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue';
-import { getUserList, getUserarchive, getUserarchiveDetail, getUserAuthStoreList } from '@/api/user';
+import { reactive, ref } from 'vue';
+import { getUserList } from '@/api/user';
 import { ElMessage } from 'element-plus';
 import { Search, Refresh } from '@element-plus/icons-vue';
-const statusData = {
+import UserArchiveDialog from '@/components/User/UserArchiveDialog.vue';
+import UserAuthStoreDialog from '@/components/User/UserAuthStoreDialog.vue';
+
+const statusData: Record<number, string> = {
     1: '未注册',
     2: '未进行人脸识别',
     3: '未完善信息',
-    4: '正常'
-}
-const authStatusData = {
-    1: '授权中',
-    2: '已过期'
-}
+    4: '正常',
+};
+
 const loading = ref(false);
 const total = ref(0);
 const userList = ref<any[]>([]);
 const queryFormRef = ref();
-const authStoreUserListDialogVisible = ref(false)
-const authStoreUserListLoading = ref(false)
-const authStorelists = ref<any[]>([])
-// 档案弹窗相关
-const archiveDialogVisible = ref(false);
-const archiveLoading = ref(false);
-const archiveTotal = ref(0);
-const archiveList = ref<any[]>([]);
-const currentUserId = ref<number | null>(null);
-const archiveParams = reactive({
-    page: 1,
-    size: 10
-});
-const authStoreUserList = (row: any) => {
-    authStoreUserListDialogVisible.value = true;
-    authStoreUserListLoading.value = true;
-    getUserAuthStoreList({ user_id: row.id }).then(({ data }: any) => {
-        console.log(data, 'data授权门店列表')
-        authStorelists.value = data;
-    })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户授权门店列表失败');
-        })
-        .finally(() => {
-            authStoreUserListLoading.value = false;
-        });
-}
-// 打开档案弹窗
-function openArchiveDialog(row: any) {
-    currentUserId.value = row.id;
-    archiveDialogVisible.value = true;
-    archiveParams.page = 1;
-    archiveParams.size = 10;
-    loadArchive();
-}
-
-// 加载档案列表
-function loadArchive() {
-    if (!currentUserId.value) return;
-    archiveLoading.value = true;
-    getUserarchive({ user_id: currentUserId.value, ...archiveParams })
-        .then(({ data }: any) => {
-            const list = Array.isArray(data) ? data : data?.data ?? data?.list ?? [];
-            archiveList.value = list;
-            archiveTotal.value =
-                typeof data?.total === 'number' ? data.total : Array.isArray(data) ? data.length : list.length;
-        })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户档案失败');
-        })
-        .finally(() => {
-            archiveLoading.value = false;
-        });
-}
-
 const queryParams = reactive({
     page: 1,
     size: 10,
-    keyword: ''
+    keyword: '',
 });
 
-function handleQuery() {
+// 档案弹窗
+const archiveDialogVisible = ref(false);
+const currentUserId = ref<number>(0);
+
+// 授权弹窗
+const authStoreDialogVisible = ref(false);
+
+function normalizePageData(data: any): { list: any[]; total: number } {
+    if (Array.isArray(data)) return { list: data, total: data.length };
+    const list = data?.list ?? data?.data ?? [];
+    const total = Number(data?.total);
+    return { list, total: Number.isFinite(total) ? total : list.length };
+}
+
+// 加载列表
+const loadList = () => {
     loading.value = true;
     getUserList(queryParams)
-        .then(({ data }: any) => {
-            userList.value = data;
+        .then(({ data }) => {
+            const { list, total: t } = normalizePageData(data);
+            userList.value = list;
+            total.value = t;
         })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户列表失败');
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-}
-//用户档案详情
-const archiveDetail = async (row) => {
-    const res = await getUserarchiveDetail({ id: row.id });
-    console.log(res, 'res用户档案详情')
-}
-function resetQuery() {
+        .catch((err: any) => ElMessage.error(err.message || '获取用户列表失败'))
+        .finally(() => (loading.value = false));
+};
+
+// 重置
+const resetQuery = () => {
     queryFormRef.value?.resetFields();
     queryParams.page = 1;
-    handleQuery();
-}
+    loadList();
+};
 
-function handleSizeChange(size: number) {
-    queryParams.size = size;
-    queryParams.page = 1;
-    handleQuery();
-}
+// 打开档案弹窗
+const openArchiveDialog = (row: any) => {
+    currentUserId.value = row.id;
+    archiveDialogVisible.value = true;
+};
 
-function handleCurrentChange(page: number) {
-    queryParams.page = page;
-    handleQuery();
-}
+// 打开授权门店列表弹窗
+const openAuthStoreDialog = (row: any) => {
+    currentUserId.value = row.id;
+    authStoreDialogVisible.value = true;
+};
 
-onMounted(() => {
-    handleQuery();
-});
+loadList();
 </script>
 
 <style lang="scss" scoped>
@@ -221,10 +145,10 @@ onMounted(() => {
     cursor: pointer;
 }
 
-.archive-cover {
-    width: 80px;
-    height: 80px;
-    border-radius: 4px;
-    cursor: pointer;
+.op-links {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
 }
 </style>
diff --git a/src/views/user/userAnalysis.vue b/src/views/user/userAnalysis.vue
new file mode 100644
index 0000000..662bf92
--- /dev/null
+++ b/src/views/user/userAnalysis.vue
@@ -0,0 +1,130 @@
+<template>
+    <div class="app-container">
+        <el-card class="box-card">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="关键词" prop="keyword">
+                    <el-input v-model="queryParams.keyword" placeholder="用户名/昵称" clearable style="width: 200px"
+                        @keyup.enter="loadList" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" :icon="Search" @click="loadList">搜索</el-button>
+                    <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-table v-loading="loading" :data="userList" border stripe style="width: 100%">
+                <el-table-column prop="username" label="用户名" align="center" />
+                <el-table-column prop="nickname" label="昵称" align="center" />
+                <el-table-column prop="mobile" label="手机号" align="center" />
+                <el-table-column prop="district" label="地区" align="center" />
+                <el-table-column prop="gender_text" label="性别" align="center" />
+                <el-table-column prop="birthday_text" label="年龄" align="center" />
+                <el-table-column prop="created_at" label="创建时间" align="center" />
+                <el-table-column prop="status" label="状态" align="center">
+                    <template #default="{ row }">
+                        <el-tag>{{ statusData[row.state] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="detection_number" label="总检测次数" align="center" />
+                <el-table-column label="操作" align="center" width="200">
+                    <template #default="{ row }">
+                        <div class="op-links">
+                            <el-button type="primary" link @click="archiveDetail(row)">详情</el-button>
+                            <el-button type="primary" link @click="handleQuickOperation(row, 5)">OK</el-button>
+                            <el-button type="primary" link @click="handleQuickOperation(row, 3)">问题</el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
+                @pagination="loadList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue';
+import { getUserDetectionList, getUserarchiveDetail, userDetectionOperation } from '@/api/user';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { Search, Refresh } from '@element-plus/icons-vue';
+
+const statusData: Record<number, string> = {
+    1: '检测过一次',
+    2: '分析中',
+    3: '有问题',
+    4: '正常',
+    5: '正常',
+};
+
+const loading = ref(false);
+const total = ref(0);
+const userList = ref<any[]>([]);
+const queryFormRef = ref();
+const queryParams = reactive({
+    page: 1,
+    size: 10,
+    keyword: '',
+    state: 2,
+});
+
+function normalizePageData(data: any): { list: any[]; total: number } {
+    if (Array.isArray(data)) return { list: data, total: data.length };
+    const list = data?.list ?? data?.data ?? [];
+    const total = Number(data?.total);
+    return { list, total: Number.isFinite(total) ? total : list.length };
+}
+
+// 加载列表
+const loadList = () => {
+    loading.value = true;
+    getUserDetectionList(queryParams)
+        .then(({ data }) => {
+            const { list, total: t } = normalizePageData(data);
+            userList.value = list;
+            total.value = t;
+        })
+        .catch((err: any) => ElMessage.error(err.message || '获取用户列表失败'))
+        .finally(() => (loading.value = false));
+};
+
+// 重置
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    queryParams.page = 1;
+    loadList();
+};
+
+// 档案详情
+const archiveDetail = async (row: any) => {
+    await getUserarchiveDetail({ id: row.id });
+};
+
+// 快速操作（OK → state=5，问题 → state=3）
+const handleQuickOperation = async (row: any, state: number) => {
+    const tip = state === 5 ? '确认设为正常？' : '确认标记为有问题？';
+    try {
+        await ElMessageBox.confirm(tip, '提示', { type: 'warning' });
+        await userDetectionOperation({ id: row.id, state });
+        ElMessage.success('操作成功');
+        loadList();
+    } catch (err: any) {
+        if (err !== 'cancel') ElMessage.error(err?.message || '操作失败');
+    }
+};
+
+loadList();
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+    padding: 20px;
+}
+
+.op-links {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+}
+</style>
diff --git a/src/views/user/userDetection.vue b/src/views/user/userDetection.vue
index 7104386..702cfe4 100644
--- a/src/views/user/userDetection.vue
+++ b/src/views/user/userDetection.vue
@@ -4,258 +4,96 @@
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
                 <el-form-item label="关键词" prop="keyword">
                     <el-input v-model="queryParams.keyword" placeholder="用户名/昵称" clearable style="width: 200px"
-                        @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="状态" prop="state">
-                    <el-select v-model="queryParams.state" placeholder="状态" clearable style="width: 200px"
-                        @keyup.enter="handleQuery">
-                        <el-option value="2" label="分析列表"></el-option>
-                        <el-option value="3" label="问题列表"></el-option>
-                    </el-select>
+                        @keyup.enter="loadList" />
                 </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" :icon="Search" @click="loadList">搜索</el-button>
+                    <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
                 </el-form-item>
             </el-form>
 
             <el-table v-loading="loading" :data="userList" border stripe style="width: 100%">
-                <el-table-column prop="username" label="用户名" align="center" />
+                <el-table-column prop="username" label="用户名" align="center">
+                    <template #default="{ row }">
+                        {{ row.username || row.nickname }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="nickname" label="昵称" align="center" />
                 <el-table-column prop="mobile" label="手机号" align="center" />
                 <el-table-column prop="district" label="地区" align="center" />
                 <el-table-column prop="gender_text" label="性别" align="center" />
                 <el-table-column prop="birthday_text" label="年龄" align="center" />
-
                 <el-table-column prop="created_at" label="创建时间" align="center" />
                 <el-table-column prop="status" label="状态" align="center">
                     <template #default="{ row }">
-                        <el-tag>
-                            {{ statusData[row.state] }}
-                        </el-tag>
+                        <el-tag>{{ statusData[row.state] }}</el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column prop="detection_number" label="总检测次数" align="center" />
-                <el-table-column label="操作" align="center" width="150">
-                    <template #default="{ row }">
-                        <el-button text @click="archiveDetail(row)">详情</el-button>
-                        <el-button text @click="handleOperation(row)">操作</el-button>
-                    </template>
-                </el-table-column>
             </el-table>
 
-            <pagination v-if="total > 0" :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
-                @pagination="handleQuery" />
+            <pagination :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
+                @pagination="loadList" />
         </el-card>
-
-
-        <!-- 用户授权门店列表弹窗 -->
-        <el-dialog v-model="authStoreUserListDialogVisible" title="用户授权门店列表" width="940px">
-            <el-table v-loading="authStoreUserListLoading" :data="authStorelists" border stripe style="width: 100%">
-                <el-table-column prop="name" label="门店名称" align="center" />
-                <el-table-column prop="user_name" label="管理门店的用户名" align="center" />
-                <el-table-column prop="user_mobile" label="电话" align="center" />
-                <el-table-column prop="district_text" label="地区" align="center" />
-                <el-table-column prop="validity_time" label="授权到期时间" align="center" />
-                <el-table-column prop="status" label="状态" align="center"><template #default="{ row }">
-                        <el-tag>
-                            {{ authStatusData[row.status] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
-        <!-- 用户操作弹窗 -->
-        <el-dialog v-model="userOperationDialogVisible" title="用户操作" width="640px">
-            <el-form ref="userOperationFormRef" :model="userOperationForm" :rules="userOperationFormRules"
-                label-width="120px">
-                <el-form-item label="操作" prop="operation">
-                    <el-select v-model="userOperationForm.state" placeholder="请选择操作" style="width: 100%">
-                        <el-option value="3" label="有问题"></el-option>
-                        <el-option value="4" label="已退款"></el-option>
-                        <el-option value="5" label="正常"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <template #footer>
-                <el-button @click="userOperationDialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="userOperationSubmit">确定</el-button>
-            </template>
-        </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue';
-import { getUserList, getUserarchive, getUserarchiveDetail, getUserAuthStoreList, getUserDetectionList, userDetectionOperation } from '@/api/user';
+import { reactive, ref } from 'vue';
+import { getUserDetectionList } from '@/api/user';
 import { ElMessage } from 'element-plus';
 import { Search, Refresh } from '@element-plus/icons-vue';
-const statusData = {
+
+const statusData: Record<number, string> = {
     1: '检测过一次',
     2: '分析中',
-    3: '已退款',
-    4: '正常'
-}
-const authStatusData = {
-    1: '授权中',
-    2: '已过期'
-}
-const loading = ref(false);
-const userOperationDialogVisible = ref(false);
-const userOperationFormRef = ref();
-const userOperationForm = reactive({
-    state: null
-})
-const userOperationFormRules = reactive({
-    state: [{ required: true, message: '请选择操作', trigger: 'change' }]
-})
+    3: '有问题',
+    4: '已退款',
+    5: '正常',
+};
 
+const loading = ref(false);
 const total = ref(0);
 const userList = ref<any[]>([]);
 const queryFormRef = ref();
-const authStoreUserListDialogVisible = ref(false)
-const authStoreUserListLoading = ref(false)
-const authStorelists = ref<any[]>([])
-// 档案弹窗相关
-const archiveDialogVisible = ref(false);
-const archiveLoading = ref(false);
-const archiveTotal = ref(0);
-const archiveList = ref<any[]>([]);
-const currentUserId = ref<number | null>(null);
-const archiveParams = reactive({
-    page: 1,
-    size: 10
-});
-const handleOperation = (row: any) => {
-    userOperationDialogVisible.value = true;
-    userOperationForm.id = row.id;
-    userOperationForm.state = null;
-    userOperationFormRef.value?.resetFields();
-}
-const userOperationSubmit = () => {
-    userOperationFormRef.value?.validate((valid) => {
-        if (valid) {
-            userDetectionOperation(userOperationForm).then(({ data }: any) => {
-                console.log(data, 'data用户检测操作')
-                ElMessage.success('操作成功');
-                userOperationDialogVisible.value = false;
-                handleQuery();
-            })
-                .catch((err: any) => {
-                    ElMessage.error(err.message || '操作失败');
-                })
-                .finally(() => {
-                    loading.value = false;
-                });
-        }
-    })
-}
-const authStoreUserList = (row: any) => {
-    authStoreUserListDialogVisible.value = true;
-    authStoreUserListLoading.value = true;
-    getUserAuthStoreList({ user_id: row.id }).then(({ data }: any) => {
-        console.log(data, 'data授权门店列表')
-        authStorelists.value = data;
-    })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户授权门店列表失败');
-        })
-        .finally(() => {
-            authStoreUserListLoading.value = false;
-        });
-}
-// 打开档案弹窗
-function openArchiveDialog(row: any) {
-    currentUserId.value = row.id;
-    archiveDialogVisible.value = true;
-    archiveParams.page = 1;
-    archiveParams.size = 10;
-    loadArchive();
-}
-
-// 加载档案列表
-function loadArchive() {
-    if (!currentUserId.value) return;
-    archiveLoading.value = true;
-    getUserarchive({ user_id: currentUserId.value, ...archiveParams })
-        .then(({ data }: any) => {
-            const list = Array.isArray(data) ? data : data?.data ?? data?.list ?? [];
-            archiveList.value = list;
-            archiveTotal.value =
-                typeof data?.total === 'number' ? data.total : Array.isArray(data) ? data.length : list.length;
-        })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户档案失败');
-        })
-        .finally(() => {
-            archiveLoading.value = false;
-        });
-}
-
 const queryParams = reactive({
     page: 1,
     size: 10,
     keyword: '',
-    state: null,
 });
 
-function handleQuery() {
+function normalizePageData(data: any): { list: any[]; total: number } {
+    if (Array.isArray(data)) return { list: data, total: data.length };
+    const list = data?.list ?? data?.data ?? [];
+    const total = Number(data?.total);
+    return { list, total: Number.isFinite(total) ? total : list.length };
+}
+
+// 加载列表
+const loadList = () => {
     loading.value = true;
     getUserDetectionList(queryParams)
-        .then(({ data }: any) => {
-            userList.value = data;
+        .then(({ data }) => {
+            const { list, total: t } = normalizePageData(data);
+            userList.value = list;
+            total.value = t;
         })
-        .catch((err: any) => {
-            ElMessage.error(err.message || '获取用户列表失败');
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-}
-//用户档案详情
-const archiveDetail = async (row) => {
-    const res = await getUserarchiveDetail({ id: row.id });
-    console.log(res, 'res用户档案详情')
-}
-function resetQuery() {
+        .catch((err: any) => ElMessage.error(err.message || '获取用户列表失败'))
+        .finally(() => (loading.value = false));
+};
+
+// 重置
+const resetQuery = () => {
     queryFormRef.value?.resetFields();
     queryParams.page = 1;
-    handleQuery();
-}
+    loadList();
+};
 
-function handleSizeChange(size: number) {
-    queryParams.size = size;
-    queryParams.page = 1;
-    handleQuery();
-}
-
-function handleCurrentChange(page: number) {
-    queryParams.page = page;
-    handleQuery();
-}
-
-onMounted(() => {
-    handleQuery();
-});
+loadList();
 </script>
 
 <style lang="scss" scoped>
 .app-container {
     padding: 20px;
 }
-
-.avatar-thumb {
-    cursor: pointer;
-}
-
-.archive-cover {
-    width: 80px;
-    height: 80px;
-    border-radius: 4px;
-    cursor: pointer;
-}
 </style>
diff --git a/src/views/user/userQuestion.vue b/src/views/user/userQuestion.vue
new file mode 100644
index 0000000..793a885
--- /dev/null
+++ b/src/views/user/userQuestion.vue
@@ -0,0 +1,124 @@
+<template>
+    <div class="app-container">
+        <el-card class="box-card">
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="关键词" prop="keyword">
+                    <el-input v-model="queryParams.keyword" placeholder="用户名/昵称" clearable style="width: 200px"
+                        @keyup.enter="loadList" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" :icon="Search" @click="loadList">搜索</el-button>
+                    <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-table v-loading="loading" :data="userList" border stripe style="width: 100%">
+                <el-table-column prop="username" label="用户名" align="center" />
+                <el-table-column prop="nickname" label="昵称" align="center" />
+                <el-table-column prop="mobile" label="手机号" align="center" />
+                <el-table-column prop="district" label="地区" align="center" />
+                <el-table-column prop="gender_text" label="性别" align="center" />
+                <el-table-column prop="birthday_text" label="年龄" align="center" />
+                <el-table-column prop="created_at" label="创建时间" align="center" />
+                <el-table-column prop="status" label="状态" align="center">
+                    <template #default="{ row }">
+                        <el-tag>{{ statusData[row.state] }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="detection_number" label="总检测次数" align="center" />
+                <el-table-column label="操作" align="center" width="160">
+                    <template #default="{ row }">
+                        <div class="op-links">
+                            <el-button type="primary" link @click="handleQuickOperation(row, 5)">OK</el-button>
+                            <el-button type="primary" link @click="handleQuickOperation(row, 4)">退款</el-button>
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <pagination :total="total" v-model:page="queryParams.page" v-model:limit="queryParams.size"
+                @pagination="loadList" />
+        </el-card>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue';
+import { getUserDetectionList, userDetectionOperation } from '@/api/user';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { Search, Refresh } from '@element-plus/icons-vue';
+
+const statusData: Record<number, string> = {
+    1: '检测过一次',
+    2: '分析中',
+    3: '有问题',
+    4: '已退款',
+    5: '正常',
+};
+
+const loading = ref(false);
+const total = ref(0);
+const userList = ref<any[]>([]);
+const queryFormRef = ref();
+const queryParams = reactive({
+    page: 1,
+    size: 10,
+    keyword: '',
+    state: 3,
+});
+
+function normalizePageData(data: any): { list: any[]; total: number } {
+    if (Array.isArray(data)) return { list: data, total: data.length };
+    const list = data?.list ?? data?.data ?? [];
+    const total = Number(data?.total);
+    return { list, total: Number.isFinite(total) ? total : list.length };
+}
+
+// 加载列表
+const loadList = () => {
+    loading.value = true;
+    getUserDetectionList(queryParams)
+        .then(({ data }) => {
+            const { list, total: t } = normalizePageData(data);
+            userList.value = list;
+            total.value = t;
+        })
+        .catch((err: any) => ElMessage.error(err.message || '获取用户列表失败'))
+        .finally(() => (loading.value = false));
+};
+
+// 重置
+const resetQuery = () => {
+    queryFormRef.value?.resetFields();
+    queryParams.page = 1;
+    loadList();
+};
+
+// 快速操作（OK → state=5，退款 → state=4）
+const handleQuickOperation = async (row: any, state: number) => {
+    const tip = state === 5 ? '确认设为正常？' : '确认退款？';
+    try {
+        await ElMessageBox.confirm(tip, '提示', { type: 'warning' });
+        await userDetectionOperation({ id: row.id, state });
+        ElMessage.success('操作成功');
+        loadList();
+    } catch (err: any) {
+        if (err !== 'cancel') ElMessage.error(err?.message || '操作失败');
+    }
+};
+
+loadList();
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+    padding: 20px;
+}
+
+.op-links {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 8px;
+}
+</style>