From a95521f6af7d439c607a000c46d7b9a1aee757b9 Mon Sep 17 00:00:00 2001
From: wangchen147 <30853657+wangchen147@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:31:08 +0800
Subject: [PATCH] 0.0.4

---
 admin/src/app/views/home/edit_personal.vue    | 102 +++++++++++++
 admin/src/app/views/home/index.vue            |   6 +-
 admin/src/app/views/home/personal.vue         |  96 ++++++++++++
 admin/src/app/views/index/index.vue           |  15 +-
 admin/src/app/views/index/store.vue           |  11 +-
 admin/src/app/views/site/edit_personal.vue    | 101 +++++++++++++
 admin/src/app/views/site/personal.vue         |  93 ++++++++++++
 admin/src/app/views/site/user_info.vue        |   2 +-
 admin/src/app/views/tools/addon/edit.vue      |   4 +-
 admin/src/app/views/tools/addon/index.vue     |   4 +-
 .../layout/admin/components/header/index.vue  |  28 +---
 .../admin/components/header/user-info.vue     |  40 ++++-
 .../default/components/header/index.vue       |  56 +------
 .../default/components/header/user-info.vue   | 141 ++++++++++++++----
 admin/src/router/routers.ts                   |  16 +-
 .../app/adminapi/controller/sys/Config.php    |  12 ++
 niucloud/app/adminapi/route/sys.php           |   3 +
 niucloud/app/dict/menu/site.php               |   2 +-
 niucloud/app/model/site/Site.php              |   2 +-
 .../service/admin/home/AuthSiteService.php    |   2 +-
 .../app/service/admin/site/SiteService.php    |  12 +-
 .../service/admin/site/SiteUserService.php    |   4 +-
 .../app/service/admin/sys/ConfigService.php   |  12 +-
 .../app/service/core/site/CoreSiteService.php |  18 ++-
 .../service/core/sys/CoreSysConfigService.php |  26 +++-
 niucloud/config/version.php                   |   4 +-
 .../core/util/niucloud/http/AccessToken.php   |   1 +
 .../admin/assets/default_headimg-1e927329.png | Bin 4313 -> 0 bytes
 .../admin/assets/default_headimg-9976c9c6.js  |   1 -
 .../admin/assets/edit-text-7fdc44bc.css       |   1 -
 .../admin/assets/member_head-9976c9c6.js      |   1 -
 niucloud/public/admin/index.html              |   8 +-
 32 files changed, 668 insertions(+), 156 deletions(-)
 create mode 100644 admin/src/app/views/home/edit_personal.vue
 create mode 100644 admin/src/app/views/home/personal.vue
 create mode 100644 admin/src/app/views/site/edit_personal.vue
 create mode 100644 admin/src/app/views/site/personal.vue
 delete mode 100644 niucloud/public/admin/assets/default_headimg-1e927329.png
 delete mode 100644 niucloud/public/admin/assets/default_headimg-9976c9c6.js
 delete mode 100644 niucloud/public/admin/assets/edit-text-7fdc44bc.css
 delete mode 100644 niucloud/public/admin/assets/member_head-9976c9c6.js

diff --git a/admin/src/app/views/home/edit_personal.vue b/admin/src/app/views/home/edit_personal.vue
new file mode 100644
index 000000000..7cd99fdd3
--- /dev/null
+++ b/admin/src/app/views/home/edit_personal.vue
@@ -0,0 +1,102 @@
+<template>
+    <div class="main-container w-full pt-[64px] bg-white"  v-loading="loading">
+        <div class="flex justify-between items-center h-[32px] mb-4">
+            <span class="text-[20px]">{{ t('editPersonal') }}</span>
+        </div>
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <upload-image v-model="saveInfo.head_img" :limit="1" />
+                </el-form-item>
+				<el-form-item :label="t('userName')">
+                    <span>{{saveInfo.username}}</span>
+				</el-form-item>
+                <el-form-item :label="t('realName')">
+                    <el-input v-model="saveInfo.real_name" :placeholder="t('realNamePlaceholder')" clearable class="input-width" />
+                </el-form-item>
+            </el-form>
+            <div class="flex justify-center mt-[50px]">
+                <el-button type="primary" @click="submitForm(formRef)">{{ t('save') }}</el-button>
+                <el-button type="primary" @click="returnFn(formRef)">{{ t('cancel') }}</el-button>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance, FormRules, ElNotification } from 'element-plus'
+import { img } from '@/utils/common'
+import { getUserInfo,setUserInfo } from '@/app/api/personal'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+// 提交信息
+let saveInfo = reactive({
+        head_img: '',
+        real_name: '',
+		username: ''
+    });
+
+const formRef = ref<FormInstance>();
+const loading = ref(true);
+
+/**
+ * 获取用户信息
+ */
+const getUserInfoFn = () => {
+    loading.value = true;
+    getUserInfo().then(res => {
+        loading.value = false;
+        
+        let data = res.data;
+        saveInfo.head_img = data.head_img;
+        saveInfo.real_name = data.real_name;
+		saveInfo.username = data.username;
+    }).catch(() => {
+        loading.value = false;  
+    })
+}
+getUserInfoFn();
+
+const submitForm = (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            loading.value = true;
+
+            setUserInfo(saveInfo).then((res: any) => {
+                loading.value = false;
+            }).catch((err: any) => {
+                loading.value = false
+            })
+        } else {
+            return false
+        }
+    });
+}
+const returnFn = ()=>{
+    router.push('/user/center')
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.personal-body){
+    background-color: #fff;
+    .el-form-item__content{
+        .el-input{
+            width: 250px;
+        }
+        .el-form-item__content{
+            justify-content: space-between;
+        }
+        .el-button{
+            margin-left: auto;
+        }
+        .personal-option{
+            margin-right: auto;
+        }
+    }
+}
+</style>
diff --git a/admin/src/app/views/home/index.vue b/admin/src/app/views/home/index.vue
index d57bddbfe..61a8edd88 100644
--- a/admin/src/app/views/home/index.vue
+++ b/admin/src/app/views/home/index.vue
@@ -15,7 +15,7 @@
         <div class="w-[1200px] m-auto  mt-[62px]">
             <div class="flex justify-between items-center">
                 <span class="text-[24px] font-bold">站点列表</span>
-                <el-button type="primary" class="w-[90px] !h-[34px]">创建站点</el-button>
+                <el-button type="primary" class="w-[90px] !h-[34px]" @click="handleChick">创建站点</el-button>
             </div>
             <div class="flex justify-between items-center mt-[18px]">
                 <div class="flex items-center flex-wrap text-[14px] w-[800px]">
