From 04fad4b18cde48517cc329286099a1af708cf6a0 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Thu, 8 Sep 2022 16:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=EF=BC=8C=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/api/consumer.ts                     |  11 ++
 admin/src/components/material/picker.vue      |  16 ++-
 admin/src/enums/appEnums.ts                   |  19 ++++
 admin/src/stores/modules/app.ts               |   3 +
 admin/src/views/article/lists/edit.vue        |  19 ++--
 admin/src/views/article/lists/index.vue       |   6 +-
 admin/src/views/consumer/lists/detail.vue     |  87 +++++-----------
 admin/src/views/consumer/lists/index.vue      |  95 +++++-------------
 .../views/decoration/component/add-nav.vue    |   7 +-
 .../component/widgets/banner/attr.vue         |   8 +-
 .../component/widgets/banner/content.vue      |   4 +-
 .../widgets/customer-service/attr.vue         |   2 +-
 .../widgets/customer-service/content.vue      |   4 +-
 .../component/widgets/my-service/content.vue  |   4 +-
 .../component/widgets/nav/content.vue         |   4 +-
 .../component/widgets/user-banner/attr.vue    |   6 +-
 .../component/widgets/user-banner/content.vue |   4 +-
 .../component/widgets/user-info/content.vue   |   7 --
 admin/src/views/setting/website/filing.vue    |   9 +-
 app/src/App.vue                               |  17 ++--
 app/src/api/app.ts                            |   8 +-
 app/src/api/shop.ts                           |   5 +
 app/src/api/user.ts                           |   5 +
 app/src/components/decoration/decoration.vue  |  27 -----
 app/src/components/widgets/banner/banner.vue  |  17 +++-
 .../customer-service/customer-service.vue     |  52 ++++++++++
 .../widgets/my-service/my-service.vue         |  50 +++++++++
 app/src/components/widgets/nav/nav.vue        |   8 +-
 .../widgets/user-banner/user-banner.vue       |  41 ++++++++
 .../widgets/user-info/user-info.vue           |  45 +++++++++
 app/src/hooks/useLockFn.ts                    |  21 ++++
 app/src/main.ts                               |   2 -
 app/src/pages.json                            |   6 ++
 .../customer_service/customer_service.vue     |  26 +++++
 app/src/pages/index/index.vue                 |  18 +++-
 app/src/pages/login/login.vue                 |  51 +++++++---
 app/src/pages/register/register.vue           |   4 +-
 app/src/pages/user/user.vue                   |  42 +++++++-
 .../static/images/{ => icon}/icon_code.png    | Bin
 .../static/images/{ => icon}/icon_mobile.png  | Bin
 .../images/{ => icon}/icon_password.png       | Bin
 .../static/images/{ => icon}/icon_user.png    | Bin
 app/src/static/images/{ => icon}/icon_wx.png  | Bin
 app/src/static/images/user/default_avatar.png | Bin 0 -> 6093 bytes
 app/src/static/images/user/my_topbg.png       | Bin 0 -> 17804 bytes
 app/src/stores/app.ts                         |  20 +++-
 app/src/stores/user.ts                        |  38 +++++--
 app/src/utils/cache.ts                        |   8 +-
 app/src/utils/file.ts                         |  21 ++++
 49 files changed, 600 insertions(+), 247 deletions(-)
 create mode 100644 admin/src/api/consumer.ts
 create mode 100644 app/src/api/user.ts
 delete mode 100644 app/src/components/decoration/decoration.vue
 create mode 100644 app/src/components/widgets/customer-service/customer-service.vue
 create mode 100644 app/src/components/widgets/my-service/my-service.vue
 create mode 100644 app/src/components/widgets/user-banner/user-banner.vue
 create mode 100644 app/src/components/widgets/user-info/user-info.vue
 create mode 100644 app/src/hooks/useLockFn.ts
 create mode 100644 app/src/pages/customer_service/customer_service.vue
 rename app/src/static/images/{ => icon}/icon_code.png (100%)
 rename app/src/static/images/{ => icon}/icon_mobile.png (100%)
 rename app/src/static/images/{ => icon}/icon_password.png (100%)
 rename app/src/static/images/{ => icon}/icon_user.png (100%)
 rename app/src/static/images/{ => icon}/icon_wx.png (100%)
 create mode 100644 app/src/static/images/user/default_avatar.png
 create mode 100644 app/src/static/images/user/my_topbg.png
 create mode 100644 app/src/utils/file.ts

diff --git a/admin/src/api/consumer.ts b/admin/src/api/consumer.ts
new file mode 100644
index 00000000..f38f0698
--- /dev/null
+++ b/admin/src/api/consumer.ts
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 用户列表
+export function getUserList(params: any) {
+    return request.get({ url: '/user/list', params })
+}
+
+// 用户详情
+export function getUserDetail(params: any) {
+    return request.get({ url: '/user/detail', params })
+}
diff --git a/admin/src/components/material/picker.vue b/admin/src/components/material/picker.vue
index 6fd96e1f..adb1470c 100644
--- a/admin/src/components/material/picker.vue
+++ b/admin/src/components/material/picker.vue
@@ -22,7 +22,7 @@
                             >
                                 <del-wrap @close="deleteImg(index)">
                                     <file-item
-                                        :uri="element"
+                                        :uri="excludeDomain ? getImageUrl(element) : element"
                                         :file-size="size"
                                         :type="type"
                                     ></file-item>
@@ -82,6 +82,7 @@ import Popup from '@/components/popup/index.vue'
 import FileItem from './file.vue'
 import Material from './index.vue'
 import Preview from './preview.vue'