@@ -142,6 +142,10 @@ const addonList = ref([])
 getInstalledAddonList().then(({ data }) => {
     addonList.value = data
 }).catch()
+
+const handleChick = () => {
+	ElMessage('加班加点研发中...')
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/app/views/home/personal.vue b/admin/src/app/views/home/personal.vue
new file mode 100644
index 000000000..084767431
--- /dev/null
+++ b/admin/src/app/views/home/personal.vue
@@ -0,0 +1,96 @@
+<template>
+    <div class="main-container w-full pt-[64px] bg-white"  v-loading="loading">
+        <div class="flex justify-between items-center h-[32px] mb-4">
+            <span class="text-[20px]">{{ t('personal') }}</span>
+            <span class="text-[14px] text-[#999] cursor-pointer" @click="toEditPersonal">{{ t('editPersonal') }}</span>
+        </div>
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form :model="saveInfo" label-width="90px" ref="formRef" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <el-image class="w-[70px] h-[70px]" :src="img(saveInfo.head_img)" fit="contain">
+                        <template #error>
+                            <div class="image-slot bg-[#c0c4cc] flex items-center justify-center w-[70px] h-[70px] rounded-full">
+                                <el-icon class="!text-[#fff] !text-[45px]"><UserFilled /></el-icon>
+                            </div>
+                        </template>
+                    </el-image>
+                </el-form-item>
+				<el-form-item :label="t('userName')">
+				    <div>{{saveInfo.username}}</div>
+				</el-form-item>
+                <el-form-item :label="t('realName')">
+                    <div>{{saveInfo.real_name}}</div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance, FormRules, ElNotification } from 'element-plus'
+import { img } from '@/utils/common'
+import { getUserInfo,setUserInfo } from '@/app/api/personal'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+// 提交信息
+let saveInfo = reactive({
+    head_img: '',
+    real_name: '',
+    original_password: '',
+    password: '',
+    password_copy: '',
+    username: ''
+});
+
+const formRef = ref<FormInstance>();
+const loading = ref(true);
+
+/**
+ * 获取用户信息
+ */
+const getUserInfoFn = () => {
+    loading.value = true;
+    getUserInfo().then(res => {
+        loading.value = false;
+        
+        let data = res.data;
+        saveInfo.head_img = data.head_img;
+        saveInfo.real_name = data.real_name;
+        saveInfo.original_password = data.original_password;
+        saveInfo.password = data.password;
+        saveInfo.password_copy = data.password;
+		saveInfo.username = data.username;
+    }).catch(() => {
+        loading.value = false;  
+    })
+}
+getUserInfoFn();
+
+// 编辑个人中心
+const toEditPersonal = () => {
+    router.push('/user/edit_center')
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.personal-body){
+    background-color: #fff;
+    .el-form-item__content{
+        .el-input{
+            width: 250px;
+        }
+        .el-form-item__content{
+            justify-content: space-between;
+        }
+        .el-button{
+            margin-left: auto;
+        }
+        .personal-option{
+            margin-right: auto;
+        }
+    }
+}
+</style>
diff --git a/admin/src/app/views/index/index.vue b/admin/src/app/views/index/index.vue
index 1926deab2..ef7e7d654 100644
--- a/admin/src/app/views/index/index.vue
+++ b/admin/src/app/views/index/index.vue
@@ -81,29 +81,29 @@
                     </el-row>
                 </el-card>
                 <div class="flex justify-between mt-[15px]">
-                    <div class="w-[258px] h-[132px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
+                    <div class="flex-1 h-[145px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer mr-[25px]"
                         @click="toLink('site/list')">
                         <img class="w-[52px]" src="@/app/assets/images/index/site1.png" />
                         <span class="text-[16px] text-[#333]">{{ t("siteList") }}</span>
                     </div>
-                    <div class="w-[258px] h-[132px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
+                    <div class="flex-1 h-[145px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer mr-[25px]"
                         @click="toLink('site/group')">
                         <img class="w-[52px]" src="@/app/assets/images/index/site_class1.png" />
                         <span class="text-[16px] text-[#333]">{{ t("sitePackage") }}</span>
                     </div>
-                    <div class="w-[258px] h-[132px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
+                    <div class="flex-1 h-[145px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer mr-[25px]"
                         @click="toLink('site/list')">
                         <img class="w-[52px]" src="@/app/assets/images/index/new_site1.png" />
                         <span class="text-[16px] text-[#333]">{{ t("newSite") }}</span>
                     </div>
-                    <div class="w-[258px] h-[132px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
+                    <div class="flex-1 h-[145px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer mr-[25px]"
                         @click="toLink('/admin/site/user')">
                         <img class="w-[52px]" src="@/app/assets/images/index/auth1.png" />
                         <span class="text-[16px] text-[#333]">{{
                             t("administrator")
                         }}</span>
                     </div>