+import useAppStore from '@/stores/modules/app'
 export default defineComponent({
     components: {
         Popup,
@@ -128,6 +129,11 @@ export default defineComponent({
         uploadClass: {
             type: String,
             default: ''
+        },
+        //选择的url排出域名
+        excludeDomain: {
+            type: Boolean,
+            default: false
         }
     },
 
@@ -142,6 +148,7 @@ export default defineComponent({
         const isAdd = ref(true)
         const currentIndex = ref(-1)
         const { disabled, limit, modelValue } = toRefs(props)
+        const { getImageUrl } = useAppStore()
         const tipsText = computed(() => {
             switch (props.type) {
                 case 'image':
@@ -164,7 +171,9 @@ export default defineComponent({
             return limit.value - fileList.value.length
         })
         const handleConfirm = () => {
-            const selectUri = select.value.map((item) => item.uri)
+            const selectUri = select.value.map((item) =>
+                props.excludeDomain ? item.path : item.uri
+            )
             if (!isAdd.value) {
                 fileList.value.splice(currentIndex.value, 1, selectUri.shift())
             } else {
@@ -234,7 +243,8 @@ export default defineComponent({
             previewUrl,
             showPreview,
             handlePreview,
-            handleClose
+            handleClose,
+            getImageUrl
         }
     }
 })
diff --git a/admin/src/enums/appEnums.ts b/admin/src/enums/appEnums.ts
index 25f3556a..98ca8445 100644
--- a/admin/src/enums/appEnums.ts
+++ b/admin/src/enums/appEnums.ts
@@ -19,3 +19,22 @@ export enum ScreenEnum {
     XL = 1280,
     '2XL' = 1536
 }
+
+// 客户端类型
+export enum ClientEnum {
+    MP_WEIXIN = 1, // 微信-小程序
+    OA_WEIXIN = 2, // 微信-公众号
+    H5 = 3, // H5
+    PC = 4, // PC
+    IOS = 5, //苹果
+    ANDROID = 6 //安卓
+}
+
+export const ClientMap = {
+    [ClientEnum.MP_WEIXIN]: '微信小程序',
+    [ClientEnum.OA_WEIXIN]: '微信公众号',
+    [ClientEnum.H5]: '手机H5Z',
+    [ClientEnum.PC]: '电脑PC',
+    [ClientEnum.IOS]: '苹果APP',
+    [ClientEnum.ANDROID]: '安卓APP'
+}
diff --git a/admin/src/stores/modules/app.ts b/admin/src/stores/modules/app.ts
index 1de8e407..f51e1f7b 100644
--- a/admin/src/stores/modules/app.ts
+++ b/admin/src/stores/modules/app.ts
@@ -18,6 +18,9 @@ const useAppStore = defineStore({
         }
     },
     actions: {
+        getImageUrl(url: string) {
+            return url ? `${this.config.ossDomain}${url}` : ''
+        },
         getConfig() {
             return new Promise((resolve, reject) => {
                 getConfig()
diff --git a/admin/src/views/article/lists/edit.vue b/admin/src/views/article/lists/edit.vue
index 7158bb35..dfffd3a8 100644
--- a/admin/src/views/article/lists/edit.vue
+++ b/admin/src/views/article/lists/edit.vue
@@ -18,8 +18,12 @@
                                 <el-input v-model="formData.title" placeholder="请输入文章标题" />
                             </div>
                         </el-form-item>
-                        <el-form-item label="文章标题" prop="cid">
-                            <el-select class="w-80" v-model="formData.cid">
+                        <el-form-item label="文章栏目" prop="cid">
+                            <el-select
+                                class="w-80"
+                                v-model="formData.cid"
+                                placeholder="请选择文章栏目"
+                            >
                                 <el-option
                                     v-for="item in optionsData.articleCate"
                                     :key="item.id"
@@ -107,15 +111,8 @@ const formData = reactive({
 
 const formRef = shallowRef<FormInstance>()
 const rules = reactive({
-    ['base.tableName']: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
-    ['base.tableComment']: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
-    ['base.entityName']: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
-    ['base.authorName']: [{ required: true, message: '请输入作者', trigger: 'blur' }],
-    ['gen.moduleName']: [{ required: true, message: '请输入模块名', trigger: 'blur' }],
-    ['gen.functionName']: [{ required: true, message: '请输入功能名称', trigger: 'blur' }],
-    ['gen.treePrimary']: [{ required: true, message: '请选择树主键字段', trigger: 'blur' }],
-    ['gen.treeParent']: [{ required: true, message: '请选择树父级字段', trigger: 'blur' }],
-    ['gen.treeName']: [{ required: true, message: '请选择树名称字段', trigger: 'blur' }]
+    title: [{ required: true, message: '请输入文章标题', trigger: 'blur' }],
+    cid: [{ required: true, message: '请输入表描述', trigger: 'blur' }]
 })
 
 const getDetails = async () => {
diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue
index b139d188..637376e9 100644
--- a/admin/src/views/article/lists/index.vue
+++ b/admin/src/views/article/lists/index.vue
@@ -49,10 +49,10 @@
                 <el-table-column label="ID" prop="id" min-width="80" />
                 <el-table-column label="封面" min-width="100">
                     <template #default="{ row }">
-                        <image-contain
+                        <el-image
+                            v-if="row.image"
                             :src="row.image"
-                            :width="60"
-                            height="45"
+                            class="w-[60px] h-[45px]"
                             :preview-src-list="[row.image]"
                         />
                     </template>
diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue
index 5c3bcc72..7800438c 100644
--- a/admin/src/views/consumer/lists/detail.vue
+++ b/admin/src/views/consumer/lists/detail.vue
@@ -1,73 +1,51 @@
 <template>
-    <div class="article-edit">
+    <div>
         <el-card class="!border-none" shadow="never">
             <el-page-header content="用户详情" @back="$router.back()" />
         </el-card>
         <el-card class="mt-4 !border-none" header="基本资料" shadow="never">
-            <el-form
-                ref="formRef"
-                class="ls-form"
-                :model="formData"
-                label-width="120px"
-                :rules="rules"
-            >
+            <el-form ref="formRef" class="ls-form" :model="formData" label-width="120px">
                 <div class="bg-page py-5 pl-20 mb-10">
                     <div class="mb-3 text-tx-regular">用户头像</div>
-                    <el-avatar :size="58" />
+                    <el-avatar :src="formData.avatar" :size="58" />
                 </div>
-                <el-form-item label="用户编号："> 20000440556 </el-form-item>
-                <el-form-item label="用户昵称："> 热心市民小张 </el-form-item>
-                <el-form-item label="账号："> fwewrwre90 </el-form-item>
-                <el-form-item label="真实姓名："> 张三 </el-form-item>
-                <el-form-item label="性别："> 未知 </el-form-item>
-                <el-form-item label="联系电话："> 13800138000 </el-form-item>
-                <el-form-item label="注册来源："> 微信小程序 </el-form-item>
-                <el-form-item label="注册时间："> 2022-02-15 12:12:12 </el-form-item>
-                <el-form-item label="最近登录时间："> 2022-02-18 12:12:12 </el-form-item>
+                <el-form-item label="用户编号："> {{ formData.sn }} </el-form-item>
+                <el-form-item label="用户昵称："> {{ formData.nickname }} </el-form-item>
+                <el-form-item label="账号："> {{ formData.username }} </el-form-item>
+                <el-form-item label="真实姓名："> {{ formData.realName || '-' }} </el-form-item>
+                <el-form-item label="性别："> {{ formData.sex }} </el-form-item>
+                <el-form-item label="联系电话："> {{ formData.mobile || '-' }} </el-form-item>
+                <el-form-item label="注册来源："> {{ formData.channel }} </el-form-item>
+                <el-form-item label="注册时间："> {{ formData.createTime }} </el-form-item>
+                <el-form-item label="最近登录时间："> {{ formData.lastLoginTime }} </el-form-item>
             </el-form>
         </el-card>
-        <footer-btns>
-            <el-button type="primary" @click="handleSave">保存</el-button>
-        </footer-btns>
     </div>
 </template>
 
 <script lang="ts" setup>
 import type { FormInstance } from 'element-plus'
-import feedback from '@/utils/feedback'
-import { useDictOptions } from '@/hooks/useDictOptions'
-import { articleCateAll, articleDetail, articleEdit } from '@/api/article'
+import { getUserDetail } from '@/api/consumer'
 
 const route = useRoute()
-const router = useRouter()
 const formData = reactive({
-    id: '',
-    title: '',
-    image: '',
-    cid: '',
-    intro: '',
-    author: '',
-    content: '',
-    visit: 0,
-    sort: 0,
-    isShow: ''
+    avatar: '',
+    channel: '',
+    createTime: '',
+    lastLoginIp: '',
+    lastLoginTime: '',
+    mobile: '',
+    nickname: '',
+    realName: 0,
+    sex: 0,
+    sn: '',
+    username: ''
 })
 
 const formRef = shallowRef<FormInstance>()
-const rules = reactive({
-    ['base.tableName']: [{ required: true, message: '请输入表名称', trigger: 'blur' }],
-    ['base.tableComment']: [{ required: true, message: '请输入表描述', trigger: 'blur' }],
-    ['base.entityName']: [{ required: true, message: '请输入实体类名称', trigger: 'blur' }],
-    ['base.authorName']: [{ required: true, message: '请输入作者', trigger: 'blur' }],
-    ['gen.moduleName']: [{ required: true, message: '请输入模块名', trigger: 'blur' }],
-    ['gen.functionName']: [{ required: true, message: '请输入功能名称', trigger: 'blur' }],
-    ['gen.treePrimary']: [{ required: true, message: '请选择树主键字段', trigger: 'blur' }],
-    ['gen.treeParent']: [{ required: true, message: '请选择树父级字段', trigger: 'blur' }],
-    ['gen.treeName']: [{ required: true, message: '请选择树名称字段', trigger: 'blur' }]
-})
 
 const getDetails = async () => {
-    const data = await articleDetail({
+    const data = await getUserDetail({
         id: route.query.id
     })
     Object.keys(formData).forEach((key) => {
@@ -76,20 +54,5 @@ const getDetails = async () => {
     })
 }
 
-const { optionsData } = useDictOptions<{
-    articleCate: any[]
-}>({
-    articleCate: {
-        api: articleCateAll
-    }
-})
-
-const handleSave = async () => {
-    await formRef.value?.validate()
-    await articleEdit(formData)
-    feedback.msgSuccess('操作成功')
-    router.back()
-}
-
 getDetails()
 </script>
diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue
index 6507111e..8fab42b4 100644
--- a/admin/src/views/consumer/lists/index.vue
+++ b/admin/src/views/consumer/lists/index.vue
@@ -5,26 +5,24 @@
                 <el-form-item label="用户信息">
                     <el-input
                         class="w-56"
-                        v-model="queryParams.title"
+                        v-model="queryParams.keyword"
                         placeholder="用户编号/昵称/手机号码"
                     />
                 </el-form-item>
                 <el-form-item label="注册时间">
-                    <el-select class="w-56" v-model="queryParams.cid">
-                        <el-option label="全部" value />
-                        <el-option
-                            v-for="item in optionsData.articleCate"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        />
-                    </el-select>
+                    <daterange-picker
+                        v-model:startTime="queryParams.startTime"
+                        v-model:endTime="queryParams.endTime"
+                    />
                 </el-form-item>
                 <el-form-item label="注册来源">
-                    <el-select class="w-56" v-model="queryParams.isShow">
-                        <el-option label="全部" value />
-                        <el-option label="显示" :value="1" />
-                        <el-option label="隐藏" :value="0" />
+                    <el-select class="w-56" v-model="queryParams.channel">
+                        <el-option
+                            v-for="(item, key) in ClientMap"
+                            :key="key"
+                            :label="item"
+                            :value="key"
+                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -35,33 +33,17 @@
         </el-card>
         <el-card class="!border-none mt-4" shadow="never">
             <el-table size="large" v-loading="pager.loading" :data="pager.lists">
-                <el-table-column label="用户编号" prop="id" min-width="80" />
+                <el-table-column label="用户编号" prop="sn" min-width="120" />
                 <el-table-column label="头像" min-width="100">
                     <template #default="{ row }">
-                        <image-contain
-                            :src="row.image"
-                            :width="60"
-                            height="45"
-                            :preview-src-list="[row.image]"
-                        />
+                        <el-avatar :src="row.image" :size="50" />
                     </template>
                 </el-table-column>
-                <el-table-column label="昵称" prop="category" min-width="100" />
-                <el-table-column label="账号" prop="author" min-width="120" />
-                <el-table-column label="手机号码" prop="visit" min-width="100" />
-                <el-table-column label="性别" min-width="100">
-                    <template #default="{ row }">
-                        <el-switch
-                            v-perms="['article:cate:change']"
-                            v-if="row.id != 1"
-                            v-model="row.isShow"
-                            :active-value="0"
-                            :inactive-value="1"
-                            @change="changeStatus(row.id)"
-                        />
-                    </template>
-                </el-table-column>
-                <el-table-column label="注册来源" prop="sort" min-width="100" />
+                <el-table-column label="昵称" prop="nickname" min-width="100" />
+                <el-table-column label="账号" prop="username" min-width="120" />
+                <el-table-column label="手机号码" prop="mobile" min-width="100" />
+                <el-table-column label="性别" prop="sex" min-width="100" />
+                <el-table-column label="注册来源" prop="channel" min-width="100" />
                 <el-table-column label="注册时间" prop="createTime" min-width="120" />
                 <el-table-column label="操作" width="120" fixed="right">
                     <template #default="{ row }">
@@ -87,46 +69,21 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { articleLists, articleDelete, articleStatus, articleCateAll } from '@/api/article'
-import { useDictOptions } from '@/hooks/useDictOptions'
 import { usePaging } from '@/hooks/usePaging'
-import feedback from '@/utils/feedback'
 import { getRoutePath } from '@/router'
+import { getUserList } from '@/api/consumer'
+import { ClientMap } from '@/enums/appEnums'
 const queryParams = reactive({
-    title: '',
-    cid: '',
-    isShow: ''
+    keyword: '',
+    channel: '',
+    startTime: '',
+    endTime: ''
 })
 
 const { pager, getLists, resetPage, resetParams } = usePaging({
-    fetchFun: articleLists,
+    fetchFun: getUserList,
     params: queryParams
 })
 
-const { optionsData } = useDictOptions<{
-    articleCate: any[]
-}>({
-    articleCate: {
-        api: articleCateAll
-    }
-})
-
-const changeStatus = async (id: number) => {
-    try {
-        await articleStatus({ id })
-        feedback.msgSuccess('修改成功')
-        getLists()
-    } catch (error) {
-        getLists()
-    }
-}
-
-const handleDelete = async (id: number) => {
-    await feedback.confirm('确定要删除？')
-    await articleDelete({ id })
-    feedback.msgSuccess('删除成功')
-    getLists()
-}
-
 getLists()
 </script>
diff --git a/admin/src/views/decoration/component/add-nav.vue b/admin/src/views/decoration/component/add-nav.vue
index e9a78d27..9696e488 100644
--- a/admin/src/views/decoration/component/add-nav.vue
+++ b/admin/src/views/decoration/component/add-nav.vue
@@ -8,7 +8,12 @@
                 @close="handleDelete(index)"
             >
                 <div class="bg-fill-light flex items-center w-full p-4 mb-4">
-                    <material-picker v-model="item.image" upload-class="bg-body" size="60px">
+                    <material-picker
+                        v-model="item.image"
+                        upload-class="bg-body"
+                        size="60px"
+                        exclude-domain
+                    >
                         <template #upload>
                             <div class="upload-btn w-[60px] h-[60px]">
                                 <icon name="el-icon-Plus" :size="20" />
diff --git a/admin/src/views/decoration/component/widgets/banner/attr.vue b/admin/src/views/decoration/component/widgets/banner/attr.vue
index f731aa65..10db027f 100644
--- a/admin/src/views/decoration/component/widgets/banner/attr.vue
+++ b/admin/src/views/decoration/component/widgets/banner/attr.vue
@@ -9,7 +9,7 @@
             </el-form-item>
             <el-form-item label="图片设置">
                 <div class="flex-1">
-                    <div class="form-tips">最多添加5张，建议图片尺寸：750px*400px</div>
+                    <div class="form-tips">最多添加5张，建议图片尺寸：750px*240px</div>
                     <del-wrap
                         v-for="(item, index) in content.data"
                         :key="index"
@@ -17,7 +17,11 @@
                         class="max-w-[400px]"
                     >
                         <div class="bg-fill-light flex items-center w-full p-4 mt-4">
-                            <material-picker v-model="item.image" upload-class="bg-body" />
+                            <material-picker
+                                v-model="item.image"
+                                upload-class="bg-body"
+                                exclude-domain
+                            />
                             <div class="ml-3 flex-1">
                                 <el-form-item label="图片名称">
                                     <el-input v-model="item.name" placeholder="请输入名称" />
diff --git a/admin/src/views/decoration/component/widgets/banner/content.vue b/admin/src/views/decoration/component/widgets/banner/content.vue
index 9dd347a4..6915116f 100644
--- a/admin/src/views/decoration/component/widgets/banner/content.vue
+++ b/admin/src/views/decoration/component/widgets/banner/content.vue
@@ -1,11 +1,12 @@
 <template>
     <div class="banner">
         <div class="banner-image">
-            <image-contain width="100%" height="200px" :src="getImage" fit="contain" />
+            <image-contain width="100%" height="170px" :src="getImageUrl(getImage)" fit="contain" />
         </div>
     </div>
 </template>
 <script lang="ts" setup>
+import useAppStore from '@/stores/modules/app'
 import type { PropType } from 'vue'
 import type options from './options'
 type OptionsType = ReturnType<typeof options>
@@ -19,6 +20,7 @@ const props = defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 const getImage = computed(() => {
     const { data } = props.content
     if (Array.isArray(data)) {
diff --git a/admin/src/views/decoration/component/widgets/customer-service/attr.vue b/admin/src/views/decoration/component/widgets/customer-service/attr.vue
index 6f7dc7eb..7dd0f1a8 100644
--- a/admin/src/views/decoration/component/widgets/customer-service/attr.vue
+++ b/admin/src/views/decoration/component/widgets/customer-service/attr.vue
@@ -12,7 +12,7 @@
             </el-form-item>
             <el-form-item label="客服二维码">
                 <div>
-                    <material-picker v-model="content.qrcode" />
+                    <material-picker v-model="content.qrcode" exclude-domain />
                     <div class="form-tips">建议图片尺寸：200*200像素；图片格式：jpg、png、jpeg</div>
                 </div>
             </el-form-item>
diff --git a/admin/src/views/decoration/component/widgets/customer-service/content.vue b/admin/src/views/decoration/component/widgets/customer-service/content.vue
index 854deab4..8fa0c830 100644
--- a/admin/src/views/decoration/component/widgets/customer-service/content.vue
+++ b/admin/src/views/decoration/component/widgets/customer-service/content.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="customer-service">
-        <image-contain width="140px" height="140px" :src="content.qrcode" alt="" />
+        <image-contain width="140px" height="140px" :src="getImageUrl(content.qrcode)" alt="" />
         <div class="text-[15px] mt-[7px] font-medium">{{ content.title }}</div>
         <div class="text-[#666] mt-[20px]">服务时间：{{ content.time }}</div>
         <div class="text-[#666] mt-[7px]">客服电话：{{ content.mobile }}</div>
@@ -12,6 +12,7 @@
     </div>
 </template>
 <script lang="ts" setup>
+import useAppStore from '@/stores/modules/app'
 import type { PropType } from 'vue'
 import type options from './options'
 type OptionsType = ReturnType<typeof options>
@@ -25,6 +26,7 @@ defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/views/decoration/component/widgets/my-service/content.vue b/admin/src/views/decoration/component/widgets/my-service/content.vue
index 6317bb52..6f360b83 100644
--- a/admin/src/views/decoration/component/widgets/my-service/content.vue
+++ b/admin/src/views/decoration/component/widgets/my-service/content.vue
@@ -19,7 +19,7 @@
                 :key="index"
                 class="flex items-center border-b border-[#e5e5e5] h-[50px] px-[12px]"
             >
-                <image-contain width="24px" height="24px" :src="item.image" alt="" />
+                <image-contain width="24px" height="24px" :src="getImageUrl(item.image)" alt="" />
                 <div class="ml-[10px] flex-1">{{ item.name }}</div>
                 <div>
                     <icon name="el-icon-ArrowRight" />
@@ -29,6 +29,7 @@
     </div>
 </template>
 <script lang="ts" setup>
+import useAppStore from '@/stores/modules/app'
 import type { PropType } from 'vue'
 import type options from './options'
 type OptionsType = ReturnType<typeof options>
@@ -42,6 +43,7 @@ defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/views/decoration/component/widgets/nav/content.vue b/admin/src/views/decoration/component/widgets/nav/content.vue
index a9abc8ac..9d707e05 100644
--- a/admin/src/views/decoration/component/widgets/nav/content.vue
+++ b/admin/src/views/decoration/component/widgets/nav/content.vue
@@ -6,13 +6,14 @@
                 :key="index"
                 class="flex flex-col items-center w-1/5 mb-[15px]"
             >
-                <image-contain width="41px" height="41px" :src="item.image" alt="" />
+                <image-contain width="41px" height="41px" :src="getImageUrl(item.image)" alt="" />
                 <div class="mt-[7px]">{{ item.name }}</div>
             </div>
         </div>
     </div>
 </template>
 <script lang="ts" setup>
+import useAppStore from '@/stores/modules/app'
 import type { PropType } from 'vue'
 import type options from './options'
 type OptionsType = ReturnType<typeof options>
@@ -26,6 +27,7 @@ const props = defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 </script>
 
 <style lang="scss" scoped>
diff --git a/admin/src/views/decoration/component/widgets/user-banner/attr.vue b/admin/src/views/decoration/component/widgets/user-banner/attr.vue
index 98b4d2ed..73263d7f 100644
--- a/admin/src/views/decoration/component/widgets/user-banner/attr.vue
+++ b/admin/src/views/decoration/component/widgets/user-banner/attr.vue
@@ -17,7 +17,11 @@
                         class="max-w-[400px]"
                     >
                         <div class="bg-fill-light flex items-center w-full p-4 mt-4">
-                            <material-picker v-model="item.image" upload-class="bg-body" />
+                            <material-picker
+                                v-model="item.image"
+                                upload-class="bg-body"
+                                exclude-domain
+                            />
                             <div class="ml-3 flex-1">
                                 <el-form-item label="图片名称">
                                     <el-input v-model="item.name" placeholder="请输入名称" />
diff --git a/admin/src/views/decoration/component/widgets/user-banner/content.vue b/admin/src/views/decoration/component/widgets/user-banner/content.vue
index 9c3ec86d..9317842b 100644
--- a/admin/src/views/decoration/component/widgets/user-banner/content.vue
+++ b/admin/src/views/decoration/component/widgets/user-banner/content.vue
@@ -1,11 +1,12 @@
 <template>
     <div class="banner mx-[10px] mt-[10px]">
         <div class="banner-image">
-            <image-contain width="100%" height="100px" :src="getImage" fit="contain" />
+            <image-contain width="100%" height="100px" :src="getImageUrl(getImage)" fit="contain" />
         </div>
     </div>
 </template>
 <script lang="ts" setup>
+import useAppStore from '@/stores/modules/app'
 import type { PropType } from 'vue'
 import type options from './options'
 type OptionsType = ReturnType<typeof options>
@@ -19,6 +20,7 @@ const props = defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 const getImage = computed(() => {
     const { data } = props.content
     if (Array.isArray(data)) {
diff --git a/admin/src/views/decoration/component/widgets/user-info/content.vue b/admin/src/views/decoration/component/widgets/user-info/content.vue
index dca207d9..b64e7e74 100644
--- a/admin/src/views/decoration/component/widgets/user-info/content.vue
+++ b/admin/src/views/decoration/component/widgets/user-info/content.vue
@@ -12,12 +12,5 @@
     height: 115px;
     background-position: bottom;
     background-size: 100% auto;
-    .search-con {
-        height: 100%;
-        height: 36px;
-        border-radius: 36px;
-        background: #f4f4f4;
-        color: #999999;
-    }
 }
 </style>
diff --git a/admin/src/views/setting/website/filing.vue b/admin/src/views/setting/website/filing.vue
index 871da6b8..ceadac77 100644
--- a/admin/src/views/setting/website/filing.vue
+++ b/admin/src/views/setting/website/filing.vue
@@ -2,7 +2,7 @@
 <template>
     <div class="website-filing">
         <el-card shadow="never" class="!border-none">
-            <div class="mb-5">底部版权设置</div>
+            <div class="mb-5">站点底部版权备案信息设置</div>
             <el-form ref="form" class="ls-form" label-width="100px">
                 <del-wrap
                     v-for="(item, index) in formData"
@@ -12,10 +12,13 @@
                     @close="handleDelete(index)"
                 >
                     <div class="bg-fill-lighter py-4">
-                        <el-form-item label="显示名称" prop="name">
+                        <el-form-item label="显示内容" prop="name">
                             <div class="w-80">
                                 <div>
-                                    <el-input v-model="item.name" placeholder="请输入名称" />
+                                    <el-input
+                                        v-model="item.name"
+                                        placeholder="请输入内容 ，例如： ICP备案号"
+                                    />
                                 </div>
                             </div>
                         </el-form-item>
diff --git a/app/src/App.vue b/app/src/App.vue
index 53b65644..d615b83b 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -1,14 +1,13 @@
 <script setup lang="ts">
-import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
-import request from './utils/request'
+import { onLaunch } from '@dcloudio/uni-app'
+import { useAppStore } from './stores/app'
+import { useUserStore } from './stores/user'
+const { getConfig } = useAppStore()
+const { getUser } = useUserStore()
+console.log(useUserStore())
 onLaunch(() => {
-    console.log('App Launch')
-})
-onShow(() => {
-    console.log('App Show')
-})
-onHide(() => {
-    console.log('App Hide')
+    getConfig()
+    getUser()
 })
 </script>
 <style lang="scss">
diff --git a/app/src/api/app.ts b/app/src/api/app.ts
index a3c70262..ccaab74c 100644
--- a/app/src/api/app.ts
+++ b/app/src/api/app.ts
@@ -1,6 +1,10 @@
 import request from '@/utils/request'
 
-//注册
-export function smsSend(data: Record<string, any>) {
+//发送短信
+export function smsSend(data: any) {
     return request.post({ url: '/sms/send', data: data })
 }
+
+export function getConfig() {
+    return request.get({ url: '/config' })
+}
diff --git a/app/src/api/shop.ts b/app/src/api/shop.ts
index 0cfaf8ac..e86ef368 100644
--- a/app/src/api/shop.ts
+++ b/app/src/api/shop.ts
@@ -4,3 +4,8 @@ import request from '@/utils/request'
 export function getIndex() {
     return request.get({ url: '/index' })
 }
+
+// 装修页面
+export function getDecorate(data: any) {
+    return request.get({ url: '/decorate', data })
+}
diff --git a/app/src/api/user.ts b/app/src/api/user.ts
new file mode 100644
index 00000000..8b8af224
--- /dev/null
+++ b/app/src/api/user.ts
@@ -0,0 +1,5 @@
+import request from '@/utils/request'
+
+export function getUserCenter() {
+    return request.get({ url: '/user/center' })
+}
diff --git a/app/src/components/decoration/decoration.vue b/app/src/components/decoration/decoration.vue
deleted file mode 100644
index d1628b94..00000000
--- a/app/src/components/decoration/decoration.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-    <view>
-        <view v-for="(item, index) in pages" :key="index">
-            <template v-if="item.name == 'search'">
-                <w-search :content="item.content" :styles="item.styles" />
-            </template>
-            <template v-if="item.name == 'banner'">
-                <w-banner :content="item.content" :styles="item.styles" />
-            </template>
-            <template v-if="item.name == 'nav'">
-                <w-nav :content="item.content" :styles="item.styles" />
-            </template>
-        </view>
-    </view>
-</template>
-
-<script setup lang="ts">
-import { PropType } from 'vue'
-
-defineProps({
-    pages: {
-        type: Array as PropType<any[]>
-    }
-})
-</script>
-
-<style></style>
diff --git a/app/src/components/widgets/banner/banner.vue b/app/src/components/widgets/banner/banner.vue
index bc13aaf0..4cb00c18 100644
--- a/app/src/components/widgets/banner/banner.vue
+++ b/app/src/components/widgets/banner/banner.vue
@@ -1,19 +1,29 @@
 <template>
-    <view class="banner h-[400rpx] bg-white">
+    <view
+        class="banner h-[340rpx] bg-white translate-y-0"
+        v-if="content.data.length && content.enabled"
+    >
         <swiper
             class="swiper h-full"
-            indicator-dots
+            :indicator-dots="content.data.length > 1"
             indicator-active-color="#4173ff"
             :autoplay="true"
         >
             <swiper-item v-for="(item, index) in content.data" :key="index">
-                <u-image mode="aspectFit" width="100%" height="100%" :src="item.image" />
+                <u-image
+                    mode="aspectFit"
+                    width="100%"
+                    height="100%"
+                    :src="getImageUrl(item.image)"
+                />
             </swiper-item>
         </swiper>
     </view>
 </template>
 
 <script setup lang="ts">
+import { useAppStore } from '@/stores/app'
+
 const props = defineProps({
     content: {
         type: Object,
@@ -24,6 +34,7 @@ const props = defineProps({
         default: () => ({})
     }
 })
+const { getImageUrl } = useAppStore()
 </script>
 
 <style></style>
diff --git a/app/src/components/widgets/customer-service/customer-service.vue b/app/src/components/widgets/customer-service/customer-service.vue
new file mode 100644
index 00000000..dc24a0c5
--- /dev/null
+++ b/app/src/components/widgets/customer-service/customer-service.vue
@@ -0,0 +1,52 @@
+<template>
+    <view
+        class="customer-service bg-white flex flex-col justify-center items-center mx-[36rpx] mt-[20rpx] rounded-lg px-[110rpx] pt-[100rpx] pb-[160rpx]"
+    >
+        <u-image width="280" height="280" :src="getImageUrl(content.qrcode)" />
+        <view v-if="content.title" class="text-lg mt-[14rpx] font-medium">{{ content.title }}</view>
+        <view v-if="content.time" class="text-content mt-[40rpx]"
+            >服务时间：{{ content.time }}</view
+        >
+        <view v-if="content.mobile" class="text-content mt-[14rpx] flex flex-wrap">
+            客服电话：{{ content.mobile }}
+            <!-- #ifdef H5 -->
+            <a class="ml-[10rpx] phone text-muted underline" :href="'tel:' + content.mobile">
+                拨打
+            </a>
+            <!-- #endif -->
+            <!-- #ifndef H5 -->
+            <view class="ml-[10rpx] phone text-muted underline" @click="handleCall">拨打</view>
+            <!-- #endif -->
+        </view>
+        <view class="mt-[100rpx] w-full">
+            <u-button type="primary" shape="circle" @click="saveImageToPhotosAlbum(content.qrcode)">
+                保存二维码图片
+            </u-button>
+        </view>
+    </view>
+</template>
+<script lang="ts" setup>
+import { useAppStore } from '@/stores/app'
+import { saveImageToPhotosAlbum } from '@/utils/file'
+
+const props = defineProps({
+    content: {
+        type: Object,
+        default: () => ({})
+    },
+    styles: {
+        type: Object,
+        default: () => ({})
+    }
+})
+
+const { getImageUrl } = useAppStore()
+
+const handleCall = () => {
+    uni.makePhoneCall({
+        phoneNumber: String(props.content.mobile)
+    })
+}
+</script>
+
+<style lang="scss"></style>
diff --git a/app/src/components/widgets/my-service/my-service.vue b/app/src/components/widgets/my-service/my-service.vue
new file mode 100644
index 00000000..28dec2cc
--- /dev/null
+++ b/app/src/components/widgets/my-service/my-service.vue
@@ -0,0 +1,50 @@
+<template>
+    <div class="my-service bg-white mx-[20rpx] mt-[20rpx] rounded-lg">
+        <div
+            v-if="content.title"
+            class="title px-[30rpx] py-[20rpx] border-light border-solid border-0 border-b"
+        >
+            <div>{{ content.title }}</div>
+        </div>
+        <div v-if="content.style == 1" class="flex flex-wrap pt-[40rpx] pb-[20rpx]">
+            <div
+                v-for="(item, index) in content.data"
+                :key="index"
+                class="flex flex-col items-center w-1/4 mb-[15px]"
+            >
+                <u-image width="52" height="52" :src="getImageUrl(item.image)" alt="" />
+                <div class="mt-[7px]">{{ item.name }}</div>
+            </div>
+        </div>
+        <div v-if="content.style == 2">
+            <div
+                v-for="(item, index) in content.data"
+                :key="index"
+                class="flex items-center border-light border-solid border-0 border-b h-[100rpx] px-[24rpx]"
+            >
+                <u-image width="48" height="48" :src="item.image" alt="" />
+                <div class="ml-[20rpx] flex-1">{{ item.name }}</div>
+                <div class="text-muted">
+                    <u-icon name="arrow-right" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import { useAppStore } from '@/stores/app'
+
+const props = defineProps({
+    content: {
+        type: Object,
+        default: () => ({})
+    },
+    styles: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const { getImageUrl } = useAppStore()
+</script>
+
+<style lang="scss"></style>
diff --git a/app/src/components/widgets/nav/nav.vue b/app/src/components/widgets/nav/nav.vue
index 8a752e15..f8d596a2 100644
--- a/app/src/components/widgets/nav/nav.vue
+++ b/app/src/components/widgets/nav/nav.vue
@@ -1,12 +1,12 @@
 <template>
-    <view class="nav pt-[30rpx] pb-[16rpx] bg-white">
+    <view class="nav pt-[30rpx] pb-[16rpx] bg-white" v-if="content.data.length && content.enabled">
         <view class="nav-item flex flex-wrap">
             <view
                 v-for="(item, index) in content.data"
                 :key="index"
                 class="flex flex-col items-center w-1/5 mb-[30rpx]"
             >
-                <u-image width="41px" height="41px" :src="item.image" alt="" />
+                <u-image width="41px" height="41px" :src="getImageUrl(item.image)" alt="" />
                 <view class="mt-[14rpx]">{{ item.name }}</view>
             </view>
         </view>
@@ -14,6 +14,8 @@
 </template>
 
 <script setup lang="ts">
+import { useAppStore } from '@/stores/app'
+
 const props = defineProps({
     content: {
         type: Object,
@@ -24,6 +26,8 @@ const props = defineProps({
         default: () => ({})
     }
 })
+
+const { getImageUrl } = useAppStore()
 </script>
 
 <style></style>
diff --git a/app/src/components/widgets/user-banner/user-banner.vue b/app/src/components/widgets/user-banner/user-banner.vue
new file mode 100644
index 00000000..95647f8a
--- /dev/null
+++ b/app/src/components/widgets/user-banner/user-banner.vue
@@ -0,0 +1,41 @@
+<template>
+    <view
+        class="banner h-[200rpx] mx-[20rpx] mt-[20rpx] translate-y-0"
+        v-if="content.data.length && content.enabled"
+    >
+        <swiper
+            class="swiper h-full"
+            :indicator-dots="content.data.length > 1"
+            indicator-active-color="#4173ff"
+            :autoplay="true"
+        >
+            <swiper-item v-for="(item, index) in content.data" :key="index">
+                <u-image
+                    mode="aspectFit"
+                    width="100%"
+                    height="100%"
+                    :src="getImageUrl(item.image)"
+                    :border-radius="14"
+                />
+            </swiper-item>
+        </swiper>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { useAppStore } from '@/stores/app'
+
+const props = defineProps({
+    content: {
+        type: Object,
+        default: () => ({})
+    },
+    styles: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const { getImageUrl } = useAppStore()
+</script>
+
+<style></style>
diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue
new file mode 100644
index 00000000..0813bf65
--- /dev/null
+++ b/app/src/components/widgets/user-info/user-info.vue
@@ -0,0 +1,45 @@
+<template>
+    <div class="user-info flex items-center px-[50rpx]">
+        <navigator
+            v-if="isLogin"
+            class="flex items-center"
+            hover-class="none"
+            url="/pages/login/login"
+        >
+            <u-avatar :src="user.avatar" :size="120"></u-avatar>
+            <div class="text-white text-3xl ml-[20rpx]">{{ user.nickname }}</div>
+        </navigator>
+        <navigator v-else class="flex items-center" hover-class="none" url="/pages/login/login">
+            <u-avatar src="/static/images/user/default_avatar.png" :size="120"></u-avatar>
+            <div class="text-white text-3xl ml-[20rpx]">未登录</div>
+        </navigator>
+    </div>
+</template>
+<script lang="ts" setup>
+const props = defineProps({
+    content: {
+        type: Object,
+        default: () => ({})
+    },
+    styles: {
+        type: Object,
+        default: () => ({})
+    },
+    user: {
+        type: Object,
+        default: () => ({})
+    },
+    isLogin: {
+        type: Boolean
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.user-info {
+    background: url(/static/images/user/my_topbg.png);
+    height: 115px;
+    background-position: bottom;
+    background-size: 100% auto;
+}
+</style>
diff --git a/app/src/hooks/useLockFn.ts b/app/src/hooks/useLockFn.ts
new file mode 100644
index 00000000..c4423d60
--- /dev/null
+++ b/app/src/hooks/useLockFn.ts
@@ -0,0 +1,21 @@
+import { ref } from 'vue'
+
+export function useLockFn(fn: (...args: any[]) => Promise<any>) {
+    const isLock = ref(false)
+    const lockFn = async (...args: any[]) => {
+        if (isLock.value) return
+        isLock.value = true
+        try {
+            const res = await fn(...args)
+            isLock.value = false
+            return res
+        } catch (e) {
+            isLock.value = false
+            throw e
+        }
+    }
+    return {
+        isLock,
+        lockFn
+    }
+}
diff --git a/app/src/main.ts b/app/src/main.ts
index 2195c7d5..9857b486 100644
--- a/app/src/main.ts
+++ b/app/src/main.ts
@@ -1,11 +1,9 @@
 import { createSSRApp } from 'vue'
-// import { createPinia } from 'pinia'
 import App from './App.vue'
 import plugins from './plugins'
 import './styles/index.scss'
 export function createApp() {
     const app = createSSRApp(App)
-    console.log(app.config.globalProperties)
     app.use(plugins)
     return {
         app
diff --git a/app/src/pages.json b/app/src/pages.json
index 8f5f43de..2afcee27 100644
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -29,6 +29,12 @@
             "style": {
                 "navigationBarTitleText": "注册"
             }
+        },
+        {
+            "path": "pages/customer_service/customer_service",
+            "style": {
+                "navigationBarTitleText": "联系客服"
+            }
         }
     ],
     "globalStyle": {
diff --git a/app/src/pages/customer_service/customer_service.vue b/app/src/pages/customer_service/customer_service.vue
new file mode 100644
index 00000000..2daf7df0
--- /dev/null
+++ b/app/src/pages/customer_service/customer_service.vue
@@ -0,0 +1,26 @@
+<template>
+    <view class="customer-service">
+        <view v-for="(item, index) in state.pages" :key="index">
+            <template v-if="item.name == 'customer-service'">
+                <w-customer-service :content="item.content" :styles="item.styles" />
+            </template>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { getDecorate } from '@/api/shop'
+import { reactive } from 'vue'
+const state = reactive<{
+    pages: any[]
+}>({
+    pages: []
+})
+const getData = async () => {
+    const data = await getDecorate({ id: 3 })
+    state.pages = JSON.parse(data.pages)
+}
+getData()
+</script>
+
+<style></style>
diff --git a/app/src/pages/index/index.vue b/app/src/pages/index/index.vue
index a3235d5a..93543542 100644
--- a/app/src/pages/index/index.vue
+++ b/app/src/pages/index/index.vue
@@ -1,14 +1,26 @@
 <template>
     <view class="index">
-        <decoration :pages="state.pages" />
+        <view v-for="(item, index) in state.pages" :key="index">
+            <template v-if="item.name == 'search'">
+                <w-search :content="item.content" :styles="item.styles" />
+            </template>
+            <template v-if="item.name == 'banner'">
+                <w-banner :content="item.content" :styles="item.styles" />
+            </template>
+            <template v-if="item.name == 'nav'">
+                <w-nav :content="item.content" :styles="item.styles" />
+            </template>
+        </view>
         <view class="article"> </view>
     </view>
 </template>
 
 <script setup lang="ts">
 import { getIndex } from '@/api/shop'
-import { reactive } from 'vue'
-const state = reactive({
+import { reactive, ref } from 'vue'
+const state = reactive<{
+    pages: any[]
+}>({
     pages: []
 })
 const getData = async () => {
diff --git a/app/src/pages/login/login.vue b/app/src/pages/login/login.vue
index 59b6df72..787bb3bc 100644
--- a/app/src/pages/login/login.vue
+++ b/app/src/pages/login/login.vue
@@ -10,7 +10,7 @@
             <u-form borderBottom>
                 <template v-if="scene == LoginTypeEnum.ACCOUNT">
                     <u-form-item borderBottom>
-                        <u-icon class="mr-2" :size="36" name="/static/images/icon_user.png" />
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon/icon_user.png" />
                         <u-input
                             class="flex-1"
                             v-model="formData.username"
@@ -19,7 +19,11 @@
                         />
                     </u-form-item>
                     <u-form-item borderBottom>
-                        <u-icon class="mr-2" :size="36" name="/static/images/icon_password.png" />
+                        <u-icon
+                            class="mr-2"
+                            :size="36"
+                            name="/static/images/icon/icon_password.png"
+                        />
                         <u-input
                             class="flex-1"
                             v-model="formData.password"
@@ -36,7 +40,11 @@
                 </template>
                 <template v-if="scene == LoginTypeEnum.MOBILE">
                     <u-form-item borderBottom>
-                        <u-icon class="mr-2" :size="36" name="/static/images/icon_mobile.png" />
+                        <u-icon
+                            class="mr-2"
+                            :size="36"
+                            name="/static/images/icon/icon_mobile.png"
+                        />
                         <u-input
                             class="flex-1"
                             v-model="formData.mobile"
@@ -45,7 +53,7 @@
                         />
                     </u-form-item>
                     <u-form-item borderBottom>
-                        <u-icon class="mr-2" :size="36" name="/static/images/icon_code.png" />
+                        <u-icon class="mr-2" :size="36" name="/static/images/icon/icon_code.png" />
                         <u-input
                             class="flex-1"
                             v-model="formData.code"
@@ -77,7 +85,7 @@
                 </u-checkbox>
             </view>
             <view class="mt-[40rpx]">
-                <u-button type="primary" shape="circle" @click="accountLogin(scene)">
+                <u-button type="primary" shape="circle" @click="handleLogin(scene)">
                     登 录
                 </u-button>
             </view>
@@ -95,7 +103,7 @@
                 <u-divider>第三方登录</u-divider>
                 <div class="flex justify-center mt-[40rpx]">
                     <div class="flex flex-col items-center" @click="wxLogin">
-                        <u-icon name="/static/images/icon_wx.png" size="80" />
+                        <u-icon name="/static/images/icon/icon_wx.png" size="80" />
                         <div class="text-sm mt-[10px]">微信登录</div>
                     </div>
                 </div>
@@ -108,7 +116,9 @@
 import { login } from '@/api/account'
 import { smsSend } from '@/api/app'
 import { SMSEnum } from '@/enums/appEnums'
-import { reactive, ref, shallowRef } from 'vue'
+import { useLockFn } from '@/hooks/useLockFn'
+import { useUserStore } from '@/stores/user'
+import { reactive, ref, shallowRef, watch } from 'vue'
 enum LoginTypeEnum {
     MOBILE = 'mobile',
     ACCOUNT = 'account',
@@ -118,6 +128,8 @@ const uCodeRef = shallowRef()
 const scene = ref(LoginTypeEnum.ACCOUNT)
 const codeTips = ref('')
 const isCheckAgreement = ref(false)
+
+const userStore = useUserStore()
 const formData = reactive({
     username: '',
     password: '',
@@ -140,7 +152,8 @@ const sendSms = async () => {
         uCodeRef.value?.start()
     }
 }
-const accountLogin = async (scene: LoginTypeEnum, code?: string) => {
+
+const loginFun = async (scene: LoginTypeEnum, code?: string) => {
     if (!isCheckAgreement.value) return uni.$u.toast('请勾选已阅读并同意《服务协议》和《隐私协议》')
     if (scene == LoginTypeEnum.ACCOUNT) {
         if (!formData.username) return uni.$u.toast('请输入账号/手机号码')
@@ -155,17 +168,29 @@ const accountLogin = async (scene: LoginTypeEnum, code?: string) => {
         scene
     }
     if (code) params.code = code
-    await login(params)
-    uni.$u.toast('登录成功')
-    uni.navigateBack()
+    uni.showLoading({
+        title: '请稍后...'
+    })
+    try {
+        const data = await login(params)
+        userStore.login(data.token)
+        await userStore.getUser()
+        uni.$u.toast('登录成功')
+        uni.hideLoading()
+        uni.navigateBack()
+    } catch (error: any) {
+        uni.hideLoading()
+        throw new Error(error)
+    }
 }
 
+const { isLock, lockFn: handleLogin } = useLockFn(loginFun)
+
 const wxLogin = async () => {
     const data: any = await uni.login({
         provider: 'weixin'
     })
-    console.log(data)
-    accountLogin(LoginTypeEnum.MNP, data.code)
+    handleLogin(LoginTypeEnum.MNP, data.code)
 }
 </script>
 
diff --git a/app/src/pages/register/register.vue b/app/src/pages/register/register.vue
index 68652dc4..b9fed846 100644
--- a/app/src/pages/register/register.vue
+++ b/app/src/pages/register/register.vue
@@ -1,5 +1,7 @@
 <template>
-    <view class="register min-h-full flex flex-col items-center px-[40rpx] pt-[40rpx] box-border">
+    <view
+        class="register bg-white min-h-full flex flex-col items-center px-[40rpx] pt-[40rpx] box-border"
+    >
         <view class="w-full">
             <u-form borderBottom :label-width="150">
                 <u-form-item label="创建账号" borderBottom>
diff --git a/app/src/pages/user/user.vue b/app/src/pages/user/user.vue
index f1e42183..e113a393 100644
--- a/app/src/pages/user/user.vue
+++ b/app/src/pages/user/user.vue
@@ -1,7 +1,45 @@
 <template>
-    <view class="content">个人设置</view>
+    <view class="user">
+        <view v-for="(item, index) in state.pages" :key="index">
+            <template v-if="item.name == 'user-info'">
+                <w-user-info
+                    :content="item.content"
+                    :styles="item.styles"
+                    :user="userInfo"
+                    :is-login="isLogin"
+                />
+            </template>
+            <template v-if="item.name == 'my-service'">
+                <w-my-service :content="item.content" :styles="item.styles" />
+            </template>
+            <template v-if="item.name == 'user-banner'">
+                <w-user-banner :content="item.content" :styles="item.styles" />
+            </template>
+        </view>
+    </view>
 </template>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { getDecorate } from '@/api/shop'
+import { useUserStore } from '@/stores/user'
+import { onShow } from '@dcloudio/uni-app'
+import { storeToRefs } from 'pinia'
+import { reactive } from 'vue'
+const state = reactive<{
+    pages: any[]
+}>({
+    pages: []
+})
+const getData = async () => {
+    const data = await getDecorate({ id: 2 })
+    state.pages = JSON.parse(data.pages)
+}
+const userStore = useUserStore()
+const { userInfo, isLogin } = storeToRefs(userStore)
+onShow(() => {
+    userStore.getUser()
+})
+getData()
+</script>
 
 <style></style>
diff --git a/app/src/static/images/icon_code.png b/app/src/static/images/icon/icon_code.png
similarity index 100%
rename from app/src/static/images/icon_code.png
rename to app/src/static/images/icon/icon_code.png
diff --git a/app/src/static/images/icon_mobile.png b/app/src/static/images/icon/icon_mobile.png
similarity index 100%
rename from app/src/static/images/icon_mobile.png
rename to app/src/static/images/icon/icon_mobile.png
diff --git a/app/src/static/images/icon_password.png b/app/src/static/images/icon/icon_password.png
similarity index 100%
rename from app/src/static/images/icon_password.png
rename to app/src/static/images/icon/icon_password.png
diff --git a/app/src/static/images/icon_user.png b/app/src/static/images/icon/icon_user.png
similarity index 100%
rename from app/src/static/images/icon_user.png
rename to app/src/static/images/icon/icon_user.png
diff --git a/app/src/static/images/icon_wx.png b/app/src/static/images/icon/icon_wx.png
similarity index 100%
rename from app/src/static/images/icon_wx.png
rename to app/src/static/images/icon/icon_wx.png
diff --git a/app/src/static/images/user/default_avatar.png b/app/src/static/images/user/default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..de31d02adfced125ae228824df009132f2a5085f
GIT binary patch
literal 6093
zcmV;;7c%IHP)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{00001b5ch_0Itp)
z=>Py1he<?1RCr$PU3-iqM|uCgn%RELu6NgWw&ehJARt{5J5fT;55Tqv=O7+Z!WnEJ
z0TU9(wnAb>c`6`9;SVFBAfd=gY@9fO7_f8a#2`h%l6{u!fQ7LUaRN$WV+9+?;m6(W
z?(J?rW~M9pmFrvA_RZ|{>~v4}-d#(r*`4V}RsHIFfAtm94mh;dOhhdr(#+g<o2<2N
zMN#w$W_~ph;rvNv-lMfXkC|tQs6#}dJ?HGbt3(vpb6sn_#?0T>TK_i@{SOg+Piy_Z
zVHh4B^gbd&d-}|*n?8JKXd{ndplYrCG)?zpS+<v%-#|oriRiUN1Ta-eoymv@li+D0
z`li<U5vA1Qp65Nu%!#}MldI`qHx6K}H9%6#+;awUSDL18*IMr<qKk;=JUg%(cru%=
zxYW&B8v-*wxPMztu<>|%uS<<Bd%Zhf0QwJz=o`#@ujhI9G4oNUjcp>zm>JhK=4cGS
zmKwl<%>Zew=h8IYmu1=2N~yPLt#{*V0A>L(695w;%QChn_4|Fwvdnx6Ncm5DKOSU&
zz-Oz~BBj*Er&3DebO3AH=SUllWLXA~5BR?SATxvFO?zw`H;IzE5U(BJJg`ZUT&T6a
zo`|j{qH`TkF<=@4*zfllXSds>Uaz+S<^ZbOG_C?@k?REXcDqe8Gcy2Q<FtT-I~bk7
za)`r3bPqG%?)(0?n*?-i0Ox^?qG%s8{~-}wNkm|Gpe#^xhHHDh9w$j+0LAHoB*2wT
zCGI<fx&gTF`_yi?Md4GHYVmq-mHV~Up9;h9!6pDbb%66MERN&16VXSB=rRkC88`to
zO;f_@vfQcw9W_A&aG`F`^9ZMa?I>M%)K`h<<{${}vp|a#FjW~nRe<dPKoQYtnqHh`
z*(Zo-pB-59eU@b^O;e8JcoU`81?n)+U9dsbK@b3J$Zc>OjH_t$4=ANR>UrK{@_pX)
z8a1&d`F$z?yHvZrzWz#P{v<QM-wp!oNhn4wfGTWQl%GjDH?4aGY+>I3TPX!DgeHJ;
zF?qk(>-GM4c6Rn~UOZLV&dLGSTDM{H0OTY|ev6rJwi@v!U;!@J@J<3Y4~zf}jT|65
zKpTo?<|A6`kNLiTJGhmM&5i_E92EdJilQH9<~uAqHmn%47}UDHzHWeR8VjCu&;d4p
z?sPf^XxQiu>wZ9MeO(xa&j92qy<(M6u*;H@B>7dX^<NRuBD73qR^4t_0az$cJDFlf
zO#-24C}IG5W@ZNR8A=vx>SIc&kNCcSSCuTgbbv*Xg6v6><kLj-J5~l6ss*r76d5z;
zWTV=x6f*QR3_}C7wGu=TyT$kY-?v^ku<=qIB&7l@GG%pj_1t#5eSnBAw^VEF*wxil
zf^*_j0d|m#hSOwjZVsl^1~n7W!@XYbnz^~T=gOALr2#Arv!19g6VXptaNAIz0Pd+o
zwWFvRAVW55t>GMj9DbUa-vv)tnIM+}urw%+<F^vgK_Z&BUY+*Z+L~d>rz+KM1vFUp
z>@0#{#sdbBm$laK4#V(JSs+ggutT|5X|3-fA`dP`I4q7IKW-GM)8Gz<85|7?*coS>
z0lOJ28_tmgJ_6tO?=1u5i2#-cL{aoXX8xSjh;_f;S1T(k#uIfK+^uzOfD8x8{QNx3
zD)EBBU3;zX`(Kz8<ZT1&Q0_Ha>$@e!3KIz6B4l?O+);+qOTUZF43MqzCFbM%eBVDf
z3CP<5*pa#KB%&|DBm$V-ZkJDkTMX1e8a5(U0NL8hzy`AUSArn;%635>8(`S7u+`Eu
z-J50EAt+RkxxHRbEiW&hrrhn}yFtkSd0}BeC>b(&MJe?b&-0KvWX67+SBwQPlmLLa
zzP^6GQtDwMf(x?W>-Acv!5wGVhhGbJ?SO2;rbq(Jvh0dZr-Q^mgF(@^6$Ti7RO>_b
zlOzG<z6szW3beGe)F^*421(q67%Yg7ygq>6p(nW46&<vyuM?TPxVR`$DS-TMzVBbj
z%&A~eq#fe`Y}i8_$F~yEjbgija+~6v62(r!b}&KUIReNy<q&WY<UreD$|3N9|K00~
z3}98)hzSLm?AXbF9R$Hg#$nZk0Cvow-(=>$wb73j>|8i8>K+sUR(!oksTo&;2e|N)
z!!ZN%uI@gGb`5VA>}0JqWG}Kke<KXTzb~qEjRaVDejLYpi0DxwS^%q#qR9A`#~sMB
zXFR|KuvYt=`0;oiK*r>4f@>9RfLk*RLj-Gp*Afw35(L4MMdWc2fQ{^p<M@6g#DPtB
zyIrGH)p^L^pLyn)2H>&}P%(51_|cm{&Csl8W@bd`dLRgbUn(Mtw*=U+cW)x1zif)!
z74OfkUAv5ot@6M`1~u0SGWv^t0%S)X-xLJFEu&cVP=JN}qbNdD=rLyA1xj99TVu$o
zx>&P-d)8TJnT&~P91umI=DI;fEO~Zz*05@%|6ut}7=~C!HPmz}0`M2%{B8nk7V`n%
zLQ|gR0V;-<uC9qKeRWwif;(XtB4cJefJF_r$><MA27lcq5da3b(30yojvYH@6tKD|
zImfEastT?3J|x)>Go1!fun6xsjvpeTE06*jMUgR!>YBmOZecE1IaCL}#xe533oq0f
zB?HJ9hcFC{lZl8P3WDIx!xXL)0G64MB*}Yil*q&>>-1KM+&%m3vumRsnNhI&j~+c*
z+eCN0T-Id?_I!<vI-TIF9x8*QD0-BcFGe7GZEa0~HPuPI(3qiQG~syh#TSj|tFG|?
z$jAhlot-s_70mpo@B5by8k<c3JJgHpjDNBVzZ7JT_-v;=z#@0fIp>^dzk2BV>ZW2e
z43i5!0EdeA`@a9Bye!TGEKUss6W#*Nd3}Ao1v8;8#R75<PIq{7nshw>{PVT?;4v;3
zlTN22&W}Su5L}s;#Tx*Ns-33kMOl`8Lk1JnTj$CH%v4bCv~1p@lL#gg&blT(+KG2#
z@{6cYN?qi6-s7&><N_?wqT7h*1{*o5RdWV=hDij|sA&geFl2FEav0+w8g&o^LdBm6
zg5XA%O&frPtXEc6c6*+O73yYX{qpj%Sw&x0Cz@ay4VzeK+jGx7SDS7k0K<j3xVR{R
zh##eCdg1*1JQlebaVr2D>J`(d30^C70D}lc!sZS)iiklyu!-v=fI;3ZW`3{l`v-)I
zHvt?)(E(<@8UU}Yt(kR1by2U((A~Rt%j&#F0gT4fZ7#_eSs%4w(^~6)48!n!8vqL_
zV?9x;)%p&C3SiGmOG{jLUNfi!&JAQ{H1Rlc<cJ9;)=dQP%Y#kZ>OM!h-R=c;os(Ip
zYZhonQS>2Z{;bWIH1Xa#8!muC!D=eN@MwX{)u~AjV$)jdYr`<S(_ky49LMoJMD%U|
zyt=xI@_@AiTz7C`6xV111rK4<2g5MLf`pdH;4n#&|3VrpbepB6B~>?jJ}rYsO|O@K
z7hnD2;v&*%kzM$V@B2T+%#i^&P1DzBS@un^<X*35%%i$olWw<~u0_L4s?!PNjuo(5
zSXj{Qw&BVU8?W~~?^_1oD2lFU=FdPDCrQ$7LSS3WB)H??t!df;^9W{AQx1TN#6#cr
zQSb&OBCZd^@NW#jNs|17)*34Wd#kIf?Iy@yVbM^qph-9FfN}*Ts|gC0j1`g(=jP@N
zz*z0+`~I(koM)0G`4$mf0QtMTyo@3#wJTUIpa8h)<hpSuP~F)b`Sv>59wLXo?fd@E
zBZ2OfN-4M}7qcug_HPs9uXF%%7_7%;_>YT2CD%jlBAV2saY9EShhYyZrA+>Gzu&(A
z0AGfMWN=)9a_i1_9yBu%NkT-aDeSNbS(d|Qu1(6r<U=yR<s3!P2blRz1dfv=F^jjG
z;NZw>(@lv9Hz6-;7`Tq2Wzwve`PTsO$C>%hB)DH^YR*>t6x0h@Tz6c!331@907hU&
zk^q?b&jIj8fZ_P@<E9{J(<oR>COFlRn^o6=Rfq^MH1z-lTTOZ+@PH!Qk7%vm02U1m
zy2({>>P+8hGHaFzCreHj78ayp&(~0w`9Fy0XPRmv4N|%gBc5i4B?b<D=Q=Yfi*Str
zrqUAt_`7ynn%XlsigZGZ`e}iTL4!l13G1LojgJGc>?QFO0RBHB`mv_OfJb#=n)Wg5
zU4RS9ZHkGu)%Z9;2Lbqp02m937m(BgCkJHBPC3w4B;~<`D%;ZqSL9ABEaR+tFbP?3
zb^u`1Vlo>+)tTVFok@j0Ncjev=|AzRLr^Q$V9CO7yrXFztF6Y$Nr=Z~T>#v*1*&%x
zz`|*yiVoPRl+uR+h9E^za}Tj^017!PMauD9slqd;O3!vC<TUQd0o*%*MK>kBxs@@G
zP5?xJ0JkB45E&`d2C%`lWn(Lu2>2bRRM?Syn55q>uwehNE2TPp)8+607QMWqlq@N@
zVk^O!IRJnFGC&Y^EtD%@<I|;P`Ch(ruNPa=E(<a5z;}2)yjV>twKT|tbQAE1=r90&
ziilp<ghcnPs8*I~3@f+-paFvHx8xQ>9mc9%*^1|bVx3JiPG}Cmh2qteM7u!%+gcu?
zMSm9nKS4x4+f+vffI_V(*u6#l&{EtC@)W?k742kDWUD$1i0oiilm)|I51{j$VHz@a
zl$m4!mYDDpa8-UyYyC#JDpyuku(wfR<)rEk$qKqjQ+7n|y6v4*al+(*cdJQdlhIFb
zq51jwmtB=^u%RjGvH+rqf&To226q6+O~^nMUEzdaLleV=bp{p2<w}stNWN==^#KaD
zRq-U6^zp_8{F}U@a2WWI`3NJ{&8`Oo{67GIFK6b5nvk-C21232g0r1=Kzj$fF6vyV
zs(-nZohy)&^(v**f7YFJCq{Y`vNpCm_;qJ{<dg2QEW1$BX8)ate!5Om2>>^Fsc2Eq
zA&=`wnivoZ{*FnTMZ=RM!AdkF-_?@%4%vlZ0c_o!egIs6JZ)C(r0YoH`<=e;Uuyu4
z<M;+5x~;CID;Ny0=4scTtZFi$Xxy|b6FCZ&EM2)F48z-NUwpO`wdPS119mZ}c$#6x
zEf=3@t!rIAilp|Fg?a`2X;QJ1$#LTHQD*@-HkEwOG#7xMOtLpm)zeI|b>y!&I9^@=
z?v!x27Aw-GS;7GgtFt`tC{{b^@6*z#F^;f*J<k(>KNyDL=cR;$si!pUA}qpIz@DeA
zaZU<c(fg75gQ!!{C{@wty4U3s?NAARQxO*Hq&9W3rddYmWK^#508L|&H~`+VjFJoR
zGz+1jVOWMz#f~Z4p@b^#K_914EX^(RpRXM~w3H#(HqvOTTnv6PYR~zJQsqK%@m{&5
z41M3ffSHeODrM+WaU92$7b86t<gWl-<yvBlBg*@aEJkVpHamB?<%ID7*mGqk!|&v%
z(YUM}Q6_{Et5CECloP(#^Ss9fmJ_xhOF{4liRc%rDhPfu+rQJYhe0InT3{l2FbINu
zLkoiEl&wlj`j?e!H7+&PaXs9YsOM4k;ZU#fUNQ4kzVF|=Wl4Xx5mj!=aVh~^MZp%K
z-my337-TZZ#vEmCt8*#=jJ}pxI9w7VY$<=C-c2>4T|%v8V=PJUY+|YYvRP@_rT;~9
z-uA{=InNfhlf|~OCR4u5t?f>h431F~qRfi4PS%EjY1>=dxn@%oMR%i2eA#9Gh1I~D
z)zo^>qre;WI|!oeO|(ndoH7USYl!IaDz=ve$Otr`ie1z8MH&U(R=-1Y2DoLGeQ<ov
z<!mo&K{nOk<2e33BKmYy8$`=WeSnO#*_|3)f?F5smasTYChsH@Mefb9<~|ne6VYTF
zL^}_c#5~C2ePy$1w-eG41R$`+W}HRbWentYo&jowA|;E*-L=ZwdET&la$CIL9|XZ$
zC*I=SWz}&U?;)bEBYzr!h$xD<Z24l}w=w%=@iu_QsyUohxcrI&fe8peW%VLHapu=0
z7kyrl>+nvy9L2C^t@SZxz9a~Or?%P{TAn?0_fhxdPS(eVnfdRCsL#x1SF|cC<Dqks
zxCXY3<)iM234s3rx}4ixH7M@^Sndf&g<Ayx|BG*ayYDIjEUv+O5bFiNT5H3awbmaF
z!|=0$$*5-)0@yX3;yAvQh;9^ljBNgCCVIP|qg^t{TYb9MxdS5WhVe}IZ+VA+F88~i
zqXu@;-|=p6E?Y(!g>tZ`{jEU|{PwWjz6ZT?9Dq$A0vVWTnqo`wOCgW33w4=Zt}+H@
z&@)`HHrSV`H1zV(6y?tKR$=#b3+N-B=RpUGi^$%wShS-EnUG=>MXzDzhl%J_0J+!e
znSGY(UR^io<Y>bE02kuM)*+EiC%><?zB~-WXNt((O_O%qP6>NhUthmeDFw}X4xo3t
zT~llNG|1zQ=*!pVz?D_{$CXn1Y@GLmE!;=FtuTuoq;$n`{L4gyox<^AXq0>!<WWOD
z_;&#pGIwTX2BHubLb2K(1i`-)RjTq&-xk1D=`v0bo2Yjee4`fR)08|W#yN07x#kJX
z{C>NWs2S@qAN$fXwsVsslV#sSY{~OE0lDAr8<3k)yJC_)R(&tPgt-UGZM9ke7np#8
zKeUm&zD;l^1~^B_S8J`mKtwZ;$yt^ekgLqfta|XPe!iGONSsqjiOlU{uLa-t4{nz&
zPo!iG>a;W@j^lR{(E%drK)Z%Q25(oD&XB4>sOtFu7k+m*F=VWWXpM-j34-8X%K*0&
z3eL0ZG);dY%d&fk=sY+>n7Ivr0d$!T_^JlJ>gUQBNMJ>4El!MQl~V7*euHI!TPnaV
zyGGrQR;zW7*7_0)atj(ZA}yyf%a&jYz-_m&y`XVFLXUa0-|xSt)9L)6OmIsF*n(_q
zHLbOmB*`sAbUoav)(d8~jYs6=RHA0-E23oZE!**dGKH;RZ}WZsChSW#jtjCVr<q8L
z9`+J=TkLk@SkMLy8$d6diqtGriyUTa-x{h#HFmA_?^;b6@m-jirI*{U1Yk?acs8gR
z+sDJTc?Xi|U1~-g6%^fsDse?AqUd$vPX@&zww<HeLt5+W!Z7?ESh9`Iy=45Bd{hQ-
zUiku5CrNUH*7{~<MmZgX9O2qD+sOm$lL2S}R*H$+U;%~$p}wQc{4wA6ZwIxOEpG?S
zjmiPG)V#s6p@1>-Um%gsI$Ab>hPI6pKpO=i7wsu|a+mfv@jS_v0x*AEV6EfgZmsnn
zbvm6NLe^HrlJlLK3cwCEqhm(lT3=s(qf+XVM0A-=0mb*AXzad*I@ZP$<_7#rL!^WU
zx$S}{3ZQzPhpk=3)o3O)5q&kwvOno`I@n>(C{|$CB{ZSXBc=*)o|@6&G)?zsS@x&Q
zyw|oE%7$^0^m;w~ZcM8tfSm_biiyMIahw&h=K3+E)F(X8`?6RN)1q1z`Kbe(qh_Ny
zTKW7ABKiX&y26?dVA0Sj@%tvQ-L#o1S-G1ekgpIgprWnTYCu!aUc|{i<@^3uq;FzT
z6e78jFRBgTL2Mh}rD^(eS(aT#L|4g<Y|a3|IiRvEV^Fswzya`lD$hWL!^-qQ*&Ul^
zJ+qPj?#?X$R4FB<3{qQ+9JOrtFv6xvsXIK+L)}lbXX@;@HYKabq|7TGTI;zaN#4xN
z2x7dAh|ZA#waS+Xp9$aq9mxhl-T53Vd+jFW&CTPIq&+8z&jl3s!S!SwV?lkMneWqD
zAM|}6<(QA>MNpA`SA9+G6rAs%Wp_|SHsYUJ>%}xpugtP+KQmuSM6VV$F85o|!6L<;
z1eI<4Z2y-2n%K2m>;7%Q1KZ6v4T=#`X1=bJ`e)Dc4ly&f1vH1XXQ3#T?yQ((5;P8A
zXTZdjXPgAi_g<Q&ugkJ*FEhW1h@hOk7O6uv<A0LzkbCjIRU&$th)@#Y5vA1Qp65LU
zmts!5;9p}Il=0%SpV3%=-Huv$Cbr`y69cS0ilTFg==@fzb-o3AkJkDX%sdBHPef<f
zzvuB>W?s=+1Hj|VysEXvCw5_d5}@|`{bz~j*)R-$ls9RtD8abFes3hG?%4f5Gb65d
T*+R{{00000NkvXXu0mjf-T0C1

literal 0
HcmV?d00001

diff --git a/app/src/static/images/user/my_topbg.png b/app/src/static/images/user/my_topbg.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b17c43e7aba8c1e1f10f82e66fa659e3f6617a
GIT binary patch
literal 17804
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
T9-=i<00000NkvXXu0mjfhMFku

literal 0
HcmV?d00001

diff --git a/app/src/stores/app.ts b/app/src/stores/app.ts
index 82bdc1ec..4a98e27e 100644
--- a/app/src/stores/app.ts
+++ b/app/src/stores/app.ts
@@ -1,8 +1,22 @@
 import { defineStore } from 'pinia'
+import { getConfig } from '@/api/app'
 
+interface AppSate {
+    config: Record<string, any>
+}
 export const useAppStore = defineStore({
-    id: 'userStore',
-    state: () => ({}),
+    id: 'appStore',
+    state: (): AppSate => ({
+        config: {}
+    }),
     getters: {},
-    actions: {}
+    actions: {
+        getImageUrl(url: string) {
+            return url ? `${this.config.domain}${url}` : ''
+        },
+        async getConfig() {
+            const data = await getConfig()
+            this.config = data
+        }
+    }
 })
diff --git a/app/src/stores/user.ts b/app/src/stores/user.ts
index 4a821b83..93e57583 100644
--- a/app/src/stores/user.ts
+++ b/app/src/stores/user.ts
@@ -1,12 +1,34 @@
-import { getClient } from '@/utils/client'
+import { getUserCenter } from '@/api/user'
+import { TOKEN_KEY } from '@/enums/cacheEnums'
+import cache from '@/utils/cache'
 import { defineStore } from 'pinia'
 
-export const useAppStore = defineStore({
-    id: 'appStore',
-    // convert to a function
-    state: () => ({
-        client: getClient()
+interface UserSate {
+    userInfo: Record<string, any>
+    token: string | null
+}
+export const useUserStore = defineStore({
+    id: 'userStore',
+    state: (): UserSate => ({
+        userInfo: {},
+        token: cache.get(TOKEN_KEY) || null
     }),
-    getters: {},
-    actions: {}
+    getters: {
+        isLogin: (state) => !!state.token
+    },
+    actions: {
+        async getUser() {
+            const data = await getUserCenter()
+            this.userInfo = data
+        },
+        login(token: string) {
+            this.token = token
+            cache.set(TOKEN_KEY, token)
+        },
+        logout() {
+            this.token = ''
+            this.userInfo = {}
+            cache.remove(TOKEN_KEY)
+        }
+    }
 })
diff --git a/app/src/utils/cache.ts b/app/src/utils/cache.ts
index dc097e28..e3035f83 100644
--- a/app/src/utils/cache.ts
+++ b/app/src/utils/cache.ts
@@ -12,7 +12,7 @@ const cache = {
             data = JSON.stringify(data)
         }
         try {
-            window.localStorage.setItem(key, data)
+            uni.setStorageSync(key, data)
         } catch (e) {
             return null
         }
@@ -20,13 +20,13 @@ const cache = {
     get(key: string) {
         key = this.getKey(key)
         try {
-            const data = window.localStorage.getItem(key)
+            const data = uni.getStorageSync(key)
             if (!data) {
                 return null
             }
             const { value, expire } = JSON.parse(data)
             if (expire && expire < this.time()) {
-                window.localStorage.removeItem(key)
+                uni.removeStorageSync(key)
                 return null
             }
             return value
@@ -40,7 +40,7 @@ const cache = {
     },
     remove(key: string) {
         key = this.getKey(key)
-        window.localStorage.removeItem(key)
+        uni.removeStorageSync(key)
     },
     getKey(key: string) {
         return this.key + key
diff --git a/app/src/utils/file.ts b/app/src/utils/file.ts
new file mode 100644
index 00000000..ea120128
--- /dev/null
+++ b/app/src/utils/file.ts
@@ -0,0 +1,21 @@
+export async function saveImageToPhotosAlbum(url: string) {
+    if (!url) return uni.$u.$toast('图片不存在')
+    //#ifdef H5
+    uni.$u.$toast('长按图片保存')
+    //#endif
+    try {
+        const res: any = await uni.downloadFile({ url, timeout: 10000 })
+        await uni.saveImageToPhotosAlbum({
+            filePath: res.tempFilePath
+        })
+        uni.showToast({
+            title: '保存成功',
+            icon: 'success'
+        })
+    } catch (error: any) {
+        uni.showToast({
+            title: error.errMsg || '保存失败',
+            icon: 'none'
+        })
+    }
+}