-                    <div class="w-[258px] h-[132px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
+                    <div class="flex-1 h-[145px] bg-[#F9F9F9] flex justify-center flex-col items-center cursor-pointer"
                         @click="toApplication">
                         <img class="w-[52px]" src="@/app/assets/images/index/app1.png" />
                         <span class="text-[16px] text-[#333]">{{
@@ -187,7 +187,7 @@ let statInfo = ref({
     about: [],
     site_stat: {},
     site_group_stat: {},
-    app: {},
+    app: {}
 });
 const getStatInfoFn = async (id: number = 0) => {
     statInfo.value = await (await getStatInfo()).data;
@@ -304,8 +304,7 @@ nowTime()
 
 <style lang="scss" scoped>
 .main-container {
-    width: 1428px;
-    margin: 0 auto;
+    margin: 0 84px;
 }
 
 :deep(.profile-data .el-card__header) {
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index 1de10874b..59264d6d9 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -294,7 +294,7 @@
                     </div>
                 </div>
                 <div v-show="installStep == 2" class="h-[50vh] mt-[20px]">
-                    <terminal :name="currAddon" :context="currAddon" :init-log="null" :show-header="false"
+                    <terminal ref="terminalRef" :context="currAddon" :init-log="null" :show-header="false"
                         :show-log-time="true" />
                 </div>
                 <div v-show="installStep == 3" class="h-[50vh] mt-[20px] flex flex-col">
@@ -399,6 +399,7 @@ const downloading = ref('')
 const installAfterTips = ref<string[]>([])
 const userStore = useUserStore()
 const unloadHintDialog = ref(false)
+const terminalRef = ref(null)
 
 const currDownData = ref()
 const downEventHintFn = () => {
@@ -635,8 +636,8 @@ const handleCloudInstall = () => {
 
     cloudInstallAddon({ addon: currAddon.value }).then(res => {
         installStep.value = 2
-        terminalApi.execute(currAddon.value, 'clear')
-        terminalApi.pushMessage(currAddon.value, { content: '开始安装插件', class: 'info' })
+        terminalRef.value.execute('clear')
+        terminalRef.value.pushMessage({ content: '开始安装插件', class: 'info' })
         getInstallTask()
         cloudInstalling.value = false
     }).catch((res) => {
@@ -670,11 +671,11 @@ const getCloudInstallLog = () => {
             if (data[0] && data[0].length && installShowDialog.value == true) {
                 data[0].forEach(item => {
                     if (!installLog.includes(item.action)) {
-                        terminalApi.pushMessage(currAddon.value, { content: `正在执行：${item.action}` })
+                        terminalRef.value.pushMessage({ content: `正在执行：${item.action}` })
                         installLog.push(item.action)
 
                         if (item.code == 0) {
-                            terminalApi.pushMessage(currAddon.value, { content: item.msg, class: 'error' })
+                            terminalRef.value.pushMessage({ content: item.msg, class: 'error' })
                         }
                     }
                 })
diff --git a/admin/src/app/views/site/edit_personal.vue b/admin/src/app/views/site/edit_personal.vue
new file mode 100644
index 000000000..1763d62a3
--- /dev/null
+++ b/admin/src/app/views/site/edit_personal.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="main-container w-full bg-white"  v-loading="loading">
+        <el-card class="box-card !border-none" shadow="never">
+            <el-form :model="saveInfo" label-width="80px" ref="formRef" :rules="formRules" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <upload-image v-model="saveInfo.head_img" :limit="1" />
+                </el-form-item>
+				<el-form-item :label="t('userName')">
+                    <span>{{saveInfo.username}}</span>
+				</el-form-item>
+                <el-form-item :label="t('realName')">
+                    <el-input v-model="saveInfo.real_name" :placeholder="t('realNamePlaceholder')" clearable class="input-width" />
+                </el-form-item>
+            </el-form>
+            <div class="fixed-footer-wrap">
+                <div class="fixed-footer">
+                    <el-button type="primary" @click="submitForm(formRef)">{{ t('save') }}</el-button>
+                    <el-button type="primary" @click="returnFn(formRef)">{{ t('cancel') }}</el-button>
+                </div>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance, FormRules, ElNotification } from 'element-plus'
+import { img } from '@/utils/common'
+import { getUserInfo,setUserInfo } from '@/app/api/personal'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+// 提交信息
+let saveInfo = reactive({
+        head_img: '',
+        real_name: '',
+		username: ''
+    });
+
+const formRef = ref<FormInstance>();
+const loading = ref(true);
+
+/**
+ * 获取用户信息
+ */
+const getUserInfoFn = () => {
+    loading.value = true;
+    getUserInfo().then(res => {
+        loading.value = false;
+        
+        let data = res.data;
+        saveInfo.head_img = data.head_img;
+        saveInfo.real_name = data.real_name;
+		saveInfo.username = data.username;
+    }).catch(() => {
+        loading.value = false;  
+    })
+}
+getUserInfoFn();
+
+const submitForm = (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            loading.value = true;
+
+            setUserInfo(saveInfo).then((res: any) => {
+                loading.value = false;
+            }).catch((err: any) => {
+                loading.value = false
+            })
+        } else {
+            return false
+        }
+    });
+}
+const returnFn = ()=>{
+    router.push('/user/center')
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.personal-body){
+    background-color: #fff;
+    .el-form-item__content{
+        .el-input{
+            width: 250px;
+        }
+        .el-form-item__content{
+            justify-content: space-between;
+        }
+        .el-button{
+            margin-left: auto;
+        }
+        .personal-option{
+            margin-right: auto;
+        }
+    }
+}
+</style>
diff --git a/admin/src/app/views/site/personal.vue b/admin/src/app/views/site/personal.vue
new file mode 100644
index 000000000..7faa9b44f
--- /dev/null
+++ b/admin/src/app/views/site/personal.vue
@@ -0,0 +1,93 @@
+<template>
+    <div class="main-container w-full bg-white"  v-loading="loading">
+        <el-card class="box-card !border-none relative" shadow="never">
+            <el-form :model="saveInfo" label-width="80px" ref="formRef" class="page-form">
+                <el-form-item :label="t('headImg')">
+                    <el-image class="w-[70px] h-[70px]" :src="img(saveInfo.head_img)" fit="contain">
+                        <template #error>
+                            <div class="image-slot bg-[#c0c4cc] flex items-center justify-center w-[70px] h-[70px] rounded-full">
+                                <el-icon class="!text-[#fff] !text-[45px]"><UserFilled /></el-icon>
+                            </div>
+                        </template>
+                    </el-image>
+                </el-form-item>
+				<el-form-item :label="t('userName')">
+				    <div>{{saveInfo.username}}</div>
+				</el-form-item>
+                <el-form-item :label="t('realName')">
+                    <div>{{saveInfo.real_name}}</div>
+                </el-form-item>
+            </el-form>
+            <span class="text-[14px] text-[#999] absolute top-[25px] right-[20px] cursor-pointer" @click="toEditPersonal">{{ t('editPersonal') }}</span>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance, FormRules, ElNotification } from 'element-plus'
+import { img } from '@/utils/common'
+import { getUserInfo,setUserInfo } from '@/app/api/personal'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+// 提交信息
+let saveInfo = reactive({
+    head_img: '',
+    real_name: '',
+    original_password: '',
+    password: '',
+    password_copy: '',
+    username: ''
+});
+
+const formRef = ref<FormInstance>();
+const loading = ref(true);
+
+/**
+ * 获取用户信息
+ */
+const getUserInfoFn = () => {
+    loading.value = true;
+    getUserInfo().then(res => {
+        loading.value = false;
+        
+        let data = res.data;
+        saveInfo.head_img = data.head_img;
+        saveInfo.real_name = data.real_name;
+        saveInfo.original_password = data.original_password;
+        saveInfo.password = data.password;
+        saveInfo.password_copy = data.password;
+		saveInfo.username = data.username;
+    }).catch(() => {
+        loading.value = false;  
+    })
+}
+getUserInfoFn();
+
+// 编辑个人中心
+const toEditPersonal = () => {
+    router.push('/user/edit_center')
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.personal-body){
+    background-color: #fff;
+    .el-form-item__content{
+        .el-input{
+            width: 250px;
+        }
+        .el-form-item__content{
+            justify-content: space-between;
+        }
+        .el-button{
+            margin-left: auto;
+        }
+        .personal-option{
+            margin-right: auto;
+        }
+    }
+}
+</style>
diff --git a/admin/src/app/views/site/user_info.vue b/admin/src/app/views/site/user_info.vue
index b4687a591..caf409c88 100644
--- a/admin/src/app/views/site/user_info.vue
+++ b/admin/src/app/views/site/user_info.vue
@@ -59,7 +59,7 @@
             <el-table :data="detail.roles" size="large">
                 <el-table-column prop="site_id" :label="t('siteId')" width="100px" />
                 <el-table-column prop="site_name" :label="t('siteName')" />
-                <el-table-column prop="last_time" :label="t('isAdmin')" min-width="180" align="center">
+                <el-table-column prop="is_admin" :label="t('isAdmin')" min-width="180" align="center">
                     <template #default="{ row }">
                         {{ row.is_admin ? t('yes') : t('no') }}
                     </template>
diff --git a/admin/src/app/views/tools/addon/edit.vue b/admin/src/app/views/tools/addon/edit.vue
index 76596255a..97cb3244e 100644
--- a/admin/src/app/views/tools/addon/edit.vue
+++ b/admin/src/app/views/tools/addon/edit.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="main-container mb-80" v-loading="loading">
         <div class="detail-head !mb-[10px]">
-            <div class="left" @click="router.push({ path: '/setting/tools/addon' })">
+            <div class="left" @click="router.push({ path: '/tools/addon' })">
                 <span class="iconfont iconxiangzuojiantou !text-xs"></span>
                 <span class="ml-[1px]">{{ t('returnToPreviousPage') }}</span>
             </div>
@@ -226,7 +226,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
 
                 setTimeout(() => {
                     window.addonActiveName = 'pluginList'
-                    router.push({ path: "/setting/tools/addon" })
+                    router.push({ path: "/tools/addon" })
                 }, 650)
 
             }).catch(() => {
diff --git a/admin/src/app/views/tools/addon/index.vue b/admin/src/app/views/tools/addon/index.vue
index 287ae29c0..37613a677 100644
--- a/admin/src/app/views/tools/addon/index.vue
+++ b/admin/src/app/views/tools/addon/index.vue
@@ -29,7 +29,7 @@
                             <template #description>
                                 <span class="text-[#999]">{{ t("describe1") }}</span>
                                 <div class="mt-[20px] mb-[40px] h-[32px]">
-                                    <el-button type="primary" @click="router.push({ path: '/setting/tools/addon_edit' })">{{t("btn1") }}</el-button>
+                                    <el-button type="primary" @click="router.push({ path: '/tools/addon_edit' })">{{t("btn1") }}</el-button>
                                 </div>
                             </template>
                         </el-step>
@@ -248,7 +248,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
     getAddonDevelopFn();
 }
 const editEvent = (key: any) => {
-    router.push({ path: '/setting/tools/addon_edit', query: { key } })
+    router.push({ path: '/tools/addon_edit', query: { key } })
 }
 const linkEvent = (url: string) => {
     window.open(url, "_blank")
diff --git a/admin/src/layout/admin/components/header/index.vue b/admin/src/layout/admin/components/header/index.vue
index 819f623e5..1a0e56a9c 100644
--- a/admin/src/layout/admin/components/header/index.vue
+++ b/admin/src/layout/admin/components/header/index.vue
@@ -25,14 +25,14 @@
                 <icon name="iconfont-iconqiehuan" :title="t('indexSwitch')"/>
             </div>
             <!-- 切换语言 -->
-            <div class="navbar-item flex items-center h-full cursor-pointer">
+            <!-- <div class="navbar-item flex items-center h-full cursor-pointer">
                 <switch-lang />
-            </div>
+            </div> -->
             <!-- 切换全屏 -->
-            <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
+            <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
                 <icon name="iconfont-icontuichuquanping" v-if="isFullscreen" />
                 <icon name="iconfont-iconquanping" v-else />
-            </div>
+            </div> -->
             <!-- 布局设置 -->
             <!-- <div class="navbar-item flex items-center h-full cursor-pointer">
                 <layout-setting />
@@ -145,26 +145,6 @@ onMounted(() => {
     }
 })
 
-watch(screenWidth, () => {
-    if (screenWidth.value < 992) {
-        if (!systemStore.menuIsCollapse) systemStore.toggleMenuCollapse(true)
-    } else {
-        if (systemStore.menuIsCollapse) systemStore.toggleMenuCollapse(false)
-    }
-})
-
-// 菜单栏展开折叠
-const toggleMenuCollapse = () => {
-    systemStore.$patch((state) => {
-        if (screenWidth.value < 768) {
-            state.menuDrawer = true
-            state.menuIsCollapse = false
-        } else {
-            systemStore.toggleMenuCollapse(!systemStore.menuIsCollapse)
-        }
-    })
-}
-
 // 刷新路由
 const refreshRouter = () => {
     if (!appStore.routeRefreshTag) return
diff --git a/admin/src/layout/admin/components/header/user-info.vue b/admin/src/layout/admin/components/header/user-info.vue
index 6fad563e5..f7ece8330 100644
--- a/admin/src/layout/admin/components/header/user-info.vue
+++ b/admin/src/layout/admin/components/header/user-info.vue
@@ -8,10 +8,34 @@
             </div>
             <template #dropdown>
                 <el-dropdown-menu>
-                    <el-dropdown-item><router-link to="/user/center">账号设置</router-link></el-dropdown-item>
-                    <el-dropdown-item><router-link to="/tools/authorize">授权信息</router-link></el-dropdown-item>
-                    <el-dropdown-item @click="changePasswordDialog=true">修改密码</el-dropdown-item>
-                    <el-dropdown-item @click="logout">退出登录</el-dropdown-item>
+                    <el-dropdown-item>
+                        <router-link to="/user/center">
+                            <div class="flex items-center leading-[1] py-[5px]">
+                                <span class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"></span>
+                                <span class="text-[14px]">账号设置</span>
+                            </div>
+                        </router-link>
+                    </el-dropdown-item>
+                    <el-dropdown-item>
+                        <router-link to="/tools/authorize">
+                            <div class="flex items-center leading-[1] py-[5px]">
+                                <span class="iconfont iconshouquanxinxi2 ml-[4px] !text-[14px] mr-[10px]"></span>
+                                <span class="text-[14px]">授权信息</span>
+                            </div>
+                        </router-link>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="changePasswordDialog=true">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">修改密码</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="logout">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont icontuichudenglu ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">退出登录</span>
+                        </div>
+                    </el-dropdown-item>
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
@@ -102,8 +126,6 @@ const submitForm = (formEl: FormInstance | undefined) => {
 
             setUserInfo(saveInfo).then((res: any) => {
                 changePasswordDialog.value = false;
-            }).catch((err: any) => {
-                changePasswordDialog.value = false;
             })
         } else {
             return false
@@ -113,4 +135,8 @@ const submitForm = (formEl: FormInstance | undefined) => {
 // 修改密码 --- end
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.el-popper .el-dropdown-menu{
+    width: 150px;
+}
+</style>
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index 27ba4a7e7..e7d4fa172 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -24,19 +24,15 @@
                 <div class="right-panel h-full flex items-center justify-end">
                     <!-- 预览 只有站点时展示-->
                     <i class="iconfont iconlingdang-xianxing cursor-pointer px-[8px]" :title="t('newInfo')" v-if="appType == 'site'"></i>
-					<!-- 切换首页 -->
-					<div class="navbar-item flex items-center h-full cursor-pointer"  v-if="appType == 'site'" @click="checkIndexList">
-						<icon name="iconfont-iconqiehuan" :title="t('indexSwitch')"/>
-					</div>
                     <!-- 切换语言 -->
-                    <div class="navbar-item flex items-center h-full cursor-pointer">
+                    <!-- <div class="navbar-item flex items-center h-full cursor-pointer">
                         <switch-lang />
-                    </div>
+                    </div> -->
                     <!-- 切换全屏 -->
-                    <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
+                    <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
                         <icon name="iconfont-icontuichuquanping" v-if="isFullscreen" />
                         <icon name="iconfont-iconquanping" v-else />
-                    </div>
+                    </div> -->
                     <!-- 布局设置 -->
                     <div class="navbar-item flex items-center h-full cursor-pointer">
                         <layout-setting />
@@ -59,26 +55,6 @@
                 </span>
             </template>
         </el-dialog>
-
-		<el-dialog v-model="showDialog" :title="t('indexTemplate')" width="550px" :destroy-on-close="true" >
-			<div class="flex flex-wrap">
-				<div v-for="(items, index) in indexList" :key="index" v-if="index_path == ''">
-					<div @click="index_path = items.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="items.is_use == 1 ? 'bg-primary text-[#fff]' : '' ">
-						<span >{{ items.name }}</span>
-					</div>
-				</div>
-				<div v-for="(itemTo, indexTo) in indexList" :key="indexTo" v-else>
-					<div @click="index_path = itemTo.view_path" class="index-item py-[5px] px-[10px] mr-[10px] rounded-[3px] cursor-pointer" :class="index_path == itemTo.view_path ? 'bg-primary text-[#fff]' : '' ">
-						<span >{{ itemTo.name }}</span>
-					</div>
-				</div>
-			</div>
-		    <template #footer>
-		        <span class="dialog-footer">
-		            <el-button type="primary" @click="submitIndex">{{ t('confirm') }}</el-button>
-		        </span>
-		    </template>
-		</el-dialog>
     </el-container>
 </template>
 
@@ -93,7 +69,6 @@ import useAppStore from '@/stores/modules/app'
 import { useRoute, useRouter } from 'vue-router'
 import { t } from '@/lang'
 import storage from '@/utils/storage'
-import { getIndexList, setIndexList } from '@/app/api/sys'
 
 const router = useRouter()
 const appType = storage.get('app_type')
@@ -179,29 +154,6 @@ const backFn = () => {
     router.go(-1)
 }
 
-const indexList = ref();
-const showDialog = ref(false)
-const checkIndexList = () => {
-	getIndexList().then(res => {
-		showDialog.value = true
-		indexList.value = res.data
-		for(let i = 0 ; i < indexList.value.length; i ++){
-			if(indexList.value[i].is_use == 1){
-				index_path.value = indexList.value[i].view_path
-			}
-		}
-	})
-}
-
-const index_path = ref('');
-const submitIndex = () => {
-	setIndexList({
-		view_path: index_path.value
-	}).then(() => {
-	    showDialog.value = false
-	    router.go(0)
-	})
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/layout/default/components/header/user-info.vue b/admin/src/layout/default/components/header/user-info.vue
index f0be7c2db..a594aedda 100644
--- a/admin/src/layout/default/components/header/user-info.vue
+++ b/admin/src/layout/default/components/header/user-info.vue
@@ -1,33 +1,74 @@
 <template>
-    <el-dropdown @command="clickEvent" :tabindex="1">
-        <div class="userinfo flex h-full items-center">
-            <el-avatar :size="25" :icon="UserFilled" />
-            <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
-            <icon name="element-ArrowDown" class="ml-[5px]" />
-        </div>
-        <template #dropdown>
-            <el-dropdown-menu>
-                <el-dropdown-item @click="toSiteLink">
-                    <div class="flex items-center leading-[1] py-[5px]">
-                        <span class="iconfont iconqiehuan ml-[4px] !text-[14px] mr-[10px]"></span>
-                        <span class="text-[14px]">切换站点</span>
-                    </div>
-                </el-dropdown-item>
-                <el-dropdown-item command="logout">
-                    <div class="flex items-center leading-[1] py-[2px]">
-                        <span class="iconfont icontuichudenglu !text-[21px] mr-[8px]"></span>
-                        <span class="text-[14px]">退出登录</span>
-                    </div>
-                </el-dropdown-item>
-            </el-dropdown-menu>
-        </template>
-    </el-dropdown>
+    <div>
+        <el-dropdown @command="clickEvent" :tabindex="1">
+            <div class="userinfo flex h-full items-center">
+                <el-avatar :size="25" :icon="UserFilled" />
+                <div class="user-name pl-[8px]">{{ userStore.userInfo.username }}</div>
+                <icon name="element-ArrowDown" class="ml-[5px]" />
+            </div>
+            <template #dropdown>
+                <el-dropdown-menu>
+                    <el-dropdown-item @click="toLink('/home/index')">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconqiehuan ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">切换站点</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="toLink('/user/center')">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconshezhi1 ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">账号设置</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="changePasswordDialog=true">
+                        <div class="flex items-center leading-[1] py-[5px]">
+                            <span class="iconfont iconxiugai ml-[4px] !text-[14px] mr-[10px]"></span>
+                            <span class="text-[14px]">修改密码</span>
+                        </div>
+                    </el-dropdown-item>
+                    <el-dropdown-item command="logout">
+                        <div class="flex items-center leading-[1] py-[2px]">
+                            <span class="iconfont icontuichudenglu !text-[21px] mr-[8px]"></span>
+                            <span class="text-[14px]">退出登录</span>
+                        </div>
+                    </el-dropdown-item>
+                </el-dropdown-menu>
+            </template>
+        </el-dropdown>
+
+        <el-dialog v-model="changePasswordDialog" width="450px" title="修改密码" :before-close="handleClose">
+            <div>
+                <el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
+                    <el-form-item :label="t('originalPassword')" prop="original_password">
+                        <el-input v-model="saveInfo.original_password" type="password" :placeholder="t('originalPasswordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                    <el-form-item :label="t('newPassword')" prop="password">
+                        <el-input v-model="saveInfo.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                        <div class="form-tip">{{t('passwordTip')}}</div>
+                    </el-form-item>
+                    <el-form-item :label="t('passwordCopy')" prop="password_copy">
+                        <el-input v-model="saveInfo.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" />
+                    </el-form-item>
+                </el-form>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="changePasswordDialog = false">{{t('cancel')}}</el-button>
+                    <el-button type="primary" @click="submitForm(formRef)">{{t('save')}}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup>
 import { CollectionTag, UserFilled } from '@element-plus/icons-vue'
+import { computed, reactive, ref, onMounted, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import type { FormInstance, FormRules, ElNotification } from 'element-plus'
 import useUserStore from '@/stores/modules/user'
-import { useRouter } from 'vue-router'
+import { setUserInfo } from '@/app/api/personal'
+import { t } from '@/lang'
 
 const userStore = useUserStore()
 const router = useRouter()
@@ -40,9 +81,57 @@ const clickEvent = (command: string) => {
     }
 }
 
-const toSiteLink = ()=>{
-    router.push('/home/index');
+const toLink = (link)=>{
+    router.push(link);
 }
+
+
+// 修改密码 --- start
+let changePasswordDialog = ref(false)
+const formRef = ref<FormInstance>();
+// 提交信息
+let saveInfo = reactive({
+    original_password: '',
+    password: '',
+    password_copy: ''
+});
+// 表单验证规则
+const formRules = reactive<FormRules>({
+  original_password: [
+    { required: true, message: t("originalPasswordPlaceholder"), trigger: "blur" },
+  ],
+  password: [
+    { required: true, message: t("passwordPlaceholder"), trigger: "blur" },
+  ],
+  password_copy: [
+    { required: true, message: t("passwordPlaceholder"), trigger: "blur" },
+  ]
+});
+const submitForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.validate((valid) => {
+        if (valid) {
+            let msg = "";
+            if (saveInfo.password && !saveInfo.original_password) msg = t('originalPasswordHint');
+            if (saveInfo.password && saveInfo.original_password && !saveInfo.password_copy) msg = t('newPasswordHint');
+            if (saveInfo.password && saveInfo.original_password && saveInfo.password_copy && saveInfo.password != saveInfo.password_copy) msg = t('doubleCipherHint');
+            if (msg) {
+                ElNotification({
+                    type: 'error',
+                    message: msg,
+                })
+                return;
+            }
+
+            setUserInfo(saveInfo).then((res: any) => {
+                changePasswordDialog.value = false;
+            })
+        } else {
+            return false
+        }
+    });
+}
+// 修改密码 --- end
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/router/routers.ts b/admin/src/router/routers.ts
index 7033ad7e1..f17572ad2 100644
--- a/admin/src/router/routers.ts
+++ b/admin/src/router/routers.ts
@@ -109,7 +109,21 @@ export const SITE_ROUTE: RouteRecordRaw = {
                         type: 1,
                         title: '个人中心'
                     },
-                    component: () => import('@/app/views/index/personal.vue')
+                    component: () => import('@/app/views/site/personal.vue')
+                }
+            ]
+        },
+        {
+            path: 'user',
+            component: Default,
+            children: [
+                {
+                    path: 'edit_center',
+                    meta: {
+                        type: 1,
+                        title: '编辑个人中心'
+                    },
+                    component: () => import('@/app/views/site/edit_personal.vue')
                 }
             ]
         }
diff --git a/niucloud/app/adminapi/controller/sys/Config.php b/niucloud/app/adminapi/controller/sys/Config.php
index 720cebc06..431d6a08c 100644
--- a/niucloud/app/adminapi/controller/sys/Config.php
+++ b/niucloud/app/adminapi/controller/sys/Config.php
@@ -172,6 +172,18 @@ class Config extends BaseAdminController
         return success();
     }
 
+    /**
+     * 获取手机端首页列表
+     */
+    public function getWapIndexList()
+    {
+        $data = $this->request->params([
+            [ 'title', '' ],
+            [ 'key', '' ] // 多个查询，逗号隔开
+        ]);
+        return success(( new ConfigService() )->getWapIndexList($data));
+    }
+
     /**
      * 设置快捷菜单
      */
diff --git a/niucloud/app/adminapi/route/sys.php b/niucloud/app/adminapi/route/sys.php
index b79633862..6a5a5ef6f 100644
--- a/niucloud/app/adminapi/route/sys.php
+++ b/niucloud/app/adminapi/route/sys.php
@@ -86,6 +86,9 @@ Route::group('sys', function () {
     //获取平台首页加载
     Route::get('config/admin_index', 'sys.Config/getAdminIndexList');
 
+    // 获取手机端首页加载
+    Route::get('config/wap_index', 'sys.Config/getWapIndexList');
+
     //快捷菜单设置
     Route::put('config/shortcut_menu', 'sys.Config/setShortcutMenu');
     //获取快捷菜单
diff --git a/niucloud/app/dict/menu/site.php b/niucloud/app/dict/menu/site.php
index 3e8dccb14..a14e0496e 100644
--- a/niucloud/app/dict/menu/site.php
+++ b/niucloud/app/dict/menu/site.php
@@ -861,7 +861,7 @@ return
                     'menu_name' => '注册登录',
                     'menu_key' => 'setting_login_register',
                     'menu_type' => 1,
-                    'icon' => 'iconfont-icondenglu',
+                    'icon' => 'iconfont-iconzhuceshezhi',
                     'api_url' => 'member/config/login',
                     'router_path' => 'login',
                     'view_path' => 'setting/login',
diff --git a/niucloud/app/model/site/Site.php b/niucloud/app/model/site/Site.php
index 086655a36..2d927678f 100644
--- a/niucloud/app/model/site/Site.php
+++ b/niucloud/app/model/site/Site.php
@@ -116,7 +116,7 @@ class Site extends BaseModel
         return $this->hasOne(SiteGroup::class, 'group_id', 'group_id')->joinType('left')->withField('group_id, group_name')->bind(['group_name' => 'group_name']);
     }
 
-    public function addon() {
+    public function addonName() {
         return $this->hasOne(Addon::class, 'key', 'app')->bind(['app_name' => 'title']);
     }
 
diff --git a/niucloud/app/service/admin/home/AuthSiteService.php b/niucloud/app/service/admin/home/AuthSiteService.php
index 4d4de4a3c..46868c838 100644
--- a/niucloud/app/service/admin/home/AuthSiteService.php
+++ b/niucloud/app/service/admin/home/AuthSiteService.php
@@ -80,7 +80,7 @@ class AuthSiteService extends BaseAdminService
     {
         $field = 'site_id, site_name, front_end_name, front_end_logo, app_type, keywords, logo, icon, `desc`, status, latitude, longitude, province_id, city_id, 
         district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id, app';
-        $search_model = $this->model->where([['site_id', 'in', $this->getSiteIds()]])->withSearch([ 'create_time', 'expire_time', 'keywords', 'status', 'group_id', 'app' ], $where)->with(['groupName', 'addon'])->field($field)->append([ 'status_name' ])->order('create_time desc');
+        $search_model = $this->model->where([['site_id', 'in', $this->getSiteIds()]])->withSearch([ 'create_time', 'expire_time', 'keywords', 'status', 'group_id', 'app' ], $where)->with(['groupName', 'addonName'])->field($field)->append([ 'status_name' ])->order('create_time desc');
         return $this->pageQuery($search_model);
     }
 
diff --git a/niucloud/app/service/admin/site/SiteService.php b/niucloud/app/service/admin/site/SiteService.php
index 6692dadba..fb69fb2d5 100644
--- a/niucloud/app/service/admin/site/SiteService.php
+++ b/niucloud/app/service/admin/site/SiteService.php
@@ -60,7 +60,7 @@ class SiteService extends BaseAdminService
         $condition = [
             [ 'app_type', '<>', 'admin' ]
         ];
-        $search_model = $this->model->where($condition)->withSearch([ 'create_time', 'expire_time', 'keywords', 'status', 'group_id', 'app' ], $where)->with(['groupName', 'addon'])->field($field)->append([ 'status_name' ])->order('create_time desc');
+        $search_model = $this->model->where($condition)->withSearch([ 'create_time', 'expire_time', 'keywords', 'status', 'group_id', 'app' ], $where)->with(['groupName', 'addonName'])->field($field)->append([ 'status_name' ])->order('create_time desc');
         return $this->pageQuery($search_model);
     }
 
@@ -73,8 +73,12 @@ class SiteService extends BaseAdminService
     {
         $field = 'site_id, site_name, front_end_name, front_end_logo, app_type, keywords, logo, icon, `desc`, status, latitude, longitude, province_id, city_id, 
         district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id, app, addons';
-        return $this->model->where([ [ 'site_id', '=', $site_id ] ])->with('groupName')->field($field)->append([ 'status_name' ])->findOrEmpty()->toArray();
-
+        $info = $this->model->where([ [ 'site_id', '=', $site_id ] ])->with([ 'groupName', 'addonName' ])->field($field)->append([ 'status_name' ])->findOrEmpty()->toArray();
+        if (!empty($info)) {
+            $site_addons = (new CoreSiteService())->getAddonKeysBySiteId($site_id);
+            $info['site_addons'] = (new Addon())->where([ ['key', 'in', $site_addons]])->field('key,title,desc,icon')->select()->toArray();
+        }
+        return $info;
     }
 
     /**
@@ -174,7 +178,7 @@ class SiteService extends BaseAdminService
                 $where = [
                     [ 'site_id', '=', $site_id ],
                 ];
-                $site = $this->model->where($where)->field('site_id, app_type,site_name,front_end_name,front_end_logo,logo,icon,group_id, status, expire_time, addons')->append([ 'status_name' ])->findOrEmpty();
+                $site = $this->model->where($where)->field('site_id, app_type,site_name,front_end_name,front_end_logo,logo,icon,group_id, status, expire_time, app, addons')->append([ 'status_name' ])->findOrEmpty();
                 return $site->toArray();
             },
             self::$cache_tag_name . $site_id
diff --git a/niucloud/app/service/admin/site/SiteUserService.php b/niucloud/app/service/admin/site/SiteUserService.php
index e79ced771..c84a5021c 100644
--- a/niucloud/app/service/admin/site/SiteUserService.php
+++ b/niucloud/app/service/admin/site/SiteUserService.php
@@ -86,9 +86,9 @@ class SiteUserService extends BaseAdminService
             $query->field('uid, site_id, is_admin')->with('siteInfo');
         }])->findOrEmpty()->toArray();
         if (!empty($info)) {
-            $info['roles'] = array_filter(array_map(function ($item) {
+            $info['roles'] = array_values(array_filter(array_map(function ($item) {
                 if ($item['site_id']) return $item;
-            }, $info['roles']));
+            }, $info['roles'])));
         }
         return $info;
     }
diff --git a/niucloud/app/service/admin/sys/ConfigService.php b/niucloud/app/service/admin/sys/ConfigService.php
index c265c7dfd..892b7f282 100644
--- a/niucloud/app/service/admin/sys/ConfigService.php
+++ b/niucloud/app/service/admin/sys/ConfigService.php
@@ -360,4 +360,14 @@ class ConfigService extends BaseAdminService
         }
         return $index_list;
     }
-}
\ No newline at end of file
+
+    /**
+     * 获取手机端首页列表
+     * @param $data
+     * @return array
+     */
+    public function getWapIndexList($data)
+    {
+        return ( new CoreSysConfigService() )->getWapIndexList($data);
+    }
+}
diff --git a/niucloud/app/service/core/site/CoreSiteService.php b/niucloud/app/service/core/site/CoreSiteService.php
index c9ad73db2..6083e8551 100644
--- a/niucloud/app/service/core/site/CoreSiteService.php
+++ b/niucloud/app/service/core/site/CoreSiteService.php
@@ -14,6 +14,7 @@ namespace app\service\core\site;
 use app\dict\site\SiteDict;
 use app\dict\sys\AppTypeDict;
 use app\model\site\Site;
+use app\model\site\SiteGroup;
 use app\service\admin\site\SiteGroupService;
 use app\service\admin\site\SiteService;
 use core\base\BaseCoreService;
@@ -110,20 +111,23 @@ class CoreSiteService extends BaseCoreService
      * @return array
      */
     public function getAddonKeysBySiteId(int $site_id){
-        $site_info = (new SiteService())->getSiteCache($site_id);
-        if (empty($site_info))
-            return [];
+        $site_info = (new Site())->where([ ['site_id', '=', $site_id] ])->field('group_id,app_type,addons')->findOrEmpty();
+        if ($site_info->isEmpty()) return [];
+
         $app_type = $site_info[ 'app_type' ];
+        $group_addon_keys = [];
+
         if ($app_type == AppTypeDict::SITE) {
             $group_id = $site_info[ 'group_id' ] ?? 0;
             if ($group_id > 0) {
-                $group_addon_keys = ( new SiteGroupService() )->getGroupAddon($group_id);
-            } else {
-                $group_addon_keys = [];
+                $group = (new SiteGroup())->field('app,addon')->findOrEmpty($group_id);
+                if (!$group->isEmpty()) {
+                    $group_addon_keys = array_merge([ $group['app'] ], $group['addon']);
+                }
             }
         }
         //在查询站点所拥有的应用插件,两者结合
-        $site_addon_keys = $site_info['addons'] ?? [];
+        $site_addon_keys = is_array($site_info['addons']) ? $site_info['addons'] : [];
         return array_merge($group_addon_keys ?? [], $site_addon_keys);
     }
 }
diff --git a/niucloud/app/service/core/sys/CoreSysConfigService.php b/niucloud/app/service/core/sys/CoreSysConfigService.php
index 60f5af595..7b49c6a60 100644
--- a/niucloud/app/service/core/sys/CoreSysConfigService.php
+++ b/niucloud/app/service/core/sys/CoreSysConfigService.php
@@ -64,4 +64,28 @@ class CoreSysConfigService extends BaseCoreService
         }
         return $info['value'];
     }
-}
\ No newline at end of file
+
+    /**
+     * 获取手机端首页列表
+     * @param array $data
+     * @return array
+     */
+    public function getWapIndexList($data = [])
+    {
+        $result = event("WapIndex");
+        $index_list = [];
+        foreach ($result as $v) {
+            $index_list = empty($index_list) ? $v : array_merge($index_list, $v);
+        }
+
+        foreach ($index_list as $k => $v) {
+            if (!empty($data[ 'key' ]) && !in_array($v[ 'key' ], explode(',', $data[ 'key' ]))) {
+                unset($index_list[ $k ]);
+                continue;
+            }
+        }
+
+        $index_list = array_values($index_list);
+        return $index_list;
+    }
+}
diff --git a/niucloud/config/version.php b/niucloud/config/version.php
index 368983385..07daf79b0 100644
--- a/niucloud/config/version.php
+++ b/niucloud/config/version.php
@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'version' => '0.0.3',
-    'code' => '202311250001'
+    'version' => '0.0.4',
+    'code' => '202311300001'
 ];
diff --git a/niucloud/core/util/niucloud/http/AccessToken.php b/niucloud/core/util/niucloud/http/AccessToken.php
index 39a354d83..c0315b3ea 100644
--- a/niucloud/core/util/niucloud/http/AccessToken.php
+++ b/niucloud/core/util/niucloud/http/AccessToken.php
@@ -67,6 +67,7 @@ trait AccessToken
     {
         $access_token_info = $this->httpGet('auth', ['code' => $this->code, 'secret' => $this->secret, 'token' => $this->createToken(), 'product_key' => self::PRODUCT, 'redirect_uri' => $this->getDomain(false)]);
         if (isset($access_token_info['code']) && $access_token_info['code'] != 1) throw new NiucloudException($access_token_info['msg']);
+        $this->setAccessToken($access_token_info['data']['token']);
     }
 
 }
diff --git a/niucloud/public/admin/assets/default_headimg-1e927329.png b/niucloud/public/admin/assets/default_headimg-1e927329.png
deleted file mode 100644
index bb09f5ec38806691bb7c9953762f47a78268dfc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4313
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
Hu0mjf>^>>B

diff --git a/niucloud/public/admin/assets/default_headimg-9976c9c6.js b/niucloud/public/admin/assets/default_headimg-9976c9c6.js
deleted file mode 100644
index 1e8565248..000000000
--- a/niucloud/public/admin/assets/default_headimg-9976c9c6.js
+++ /dev/null
@@ -1 +0,0 @@
-const e=""+new URL("default_headimg-1e927329.png",import.meta.url).href;export{e as _};
diff --git a/niucloud/public/admin/assets/edit-text-7fdc44bc.css b/niucloud/public/admin/assets/edit-text-7fdc44bc.css
deleted file mode 100644
index c138e6055..000000000
--- a/niucloud/public/admin/assets/edit-text-7fdc44bc.css
+++ /dev/null
@@ -1 +0,0 @@
-.horz-blank-slider .el-slider__input{width:100px}
diff --git a/niucloud/public/admin/assets/member_head-9976c9c6.js b/niucloud/public/admin/assets/member_head-9976c9c6.js
deleted file mode 100644
index 1e8565248..000000000
--- a/niucloud/public/admin/assets/member_head-9976c9c6.js
+++ /dev/null
@@ -1 +0,0 @@
-const e=""+new URL("default_headimg-1e927329.png",import.meta.url).href;export{e as _};
diff --git a/niucloud/public/admin/index.html b/niucloud/public/admin/index.html
index 47c689bb1..89d3aa9e6 100644
--- a/niucloud/public/admin/index.html
+++ b/niucloud/public/admin/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image" href="/admin/niucloud.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title></title>
-    <script type="module" crossorigin src="/admin/assets/index-e35911a1.js"></script>
+    <script type="module" crossorigin src="/admin/assets/index-32be3ace.js"></script>
     <link rel="modulepreload" crossorigin href="/admin/assets/base-9962c822.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/index-57446bef.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/index-5c4817f4.js">
@@ -19,7 +19,7 @@
     <link rel="modulepreload" crossorigin href="/admin/assets/index-2cabf788.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/_plugin-vue_export-helper-c27b6911.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/index-c4e33d8d.js">
-    <link rel="modulepreload" crossorigin href="/admin/assets/index-db1ad0a3.js">
+    <link rel="modulepreload" crossorigin href="/admin/assets/index-38fee8c5.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/event-9519ab40.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/error-78e43d3e.js">
     <link rel="modulepreload" crossorigin href="/admin/assets/scroll-d85c8f38.js">
@@ -91,10 +91,10 @@
     <link rel="stylesheet" href="/admin/assets/base-a43f0bed.css">
     <link rel="stylesheet" href="/admin/assets/index-f5c6a819.css">
     <link rel="stylesheet" href="/admin/assets/index-f5128a35.css">
-    <link rel="stylesheet" href="/admin/assets/index-4ddae479.css">
+    <link rel="stylesheet" href="/admin/assets/index-f45d3e43.css">
   </head>
   <body>
     <div id="app"></div>
-
+    
   </body>
 </html>