From 3da97eb797bb4ad30e2a8802c68196ac3b1303d1 Mon Sep 17 00:00:00 2001
From: Echo <1711788888@qq.com>
Date: Mon, 18 Aug 2025 23:49:43 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E6=A0=B8=E5=BF=83?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=92=8C=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                 |   1 +
 src/App.vue                          |  29 +-
 src/api/http.js                      | 111 ------
 src/api/index.js                     |  19 +
 src/api/modules/test.js              |  12 -
 src/api/request.js                   | 150 +++++++
 src/config/index.js                  |  18 +
 src/manifest.json                    |   6 +-
 src/pages.json                       | 111 +++++-
 src/pages/checkin/checkin.vue        | 577 +++++++++++++++++++++++++++
 src/pages/components/components.vue  |  46 ---
 src/pages/diary/diary.vue            | 457 +++++++++++++++++++++
 src/pages/functions/functions.vue    |  50 ---
 src/pages/home/home.vue              | 457 ++++++++++++++++++++-
 src/pages/order/order.vue            | 562 ++++++++++++++++++++++++++
 src/pages/profile/profile.vue        | 567 ++++++++++++++++++++++++++
 src/pages/recipe/recipe.vue          | 338 ++++++++++++++++
 src/pages/user/login.vue             | 526 ++++++++++++++++++++++++
 src/pages/user/setup.vue             | 328 +++++++++++++++
 src/static/images/checkin-active.png | Bin 0 -> 4384 bytes
 src/static/images/checkin.png        | Bin 0 -> 4376 bytes
 src/static/images/diary-active.png   | Bin 0 -> 4681 bytes
 src/static/images/diary.png          | Bin 0 -> 6934 bytes
 src/static/images/home-active.png    | Bin 0 -> 4603 bytes
 src/static/images/home.png           | Bin 0 -> 4612 bytes
 src/static/images/profile-active.png | Bin 0 -> 3893 bytes
 src/static/images/profile.png        | Bin 0 -> 3855 bytes
 src/static/images/recipe-active.png  | Bin 0 -> 5741 bytes
 src/static/images/recipe.png         | Bin 0 -> 6612 bytes
 src/store/user.js                    | 105 ++++-
 30 files changed, 4213 insertions(+), 257 deletions(-)
 create mode 100644 .env
 delete mode 100644 src/api/http.js
 create mode 100644 src/api/index.js
 delete mode 100644 src/api/modules/test.js
 create mode 100644 src/api/request.js
 create mode 100644 src/config/index.js
 create mode 100644 src/pages/checkin/checkin.vue
 delete mode 100644 src/pages/components/components.vue
 create mode 100644 src/pages/diary/diary.vue
 delete mode 100644 src/pages/functions/functions.vue
 create mode 100644 src/pages/order/order.vue
 create mode 100644 src/pages/profile/profile.vue
 create mode 100644 src/pages/recipe/recipe.vue
 create mode 100644 src/pages/user/login.vue
 create mode 100644 src/pages/user/setup.vue
 create mode 100644 src/static/images/checkin-active.png
 create mode 100644 src/static/images/checkin.png
 create mode 100644 src/static/images/diary-active.png
 create mode 100644 src/static/images/diary.png
 create mode 100644 src/static/images/home-active.png
 create mode 100644 src/static/images/home.png
 create mode 100644 src/static/images/profile-active.png
 create mode 100644 src/static/images/profile.png
 create mode 100644 src/static/images/recipe-active.png
 create mode 100644 src/static/images/recipe.png

diff --git a/.env b/.env
new file mode 100644
index 0000000..b1f7c87
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+VITE_BASE_URL = http://127.0.0.1:8888
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 5d229d9..71e4840 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,37 @@
 <script setup>
 import { useSystemStore } from '@/store/system.js'
-import { onLaunch } from '@dcloudio/uni-app'
+import { useUserStore } from '@/store/user.js'
+import { onLaunch, onShow } from '@dcloudio/uni-app'
 
 const systemStore = useSystemStore()
+const userStore = useUserStore()
 
 onLaunch(() => {
   systemStore.init()
+  checkLoginStatus()
 })
+
+onShow(() => {
+  // 每次显示时检查登录状态
+  checkLoginStatus()
+})
+
+// 检查登录状态
+const checkLoginStatus = () => {
+  const isLoggedIn = userStore.checkLoginStatus()
+  
+  // 如果未登录且不在登录页面，则跳转到登录页
+  if (!isLoggedIn) {
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    
+    if (currentPage && currentPage.route !== 'pages/user/login') {
+      uni.reLaunch({
+        url: '/pages/user/login'
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss">
@@ -20,7 +45,7 @@ onLaunch(() => {
 }
 //主题scss
 .red-theme {
-  @import 'styles/themes/red-theme.scss';
+  @import 'styles/themes/default-theme.scss';
 }
 </style>
 
diff --git a/src/api/http.js b/src/api/http.js
deleted file mode 100644
index d0889a6..0000000
--- a/src/api/http.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import Request from 'luch-request'
-const tokeyKey = 'Authorization'
-const env = import.meta.env
-
-// 创建实例
-const axiosInstance = new Request({
-  baseURL: env.VITE_BASE_URL,
-  timeout: 30 * 1000, // 超时配置
-  headers: {
-    'Content-Type': 'application/json;charset=UTF-8'
-  }
-})
-
-// 请求拦截
-axiosInstance.interceptors.request.use(
-  config => {
-    const token = ''
-    if (token) {
-      config.headers[tokeyKey] = ''
-    }
-    return config
-  },
-  error => {
-    return Promise.reject(error)
-  }
-)
-
-// 响应拦截
-axiosInstance.interceptors.response.use(
-  response => {
-    // console.log('response=>', response)
-    const { status, data, config } = response
-    if (status === 200) {
-      const { code, message, data: resData } = data
-      if (code === '0000') {
-        return resData
-      }
-      // 文件
-      if (config?.responseType === 'blob') {
-        return response
-      }
-      // token过期
-      if (code === '5010') {
-        uni.showToast({
-          title: 'token过期，请重新登陆！',
-          icon: 'none'
-        })
-        // userStore.logout(false)
-        return
-      }
-      uni.showToast({
-        title: message || '接口请求异常',
-        icon: 'none'
-      })
-      return Promise.reject(data)
-    }
-    uni.showToast({
-      title: `${status}服务器响应异常`,
-      icon: 'none'
-    })
-    return Promise.reject(data)
-  },
-  error => {
-    // 如果是取消请求，返回空的Promise，避免触发异常处理
-    if (axiosInstance.isCancel(error)) {
-      return new Promise(() => {})
-    }
-    const { response, code, message, config } = error
-    if (!response) {
-      uni.showToast({
-        title: '连接超时，请稍后重试',
-        icon: 'none'
-      })
-    } else {
-      const { _retry } = config
-      const { status } = response
-      if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1 && !_retry) {
-        uni.showToast({
-          title: '连接超时，请稍后重试',
-          icon: 'none'
-        })
-      } else {
-        uni.showToast({
-          title: `${status}`,
-          icon: 'none'
-        })
-      }
-    }
-    return Promise.reject(error)
-  }
-)
-
-/**
- * 上传文件
- * @param {*} url
- * @param {*} data
- * @returns
- */
-export const upload = (url, data) => {
-  let formData = new FormData()
-  Object.keys(data || []).forEach(key => {
-    formData.append(key, data[key])
-  })
-  return axiosInstance.post(url, formData, {
-    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
-  })
-}
-
-export default axiosInstance
diff --git a/src/api/index.js b/src/api/index.js
new file mode 100644
index 0000000..7b3ee86
--- /dev/null
+++ b/src/api/index.js
@@ -0,0 +1,19 @@
+import net from './request.js';
+
+// import store from '../store';
+
+const API = {
+	/*
+	 用户相关
+	 */
+    login: data => net.post('/user/login', data, false), // 登录
+    getUserInfo: () => net.get('/user/info', {}, true), // 获取用户信息
+    getUserInfoById: id => net.get(`/user/info/id`, {}, true), // 获取用户信息
+    updateUserInfo: data => net.put('/user/info', data, true), // 更新用户信息
+    upload: data => net.post('/user/upload', data, true), // 上传头像
+    getLoverInfo: () => net.get('/user/lover', {}, true), // 获取另一半信息
+	
+};
+
+export default API
+
diff --git a/src/api/modules/test.js b/src/api/modules/test.js
deleted file mode 100644
index 6c7b64d..0000000
--- a/src/api/modules/test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import http from '@/api/http.js'
-const VITE_BASE_URL_AUTH = import.meta.env.VITE_BASE_URL_AUTH // 认证中心
-export default {
-  login: data => {
-    return http.request({
-      baseURL: VITE_BASE_URL_AUTH,
-      url: '/login',
-      method: 'post',
-      data
-    })
-  }
-}
diff --git a/src/api/request.js b/src/api/request.js
new file mode 100644
index 0000000..ac4443f
--- /dev/null
+++ b/src/api/request.js
@@ -0,0 +1,150 @@
+import config from '../config'
+
+const LOGIN_PAGE = '/pages/user/login'
+
+/**
+ * 获取本地 token
+ */
+function getToken() {
+  return uni.getStorageSync('token') || ''
+}
+
+/**
+ * 统一处理未登录或被踢下线
+ */
+function handleAuthFail(checkLogin = true) {
+  console.log('开始清理登录信息并跳转登录页')
+  uni.removeStorageSync('token')
+  uni.removeStorageSync('tokenExpiresAt')
+  uni.removeStorageSync('userInfo')
+  if (checkLogin) {
+    console.log('准备跳转到登录页:', LOGIN_PAGE)
+    // 使用 reLaunch 强制跳转到登录页，避免用户返回到已失效的页面
+    uni.reLaunch({ 
+      url: LOGIN_PAGE,
+      success: () => {
+        console.log('跳转登录页成功')
+      },
+      fail: (err) => {
+        console.log('跳转登录页失败:', err)
+      }
+    })
+  }
+}
+
+/**
+ * 构建请求头
+ */
+function buildHeaders(customHeaders = {}) {
+  return {
+    'Content-Type': 'application/json',
+    'Authorization': getToken(),
+    ...customHeaders
+  }
+}
+
+/**
+ * 通用请求方法
+ */
+function baseRequest({ url, method = 'GET', data = {}, checkLogin = true, headers = {} }) {
+  return new Promise((resolve, reject) => {
+    // 确保URL拼接正确，避免重复的斜杠
+    const fullUrl = config.baseUrl.replace(/\/$/, '') + '/' + url.replace(/^\//, '')
+    console.log('请求URL:', fullUrl)
+    
+    uni.request({
+      url: fullUrl,
+      method,
+      data,
+      header: buildHeaders(headers),
+      success: (res) => {
+        const { statusCode, data: resData } = res
+        if (statusCode === 200 && resData) {
+          // 账号在其他设备登录
+          if (resData.code === 409) {
+            uni.showModal({
+              title: '提示',
+              content: '您的账号已在其他设备登录，已强制下线!',
+              showCancel: false,
+              success: () => handleAuthFail(checkLogin)
+            })
+            resolve(resData)
+            return
+          }
+          // 用户认证失败
+          if (resData.code === 5) {
+            handleAuthFail(checkLogin)
+            resolve(resData)
+            return
+          }
+          // 授权已过期
+          if (resData.code === 5) {
+            console.log('检测到授权过期，code=7，准备跳转登录页')
+            uni.showToast({
+              title: '授权已过期，请重新登录',
+              icon: 'none'
+            })
+            handleAuthFail(checkLogin)
+            resolve(resData)
+            return
+          }
+          resolve(resData)
+        } else {
+          reject({
+            code: statusCode,
+            msg: res.errMsg || '网络错误',
+            data: null
+          })
+        }
+      },
+      fail: (err) => {
+        console.log('请求失败:', err)
+        // 处理401未授权错误
+        if (err.statusCode === 401 || err.code === 401) {
+          console.log('检测到401未授权，准备跳转登录页')
+          uni.showToast({
+            title: '授权已过期，请重新登录',
+            icon: 'none'
+          })
+          handleAuthFail(true)
+          reject({
+            code: 7,
+            msg: '授权已过期',
+            data: null
+          })
+          return
+        }
+        reject({
+          code: 0,
+          msg: err.errMsg || '请求失败',
+          data: null
+        })
+      }
+    })
+  })
+}
+
+/**
+ * 导出常用请求方法
+ */
+const request = {
+  get(url, data = {}, checkLogin = true, headers = {}) {
+    return baseRequest({ url, method: 'GET', data, checkLogin, headers })
+  },
+  post(url, data = {}, checkLogin = true, headers = {}) {
+    return baseRequest({ url, method: 'POST', data, checkLogin, headers })
+  },
+  put(url, data = {}, checkLogin = true, headers = {}) {
+    return baseRequest({ url, method: 'PUT', data, checkLogin, headers })
+  },
+  delete(url, data = {}, checkLogin = true, headers = {}) {
+    return baseRequest({ url, method: 'DELETE', data, checkLogin, headers })
+  },
+  
+  // 兼容原有的http.request方法
+  request: ({ url, method = 'GET', data = {}, headers = {} }) => {
+    return baseRequest({ url, method, data, checkLogin: true, headers })
+  }
+}
+
+export default request
\ No newline at end of file
diff --git a/src/config/index.js b/src/config/index.js
new file mode 100644
index 0000000..b5e4167
--- /dev/null
+++ b/src/config/index.js
@@ -0,0 +1,18 @@
+// isdev 为 true 表示开发环境 false 表示发布环境
+const isdev = true;
+
+// 开发环境使用代理，生产环境使用完整URL
+const baseUrl = isdev ? 'http://127.0.0.1:8888/' : 'http://lckt.hnlc5588.cn/';// 开发环境代理 & 生产环境
+
+const shareUrl = isdev ? 'https://h5.gwkjxb.com/' : 'http://test_h5.gwkjxb.com/';
+
+const config = {
+	appName: '小呆呆的私人菜谱',
+	baseUrl,
+	appVersion: '1.0.0',
+	developer: '小呆呆的私人菜谱',
+	shareUrl,
+	appID:'wx8ed262fbd9eaaf74',
+	isdev
+}
+export default config
diff --git a/src/manifest.json b/src/manifest.json
index 7093534..55121f6 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "zy",
-    "appid" : "",
+    "name" : "xdd-menu",
+    "appid" : "__UNI__3FD9A6A",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -44,7 +44,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx8ed262fbd9eaaf74",
         "mergeVirtualHostAttributes" : true,
         "setting" : {
             "urlCheck" : false,
diff --git a/src/pages.json b/src/pages.json
index c62bddf..19d6580 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2,7 +2,6 @@
   "easycom": {
     "autoscan": true,
     "custom": {
-      // uni-ui 规则如下配置
       "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
       "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
       "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
@@ -12,59 +11,135 @@
     }
   },
   "pages": [
-    //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    {
+      "path": "pages/user/login",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/user/setup",
+      "style": {
+        "navigationBarTitleText": "完善信息",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/home/home",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "我们的纪念日",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/recipe/recipe",
+      "style": {
+        "navigationBarTitleText": "私人菜谱",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/components/components",
+      "path": "pages/recipe/create",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "创建菜品",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/functions/functions",
+      "path": "pages/recipe/detail",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "菜品详情",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/uploadDemo/uploadDemo",
+      "path": "pages/order/order",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "点餐",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/diary/diary",
+      "style": {
+        "navigationBarTitleText": "我们的日志",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/diary/create",
+      "style": {
+        "navigationBarTitleText": "写日志",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/checkin/checkin",
+      "style": {
+        "navigationBarTitleText": "打卡目标",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/checkin/create",
+      "style": {
+        "navigationBarTitleText": "创建目标",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/profile/profile",
+      "style": {
+        "navigationBarTitleText": "个人中心",
         "enablePullDownRefresh": false
       }
     }
   ],
   "globalStyle": {
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "订单中心",
-    "navigationStyle": "custom",
+    "navigationBarTitleText": "情侣菜谱",
+    "navigationStyle": "default",
     "navigationBarTextStyle": "black"
   },
   "tabBar": {
-    "color": "#333333",
-    "selectedColor": "#2E69FF",
+    "color": "#999999",
+    "selectedColor": "#FF6B9D",
     "borderStyle": "white",
     "backgroundColor": "#ffffff",
     "list": [
       {
         "pagePath": "pages/home/home",
-        "text": "首页"
+        "text": "首页",
+        "iconPath": "./static/images/home.png",
+        "selectedIconPath": "./static/images/home-active.png"
       },
       {
-        "pagePath": "pages/components/components",
-        "text": "组件"
+        "pagePath": "pages/recipe/recipe",
+        "text": "菜谱",
+        "iconPath": "./static/images/recipe.png",
+        "selectedIconPath": "./static/images/recipe-active.png"
       },
       {
-        "pagePath": "pages/functions/functions",
-        "text": "功能"
+        "pagePath": "pages/diary/diary",
+        "text": "日志",
+        "iconPath": "./static/images/diary.png",
+        "selectedIconPath": "./static/images/diary-active.png"
+      },
+      {
+        "pagePath": "pages/checkin/checkin",
+        "text": "打卡",
+        "iconPath": "./static/images/checkin.png",
+        "selectedIconPath": "./static/images/checkin-active.png"
+      },
+      {
+        "pagePath": "pages/profile/profile",
+        "text": "我的",
+        "iconPath": "./static/images/profile.png",
+        "selectedIconPath": "./static/images/profile-active.png"
       }
     ]
   }
diff --git a/src/pages/checkin/checkin.vue b/src/pages/checkin/checkin.vue
new file mode 100644
index 0000000..72efe3f
--- /dev/null
+++ b/src/pages/checkin/checkin.vue
@@ -0,0 +1,577 @@
+<template>
+  <view class="checkin-container">
+    <!-- 进度概览 -->
+    <view class="progress-overview">
+      <view class="progress-header">
+        <text class="progress-title">打卡进度</text>
+        <text class="progress-subtitle">已完成 {{ completedCount }}/{{ totalCount }}</text>
+      </view>
+      <view class="progress-bar">
+        <view class="progress-fill" :style="{ width: progressPercentage + '%' }"></view>
+      </view>
+      <view class="progress-stats">
+        <view class="stat-item">
+          <text class="stat-number">{{ completedCount }}</text>
+          <text class="stat-label">已完成</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-number">{{ inProgressCount }}</text>
+          <text class="stat-label">进行中</text>
+        </view>
+        <view class="stat-item">
+          <text class="stat-number">{{ streakDays }}</text>
+          <text class="stat-label">连续天数</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 目标分类 -->
+    <view class="category-tabs">
+      <view 
+        v-for="(tab, index) in categoryTabs" 
+        :key="index"
+        class="tab-item"
+        :class="{ active: activeTab === tab.id }"
+        @click="switchTab(tab.id)"
+      >
+        <text class="tab-text">{{ tab.name }}</text>
+        <text class="tab-count">({{ tab.count }})</text>
+      </view>
+    </view>
+
+    <!-- 目标列表 -->
+    <view class="goal-list">
+      <view 
+        v-for="(goal, index) in filteredGoals" 
+        :key="goal.id"
+        class="goal-item"
+        @click="viewGoal(goal)"
+      >
+        <view class="goal-header">
+          <view class="goal-icon">
+            <u-icon :name="goal.icon" size="24" :color="goal.color"></u-icon>
+          </view>
+          <view class="goal-info">
+            <text class="goal-name">{{ goal.name }}</text>
+            <text class="goal-desc">{{ goal.description }}</text>
+          </view>
+          <view class="goal-status" :class="goal.status">
+            <text class="status-text">{{ getStatusText(goal.status) }}</text>
+          </view>
+        </view>
+        
+        <view class="goal-progress">
+          <view class="progress-info">
+            <text class="progress-text">进度: {{ goal.completedCount }}/{{ goal.totalCount }}</text>
+            <text class="progress-percentage">{{ Math.round((goal.completedCount / goal.totalCount) * 100) }}%</text>
+          </view>
+          <view class="progress-bar-mini">
+            <view 
+              class="progress-fill-mini" 
+              :style="{ width: (goal.completedCount / goal.totalCount) * 100 + '%' }"
+            ></view>
+          </view>
+        </view>
+        
+        <view class="goal-footer">
+          <view class="goal-tags">
+            <view 
+              v-for="(tag, tagIndex) in goal.tags" 
+              :key="tagIndex"
+              class="goal-tag"
+            >
+              <text class="tag-text">{{ tag }}</text>
+            </view>
+          </view>
+          <view class="goal-actions">
+            <view 
+              v-if="goal.status === 'in-progress'"
+              class="checkin-btn"
+              @click.stop="checkinGoal(goal)"
+            >
+              <u-icon name="checkmark" size="16" color="#fff"></u-icon>
+              <text class="checkin-text">打卡</text>
+            </view>
+            <view 
+              v-else-if="goal.status === 'completed'"
+              class="completed-badge"
+            >
+              <u-icon name="checkmark-circle" size="20" color="#52c41a"></u-icon>
+              <text class="completed-text">已完成</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view v-if="filteredGoals.length === 0" class="empty-state">
+      <u-empty
+        icon="target"
+        text="还没有打卡目标"
+        mode="data"
+      ></u-empty>
+      <view class="empty-action">
+        <u-button 
+          type="primary" 
+          text="创建第一个目标" 
+          @click="createGoal"
+        ></u-button>
+      </view>
+    </view>
+
+    <!-- 悬浮添加按钮 -->
+    <view class="fab-button" @click="createGoal">
+      <u-icon name="plus" size="24" color="#fff"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+// 响应式数据
+const activeTab = ref('all')
+
+const categoryTabs = ref([
+  { id: 'all', name: '全部', count: 0 },
+  { id: 'daily', name: '日常', count: 0 },
+  { id: 'weekly', name: '每周', count: 0 },
+  { id: 'monthly', name: '每月', count: 0 },
+  { id: 'special', name: '特殊', count: 0 }
+])
+
+const goals = ref([
+  {
+    id: 1,
+    name: '一起做饭',
+    description: '每天一起做一顿饭，增进感情',
+    icon: 'home',
+    color: '#FF6B9D',
+    status: 'in-progress',
+    category: 'daily',
+    totalCount: 30,
+    completedCount: 15,
+    tags: ['日常', '做饭', '感情'],
+    createTime: '2025-01-01',
+    deadline: '2025-02-01'
+  },
+  {
+    id: 2,
+    name: '一起运动',
+    description: '每周一起运动3次，保持健康',
+    icon: 'heart',
+    color: '#52c41a',
+    status: 'in-progress',
+    category: 'weekly',
+    totalCount: 12,
+    completedCount: 8,
+    tags: ['运动', '健康', '每周'],
+    createTime: '2025-01-01',
+    deadline: '2025-04-01'
+  },
+  {
+    id: 3,
+    name: '一起旅行',
+    description: '每月一起去一个新地方',
+    icon: 'map',
+    color: '#1890ff',
+    status: 'completed',
+    category: 'monthly',
+    totalCount: 3,
+    completedCount: 3,
+    tags: ['旅行', '探索', '每月'],
+    createTime: '2025-01-01',
+    deadline: '2025-04-01'
+  },
+  {
+    id: 4,
+    name: '一起学习',
+    description: '一起学习新技能，共同成长',
+    icon: 'book',
+    color: '#722ed1',
+    status: 'in-progress',
+    category: 'special',
+    totalCount: 20,
+    completedCount: 12,
+    tags: ['学习', '成长', '技能'],
+    createTime: '2025-01-01',
+    deadline: '2025-06-01'
+  }
+])
+
+// 计算属性
+const totalCount = computed(() => goals.value.length)
+
+const completedCount = computed(() => 
+  goals.value.filter(goal => goal.status === 'completed').length
+)
+
+const inProgressCount = computed(() => 
+  goals.value.filter(goal => goal.status === 'in-progress').length
+)
+
+const streakDays = computed(() => {
+  // 这里可以计算连续打卡天数
+  return 7
+})
+
+const progressPercentage = computed(() => {
+  if (totalCount.value === 0) return 0
+  return Math.round((completedCount.value / totalCount.value) * 100)
+})
+
+const filteredGoals = computed(() => {
+  if (activeTab.value === 'all') {
+    return goals.value
+  }
+  return goals.value.filter(goal => goal.category === activeTab.value)
+})
+
+// 方法
+const switchTab = (tabId) => {
+  activeTab.value = tabId
+}
+
+const getStatusText = (status) => {
+  const statusMap = {
+    'in-progress': '进行中',
+    'completed': '已完成',
+    'paused': '已暂停'
+  }
+  return statusMap[status] || '未知'
+}
+
+const viewGoal = (goal) => {
+  uni.navigateTo({
+    url: `/pages/checkin/detail?id=${goal.id}`
+  })
+}
+
+const createGoal = () => {
+  uni.navigateTo({
+    url: '/pages/checkin/create'
+  })
+}
+
+const checkinGoal = (goal) => {
+  if (goal.completedCount < goal.totalCount) {
+    goal.completedCount++
+    
+    // 检查是否完成
+    if (goal.completedCount >= goal.totalCount) {
+      goal.status = 'completed'
+      uni.showToast({
+        title: '恭喜完成目标！',
+        icon: 'success'
+      })
+    } else {
+      uni.showToast({
+        title: '打卡成功！',
+        icon: 'success'
+      })
+    }
+  }
+}
+
+// 初始化分类数量
+const initCategoryCounts = () => {
+  categoryTabs.value.forEach(tab => {
+    if (tab.id === 'all') {
+      tab.count = goals.value.length
+    } else {
+      tab.count = goals.value.filter(goal => goal.category === tab.id).length
+    }
+  })
+}
+
+// 生命周期
+onMounted(() => {
+  initCategoryCounts()
+})
+</script>
+
+<style lang="scss" scoped>
+.checkin-container {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 120rpx;
+}
+
+.progress-overview {
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  padding: 40rpx 30rpx;
+  color: #fff;
+  
+  .progress-header {
+    text-align: center;
+    margin-bottom: 30rpx;
+    
+    .progress-title {
+      display: block;
+      font-size: 36rpx;
+      font-weight: bold;
+      margin-bottom: 10rpx;
+    }
+    
+    .progress-subtitle {
+      font-size: 28rpx;
+      opacity: 0.9;
+    }
+  }
+  
+  .progress-bar {
+    width: 100%;
+    height: 12rpx;
+    background: rgba(255, 255, 255, 0.3);
+    border-radius: 6rpx;
+    overflow: hidden;
+    margin-bottom: 30rpx;
+    
+    .progress-fill {
+      height: 100%;
+      background: #fff;
+      border-radius: 6rpx;
+      transition: width 0.3s ease;
+    }
+  }
+  
+  .progress-stats {
+    display: flex;
+    justify-content: space-around;
+    
+    .stat-item {
+      text-align: center;
+      
+      .stat-number {
+        display: block;
+        font-size: 40rpx;
+        font-weight: bold;
+        margin-bottom: 8rpx;
+      }
+      
+      .stat-label {
+        font-size: 24rpx;
+        opacity: 0.9;
+      }
+    }
+  }
+}
+
+.category-tabs {
+  background: #fff;
+  padding: 20rpx 0;
+  margin-bottom: 20rpx;
+  
+  .tab-item {
+    display: inline-block;
+    padding: 16rpx 32rpx;
+    margin: 0 15rpx;
+    border-radius: 25rpx;
+    transition: all 0.3s;
+    
+    .tab-text {
+      font-size: 28rpx;
+      color: #666;
+    }
+    
+    .tab-count {
+      font-size: 24rpx;
+      color: #999;
+      margin-left: 5rpx;
+    }
+    
+    &.active {
+      background: #FF6B9D;
+      
+      .tab-text,
+      .tab-count {
+        color: #fff;
+      }
+    }
+  }
+}
+
+.goal-list {
+  padding: 0 30rpx;
+  
+  .goal-item {
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+    
+    .goal-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20rpx;
+      
+      .goal-icon {
+        width: 60rpx;
+        height: 60rpx;
+        background: #f8f8f8;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 20rpx;
+      }
+      
+      .goal-info {
+        flex: 1;
+        
+        .goal-name {
+          display: block;
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+          margin-bottom: 8rpx;
+        }
+        
+        .goal-desc {
+          font-size: 26rpx;
+          color: #999;
+          line-height: 1.4;
+        }
+      }
+      
+      .goal-status {
+        padding: 8rpx 16rpx;
+        border-radius: 20rpx;
+        font-size: 22rpx;
+        
+        &.in-progress {
+          background: #e6f7ff;
+          color: #1890ff;
+        }
+        
+        &.completed {
+          background: #f6ffed;
+          color: #52c41a;
+        }
+        
+        &.paused {
+          background: #fff7e6;
+          color: #fa8c16;
+        }
+      }
+    }
+    
+    .goal-progress {
+      margin-bottom: 20rpx;
+      
+      .progress-info {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 15rpx;
+        
+        .progress-text {
+          font-size: 26rpx;
+          color: #666;
+        }
+        
+        .progress-percentage {
+          font-size: 26rpx;
+          color: #FF6B9D;
+          font-weight: bold;
+        }
+      }
+      
+      .progress-bar-mini {
+        width: 100%;
+        height: 8rpx;
+        background: #f0f0f0;
+        border-radius: 4rpx;
+        overflow: hidden;
+        
+        .progress-fill-mini {
+          height: 100%;
+          background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+          border-radius: 4rpx;
+          transition: width 0.3s ease;
+        }
+      }
+    }
+    
+    .goal-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      
+      .goal-tags {
+        display: flex;
+        gap: 15rpx;
+        
+        .goal-tag {
+          background: #f8f8f8;
+          padding: 8rpx 16rpx;
+          border-radius: 20rpx;
+          
+          .tag-text {
+            font-size: 22rpx;
+            color: #666;
+          }
+        }
+      }
+      
+      .goal-actions {
+        .checkin-btn {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+          background: #FF6B9D;
+          color: #fff;
+          padding: 12rpx 24rpx;
+          border-radius: 25rpx;
+          font-size: 24rpx;
+          
+          .checkin-text {
+            color: #fff;
+          }
+        }
+        
+        .completed-badge {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+          
+          .completed-text {
+            font-size: 24rpx;
+            color: #52c41a;
+          }
+        }
+      }
+    }
+  }
+}
+
+.empty-state {
+  padding: 100rpx 0;
+  text-align: center;
+  
+  .empty-action {
+    margin-top: 40rpx;
+  }
+}
+
+.fab-button {
+  position: fixed;
+  right: 40rpx;
+  bottom: 120rpx;
+  width: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 8rpx 30rpx rgba(255, 107, 157, 0.3);
+  z-index: 999;
+  
+  &:active {
+    transform: scale(0.9);
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/components/components.vue b/src/pages/components/components.vue
deleted file mode 100644
index 89f3590..0000000
--- a/src/pages/components/components.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <custom-page>
-    <custom-head title-text="组件"></custom-head>
-    <!--   使用scroll-page 组件的话,需要加上content-container才能让里面的元素继承外部的高度-->
-    <scroll-page class="content-container">
-      <view class="list-item" v-for="item in list" :key="item.name" @tap="item.callback">
-        <view>{{ item.name }}</view>
-        <up-icon name="arrow-right"></up-icon>
-      </view>
-    </scroll-page>
-    <cu-tabbar></cu-tabbar>
-  </custom-page>
-
-  <city-picker :visible="cityPickerVisible" @cancel="cityPickerVisible = false"></city-picker>
-</template>
-<script setup>
-const cityPickerVisible = ref(false)
-
-const list = ref([
-  {
-    name: '省市区选择',
-    callback() {
-      cityPickerVisible.value = true
-    }
-  },
-  {
-    name: '图片视频上传',
-    callback() {
-      uni.navigateTo({
-        url: '/pages/uploadDemo/uploadDemo'
-      })
-    }
-  }
-])
-</script>
-
-<style lang="scss">
-.list-item {
-  height: 80rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 30rpx;
-  border-bottom: 1rpx solid #ddd;
-}
-</style>
diff --git a/src/pages/diary/diary.vue b/src/pages/diary/diary.vue
new file mode 100644
index 0000000..d59e4e1
--- /dev/null
+++ b/src/pages/diary/diary.vue
@@ -0,0 +1,457 @@
+<template>
+  <view class="diary-container">
+    <!-- 头部统计 -->
+    <view class="header-stats">
+      <view class="stats-item">
+        <text class="stats-number">{{ totalDiaries }}</text>
+        <text class="stats-label">总日志</text>
+      </view>
+      <view class="stats-divider"></view>
+      <view class="stats-item">
+        <text class="stats-number">{{ thisMonthDiaries }}</text>
+        <text class="stats-label">本月</text>
+      </view>
+      <view class="stats-divider"></view>
+      <view class="stats-item">
+        <text class="stats-number">{{ todayDiaries }}</text>
+        <text class="stats-label">今天</text>
+      </view>
+    </view>
+
+    <!-- 日志列表 -->
+    <view class="diary-list">
+      <view 
+        v-for="(diary, index) in diaryList" 
+        :key="diary.id"
+        class="diary-item"
+        @click="viewDiary(diary)"
+      >
+        <view class="diary-header">
+          <view class="diary-avatar">
+            <u-avatar :src="diary.author.avatar" size="40" shape="circle"></u-avatar>
+          </view>
+          <view class="diary-info">
+            <text class="diary-author">{{ diary.author.name }}</text>
+            <text class="diary-time">{{ formatTime(diary.createTime) }}</text>
+          </view>
+          <view class="diary-mood">
+            <u-icon :name="getMoodIcon(diary.mood)" size="20" :color="getMoodColor(diary.mood)"></u-icon>
+          </view>
+        </view>
+        
+        <view class="diary-content">
+          <text class="diary-title">{{ diary.title }}</text>
+          <text class="diary-text">{{ diary.content }}</text>
+        </view>
+        
+        <view v-if="diary.images && diary.images.length > 0" class="diary-images">
+          <view 
+            v-for="(image, imgIndex) in diary.images.slice(0, 3)" 
+            :key="imgIndex"
+            class="diary-image"
+          >
+            <u-image
+              :src="image"
+              width="120rpx"
+              height="120rpx"
+              radius="8rpx"
+              mode="aspectFill"
+            ></u-image>
+          </view>
+          <view v-if="diary.images.length > 3" class="more-images">
+            <text class="more-text">+{{ diary.images.length - 3 }}</text>
+          </view>
+        </view>
+        
+        <view class="diary-footer">
+          <view class="diary-tags">
+            <view 
+              v-for="(tag, tagIndex) in diary.tags" 
+              :key="tagIndex"
+              class="diary-tag"
+            >
+              <text class="tag-text">{{ tag }}</text>
+            </view>
+          </view>
+          <view class="diary-actions">
+            <view class="action-item" @click.stop="likeDiary(diary)">
+              <u-icon 
+                :name="diary.isLiked ? 'heart-fill' : 'heart'" 
+                size="16" 
+                :color="diary.isLiked ? '#FF6B9D' : '#999'"
+              ></u-icon>
+              <text class="action-text">{{ diary.likes }}</text>
+            </view>
+            <view class="action-item" @click.stop="commentDiary(diary)">
+              <u-icon name="chat" size="16" color="#999"></u-icon>
+              <text class="action-text">{{ diary.comments }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view v-if="diaryList.length === 0" class="empty-state">
+      <u-empty
+        icon="edit-pen"
+        text="还没有日志记录"
+        mode="data"
+      ></u-empty>
+      <view class="empty-action">
+        <u-button 
+          type="primary" 
+          text="写第一篇日志" 
+          @click="createDiary"
+        ></u-button>
+      </view>
+    </view>
+
+    <!-- 悬浮添加按钮 -->
+    <view class="fab-button" @click="createDiary">
+      <u-icon name="edit-pen" size="24" color="#fff"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+
+// 响应式数据
+const diaryList = ref([
+  {
+    id: 1,
+    title: '今天一起做饭很开心',
+    content: '今天和另一半一起做了红烧肉，虽然卖相一般，但是味道很棒！一起在厨房忙碌的感觉真的很温馨，希望以后能经常这样。',
+    author: {
+      name: '小美',
+      avatar: '/static/images/avatar1.jpg'
+    },
+    createTime: new Date('2025-01-15 18:30:00'),
+    mood: 'happy',
+    images: [
+      '/static/images/diary1.jpg',
+      '/static/images/diary2.jpg'
+    ],
+    tags: ['做饭', '温馨', '美食'],
+    likes: 12,
+    comments: 3,
+    isLiked: false
+  },
+  {
+    id: 2,
+    title: '周末约会记录',
+    content: '周末去了新开的咖啡店，环境很好，咖啡也很香。最重要的是和喜欢的人在一起，做什么都开心。',
+    author: {
+      name: '小明',
+      avatar: '/static/images/avatar2.jpg'
+    },
+    createTime: new Date('2025-01-14 15:20:00'),
+    mood: 'excited',
+    images: [
+      '/static/images/diary3.jpg'
+    ],
+    tags: ['约会', '咖啡', '周末'],
+    likes: 8,
+    comments: 2,
+    isLiked: true
+  }
+])
+
+// 计算属性
+const totalDiaries = computed(() => diaryList.value.length)
+
+const thisMonthDiaries = computed(() => {
+  const now = new Date()
+  const thisMonth = now.getMonth()
+  const thisYear = now.getFullYear()
+  
+  return diaryList.value.filter(diary => {
+    const diaryDate = new Date(diary.createTime)
+    return diaryDate.getMonth() === thisMonth && diaryDate.getFullYear() === thisYear
+  }).length
+})
+
+const todayDiaries = computed(() => {
+  const now = new Date()
+  const today = now.toDateString()
+  
+  return diaryList.value.filter(diary => {
+    const diaryDate = new Date(diary.createTime)
+    return diaryDate.toDateString() === today
+  }).length
+})
+
+// 方法
+const formatTime = (time) => {
+  const now = new Date()
+  const diaryTime = new Date(time)
+  const diffTime = now - diaryTime
+  const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24))
+  
+  if (diffDays === 0) {
+    return '今天'
+  } else if (diffDays === 1) {
+    return '昨天'
+  } else if (diffDays < 7) {
+    return `${diffDays}天前`
+  } else {
+    return diaryTime.toLocaleDateString()
+  }
+}
+
+const getMoodIcon = (mood) => {
+  const moodIcons = {
+    happy: 'smile',
+    excited: 'star',
+    sad: 'sad',
+    angry: 'close',
+    normal: 'heart'
+  }
+  return moodIcons[mood] || 'heart'
+}
+
+const getMoodColor = (mood) => {
+  const moodColors = {
+    happy: '#FFD700',
+    excited: '#FF6B9D',
+    sad: '#87CEEB',
+    angry: '#FF6347',
+    normal: '#FF6B9D'
+  }
+  return moodColors[mood] || '#FF6B9D'
+}
+
+const viewDiary = (diary) => {
+  uni.navigateTo({
+    url: `/pages/diary/detail?id=${diary.id}`
+  })
+}
+
+const createDiary = () => {
+  uni.navigateTo({
+    url: '/pages/diary/create'
+  })
+}
+
+const likeDiary = (diary) => {
+  diary.isLiked = !diary.isLiked
+  if (diary.isLiked) {
+    diary.likes++
+  } else {
+    diary.likes--
+  }
+}
+
+const commentDiary = (diary) => {
+  uni.showToast({
+    title: '评论功能开发中',
+    icon: 'none'
+  })
+}
+
+// 生命周期
+onMounted(() => {
+  // 可以在这里加载数据
+})
+</script>
+
+<style lang="scss" scoped>
+.diary-container {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 120rpx;
+}
+
+.header-stats {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  background: #fff;
+  padding: 40rpx 30rpx;
+  margin-bottom: 20rpx;
+  
+  .stats-item {
+    text-align: center;
+    
+    .stats-number {
+      display: block;
+      font-size: 48rpx;
+      font-weight: bold;
+      color: #FF6B9D;
+      margin-bottom: 10rpx;
+    }
+    
+    .stats-label {
+      font-size: 24rpx;
+      color: #999;
+    }
+  }
+  
+  .stats-divider {
+    width: 2rpx;
+    height: 60rpx;
+    background: #f0f0f0;
+  }
+}
+
+.diary-list {
+  padding: 0 30rpx;
+  
+  .diary-item {
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+    
+    .diary-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20rpx;
+      
+      .diary-avatar {
+        margin-right: 20rpx;
+      }
+      
+      .diary-info {
+        flex: 1;
+        
+        .diary-author {
+          display: block;
+          font-size: 28rpx;
+          font-weight: bold;
+          color: #333;
+          margin-bottom: 5rpx;
+        }
+        
+        .diary-time {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+      
+      .diary-mood {
+        width: 40rpx;
+        height: 40rpx;
+        background: #f8f8f8;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+    
+    .diary-content {
+      margin-bottom: 20rpx;
+      
+      .diary-title {
+        display: block;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 15rpx;
+        line-height: 1.4;
+      }
+      
+      .diary-text {
+        display: block;
+        font-size: 28rpx;
+        color: #666;
+        line-height: 1.6;
+      }
+    }
+    
+    .diary-images {
+      display: flex;
+      gap: 15rpx;
+      margin-bottom: 20rpx;
+      
+      .diary-image {
+        position: relative;
+      }
+      
+      .more-images {
+        width: 120rpx;
+        height: 120rpx;
+        background: rgba(0, 0, 0, 0.5);
+        border-radius: 8rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+        .more-text {
+          color: #fff;
+          font-size: 24rpx;
+        }
+      }
+    }
+    
+    .diary-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      
+      .diary-tags {
+        display: flex;
+        gap: 15rpx;
+        
+        .diary-tag {
+          background: #f8f8f8;
+          padding: 8rpx 16rpx;
+          border-radius: 20rpx;
+          
+          .tag-text {
+            font-size: 22rpx;
+            color: #666;
+          }
+        }
+      }
+      
+      .diary-actions {
+        display: flex;
+        gap: 30rpx;
+        
+        .action-item {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+          
+          .action-text {
+            font-size: 24rpx;
+            color: #999;
+          }
+        }
+      }
+    }
+  }
+}
+
+.empty-state {
+  padding: 100rpx 0;
+  text-align: center;
+  
+  .empty-action {
+    margin-top: 40rpx;
+  }
+}
+
+.fab-button {
+  position: fixed;
+  right: 40rpx;
+  bottom: 120rpx;
+  width: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 8rpx 30rpx rgba(255, 107, 157, 0.3);
+  z-index: 999;
+  
+  &:active {
+    transform: scale(0.9);
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/functions/functions.vue b/src/pages/functions/functions.vue
deleted file mode 100644
index ab2d20c..0000000
--- a/src/pages/functions/functions.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <custom-page>
-    <custom-head title-text="功能"></custom-head>
-    <!--   使用scroll-page 组件的话,需要加上content-container才能让里面的元素继承外部的高度-->
-    <scroll-page class="content-container">
-      <div>
-        <up-radio-group v-model="themeValue" placement="column" @change="groupChange">
-          <up-radio
-            :customStyle="{ marginBottom: '8px' }"
-            v-for="(item, index) in themeList"
-            :key="index"
-            :label="item.label"
-            :name="item.name"
-          ></up-radio>
-        </up-radio-group>
-      </div>
-
-      <div class="demo-btn">皮肤测试</div>
-    </scroll-page>
-
-    <cu-tabbar></cu-tabbar>
-  </custom-page>
-</template>
-<script setup>
-import { useSystemStore } from '@/store/system.js'
-
-const systemStore = useSystemStore()
-const themeList = ref([
-  {
-    name: 'default-theme',
-    label: '默认主题'
-  },
-  {
-    name: 'red-theme',
-    label: '红色主题'
-  }
-])
-
-const themeValue = ref('default-theme')
-
-const groupChange = name => {
-  systemStore.setThemeName(name)
-}
-</script>
-
-<style lang="scss">
-.demo-btn {
-  background: var(--color-primary);
-}
-</style>
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index ce8975a..4482726 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -1,15 +1,450 @@
 <template>
-  <custom-page>
-    <custom-head title-text="演示界面"></custom-head>
-    <!--   使用scroll-page 组件的话,需要加上content-container才能让里面的元素继承外部的高度-->
-    <scroll-page class="content-container">
-      <div class="h-[3000rpx]">自适应的内容滚动区域,兼容IOS下不显示滚动条</div>
-    </scroll-page>
-    <view class="bg-red-500 h-[200rpx]">占位盒子</view>
+  <view class="home-container">
+    <!-- 自定义头部 -->
+    <view class="custom-header">
+      <view class="status-bar"></view>
+      <view class="header-content">
+        <view class="header-title">情侣菜谱</view>
+        <view class="header-actions">
+          <u-icon name="more-dot-fill" size="20" color="#fff"></u-icon>
+        </view>
+      </view>
+    </view>
 
-    <cu-tabbar></cu-tabbar>
-  </custom-page>
+    <!-- 主要内容区域 -->
+    <view class="main-content">
+      <!-- 情侣头像和恋爱天数 -->
+      <view class="couple-info">
+        <view class="avatar-section">
+          <view class="avatar left-avatar">
+            <u-avatar 
+              :src="userInfo.avatar" 
+              size="60" 
+              shape="circle"
+              :key="userInfo.avatar"
+            ></u-avatar>
+          </view>
+          <view class="heart-icon">
+            <u-icon name="heart-fill" size="24" color="#FF6B9D"></u-icon>
+          </view>
+          <view class="avatar right-avatar">
+            <u-avatar :src="partnerInfo.avatar" size="60" shape="circle"></u-avatar>
+            <view v-if="!partnerInfo.avatar" class="add-partner">
+              <u-icon name="plus" size="24" color="#FF6B9D"></u-icon>
+            </view>
+          </view>
+        </view>
+        
+        <view class="relationship-info">
+          <text class="relationship-text">我们在一起已经</text>
+          <view class="days-count">
+            <text class="days-number">{{ loveDays }}</text>
+            <text class="days-unit">天</text>
+          </view>
+          <text class="start-date">{{ startDate }}</text>
+        </view>
+      </view>
+
+      <!-- 快捷功能卡片 -->
+      <view class="feature-cards">
+        <view class="feature-card diary-card" @click="goToDiary">
+          <view class="card-content">
+            <text class="card-title">写日志</text>
+            <u-icon name="edit-pen" size="32" color="#fff"></u-icon>
+          </view>
+        </view>
+        <view class="feature-card order-card" @click="goToOrder">
+          <view class="card-content">
+            <text class="card-title">点餐下单</text>
+            <u-icon name="shopping-cart" size="32" color="#fff"></u-icon>
+          </view>
+        </view>
+      </view>
+
+      <!-- 纪念日列表 -->
+      <view class="anniversary-section">
+        <view class="section-header">
+          <text class="section-title">重要纪念日</text>
+          <view class="add-anniversary" @click="addAnniversary">
+            <u-icon name="plus" size="20" color="#FF6B9D"></u-icon>
+          </view>
+        </view>
+        
+        <view class="anniversary-list">
+          <view 
+            v-for="(item, index) in anniversaryList" 
+            :key="index" 
+            class="anniversary-item"
+            @click="viewAnniversary(item)"
+          >
+            <view class="anniversary-icon">
+              <u-icon :name="item.icon" size="24" color="#FF6B9D"></u-icon>
+            </view>
+            <view class="anniversary-info">
+              <text class="anniversary-name">{{ item.name }}</text>
+              <text class="anniversary-date">{{ item.date }}</text>
+            </view>
+            <view class="anniversary-countdown">
+              <text class="countdown-text">{{ item.countdown }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
-<script setup></script>
 
-<style lang="scss"></style>
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import { useUserStore } from '@/store/user.js'
+
+const userStore = useUserStore()
+
+// 响应式数据
+const userInfo = ref({
+  avatar: ''
+})
+
+const partnerInfo = ref({
+  avatar: ''
+})
+
+const startDate = ref('2025/01/01')
+const loveDays = ref(0)
+
+const anniversaryList = ref([
+  {
+    id: 1,
+    name: '恋爱纪念日',
+    date: '2025/01/01',
+    countdown: '还有 30 天',
+    icon: 'heart-fill'
+  },
+  {
+    id: 2,
+    name: '生日',
+    date: '2025/03/15',
+    countdown: '还有 45 天',
+    icon: 'gift-fill'
+  }
+])
+
+// 计算属性
+const computedLoveDays = computed(() => {
+  // 这里可以根据实际的开始日期计算
+  return loveDays.value
+})
+
+// 方法
+const invitePartner = () => {
+  uni.showToast({
+    title: '邀请功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToDiary = () => {
+  uni.switchTab({
+    url: '/pages/diary/diary'
+  })
+}
+
+const goToOrder = () => {
+  uni.switchTab({
+    url: '/pages/order/order'
+  })
+}
+
+const addAnniversary = () => {
+  uni.showToast({
+    title: '添加纪念日功能开发中',
+    icon: 'none'
+  })
+  // TODO: 跳转到添加纪念日页面
+  // uni.navigateTo({
+  //   url: '/pages/anniversary/create'
+  // })
+}
+
+const viewAnniversary = (item) => {
+  uni.showToast({
+    title: `查看${item.name}`,
+    icon: 'none'
+  })
+  // TODO: 跳转到纪念日详情页面
+  // uni.navigateTo({
+  //   url: `/pages/anniversary/detail?id=${item.id}`
+  // })
+}
+
+
+
+// 获取用户信息
+const getUserInfo = () => {
+  try {
+    // 从缓存获取用户信息
+    const cachedUser = uni.getStorageSync('userInfo')
+   
+    if (cachedUser) {
+      userInfo.value = {
+        avatar: cachedUser.avatar,
+        nickname: cachedUser.nick_name || cachedUser.nickname || '用户'
+      }
+
+      console.log(userInfo.value)
+    } else {
+      // 如果没有userInfo缓存，尝试从user缓存获取
+      const fallbackUser = uni.getStorageSync('user')
+      if (fallbackUser && fallbackUser.userInfo) {
+        userInfo.value = {
+          avatar: fallbackUser.userInfo.avatar,
+          nickname: fallbackUser.userInfo.nickname || '用户'
+        }
+      }
+    }
+
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
+}
+
+// 生命周期
+onMounted(() => {
+  // 获取用户信息
+  getUserInfo()
+  
+  // 计算恋爱天数
+  const start = new Date('2025-01-01')
+  const today = new Date()
+  const diffTime = Math.abs(today - start)
+  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+  loveDays.value = diffDays
+})
+</script>
+
+<style lang="scss" scoped>
+.home-container {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #FFE4E1 0%, #FFB6C1 50%, #E6E6FA 100%);
+}
+
+.custom-header {
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  padding: 0 20rpx;
+  
+  .status-bar {
+    height: var(--status-bar-height);
+  }
+  
+  .header-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20rpx 0;
+    
+    .header-title {
+      color: #fff;
+      font-size: 36rpx;
+      font-weight: bold;
+    }
+    
+    .header-actions {
+      display: flex;
+      gap: 20rpx;
+    }
+  }
+}
+
+.main-content {
+  padding: 40rpx 30rpx;
+}
+
+.couple-info {
+  text-align: center;
+  margin-bottom: 60rpx;
+  
+  .avatar-section {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 30rpx;
+    
+    .avatar {
+      position: relative;
+      
+      .add-partner {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        background: rgba(255, 255, 255, 0.8);
+        border-radius: 50%;
+        width: 40rpx;
+        height: 40rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+    
+    .heart-icon {
+      margin: 0 30rpx;
+      animation: heartbeat 1.5s ease-in-out infinite;
+    }
+  }
+  
+  .relationship-info {
+    margin-bottom: 30rpx;
+    
+    .relationship-text {
+      display: block;
+      color: #666;
+      font-size: 28rpx;
+      margin-bottom: 20rpx;
+    }
+    
+    .days-count {
+      margin-bottom: 20rpx;
+      
+      .days-number {
+        font-size: 80rpx;
+        font-weight: bold;
+        color: #FF6B9D;
+      }
+      
+      .days-unit {
+        font-size: 32rpx;
+        color: #FF6B9D;
+        margin-left: 10rpx;
+      }
+    }
+    
+    .start-date {
+      color: #999;
+      font-size: 24rpx;
+    }
+  }
+  
+  .invite-button {
+    display: inline-flex;
+    align-items: center;
+    gap: 10rpx;
+    background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+    color: #fff;
+    padding: 20rpx 40rpx;
+    border-radius: 50rpx;
+    font-size: 28rpx;
+    
+    .invite-text {
+      color: #fff;
+    }
+  }
+}
+
+.feature-cards {
+  display: flex;
+  gap: 30rpx;
+  margin-bottom: 60rpx;
+  
+  .feature-card {
+    flex: 1;
+    height: 160rpx;
+    border-radius: 20rpx;
+    overflow: hidden;
+    
+    .card-content {
+      height: 100%;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 30rpx;
+      
+      .card-title {
+        color: #fff;
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+    }
+    
+    &.diary-card {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    }
+    
+    &.order-card {
+      background: linear-gradient(135deg, #4CAF50 0%, #45a049 100%);
+    }
+  }
+}
+
+.anniversary-section {
+  .section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 30rpx;
+    
+    .section-title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333;
+    }
+    
+    .add-anniversary {
+      width: 60rpx;
+      height: 60rpx;
+      background: #fff;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
+    }
+  }
+  
+  .anniversary-list {
+    .anniversary-item {
+      display: flex;
+      align-items: center;
+      background: #fff;
+      padding: 30rpx;
+      border-radius: 20rpx;
+      margin-bottom: 20rpx;
+      box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+      
+      .anniversary-icon {
+        margin-right: 30rpx;
+      }
+      
+      .anniversary-info {
+        flex: 1;
+        
+        .anniversary-name {
+          display: block;
+          font-size: 30rpx;
+          font-weight: bold;
+          color: #333;
+          margin-bottom: 10rpx;
+        }
+        
+        .anniversary-date {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+      
+      .anniversary-countdown {
+        .countdown-text {
+          color: #FF6B9D;
+          font-size: 26rpx;
+        }
+      }
+    }
+  }
+}
+
+@keyframes heartbeat {
+  0% { transform: scale(1); }
+  50% { transform: scale(1.1); }
+  100% { transform: scale(1); }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue
new file mode 100644
index 0000000..aff09b7
--- /dev/null
+++ b/src/pages/order/order.vue
@@ -0,0 +1,562 @@
+<template>
+  <view class="order-container">
+    <!-- 搜索栏 -->
+    <view class="search-section">
+      <view class="search-box">
+        <u-search
+          v-model="searchKeyword"
+          placeholder="搜索菜品名称"
+          :show-action="false"
+          @search="onSearch"
+          @custom="onSearch"
+        ></u-search>
+      </view>
+    </view>
+
+    <!-- 分类标签 -->
+    <view class="category-section">
+      <scroll-view scroll-x class="category-scroll">
+        <view class="category-list">
+          <view 
+            v-for="(category, index) in categories" 
+            :key="index"
+            class="category-item"
+            :class="{ active: selectedCategory === category.id }"
+            @click="selectCategory(category.id)"
+          >
+            <text class="category-name">{{ category.name }}</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 菜品列表 -->
+    <view class="dish-list">
+      <view 
+        v-for="(dish, index) in filteredDishes" 
+        :key="dish.id"
+        class="dish-item"
+      >
+        <view class="dish-image">
+          <u-image
+            :src="dish.image"
+            width="120rpx"
+            height="120rpx"
+            radius="12rpx"
+            mode="aspectFill"
+          ></u-image>
+        </view>
+        <view class="dish-info">
+          <text class="dish-name">{{ dish.name }}</text>
+          <text class="dish-desc">{{ dish.description }}</text>
+          <view class="dish-meta">
+            <view class="meta-item">
+              <u-icon name="clock" size="14" color="#999"></u-icon>
+              <text class="meta-text">{{ dish.cookTime }}分钟</text>
+            </view>
+            <view class="meta-item">
+              <u-icon name="star" size="14" color="#FFD700"></u-icon>
+              <text class="meta-text">{{ dish.difficulty }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="dish-actions">
+          <view class="price-section">
+            <text class="price">¥{{ dish.price }}</text>
+            <text class="unit">/份</text>
+          </view>
+          <view class="quantity-control">
+            <view 
+              v-if="getCartQuantity(dish.id) > 0"
+              class="quantity-btn minus"
+              @click="decreaseQuantity(dish)"
+            >
+              <u-icon name="minus" size="16" color="#FF6B9D"></u-icon>
+            </view>
+            <text v-if="getCartQuantity(dish.id) > 0" class="quantity-text">
+              {{ getCartQuantity(dish.id) }}
+            </text>
+            <view class="quantity-btn plus" @click="addToCart(dish)">
+              <u-icon name="plus" size="16" color="#fff"></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view v-if="filteredDishes.length === 0" class="empty-state">
+      <u-empty
+        icon="search"
+        text="暂无相关菜品"
+        mode="data"
+      ></u-empty>
+    </view>
+
+    <!-- 购物车 -->
+    <view v-if="cartItems.length > 0" class="cart-section">
+      <view class="cart-header">
+        <view class="cart-info">
+          <u-icon name="shopping-cart" size="24" color="#FF6B9D"></u-icon>
+          <text class="cart-title">购物车</text>
+          <text class="cart-count">({{ totalQuantity }})</text>
+        </view>
+        <view class="cart-total">
+          <text class="total-label">总计:</text>
+          <text class="total-price">¥{{ totalPrice }}</text>
+        </view>
+      </view>
+      <view class="cart-actions">
+        <view class="clear-cart" @click="clearCart">
+          <u-icon name="trash" size="20" color="#999"></u-icon>
+          <text class="clear-text">清空</text>
+        </view>
+        <view class="checkout-btn" @click="checkout">
+          <text class="checkout-text">去下单</text>
+          <u-icon name="arrow-right" size="16" color="#fff"></u-icon>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+
+// 响应式数据
+const searchKeyword = ref('')
+const selectedCategory = ref('all')
+const cartItems = ref([])
+
+const categories = ref([
+  { id: 'all', name: '全部' },
+  { id: 'chinese', name: '中餐' },
+  { id: 'western', name: '西餐' },
+  { id: 'dessert', name: '甜点' },
+  { id: 'drink', name: '饮品' },
+  { id: 'snack', name: '小吃' }
+])
+
+const dishes = ref([
+  {
+    id: 1,
+    name: '红烧肉',
+    description: '经典美味的红烧肉，肥而不腻',
+    image: '/static/images/dish1.jpg',
+    category: 'chinese',
+    cookTime: 60,
+    difficulty: '中等',
+    price: 28,
+    ingredients: ['五花肉', '生抽', '老抽', '冰糖', '葱姜蒜']
+  },
+  {
+    id: 2,
+    name: '提拉米苏',
+    description: '意大利经典咖啡甜点',
+    image: '/static/images/dish2.jpg',
+    category: 'dessert',
+    cookTime: 30,
+    difficulty: '简单',
+    price: 18,
+    ingredients: ['手指饼干', '马斯卡彭奶酪', '咖啡', '鸡蛋', '糖']
+  },
+  {
+    id: 3,
+    name: '意式咖啡',
+    description: '浓郁香醇的意式浓缩咖啡',
+    image: '/static/images/dish3.jpg',
+    category: 'drink',
+    cookTime: 5,
+    difficulty: '简单',
+    price: 12,
+    ingredients: ['咖啡豆', '水']
+  },
+  {
+    id: 4,
+    name: '宫保鸡丁',
+    description: '川菜经典，麻辣鲜香',
+    image: '/static/images/dish4.jpg',
+    category: 'chinese',
+    cookTime: 25,
+    difficulty: '中等',
+    price: 22,
+    ingredients: ['鸡胸肉', '花生', '干辣椒', '葱姜蒜', '生抽']
+  }
+])
+
+// 计算属性
+const filteredDishes = computed(() => {
+  let filtered = dishes.value
+  
+  // 按分类筛选
+  if (selectedCategory.value !== 'all') {
+    filtered = filtered.filter(dish => dish.category === selectedCategory.value)
+  }
+  
+  // 按关键词搜索
+  if (searchKeyword.value) {
+    filtered = filtered.filter(dish => 
+      dish.name.includes(searchKeyword.value) || 
+      dish.description.includes(searchKeyword.value)
+    )
+  }
+  
+  return filtered
+})
+
+const totalQuantity = computed(() => {
+  return cartItems.value.reduce((total, item) => total + item.quantity, 0)
+})
+
+const totalPrice = computed(() => {
+  return cartItems.value.reduce((total, item) => total + (item.price * item.quantity), 0)
+})
+
+// 方法
+const onSearch = () => {
+  console.log('搜索关键词:', searchKeyword.value)
+}
+
+const selectCategory = (categoryId) => {
+  selectedCategory.value = categoryId
+}
+
+const getCartQuantity = (dishId) => {
+  const cartItem = cartItems.value.find(item => item.id === dishId)
+  return cartItem ? cartItem.quantity : 0
+}
+
+const addToCart = (dish) => {
+  const existingItem = cartItems.value.find(item => item.id === dish.id)
+  
+  if (existingItem) {
+    existingItem.quantity++
+  } else {
+    cartItems.value.push({
+      id: dish.id,
+      name: dish.name,
+      price: dish.price,
+      image: dish.image,
+      quantity: 1
+    })
+  }
+  
+  uni.showToast({
+    title: '已添加到购物车',
+    icon: 'success'
+  })
+}
+
+const decreaseQuantity = (dish) => {
+  const existingItem = cartItems.value.find(item => item.id === dish.id)
+  
+  if (existingItem) {
+    if (existingItem.quantity > 1) {
+      existingItem.quantity--
+    } else {
+      // 移除数量为0的商品
+      const index = cartItems.value.findIndex(item => item.id === dish.id)
+      cartItems.value.splice(index, 1)
+    }
+  }
+}
+
+const clearCart = () => {
+  uni.showModal({
+    title: '提示',
+    content: '确定要清空购物车吗？',
+    success: (res) => {
+      if (res.confirm) {
+        cartItems.value = []
+        uni.showToast({
+          title: '购物车已清空',
+          icon: 'success'
+        })
+      }
+    }
+  })
+}
+
+const checkout = () => {
+  if (cartItems.value.length === 0) {
+    uni.showToast({
+      title: '购物车为空',
+      icon: 'none'
+    })
+    return
+  }
+  
+  // 这里可以跳转到订单确认页面
+  uni.showToast({
+    title: '下单功能开发中',
+    icon: 'none'
+  })
+}
+
+// 生命周期
+onMounted(() => {
+  // 可以在这里加载数据
+})
+</script>
+
+<style lang="scss" scoped>
+.order-container {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 120rpx;
+}
+
+.search-section {
+  background: #fff;
+  padding: 20rpx 30rpx;
+  
+  .search-box {
+    background: #f8f8f8;
+    border-radius: 20rpx;
+    overflow: hidden;
+  }
+}
+
+.category-section {
+  background: #fff;
+  padding: 20rpx 0;
+  margin-bottom: 20rpx;
+  
+  .category-scroll {
+    white-space: nowrap;
+    
+    .category-list {
+      display: flex;
+      padding: 0 30rpx;
+      
+      .category-item {
+        display: inline-block;
+        padding: 16rpx 32rpx;
+        margin-right: 20rpx;
+        background: #f8f8f8;
+        border-radius: 25rpx;
+        transition: all 0.3s;
+        
+        .category-name {
+          font-size: 28rpx;
+          color: #666;
+        }
+        
+        &.active {
+          background: #FF6B9D;
+          
+          .category-name {
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+}
+
+.dish-list {
+  padding: 0 30rpx;
+  
+  .dish-item {
+    display: flex;
+    align-items: center;
+    background: #fff;
+    padding: 30rpx;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+    
+    .dish-image {
+      margin-right: 30rpx;
+    }
+    
+    .dish-info {
+      flex: 1;
+      
+      .dish-name {
+        display: block;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 10rpx;
+      }
+      
+      .dish-desc {
+        display: block;
+        font-size: 26rpx;
+        color: #999;
+        margin-bottom: 20rpx;
+        line-height: 1.4;
+      }
+      
+      .dish-meta {
+        display: flex;
+        gap: 30rpx;
+        
+        .meta-item {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+          
+          .meta-text {
+            font-size: 24rpx;
+            color: #999;
+          }
+        }
+      }
+    }
+    
+    .dish-actions {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+      gap: 20rpx;
+      
+      .price-section {
+        text-align: right;
+        
+        .price {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #FF6B9D;
+        }
+        
+        .unit {
+          font-size: 24rpx;
+          color: #999;
+        }
+      }
+      
+      .quantity-control {
+        display: flex;
+        align-items: center;
+        gap: 15rpx;
+        
+        .quantity-btn {
+          width: 50rpx;
+          height: 50rpx;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          transition: all 0.3s;
+          
+          &.minus {
+            background: #f8f8f8;
+            border: 2rpx solid #FF6B9D;
+          }
+          
+          &.plus {
+            background: #FF6B9D;
+          }
+          
+          &:active {
+            transform: scale(0.9);
+          }
+        }
+        
+        .quantity-text {
+          font-size: 28rpx;
+          color: #333;
+          min-width: 40rpx;
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+
+.empty-state {
+  padding: 100rpx 0;
+}
+
+.cart-section {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
+  z-index: 999;
+  
+  .cart-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 2rpx solid #f5f5f5;
+    
+    .cart-info {
+      display: flex;
+      align-items: center;
+      gap: 15rpx;
+      
+      .cart-title {
+        font-size: 30rpx;
+        font-weight: bold;
+        color: #333;
+      }
+      
+      .cart-count {
+        font-size: 24rpx;
+        color: #999;
+      }
+    }
+    
+    .cart-total {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+      
+      .total-label {
+        font-size: 26rpx;
+        color: #666;
+      }
+      
+      .total-price {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #FF6B9D;
+      }
+    }
+  }
+  
+  .cart-actions {
+    display: flex;
+    padding: 30rpx;
+    gap: 20rpx;
+    
+    .clear-cart {
+      display: flex;
+      align-items: center;
+      gap: 8rpx;
+      padding: 20rpx 30rpx;
+      background: #f8f8f8;
+      border-radius: 25rpx;
+      
+      .clear-text {
+        font-size: 26rpx;
+        color: #999;
+      }
+    }
+    
+    .checkout-btn {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 10rpx;
+      background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+      color: #fff;
+      padding: 20rpx;
+      border-radius: 25rpx;
+      
+      .checkout-text {
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+    }
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue
new file mode 100644
index 0000000..aa06291
--- /dev/null
+++ b/src/pages/profile/profile.vue
@@ -0,0 +1,567 @@
+<template>
+  <view class="profile-container">
+    <!-- 用户信息卡片 -->
+    <view class="user-card">
+      <view class="user-header">
+        <view class="user-avatar">
+          <u-avatar :src="userInfo.avatar" size="120" shape="circle"></u-avatar>
+          <view class="edit-avatar" @click="editAvatar">
+            <u-icon name="camera" size="20" color="#fff"></u-icon>
+          </view>
+        </view>
+        <view class="user-info">
+          <text class="user-name">{{ userInfo.nickname }}</text>
+          <text class="user-id">ID: {{ userInfo.userId }}</text>
+          <view class="user-level">
+            <u-icon name="star" size="16" color="#FFD700"></u-icon>
+            <text class="level-text">{{ userInfo.level }}</text>
+          </view>
+        </view>
+        <view class="user-actions">
+          <view class="action-btn" @click="editProfile">
+            <u-icon name="edit-pen" size="20" color="#FF6B9D"></u-icon>
+          </view>
+        </view>
+      </view>
+      
+    </view>
+
+    <!-- 快捷功能 -->
+    <view class="quick-functions">
+      <view class="function-group">
+        <view class="group-title">我的功能</view>
+        <view class="function-list">
+          <view class="function-item" @click="goToMyRecipes">
+            <view class="function-icon">
+              <u-icon name="book" size="14" color="#FF6B9D"></u-icon>
+            </view>
+            <text class="function-name">我的菜谱</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToMyDiaries">
+            <view class="function-icon">
+              <u-icon name="edit-pen" size="24" color="#52c41a"></u-icon>
+            </view>
+            <text class="function-name">我的日志</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToMyGoals">
+            <view class="function-icon">
+              <u-icon name="target" size="14" color="#1890ff"></u-icon>
+            </view>
+            <text class="function-name">我的目标</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+        </view>
+      </view>
+
+      <view class="function-group">
+        <view class="group-title">设置</view>
+        <view class="function-list">
+          <view class="function-item" @click="goToSettings">
+            <view class="function-icon">
+              <u-icon name="setting" size="24" color="#722ed1"></u-icon>
+            </view>
+            <text class="function-name">应用设置</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToPrivacy">
+            <view class="function-icon">
+              <u-icon name="lock" size="24" color="#fa8c16"></u-icon>
+            </view>
+            <text class="function-name">隐私设置</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToNotification">
+            <view class="function-icon">
+              <u-icon name="bell" size="24" color="#13c2c2"></u-icon>
+            </view>
+            <text class="function-name">消息通知</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+        </view>
+      </view>
+
+      <view class="function-group">
+        <view class="group-title">其他</view>
+        <view class="function-list">
+          <view class="function-item" @click="goToHelp">
+            <view class="function-icon">
+              <u-icon name="question-circle" size="24" color="#eb2f96"></u-icon>
+            </view>
+            <text class="function-name">帮助中心</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToFeedback">
+            <view class="function-icon">
+              <u-icon name="chat" size="24" color="#fa541c"></u-icon>
+            </view>
+            <text class="function-name">意见反馈</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+          <view class="function-item" @click="goToAbout">
+            <view class="function-icon">
+              <u-icon name="info-circle" size="24" color="#2f54eb"></u-icon>
+            </view>
+            <text class="function-name">关于我们</text>
+            <u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 退出登录按钮 -->
+    <view class="logout-section">
+      <u-button 
+        type="error" 
+        text="退出登录" 
+        @click="logout"
+        :custom-style="{ margin: '40rpx 30rpx' }"
+      ></u-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { useUserStore } from '@/store/user.js'
+import api from '@/api'
+
+const userStore = useUserStore()
+
+// 响应式数据
+const userInfo = ref({
+  nickname: '',
+  userId: '',
+  avatar: '/static/images/default-avatar.png',
+  level: 'LV.1 新手',
+  recipeCount: 0,
+  diaryCount: 0,
+  checkinCount: 0
+})
+
+// 获取用户信息
+const getUserInfo = async () => {
+  try {
+    uni.showLoading({
+      title: '加载中...'
+    })
+    
+    const result = await api.getUserInfo()
+    
+    if (result.code === 0 && result.data) {
+      console.log('获取用户信息成功:', result.data)
+      
+      // 更新用户信息
+      userInfo.value = {
+        nickname: result.data.nick_name || result.data.nickname || '用户',
+        userId: result.data.ID || result.data.userId || '',
+        avatar: result.data.avatar || '/static/images/default-avatar.png',
+        level: getUserLevel(result.data.level || 1),
+        recipeCount: result.data.recipe_count || result.data.recipeCount || 0,
+        diaryCount: result.data.diary_count || result.data.diaryCount || 0,
+        checkinCount: result.data.checkin_count || result.data.checkinCount || 0
+      }
+      
+      uni.setStorageSync('user', result.data)
+      
+    } else {
+      throw new Error(result.msg || '获取用户信息失败')
+    }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+    uni.showToast({
+      title: error.message || '获取用户信息失败',
+      icon: 'none'
+    })
+    
+    // 如果获取失败，尝试从缓存读取
+    const cachedUser = uni.getStorageSync('user')
+    if (cachedUser && cachedUser.userInfo) {
+      userInfo.value = {
+        nickname: cachedUser.userInfo.nickname || '用户',
+        userId: cachedUser.userInfo.userId || '',
+        avatar: cachedUser.userInfo.avatar || '/static/images/default-avatar.png',
+        level: getUserLevel(cachedUser.userInfo.level || 1),
+        recipeCount: cachedUser.userInfo.recipeCount || 0,
+        diaryCount: cachedUser.userInfo.diaryCount || 0,
+        checkinCount: cachedUser.userInfo.checkinCount || 0
+      }
+    }
+  } finally {
+    uni.hideLoading()
+  }
+}
+
+// 获取用户等级
+const getUserLevel = (level) => {
+  const levelMap = {
+    1: 'LV.1 新手',
+    2: 'LV.2 初学者',
+    3: 'LV.3 进阶者',
+    4: 'LV.4 熟练者',
+    5: 'LV.5 美食达人',
+    6: 'LV.6 厨艺大师',
+    7: 'LV.7 传奇厨师',
+    8: 'LV.8 食神'
+  }
+  return levelMap[level] || 'LV.1 新手'
+}
+
+// 编辑头像
+const editAvatar = () => {
+  uni.chooseImage({
+    count: 1,
+    sizeType: ['compressed'],
+    sourceType: ['album', 'camera'],
+    success: (res) => {
+      const tempFilePath = res.tempFilePaths[0]
+      console.log('选择的头像:', tempFilePath)
+      
+      // 上传头像
+      uploadAvatar(tempFilePath)
+    }
+  })
+}
+
+// 上传头像
+const uploadAvatar = (tempFilePath) => {
+  uni.showLoading({
+    title: '上传头像中...'
+  })
+  
+  // 获取token
+  const token = uni.getStorageSync('token')
+  if (!token) {
+    uni.hideLoading()
+    uni.showToast({
+      title: '未找到登录token',
+      icon: 'none'
+    })
+    return
+  }
+  
+  uni.uploadFile({
+    url: 'http://127.0.0.1:8888/user/avatar',
+    filePath: tempFilePath,
+    name: 'avatar',
+    header: {
+      'Authorization': `Bearer ${token}`
+    },
+    success: (res) => {
+      uni.hideLoading()
+      console.log('头像上传响应:', res)
+      
+      try {
+        const response = JSON.parse(res.data)
+        if (response.code === 0) {
+          // 更新头像
+          userInfo.value.avatar = response.data.url
+          
+          // 更新缓存
+          const cachedUser = uni.getStorageSync('user') || {}
+          if (cachedUser.userInfo) {
+            cachedUser.userInfo.avatar = response.data.url
+            uni.setStorageSync('user', cachedUser)
+          }
+          
+          // 更新状态管理
+          userStore.setUserInfo({
+            ...userStore.userInfo,
+            avatar: response.data.url
+          })
+          
+          uni.showToast({
+            title: '头像更新成功',
+            icon: 'success'
+          })
+        } else {
+          throw new Error(response.msg || '头像上传失败')
+        }
+      } catch (error) {
+        console.error('头像上传失败:', error)
+        uni.showToast({
+          title: error.message || '头像上传失败',
+          icon: 'none'
+        })
+      }
+    },
+    fail: (error) => {
+      uni.hideLoading()
+      console.error('头像上传失败:', error)
+      uni.showToast({
+        title: '头像上传失败，请重试',
+        icon: 'none'
+      })
+    }
+  })
+}
+
+const editProfile = () => {
+  uni.navigateTo({
+    url: '/pages/user/setup'
+  })
+}
+
+const goToMyRecipes = () => {
+  uni.switchTab({
+    url: '/pages/recipe/recipe'
+  })
+}
+
+const goToMyDiaries = () => {
+  uni.switchTab({
+    url: '/pages/diary/diary'
+  })
+}
+
+const goToMyGoals = () => {
+  uni.switchTab({
+    url: '/pages/checkin/checkin'
+  })
+}
+
+const goToFavorites = () => {
+  uni.showToast({
+    title: '收藏功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToSettings = () => {
+  uni.showToast({
+    title: '设置功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToPrivacy = () => {
+  uni.showToast({
+    title: '隐私设置功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToNotification = () => {
+  uni.showToast({
+    title: '消息通知功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToHelp = () => {
+  uni.showToast({
+    title: '帮助中心功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToFeedback = () => {
+  uni.showToast({
+    title: '意见反馈功能开发中',
+    icon: 'none'
+  })
+}
+
+const goToAbout = () => {
+  uni.showToast({
+    title: '关于我们功能开发中',
+    icon: 'none'
+  })
+}
+
+const logout = () => {
+  uni.showModal({
+    title: '提示',
+    content: '确定要退出登录吗？',
+    success: (res) => {
+      if (res.confirm) {
+        // 清除用户数据
+        userStore.logout()
+        uni.removeStorageSync('user')
+        uni.removeStorageSync('token')
+        
+        uni.showToast({
+          title: '退出成功',
+          icon: 'success'
+        })
+        
+        // 跳转到登录页
+        setTimeout(() => {
+          uni.reLaunch({
+            url: '/pages/user/login'
+          })
+        }, 1500)
+      }
+    }
+  })
+}
+
+// 生命周期
+onMounted(() => {
+  // 页面加载时获取用户信息
+  getUserInfo()
+})
+</script>
+
+<style lang="scss" scoped>
+.profile-container {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 40rpx;
+}
+
+.user-card {
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  margin: 20rpx;
+  border-radius: 20rpx;
+  padding: 40rpx 30rpx;
+  color: #fff;
+  
+  .user-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 40rpx;
+    
+    .user-avatar {
+      position: relative;
+      margin-right: 30rpx;
+      
+      .edit-avatar {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 40rpx;
+        height: 40rpx;
+        background: rgba(0, 0, 0, 0.5);
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+    
+    .user-info {
+      flex: 1;
+      
+      .user-name {
+        display: block;
+        font-size: 36rpx;
+        font-weight: bold;
+        margin-bottom: 10rpx;
+      }
+      
+      .user-id {
+        display: block;
+        font-size: 24rpx;
+        opacity: 0.8;
+        margin-bottom: 15rpx;
+      }
+      
+      .user-level {
+        display: flex;
+        align-items: center;
+        gap: 8rpx;
+        
+        .level-text {
+          font-size: 24rpx;
+          opacity: 0.9;
+        }
+      }
+    }
+    
+    .user-actions {
+      .action-btn {
+        width: 60rpx;
+        height: 60rpx;
+        background: rgba(255, 255, 255, 0.2);
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
+  
+  .user-stats {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    
+    .stat-item {
+      text-align: center;
+      
+      .stat-number {
+        display: block;
+        font-size: 40rpx;
+        font-weight: bold;
+        margin-bottom: 8rpx;
+      }
+      
+      .stat-label {
+        font-size: 24rpx;
+        opacity: 0.9;
+      }
+    }
+    
+    .stat-divider {
+      width: 2rpx;
+      height: 60rpx;
+      background: rgba(255, 255, 255, 0.3);
+    }
+  }
+}
+
+.quick-functions {
+  margin: 0 20rpx;
+  
+  .function-group {
+    background: #fff;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    overflow: hidden;
+    
+    .group-title {
+      padding: 30rpx 30rpx 20rpx;
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #333;
+      border-bottom: 2rpx solid #f5f5f5;
+    }
+    
+    .function-list {
+      .function-item {
+        display: flex;
+        align-items: center;
+        padding: 30rpx;
+        border-bottom: 2rpx solid #f5f5f5;
+        
+        &:last-child {
+          border-bottom: none;
+        }
+        
+        .function-icon {
+          width: 60rpx;
+          height: 60rpx;
+          background: #f8f8f8;
+          border-radius: 50%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 20rpx;
+        }
+        
+        .function-name {
+          flex: 1;
+          font-size: 30rpx;
+          color: #333;
+        }
+      }
+    }
+  }
+}
+
+.logout-section {
+  margin-top: 40rpx;
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/recipe/recipe.vue b/src/pages/recipe/recipe.vue
new file mode 100644
index 0000000..22b8871
--- /dev/null
+++ b/src/pages/recipe/recipe.vue
@@ -0,0 +1,338 @@
+<template>
+  <view class="recipe-container">
+    <!-- 搜索栏 -->
+    <view class="search-section">
+      <view class="search-box">
+        <u-search
+          v-model="searchKeyword"
+          placeholder="搜索菜品名称"
+          :show-action="false"
+          @search="onSearch"
+          @custom="onSearch"
+        ></u-search>
+      </view>
+    </view>
+
+    <!-- 分类标签 -->
+    <view class="category-section">
+      <scroll-view scroll-x class="category-scroll">
+        <view class="category-list">
+          <view 
+            v-for="(category, index) in categories" 
+            :key="index"
+            class="category-item"
+            :class="{ active: selectedCategory === category.id }"
+            @click="selectCategory(category.id)"
+          >
+            <text class="category-name">{{ category.name }}</text>
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+
+    <!-- 菜谱列表 -->
+    <view class="recipe-list">
+      <view 
+        v-for="(recipe, index) in filteredRecipes" 
+        :key="index"
+        class="recipe-item"
+        @click="viewRecipe(recipe)"
+      >
+        <view class="recipe-image">
+          <u-image
+            :src="recipe.image"
+            width="120rpx"
+            height="120rpx"
+            radius="12rpx"
+            mode="aspectFill"
+          ></u-image>
+        </view>
+        <view class="recipe-info">
+          <text class="recipe-name">{{ recipe.name }}</text>
+          <text class="recipe-desc">{{ recipe.description }}</text>
+          <view class="recipe-meta">
+            <view class="meta-item">
+              <u-icon name="clock" size="14" color="#999"></u-icon>
+              <text class="meta-text">{{ recipe.cookTime }}分钟</text>
+            </view>
+            <view class="meta-item">
+              <u-icon name="star" size="14" color="#FFD700"></u-icon>
+              <text class="meta-text">{{ recipe.difficulty }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="recipe-actions">
+          <view class="action-btn" @click.stop="orderRecipe(recipe)">
+            <u-icon name="shopping-cart" size="20" color="#FF6B9D"></u-icon>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 空状态 -->
+    <view v-if="filteredRecipes.length === 0" class="empty-state">
+      <u-empty
+        icon="search"
+        text="暂无相关菜品"
+        mode="data"
+      ></u-empty>
+    </view>
+
+    <!-- 悬浮添加按钮 -->
+    <view class="fab-button" @click="createRecipe">
+      <u-icon name="plus" size="24" color="#fff"></u-icon>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+// 响应式数据
+const searchKeyword = ref('')
+const selectedCategory = ref('all')
+
+const categories = ref([
+  { id: 'all', name: '全部' },
+  { id: 'chinese', name: '中餐' },
+  { id: 'western', name: '西餐' },
+  { id: 'dessert', name: '甜点' },
+  { id: 'drink', name: '饮品' },
+  { id: 'snack', name: '小吃' }
+])
+
+const recipes = ref([
+  {
+    id: 1,
+    name: '红烧肉',
+    description: '经典美味的红烧肉，肥而不腻',
+    image: '/static/images/recipe1.jpg',
+    category: 'chinese',
+    cookTime: 60,
+    difficulty: '中等',
+    ingredients: ['五花肉', '生抽', '老抽', '冰糖', '葱姜蒜'],
+    steps: ['步骤1', '步骤2', '步骤3']
+  },
+  {
+    id: 2,
+    name: '提拉米苏',
+    description: '意大利经典咖啡甜点',
+    image: '/static/images/recipe2.jpg',
+    category: 'dessert',
+    cookTime: 30,
+    difficulty: '简单',
+    ingredients: ['手指饼干', '马斯卡彭奶酪', '咖啡', '鸡蛋', '糖'],
+    steps: ['步骤1', '步骤2', '步骤3']
+  },
+  {
+    id: 3,
+    name: '意式咖啡',
+    description: '浓郁香醇的意式浓缩咖啡',
+    image: '/static/images/recipe3.jpg',
+    category: 'drink',
+    cookTime: 5,
+    difficulty: '简单',
+    ingredients: ['咖啡豆', '水'],
+    steps: ['步骤1', '步骤2']
+  }
+])
+
+// 计算属性
+const filteredRecipes = computed(() => {
+  let filtered = recipes.value
+  
+  // 按分类筛选
+  if (selectedCategory.value !== 'all') {
+    filtered = filtered.filter(recipe => recipe.category === selectedCategory.value)
+  }
+  
+  // 按关键词搜索
+  if (searchKeyword.value) {
+    filtered = filtered.filter(recipe => 
+      recipe.name.includes(searchKeyword.value) || 
+      recipe.description.includes(searchKeyword.value)
+    )
+  }
+  
+  return filtered
+})
+
+// 方法
+const onSearch = () => {
+  // 搜索逻辑
+  console.log('搜索关键词:', searchKeyword.value)
+}
+
+const selectCategory = (categoryId) => {
+  selectedCategory.value = categoryId
+}
+
+const viewRecipe = (recipe) => {
+  uni.navigateTo({
+    url: `/pages/recipe/detail?id=${recipe.id}`
+  })
+}
+
+const orderRecipe = (recipe) => {
+  uni.navigateTo({
+    url: `/pages/order/order?recipeId=${recipe.id}`
+  })
+}
+
+const createRecipe = () => {
+  uni.navigateTo({
+    url: '/pages/recipe/create'
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.recipe-container {
+  min-height: 100vh;
+  background: #f5f5f5;
+  padding-bottom: 120rpx;
+}
+
+.search-section {
+  background: #fff;
+  padding: 20rpx 30rpx;
+  
+  .search-box {
+    background: #f8f8f8;
+    border-radius: 20rpx;
+    overflow: hidden;
+  }
+}
+
+.category-section {
+  background: #fff;
+  padding: 20rpx 0;
+  margin-bottom: 20rpx;
+  
+  .category-scroll {
+    white-space: nowrap;
+    
+    .category-list {
+      display: flex;
+      padding: 0 30rpx;
+      
+      .category-item {
+        display: inline-block;
+        padding: 16rpx 32rpx;
+        margin-right: 20rpx;
+        background: #f8f8f8;
+        border-radius: 25rpx;
+        transition: all 0.3s;
+        
+        .category-name {
+          font-size: 28rpx;
+          color: #666;
+        }
+        
+        &.active {
+          background: #FF6B9D;
+          
+          .category-name {
+            color: #fff;
+          }
+        }
+      }
+    }
+  }
+}
+
+.recipe-list {
+  padding: 0 30rpx;
+  
+  .recipe-item {
+    display: flex;
+    align-items: center;
+    background: #fff;
+    padding: 30rpx;
+    border-radius: 20rpx;
+    margin-bottom: 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
+    
+    .recipe-image {
+      margin-right: 30rpx;
+    }
+    
+    .recipe-info {
+      flex: 1;
+      
+      .recipe-name {
+        display: block;
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333;
+        margin-bottom: 10rpx;
+      }
+      
+      .recipe-desc {
+        display: block;
+        font-size: 26rpx;
+        color: #999;
+        margin-bottom: 20rpx;
+        line-height: 1.4;
+      }
+      
+      .recipe-meta {
+        display: flex;
+        gap: 30rpx;
+        
+        .meta-item {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+          
+          .meta-text {
+            font-size: 24rpx;
+            color: #999;
+          }
+        }
+      }
+    }
+    
+    .recipe-actions {
+      .action-btn {
+        width: 60rpx;
+        height: 60rpx;
+        background: #f8f8f8;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.3s;
+        
+        &:active {
+          background: #FF6B9D;
+          transform: scale(0.9);
+        }
+      }
+    }
+  }
+}
+
+.empty-state {
+  padding: 100rpx 0;
+}
+
+.fab-button {
+  position: fixed;
+  right: 40rpx;
+  bottom: 120rpx;
+  width: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 8rpx 30rpx rgba(255, 107, 157, 0.3);
+  z-index: 999;
+  
+  &:active {
+    transform: scale(0.9);
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/src/pages/user/login.vue b/src/pages/user/login.vue
new file mode 100644
index 0000000..da45a5a
--- /dev/null
+++ b/src/pages/user/login.vue
@@ -0,0 +1,526 @@
+<template>
+  <view class="login-container">
+    <!-- 背景装饰 -->
+    <view class="bg-decoration">
+      <view class="circle circle-1"></view>
+      <view class="circle circle-2"></view>
+      <view class="circle circle-3"></view>
+    </view>
+
+    <!-- 主要内容 -->
+    <view class="main-content">
+      <!-- Logo和标题 -->
+      <view class="header-section">
+        <view class="app-logo">
+          <u-icon name="heart-fill" size="80" color="#FF6B9D"></u-icon>
+        </view>
+        <text class="app-title">情侣菜谱</text>
+        <text class="app-subtitle">记录我们的美食时光</text>
+      </view>
+
+      <!-- 功能介绍 -->
+      <view class="features-section">
+        <view class="feature-item">
+          <u-icon name="book" size="24" color="#FF6B9D"></u-icon>
+          <text class="feature-text">私人菜谱管理</text>
+        </view>
+        <view class="feature-item">
+          <u-icon name="edit-pen" size="24" color="#52c41a"></u-icon>
+          <text class="feature-text">记录美好时光</text>
+        </view>
+        <view class="feature-item">
+          <u-icon name="target" size="24" color="#1890ff"></u-icon>
+          <text class="feature-text">打卡目标完成</text>
+        </view>
+        <view class="feature-item">
+          <u-icon name="shopping-cart" size="24" color="#722ed1"></u-icon>
+          <text class="feature-text">便捷点餐服务</text>
+        </view>
+      </view>
+
+      <!-- 登录按钮 -->
+      <view class="login-section">
+        <view class="login-tips">
+          <text class="tips-text">登录后即可使用全部功能</text>
+        </view>
+        
+        <button 
+          class="wechat-login-btn"
+          @click="onGetUserInfo"
+          :loading="isLogging"
+          :disabled="isLogging"
+        >
+          <view class="btn-content">
+            <text class="btn-text">{{ isLogging ? '登录中...' : '微信一键登录' }}</text>
+          </view>
+        </button>
+
+
+
+        <view class="privacy-tips">
+          <text class="privacy-text">登录即表示同意</text>
+          <text class="privacy-link" @click="viewPrivacy">《用户协议》</text>
+          <text class="privacy-text">和</text>
+          <text class="privacy-link" @click="viewPrivacy">《隐私政策》</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 底部装饰 -->
+    <view class="bottom-decoration">
+      <view class="wave wave-1"></view>
+      <view class="wave wave-2"></view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { useUserStore } from '@/store/user.js'
+import api from '@/api'
+
+const userStore = useUserStore()
+
+// 响应式数据
+const isLogging = ref(false)
+
+// 方法
+const onGetUserInfo = async () => {
+  // 直接进行登录流程
+  console.log('用户点击登录按钮，开始登录流程')
+  
+  try {
+    isLogging.value = true
+    
+    // 获取微信登录code
+    const loginRes = await uni.login({
+      provider: 'weixin'
+    })
+    
+    console.log('微信登录结果:', loginRes)
+    
+    if (loginRes.errMsg !== 'login:ok') {
+      throw new Error('微信登录失败')
+    }
+
+    // 调用登录接口
+    const loginResult = await api.login({
+      code: loginRes.code
+    })
+
+    
+    // 检查登录结果 - 处理可能被错误包装的成功响应
+    if (!loginResult) {
+      throw new Error('登录接口返回数据为空')
+    }
+
+    // 如果loginResult本身就是一个包含成功数据的对象，直接使用
+    if (loginResult.code === 0) {
+      console.log('登录成功，开始处理用户信息')
+      
+      // 检查必要的数据字段
+      if (!loginResult.data || !loginResult.data.token || !loginResult.data.Info) {
+        throw new Error('登录返回数据格式错误')
+      }
+      
+      // 登录成功，保存token到本地缓存
+      const token = loginResult.data.token
+      console.log('获取到的token:', token)
+      uni.setStorageSync('token', token)
+      
+      userStore.setToken(token)
+      
+      uni.showToast({
+        title: '登录成功',
+        icon: 'success'
+      })
+
+      // 判断是否首次登录
+      if (loginResult.data.isFirstLogin) {
+        // 首次登录，跳转到设置页面
+        setTimeout(() => {
+          uni.navigateTo({
+            url: '/pages/user/setup'
+          })
+        }, 1500)
+      } else {
+        // 非首次登录，获取最新用户信息并缓存
+        try {
+          console.log('非首次登录，开始获取最新用户信息...')
+          const userInfoResult = await api.getUserInfo()
+          
+          if (userInfoResult.code === 0 && userInfoResult.data) {
+            console.log('获取用户信息成功:', userInfoResult.data)
+            
+            // 缓存用户信息到userInfo
+            uni.setStorageSync('userInfo', userInfoResult.data)
+            
+            // 更新用户store
+            userStore.setUserInfo({
+              userId: userInfoResult.data.ID || userInfoResult.data.userId,
+              nickname: userInfoResult.data.nick_name || userInfoResult.data.nickname,
+              avatar: userInfoResult.data.avatar,
+              phone: userInfoResult.data.phone
+            })
+            
+            console.log('用户信息已缓存到userInfo:', userInfoResult.data)
+          } else {
+            console.warn('获取用户信息失败，使用登录返回的基础信息')
+            // 如果获取失败，使用登录返回的基础信息
+            const basicUserInfo = {
+              ID: loginResult.data.Info.ID,
+              nick_name: loginResult.data.Info.nick_name,
+              avatar: loginResult.data.Info.avatar,
+              phone: loginResult.data.Info.phone
+            }
+            uni.setStorageSync('userInfo', basicUserInfo)
+          }
+        } catch (error) {
+          console.error('获取用户信息失败:', error)
+          // 如果获取失败，使用登录返回的基础信息
+          const basicUserInfo = {
+            ID: loginResult.data.Info.ID,
+            nick_name: loginResult.data.Info.nick_name,
+            avatar: loginResult.data.Info.avatar,
+            phone: loginResult.data.Info.phone
+          }
+          uni.setStorageSync('userInfo', basicUserInfo)
+        }
+        
+        // 跳转到首页
+        setTimeout(() => {
+          uni.switchTab({
+            url: '/pages/home/home'
+          })
+        }, 1500)
+      }
+    } else {
+      console.log('登录失败，错误信息:', loginResult?.msg)
+      throw new Error(loginResult?.msg || '登录失败')
+    }
+
+  } catch (error) {
+    // 检查是否是被错误包装的成功响应
+    if (error && typeof error === 'object' && error.code === 0) {
+      console.log('🔍 检测到被错误包装的成功响应，正在重新处理...')
+      
+      try {
+        // 重新处理成功响应
+        const loginResult = error
+        
+        if (loginResult.data && loginResult.data.token && loginResult.data.Info) {
+          console.log('✅ 成功解析登录数据，开始处理用户信息')
+          
+          // 登录成功，保存token到本地缓存
+          const token = loginResult.data.token
+          console.log('🔑 获取到的token:', token)
+          uni.setStorageSync('token', token)
+        
+          userStore.setToken(token)
+          
+          uni.showToast({
+            title: '登录成功',
+            icon: 'success'
+          })
+
+          // 判断是否首次登录
+          if (loginResult.data.isFirstLogin) {
+            console.log('🎯 首次登录，准备跳转设置页面')
+            setTimeout(() => {
+              uni.navigateTo({
+                url: '/pages/user/setup'
+              })
+            }, 1500)
+          } else {
+            console.log('🏠 非首次登录，准备获取最新用户信息并跳转首页')
+            
+            // 非首次登录，获取最新用户信息并缓存
+            try {
+              const userInfoResult = await api.getUserInfo()
+              
+              if (userInfoResult.code === 0 && userInfoResult.data) {
+                console.log('✅ 获取用户信息成功:', userInfoResult.data)
+                
+                // 缓存用户信息到userInfo
+                uni.setStorageSync('userInfo', userInfoResult.data)
+                
+                // 更新用户store
+                userStore.setUserInfo({
+                  userId: userInfoResult.data.ID || userInfoResult.data.userId,
+                  nickname: userInfoResult.data.nick_name || userInfoResult.data.nickname,
+                  avatar: userInfoResult.data.avatar,
+                  phone: userInfoResult.data.phone
+                })
+                
+                console.log('🎉 用户信息已缓存到userInfo:', userInfoResult.data)
+              } else {
+                console.warn('⚠️ 获取用户信息失败，使用登录返回的基础信息')
+                // 如果获取失败，使用登录返回的基础信息
+                const basicUserInfo = {
+                  ID: loginResult.data.Info.ID,
+                  nick_name: loginResult.data.Info.nick_name,
+                  avatar: loginResult.data.Info.avatar,
+                  phone: loginResult.data.Info.phone
+                }
+                uni.setStorageSync('userInfo', basicUserInfo)
+              }
+            } catch (error) {
+              console.error('❌ 获取用户信息失败:', error)
+              // 如果获取失败，使用登录返回的基础信息
+              const basicUserInfo = {
+                ID: loginResult.data.Info.ID,
+                nick_name: loginResult.data.Info.nick_name,
+                avatar: loginResult.data.Info.avatar,
+                phone: loginResult.data.Info.phone
+              }
+              uni.setStorageSync('userInfo', basicUserInfo)
+            }
+            
+            // 跳转到首页
+            setTimeout(() => {
+              uni.switchTab({
+                url: '/pages/home/home'
+              })
+            }, 1500)
+          }
+          
+          // 标记为已处理，避免后续错误日志
+          error._handled = true
+          console.log('🎉 登录流程处理完成')
+          return // 成功处理，退出函数
+        } else {
+          console.warn('⚠️ 登录数据格式不完整，无法处理')
+        }
+      } catch (innerError) {
+        console.error('❌ 重新处理成功响应时出错:', innerError)
+      }
+    }
+    
+    // 真正的错误处理 - 只处理未被标记的错误
+    if (!error._handled) {
+      console.error('❌ 登录遇到真实错误:', error)
+      console.error('🚨 错误类型:', error.constructor.name)
+      console.error('💬 错误消息:', error.message)
+      
+      // 如果是我们自定义的错误，直接显示
+      if (error.message && error.message !== '登录失败，请重试') {
+        uni.showToast({
+          title: error.message,
+          icon: 'none'
+        })
+      } else {
+        uni.showToast({
+          title: '登录失败，请重试',
+          icon: 'none'
+        })
+      }
+    }
+  } finally {
+    isLogging.value = false
+  }
+}
+
+const viewPrivacy = () => {
+  uni.showToast({
+    title: '隐私政策功能开发中',
+    icon: 'none'
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.login-container {
+  min-height: 100vh;
+  background: linear-gradient(135deg, #FFE4E1 0%, #FFB6C1 50%, #E6E6FA 100%);
+  position: relative;
+  overflow: hidden;
+}
+
+.bg-decoration {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  pointer-events: none;
+  
+  .circle {
+    position: absolute;
+    border-radius: 50%;
+    background: rgba(255, 255, 255, 0.1);
+    
+    &.circle-1 {
+      width: 200rpx;
+      height: 200rpx;
+      top: 10%;
+      right: -50rpx;
+      animation: float 6s ease-in-out infinite;
+    }
+    
+    &.circle-2 {
+      width: 150rpx;
+      height: 150rpx;
+      top: 30%;
+      left: -30rpx;
+      animation: float 8s ease-in-out infinite reverse;
+    }
+    
+    &.circle-3 {
+      width: 100rpx;
+      height: 100rpx;
+      top: 60%;
+      right: 20%;
+      animation: float 10s ease-in-out infinite;
+    }
+  }
+}
+
+.main-content {
+  position: relative;
+  z-index: 1;
+  padding: 100rpx 60rpx 60rpx;
+  text-align: center;
+}
+
+.header-section {
+  margin-bottom: 80rpx;
+  
+  .app-logo {
+    margin-bottom: 30rpx;
+    animation: bounce 2s ease-in-out infinite;
+  }
+  
+  .app-title {
+    display: block;
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 20rpx;
+  }
+  
+  .app-subtitle {
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.4;
+  }
+}
+
+.features-section {
+  margin-bottom: 80rpx;
+  
+  .feature-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 20rpx;
+    margin-bottom: 30rpx;
+    
+    .feature-text {
+      font-size: 28rpx;
+      color: #333;
+    }
+  }
+}
+
+.login-section {
+  .login-tips {
+    margin-bottom: 40rpx;
+    
+    .tips-text {
+      font-size: 26rpx;
+      color: #999;
+    }
+  }
+  
+  .wechat-login-btn {
+    width: 100%;
+    height: 100rpx;
+    background: linear-gradient(135deg, #07c160 0%, #10ad6a 100%);
+    border: none;
+    border-radius: 50rpx;
+    margin-bottom: 40rpx;
+    box-shadow: 0 8rpx 30rpx rgba(7, 193, 96, 0.3);
+    transition: all 0.3s;
+    
+    &:active {
+      transform: translateY(2rpx);
+      box-shadow: 0 4rpx 15rpx rgba(7, 193, 96, 0.3);
+    }
+    
+    .btn-content {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 15rpx;
+      height: 100%;
+      
+      .btn-text {
+        color: #fff;
+        font-size: 32rpx;
+        font-weight: bold;
+      }
+    }
+  }
+  
+  .privacy-tips {
+    text-align: center;
+    line-height: 1.6;
+    
+    .privacy-text {
+      font-size: 24rpx;
+      color: #999;
+    }
+    
+    .privacy-link {
+      font-size: 24rpx;
+      color: #FF6B9D;
+      text-decoration: underline;
+    }
+  }
+}
+
+.bottom-decoration {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 200rpx;
+  pointer-events: none;
+  
+  .wave {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 100rpx;
+    background: rgba(255, 255, 255, 0.1);
+    border-radius: 50% 50% 0 0;
+    
+    &.wave-1 {
+      bottom: 0;
+      animation: wave 4s ease-in-out infinite;
+    }
+    
+    &.wave-2 {
+      bottom: 20rpx;
+      animation: wave 6s ease-in-out infinite reverse;
+    }
+  }
+}
+
+@keyframes float {
+  0%, 100% { transform: translateY(0px); }
+  50% { transform: translateY(-20px); }
+}
+
+@keyframes bounce {
+  0%, 20%, 50%, 80%, 100% { transform: translateY(0); }
+  40% { transform: translateY(-10px); }
+  60% { transform: translateY(-5px); }
+}
+
+@keyframes wave {
+  0%, 100% { transform: scaleX(1); }
+  50% { transform: scaleX(1.1); }
+}
+</style>
diff --git a/src/pages/user/setup.vue b/src/pages/user/setup.vue
new file mode 100644
index 0000000..62e25aa
--- /dev/null
+++ b/src/pages/user/setup.vue
@@ -0,0 +1,328 @@
+<template>
+  <view class="container">
+    <cu-custom bgColor="none" :isBack="false">
+      <block slot="content">
+        <span style="color: #333;font-weight: 400;">获取用户头像昵称</span>
+      </block>
+    </cu-custom>
+
+    <view class="avatarUrl">
+      <button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+        <image :src="avatarUrl" class="refreshIcon"></image>
+      </button>
+    </view>
+    
+    <view class="userName">
+      <text>昵称：</text>
+      <input 
+        :clearable="false" 
+        type="nickname" 
+        class="weui-input" 
+        :value="userName" 
+        @blur="bindBlur"
+        placeholder="请输入昵称" 
+        @input="bindInput" 
+      />
+    </view>
+
+    <view style="width: 100%;height: 1px; background: #EEE;"></view>
+    
+    <view style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; margin-top: 40rpx;">
+      · 申请获取以下权限
+    </view>
+    <view style="width: 700rpx; height: 20px; font-size: 13px; margin: auto; color: #cbcbcb; margin-top: 25rpx;">
+      · 获得你的信息(昵称、头像等)
+    </view>
+
+    <view class="btn">
+      <u-button @click="onSubmit" type="primary">保存</u-button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { pathToBase64, base64ToPath } from 'image-tools'
+import api from '@/api'
+import { useUserStore } from '@/store/user.js'
+
+const userStore = useUserStore()
+
+// 响应式数据
+const avatarUrl = ref('https://menu-echo.oss-cn-chengdu.aliyuncs.com/avatar/def.jpg')
+const userName = ref('')
+const appUserId = ref('')
+
+
+// 输入事件处理
+const bindBlur = (e) => {
+  userName.value = e.detail.value // 获取微信昵称
+}
+
+const bindInput = (e) => {
+  userName.value = e.detail.value // 获取微信昵称
+}
+
+// 头像选择事件
+const onChooseAvatar = (e) => {
+  const { avatarUrl: newAvatarUrl } = e.detail
+  avatarUrl.value = newAvatarUrl
+}
+
+// 提交事件
+const onSubmit = () => {
+  uni.login({
+    "provider": "weixin",
+    "onlyAuthorize": true, // 微信登录仅请求授权认证
+    success: async function(event) {
+      const { code } = event
+      const name = userName.value
+      
+      // 判断头像以及昵称不为空 再上传
+      if (userName.value && avatarUrl.value) {
+        console.log('头像URL:', avatarUrl.value) // 返回的是临时图片地址
+        
+        // 检查是否是临时文件，如果是则需要先上传
+        if (avatarUrl.value.startsWith('http://tmp/') || avatarUrl.value.startsWith('wxfile://')) {
+          console.log('检测到临时文件，开始上传头像...')
+          uploadAvatar(avatarUrl.value).then(uploadResult => {
+            if (uploadResult.success) {
+              console.log('头像上传成功:', uploadResult.data)
+              // 使用上传后的URL保存用户信息
+              save(uploadResult.data.url)
+            } else {
+              uni.showToast({
+                title: uploadResult.message || '头像上传失败',
+                icon: 'none'
+              })
+            }
+          }).catch(error => {
+            console.error('头像上传失败:', error)
+            uni.showToast({
+              title: '头像上传失败，请重试',
+              icon: 'none'
+            })
+          })
+        } else {
+          // 已经是网络图片，直接保存
+          save(avatarUrl.value)
+        }
+      } else {
+        uni.showToast({
+          icon: 'none',
+          title: '请上传头像并填写昵称'
+        })
+        return false
+      }
+    },
+    fail: function(err) {
+      console.log('err', err)
+    }
+  })
+}
+
+/**
+ * 上传头像到服务器
+ */
+const uploadAvatar = (tempFilePath) => {
+  return new Promise((resolve, reject) => {
+    uni.showLoading({
+      title: '上传头像中...'
+    })
+    
+    // 获取token
+    const token = uni.getStorageSync('token')
+    if (!token) {
+      uni.hideLoading()
+      reject(new Error('未找到登录token'))
+      return
+    }
+    
+    // 使用uni.uploadFile上传文件
+    uni.uploadFile({
+      url: 'http://127.0.0.1:8888/user/avatar', // 替换为你的实际上传接口
+      filePath: tempFilePath,
+      name: 'avatar',
+      header: {
+        'Authorization': `${token}`
+      },
+      success: (res) => {
+        uni.hideLoading()
+        console.log('上传响应:', res)
+        
+        try {
+          const response = JSON.parse(res.data)
+          if (response.code === 0) {
+            resolve({
+              success: true,
+              data: response.data
+            })
+          } else {
+            resolve({
+              success: false,
+              message: response.msg || '上传失败'
+            })
+          }
+        } catch (error) {
+          console.error('解析上传响应失败:', error)
+          resolve({
+            success: false,
+            message: '上传响应解析失败'
+          })
+        }
+      },
+      fail: (error) => {
+        uni.hideLoading()
+        console.error('上传失败:', error)
+        reject(error)
+      }
+    })
+  })
+}
+
+/**
+ * @description 保存事件，用于保存用户头像昵称
+ */
+const save = async (finalAvatarUrl) => {
+  uni.showLoading({
+    title: '保存中...'
+  })
+  
+  const data = {
+    nick_name: userName.value,
+    avatar: finalAvatarUrl
+  }
+  
+  console.log('保存用户信息:', data)
+  const result = await api.updateUserInfo(data)
+
+  if (result.code === 0) {
+    // 更新成功后，获取最新用户信息并缓存
+    try {
+      console.log('用户信息更新成功，开始获取最新用户信息...')
+      const userInfoResult = await api.getUserInfo()
+      
+      if (userInfoResult.code === 0 && userInfoResult.data) {
+        console.log('✅ 获取最新用户信息成功:', userInfoResult.data)
+        
+        // 缓存用户信息到userInfo
+        uni.setStorageSync('userInfo', userInfoResult.data)
+        
+        // 更新本地用户信息
+        userStore.updateUserInfo({
+          nickname: userInfoResult.data.nick_name || userInfoResult.data.nickname,
+          avatar: userInfoResult.data.avatar
+        })
+
+        uni.showToast({
+          title: '设置成功',
+          icon: 'success'
+        })
+
+        // 跳转到首页
+        setTimeout(() => {
+          uni.switchTab({
+            url: '/pages/home/home'
+          })
+        }, 1500)
+      } else {
+        throw new Error(userInfoResult.msg || '获取用户信息失败')
+      }
+    } catch (error) {
+      console.error('获取最新用户信息失败:', error)
+      // 如果获取失败，仍然显示设置成功，但使用更新后的数据
+      uni.showToast({
+        title: '设置成功',
+        icon: 'success'
+      })
+      
+      // 使用更新后的数据缓存
+      const updatedUserInfo = {
+        ID: userStore.userInfo.userId,
+        nick_name: userName.value,
+        avatar: finalAvatarUrl,
+        phone: userStore.userInfo.phone || ''
+      }
+      uni.setStorageSync('userInfo', updatedUserInfo)
+      
+      setTimeout(() => {
+        uni.switchTab({
+          url: '/pages/home/home'
+        })
+      }, 1500)
+    }
+  } else {
+    uni.hideLoading()
+    uni.showToast({
+      title: result.msg || '保存失败',
+      icon: 'none'
+    })
+  }
+}
+
+// 生命周期
+onMounted(() => {
+  // 初始化随机昵称
+  userName.value = getRandomName(Math.floor(Math.random() * (6 - 2) + 3))
+})
+</script>
+
+<style lang="scss" scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 0 30rpx;
+
+  .avatarUrl {
+    padding: 80rpx 0 40rpx;
+    background: #fff;
+
+    button {
+      background: #fff;
+      line-height: 80rpx;
+      height: auto;
+      border: none !important;
+      width: auto;
+      margin: 0;
+      display: flex;
+      border: none;
+      justify-content: center;
+      align-items: center;
+
+      &::after {
+        border: none;
+      }
+
+      .refreshIcon {
+        width: 160rpx;
+        height: 160rpx;
+        border-radius: 50%;
+        background-color: #ccc;
+      }
+
+      .jt {
+        width: 14rpx;
+        height: 28rpx;
+      }
+    }
+  }
+
+  .userName {
+    background: #fff;
+    padding: 20rpx 30rpx 80rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .weui-input {
+      padding-left: 60rpx;
+    }
+  }
+
+  .btn {
+    margin-top: 30rpx;
+  }
+}
+</style>
diff --git a/src/static/images/checkin-active.png b/src/static/images/checkin-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..b68cca6e0ebc609d1fc9753cac1e907f929f8d3b
GIT binary patch
literal 4384
zcmZu#c|4Te7oX=b6HS(}jO-1@Hd?$PL_EWkJ?q#>mWn7_WPfZ!h_PlXvWAf2Me-(V
z$eN1CGPW!wlzsV4|Ns8D_uS99=bU@b=id9h-_LnqcvX`H&4)%H5G>kSBxAaK|F<z6
zqxTgSl}``|3__bkG`$b3JidFUK!>}%Tx->lqv&n?tX*rI`FgUgo~FSPDZs1$Y>wRn
z+1uZ>Hi|0lZw?;!P7FgTj~rVvGcxSV2PygWTQ(uXr<nSf)l6ZufGG?Mq*C~w!T%s5
zZvt4wd<38*!m3~dfGytiX`^OQoMu9|zNtMPjiDwXV{fn)AOPMgenR*Dk0PFvniQie
z+gU|731wak(?l`FXnI=y-p1l^Gl{~Nemz3~Ym#T<gx-Qkr*o8j9n=y%>T5omVla?C
zxJ2AeLl4t!@5$Hep*Fd2IC<h>;9=E9NzYhO;Z5zGz}?roJ3E`KW4A{&8=2JF>bmwy
z*>Rw8Sq$g=-08sdsxQfXVxPnVoxL|$#ss0#G=*^oLWrxB9z^OY>8X;=1eh}ga}nLE
z2BY$oEuG#Sb@Es>`7{F|Dy^{E+?G^<TYT9+;BT^KV!coZB+XNX`Mym(0})ys#&LzT
zn^^u{{~<VrI*I@D#IA4U<yPNyKfQK?d*l>U;hWvndmW8Sx2w9nUjKZSbL8P!6r8fP
z@dCVKos2>Xx+^TkHaR<$n;aF5NRLmN?*A^j^%CCZNS(W?3xG79{&Bv}`8eKo39Q;y
z1QFWAPWurIO<;JqZOS16d{8BVdytFpIjRSdv-PUuS@mEFfSft7P44Ygt8ti|tADz|
z`lBShLnBR=0R4K8d{Ug||L57}nB$_C8m&Q><6V`Ql7Sa^CwKja*9z6Y{T=Zj)ne}Q
z?(3Efdo{JmiG%%p^WO><m+O9TUBZd{l#fjFKg)g2Q@vY&*!hc)95l!E7Q8>-d*{f#
zdA>^829NoI&an8A$bkvF&WLt&8}=(_QM-hFakm-4-6p6%@FdEA^b7&QQStj9hlVid
zl+T?sk$O^ZxRn^UVLk%sZfrxGjl{?>XX}gqV9Oc=V}D!TVLa-rc?Tr%Y3yRFq+9t~
zf4wR|oJ}<@7@4EicG<(ti!VPz(Se%0Ay2_o^oVq+zKqrAoQnVCH%}J~G*B4+ky1;U
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
IQr$lMf1Nq-7ytkO

literal 0
HcmV?d00001

diff --git a/src/static/images/checkin.png b/src/static/images/checkin.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa5442f830c1c9537f59cc20eca6cbfb0c7addce
GIT binary patch
literal 4376
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

literal 0
HcmV?d00001

diff --git a/src/static/images/diary-active.png b/src/static/images/diary-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b38c29a065f21db37cb79c890c150077ccf0d10
GIT binary patch
literal 4681
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
Khptq$3;Q2n_>mw0

literal 0
HcmV?d00001

diff --git a/src/static/images/diary.png b/src/static/images/diary.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb537ab562edabea6be4335434ec060991049518
GIT binary patch
literal 6934
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
O0MwMU6f5K{gZ>AuLb6i;

literal 0
HcmV?d00001

diff --git a/src/static/images/home-active.png b/src/static/images/home-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..036f4952fa210f775676ad7d9b79825cea815747
GIT binary patch
literal 4603
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
P=mBZo(NnEbu?zbje-v;F

literal 0
HcmV?d00001

diff --git a/src/static/images/home.png b/src/static/images/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..57ce6a1e8be37398615d5652d3dc974c462ba46f
GIT binary patch
literal 4612
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
L>WankX2JghdAeI^

literal 0
HcmV?d00001

diff --git a/src/static/images/profile-active.png b/src/static/images/profile-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..2efe615e0af544b0093ff3f0ab3b07d8554f851b
GIT binary patch
literal 3893
zcmZ{nc{J2**vDtaZ#07#W64(iFc@LTk~IuNGg+EMkv&7UY!RWF8IiTdz7(ctL9#vB
zW00NnC?ym!qq2pvmGaK>p7Z|s{&C;;xxVK**Y{l4Irn|;PZHVo#C|?0J_rP|pF||s
zanHX07J`?%S2{i`f<OcpNCdon6m+T3=8iN;vbSP#)~Xs!$wY|G&Njwigwgvp5yFqf
zKA69R3$o$`RF>rwUb#8ScECgPKpetiY9;}V!G&Pz&eMD{sN^=FCZM=|QpYc5>QLm?
znc$Cm=_;2ZTNXLz{#d<uzC5~m2Ou)jA#guJ7Z1im06yzr3Nu8I83#k65&<lt3W^@b
zvr0fiJB}>6?<NG^U-}?#SP#GwWmc?pL|~$r%;XEl=1@#9v{7r!8o^d3Du(0_?;^>J
z-9?7NDv?T$x;gmdhmt9Ny~;d?B@gBMEQ~98RSbcDcw*j$p&3B=>>hV~!Bpd^^gzh0
z75a$?6O53GwS`Fo*gjs=|E0`s>3fYZxc=3nd7Kcgzur4*Wph}G82injNmJ_T&xzl<
z)e*8?2KK}28C}^e?!UfdZ?*4~1-g=LFeQDwDhS-}T*a-1VmHHGa{UQ(kySNrNQra#
zW+(2D*CO5UdhEuE*UiUa#-Ght-I=F91`Qt>koA6gdFM`RJx*0$w7Y%a!rJ4eK-ZAo
zJ5@4&uSq`p_(vaOMkP3lNV8tyk#gBl&YgC=F57k{C*pMu_ifhS97LZtN|x>s)eZUI
zqI0DrEAhG?r}CCQug4cE1s_r!a^~$2H=z>{j6RZ<wo~l^io?#}JN&{r(QKb2`{|3r
z+1h1;=zD`F3-0%4JOmv$CH&#OoaO{kHRpZ$R-76f|GHS6H~yFJEJZqZFhRB0<<GaR
z%a@#L(S#$1T;solT}ly+52vx6H1Bv{zg?cgS-nC$oiQ(0>*#eODM#VN=~@)!4@@Kd
zJpY?{^+aq_Xy^l(L5NANxPl+PTr#)i4rd@syo(JceAte|YD!;84E?v~{)&2B*teqL
zc`a|MiF!(}@9Bc+te$iVTtCO}?2wFPK1uWH9zHPNspYq0$)t`1?p^F5H9ntqyC9nk
zk<wq&!g1fdi;aVI-i5hOv9{S|Pb<QOy{la)sq{5uvui*j`f7R>ShW{vee?FMKo3`M
zW98cuL``0tWwWbty&?%gPk|qx^|u>(Z~k_!S3Gc~$+8z-nUrc{w-9D=0C3$GetgK6
zt+Dc5b094r+fdSWkS90#>PXSxIN<v16lIwm=>AgaG`z!ty#J*<I<fetaF4=9AS31I
zAhgwb-}|PQQHN|$Za`Iq^c-3V+0;6JK?9ehN)pAtuJjl@-GX8(WAu&hPUIYnwFl&^
z&@QN5A!UW$&f>srM<tDa%9b}qBd&{`&S26_1?y!B)iXnj$8FI%XFGt7ECmj^q9N20
zlQF|{UY7r`HA?k%ysE?-DMe_ksS4YGgu+wEI4{A?s#{n46V%0m!UYtPBJl*lss3bC
z5$24HB2-l|XFf)j?~4N})vy#b8r|0(%b+UKOy|;n(6Qq5IYEoO)CCz@t;=pt<hjAS
zVBV<CTub}Fsyax6xT*!yLr&_>#B0u%mR4};#Ma~zTdI7AHhOAr$!q9#e~*3m2#4UE
zZ>;J&mmsN*yeCi2YlwX=w?J=gwm)Y3tw=>8l0ij7our$pM90o+b0#W^)W@TL0)1~<
zM5^Z}jn4}^;K!rGtK5q|6tkwfKHo0~H8;0|_AY4hqQ4SZU8y+*;8!<N&FVpN?Q9(I
z8RaO-(bYb4Rs<8abutq<H;_ktzUex=RDqQHSRtgX)ze61ia<Ha?qc}z$&&_Rx0KSU
z2GHT4oMf;^75!To7BQcyArC9~s49l%3uw;~Ht~u03W&Biy?~ebR3+^Cb=-Hi=~A8E
z8)g?+_DA!tFN`YKF8jX)=Ew@<oF7#IgmGuoZ4>QsTIg31?8KkwU~}GRez`X-?tzJS
zTS(v`T0F@d<)zx<xQ63-G(|AwU9h<|vGn~TUE=!Fcj15MlH8EKQy(X-82-G20g{sX
z$Z$pG(abR`#w-0VNf;EBRa$-Sm*N{Ml<nGP_sEYkO0TULZ~1$7)9zB$#Dg~#xM3$w
zFK(=X*QjvBHv;h!O;F-bjR#_dzqUIP@v&q3=WM9dKf%-1WJVis^)D0o6a7-0lY)Qa
zIcs@}DRUeO^R@D@|Na;(DPIW{tFPw#Xj52G=zDmsYP@^Fna5~an%1ONw2{`D3%+-c
z1@Nd}^KoA?sRp!>{2kIXF$OuR8(MS<W{h;Xu{kq+ZSFmaO`5h|jYU5}VE;Pj<x17~
zAs(a)_26O6fcX3kDPe!a`nj}J4M8+_f)nk2FW)<(aN_><Jafcs(_p-y?TV*BXZ}<B
zfT+@)f+C~s8q0rU`0czq?HGK(o(+vv4~_1PRYuy88Mnn)Z;Vi6DW?3zBlJE!c0*z+
z4afkQ+NLL*>;e55JwR0wEvw;_=N{l~VZm_l(QtG>&Pf2|gc)nMdia_LUpxX`ghK6`
z(ul0TZdz;CfDbA!zI|J|-<lp5L1UdTf~9n`)eFihkPq^edn{mu2;$a4#mLH^rZ-Ld
zmHhbE>k`5n?*cH?>t#3Du5x<yU3jTL4Z`=8Ta)G!zS`uhIwuv>6o3IgstkWn$-Nwb
zpHP!(4h*q^T|<72tYXMV;2V7rPX+Ku;^I+<X8lmD=><9nb(Z)P4MPdg5Zivo8CTWm
zGWUjzv-+A8<xtzJr&#9}Y4>7;0pU6^D4h2@!1udmM7tG<ej&C-N()soXZ5}fdJ*yo
zz{>?%n9@3=p#gtqz5E-B+^gu-Vr3=smoLFYyr#!)U)D0NqJu~4<(Mp{Eoiz(Gm1HI
zvl5}9<tu{tHyRxI1joyn2Uw656A}T+{J_?DS2ivY478953W^a~ZS-$b3&sQZ&U);0
zR}KyMCA`|emE1c3{U>eX&|-tB9HA9?S_%>fI?lN7K?iI4V`)P6YvQ6T4__OP8tnIf
zjLW_t@$e3zl@L~2T~AbX64iRq|Hi#~<+5LYnRL)oa2!v&F9r>-EE@h46mfg>ZX7>7
z*6Q5iqreYiXhf`wHE8*MfO8}nT=Li7opK|BcHB@U86@6wRU><hlfVoA#RXs=q~$yl
zb%dR3JM=8OM9cwo<++PaNX%_h&qLjL&nJdX*y9=b<rUsL4tQz@S=jXb0_93YwD8vS
zS2}Y$v#I+M_TCswfH%|Z{eXixn$E0Hko<h4#Z=-?N%i5!ub+o)Fm8f<0&Vqg*B9wj
zxpro@SN>>W^snm`&z!6+QKHm2VX}lDt5JT`e+T!Ogruk1o;n<oeGs%1SL9ELKK1Nv
zKN4n^xdW@#^WB#!d^28c8o7b&sMpIB1>&v@t`R4jhkpD?+CQKxtEi07Oj=7M((~0?
zDH3wD<Gh@jl)|SV#GGX6$%KYs^sv*Vh5vwks+e@OUU`_O#vQ`Nr}b+#ZYWB0v_Z_7
z`YZw{Fq=Mla>v4`4h6)|42fgehc&#i|5FHc!hn`@7W=`1_3x+)VM}loX*^kqc%kC^
z`wNl$rkZ^5%GViZ24`RUC?GVig@k=ivflfw^a+ckvQd=EIhDs-H?qyo>i)<p1hEjG
zdMuJiLGk_YEg0XQc<G6^GJ?-B6Hu45!&GO<rwJKHbZ1tA*wvHhXZ1Xm{+^I9h@UP#
z#7B;nfw2?b2=vG{O20Gou5OHTb(79~odt-Zkqr4bXX55V9R!~2coN2!-o;`=hC2}S
zPBNODDE?RPAbD^WD|iwmnw&v3o1sE?zAZV^&g{={38VXFH7g<yi0DvPl6k@eD5h<d
zd2ylu+?CWR7Rg!_qr}G=c<56vRnwUv*_gp;ONtc?Ooncqwb62uoj%abghOw}ab7rQ
z0jmGNRtAPQK9$!C@Tw!Irsz*cgwTI@*nMlyrk*Jrjt8li|8$>F=QbZM5Pwzwn7*mM
zHl10$ZG<#w<43FUupP4^d)|iWnU$blibX5*n{O3N9t5flu4~44rG`-luyA~bMaEX3
zXOxnLhc>+LC~Iu((dVE^lk<2;Ndd3h$xc5HNZG!pp{Xu{GZN212$?h*DJ5}qzmkWB
z@xczMUSpkO(Rj!=(|0HJx)d-P5)B+fuY<t|+GQcWS~I)5vr=DXTzjOqk+6Z9X7H>u
zUoC9*Scyz)icF)!@v&ksBtpc?3SUp|Z6sW|Gk42EUm~|W=sKCfdu%kr$ohiID8nS}
zqfDy1bvk{?Lwh_lDZEVa-Szyrw1e601_b<B@XDo9ozRrzovPeK8JXav^5qRLQA**7
zIh9nausydK@7&~+8)*@(%iMpv<wMWu#SQfD(pfdXmHA(mU!w1WYX3USW$e>Ew-x$u
znq!t*KI_w!V{w=>sZ8wkAGtr+jdSQ7s4TR^`)f=X+td##RPwTCR2?Rzj_+OP3o9a3
z9Pf{4I?I0}tHeR)SX(|_`+;917@ZrSgDPIfO<fU->}XN$gHtDDjP;tf2=A;{Q(8TP
zqq1;g+Lg2@=|EC@E<NhWp>%?{_~2di^DQS_s!sK)lHb}a4FX?-h@C#P9b{8FHnS`T
zF6)v}?XmmMi;&E=UU@k0qAGcVPaUW&IxPB9%Y&ev(P$X=JB^$Bq}hJ!1}#c*my08R
zCDqS7c@%eXY@Fb8FUQb%w{90Vb+N8N|Jo$1pwn475%%)fY1Lju%{dD9;#B=89b-9q
zsZPhY9LS^wKLDYg?=uUEhJx<5U>>wS{a$6#8+u!3fzWC47@W;7ewetDk+`0qGcOeI
zfVe0(mjmk^`81?-n#*9=@%JLf^$M?D<UYHJm^(R@J^f4Xei?2b5r^`jQ+6$zebq{J
zn&OvxWZMKRJgf{vDg2@<a?lf0x*mEegC!38e+5%3)Pchd7!52pg*?{Z>C5eMf*?7~
z<htS=l=w?*sB~Wu@7Opw1`Uk+JlsjKq|zy8J%@rExyYv){3u5f%9r63f3(GuOM2C<
z`R9Fr9yOv*cK1>O7xg-|E+$I~GeJoQ@j9s@2pl<bPuYjStzhpo<R1kSeJOI;(og_a
o423}U_N*}v&T`?G_dn|8ffTtf57Q+ck8>3W$-<WK%*=!SKhP!LnE(I)

literal 0
HcmV?d00001

diff --git a/src/static/images/profile.png b/src/static/images/profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4324d4dc42144ea7b96031ba1ec011dae2c14cb
GIT binary patch
literal 3855
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
P@H`N*u_dw8(2enbwYuE^

literal 0
HcmV?d00001

diff --git a/src/static/images/recipe-active.png b/src/static/images/recipe-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ccafbdc613711b2a6d46eb4c35dd657a2718687
GIT binary patch
literal 5741
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

literal 0
HcmV?d00001

diff --git a/src/static/images/recipe.png b/src/static/images/recipe.png
new file mode 100644
index 0000000000000000000000000000000000000000..673c7935e05c2eef1bc7098002ccac8b3bc6f4f8
GIT binary patch
literal 6612
zcmaKxcQhPt*!Pz#RtdYS28msEktorlg<W+QD_XRW=)IQ&`3Y9<Yjx403xX&?qIc0Y
zL_$OhqC^l8U7pQ*-v6F+o<C;hI@f%^_jS$OGjs0qnOHqt&8u{rbN~S0Di)(=Kt2xr
z+d$OheU0g>d;kCpz^b8*0w{i1;@s8;0&hGsuW5|@<o|(k=S3Z|P>ilI^Pvwmu{ti_
zys(vOc=&BJ<yFGNFU5_5gvR!n9e;aRrQvTqL^LcDrL_Vaf)63(<U$*DDG@`-*LQoW
zJVjyy^TjJmkAri0h?1*>+AfpT!E56ak_V$_9g@Af4+Kw`fxs{gU<5325)%q5OarS0
zg~6;)D3A?66Az?-$NZ*1cZH%*cn+U*7#ap4D`Tb7SbRCiLGO}iD?dIIj7W(h+AxNP
zg6%lwk)PDSm{eG7s8GKS4+R`^>Mke^iXm%YEkwUl5D5LjQ?(L}BD*QN(@Ul_Q6K|X
z)e}LG5d@4kA`x8Cg;Am466%=$Sb#6d>X%MKO)x!Gvg(SO5*_7zvhTiB&qM7kT3#3s
zTSqDx+6RO2eZA&BT3~WDd?LSkQZ%{RjTxdLp6rLZHGbrMpQlF-Rp3IKx|9^~Aw-V;
zEeIW1Eog`QiiN>|*=mwnNEJ8?NE`XX=tExM-3XZEF2EpIl2QdMsRWhxC0G4l3BE1B
zmoHxwBIlO_)zs+?(paFZc!p^$1Yp(5)pZ+0H2kHgJgl6?mmkRFLn+r5c(8t@uTxUb
z+wpk~7~wP3klN6j3LpgAd2at!NJzDxwd@nf)+G#3{2Yc*kb46XvZ>?`b<qiY|23yj
z>T@Pv2ix;F)9Q1=w{D|AA9yknZ-#NxY)lKpOh$49oX_ba>6%8HP$!d2lq!U0UT!*6
ze0MKsa|{x_<*5mRnh5Jbzp~!}p8gQLEGl+<a27c({I&m(qSPxVaO|m24uy9kHgeUZ
z$E$WX95Jhzzw-QdLN&OALeEczh;PvOm|aREmj35v<kYC^Lh-?9w%`u?(yT(v0RTG)
zqj`O@hsswWGQHT?=_Jn`QvT>`k1(&e6X(h2qacK)=AnPzz5P)*<_V8aEz5%HeiD3~
zCO?qXKSoREdk>OBA7miKDW5JAJK0^7cn+hat$$-7`lLW9IB56Bj~@UZQ@UNa8`J({
z_)&b(oG#+#CmrLMF?j<wTFkK|d1ksO^P>3m7aMdit^2a-(Ti6g7*JId>Yd>bMZPzZ
z4qL>|UU?O6;RZbNbx{u<dn&E$5~-J1TA<%`3+-SOXw160#3GF2eU<<poTPiZv1e>E
zO&{*4Rn+2?dL6ta`k}D3>D9sZp5lbI@>U6Kw5<i>kUv;WYd{Eprcpg3Aor)ufx1ZV
z`TTZ{?nNN<)`V|OU}z$k3NV%d+W^eBkutc;yT*@XBiA={k|YcX5xT*<2=r;G14*s>
zyBSX^93=lPKcoL7w2actO}G8S!pzmgv!HfL$ARJrwBvl!{-$IaqkmLV2Yq+wbCN(I
z^H`D#0+(T*@GYmnRWZkz<<qg!zLb6_U->J?Djbm?Lz-<hrg#q{KYWelM-9SNa|=(7
zuUY@U5q*EjfisJxhEWC9{VxUtbqkg_zN><x?BKM<^1{D5lVydDf`hinS7^xm#L_hR
zsIm86^-~?m?2;mA$!(+0rW~_LlVP*7UvjVmD}{!;-Z|-clN|NXm==VVWidgm+qfm=
zySSHZH49(gnj4nLg2pi9+}i-d%kAWD`O-BX#w6=%kEs?-3KtvGlALQlSO~M#J_<H%
z-*APzM$o>Q*K>Mp5HObg`eUwum%ueVfg3@s@i^yRccJEK-jF^U1A>%u<@=19(A4X^
zc*R$1;X#C4-FQOR$NN{Di7=(6J2+#y+Rfd~8X4}cNn`Yvp(xFQWh@vNI#pRVv(fNV
z$oYj~3b%&i)3p~V^QhTM^@@w1y*wkR9M%G7OMS?0S{WjLQT<q&xZJS&;`&qY28E85
z{1J`Q+mh?&BxWEWm0MT0$<uXaWoq{49NGn|aWN##b~k&H|5HPQBr*Q1%YqGV`MR)q
znYUyiF8Q$zQLvaFgz`sfws%)hX?;)6%P-jWeib|b;+!{W$*`W_`P}`Me^?4;5%D7)
zA#9K?IGkeF2&9k$RX41oXv)WG#^|#+a&ta5=(Wr|mhIsxx3-3Qg%_r)x$Ve-u=pS!
ztM1A-s&545q(3J-^hDMmq|EV!Q*ENF*BcHR^lzrOS-w@{$XoZ}e9XT2NUki4YRk9p
zU54jNp3s}pE{oyRSmLyTP%#3eacvxLTFy8dGY$T6u5>+RUwbgkd9PvOz&A!)Clp5r
zyAp0Ffw+c5g9>Yyi}q!|`IS<+?SG1FU`EN8){B0voENIA%rT#ynM*@nf^%vtc3Y!m
z4tgN_CpMop#%f5AlF1tyj*M4TeT=w7tqO9VeCW!NeDM2Q3r%8+?`c+#nQ~5zB9F1O
z1lU)6%*i7KG0?1G9)6>k52V5NZ3ZG`N(jb<H}}LyMzfI+UN>zZM=tDPy^;!<nVAEB
z9%J~N(nt_slXQ}xQv|8Xe%gA5W-g{=#joD~sWP=<yQO_~Xkr{JGVo&zYuD<imTe0#
zft~^!sYGwGkw_K(aY^3RSw}!^sRBgle@3f~?BA^eNHtp#)M_UmjFc{t>ie!C0*ruR
zQBJvY{eqJ1{qF#{%O3jM@BGgG?3m<-T%IJuPq+x(OoRwYi-GQ|;oqvl+5K=78tUM*
zTGHPxn+4T~_tq#t$?;-*JpDK<nEuMh5h`s_@o3(+Kw1$h0tzo6DQX0KTjHo8xJqzx
zp=Vh3x7fHYx56zfGy!(UcL*znpLSn<*$DWXSf^a|HTe=^9<k&2fwx$yK|>WRyOB7@
z7vx%&y}T&R%GGzWT~?QMgr0#39l*E6=<uQ3^G#gm!N~+v5^N`#b7T*qYB~yYffzn3
zmTaI#f@1WaeJy|g%911&^(vBd!v1k-?(nv20nLeNmRVw;>eQ@*I9I_{Rxu7VD#^fA
zHj&d7c-yGB5zF3y`n&jhetmuY)AJtc7SCU*KUq9^lN`jjBVbf=7L5adolJ*}WFF;9
z6Q`8FDx1ETz;}^hYlge;4#vN%B|>uD^9r6e9<%X2@nd>8zX9AtF>=*~hs*g<EIi$9
zpST<JdxI_J*RPY4llYcr*ZNL6U%daw8$yhDu##6D&$g+c3{8i@XoMCte4V~0O(=YF
z>wsj!MjqVDS3JS4fa_`*I;fDh&{hHpyYqd5Lr081MKZNL8rFpx&s8XKX?<Kuu`9Of
z9a!5Zx0H31Qke|yJ&k_EXViJ^z}JZU5<S?_>Lcx@+YW^9a(l(A=qNhmv17y3`}r_Q
ztS8L5$pN+Z^!{7qLWgkpz44U7w<G`os-1)>$8e0f2Z#VdP}!L5Tq?ADQoxEGdn>#<
zc*<9&Nd2XpH4(OPuCWv5MeNnQC=yxQpr`QbDf=@^fqhxBDWrWL9J!mwVe*-D2fw;&
zkRk{S^Zg2ZW~R~6d~;Qh#IeM%*wu(}q}wiTlq$vTD1TO}5d_x5V<0`U_|N&7dk?`*
zxd8MT@GBOF!z(^C88J;pH)2@us9-Kl7{HG6ZbAjtN*Uzl=H^8(*CZP1a192G&3>kt
zjDEOPUiPd~4IWd9(XbMp(DJ$mdUy8oEkZL7alQ%s_LTdseeDIL<l|@dLTkK^0^hxF
zkVsg?JZy_(>Pu^Z1_<p&gP(1$-jEs*t*wVHes(s2f}Yy80VzDV^SsQTG8pVPAyb}n
zQV@$K1y6nZLK1^1QbFNh={V|oz&t2!O^!DI2IcapigtAo7|1_!2e;NMRhMPOAL;;(
zQnIq3<JeN5C7;=GHA>bi2=~-dy|%^yrua?q#ig~LDe_j3Fh1))@QnK&&RIBONDRdC
zg^*y}r>9M!55kXlw-KsJ6GZ@$KRi9YwjDZGn7_(ti@S`xugH8bI_6uy2JlZ1{n7Hm
zp1f=mX>2FGQz<{8+ww$!SAcRw;0R>&)nU2E4`qf6ti(62R+wM@X|39LWZEw&K5=gU
z>2uHGY5YGoRo?PFc=NYZH(LVsuULhMPr<S%a8pS6iy+BFi8$^DS<*H-qtY)L4WJSL
z8QGqUA;)iP<K6_9I^2b$iqrx<@5-VpI4MS8fB1f-+qQuSh;Ev%g}|^sg=Vbkth#S_
zFk=iLV8I207T76yiQ!JD09q0SNCo9~Gsu8w_&|+=6mx?HUVQ{x7SOvA86&rothN^q
zH9A5{*tXPj125v{jQr~XeM)Sj5lk9jo!Jh%N{$dy^$=fL4T?*>65Jo~uGSy6=LIL`
zmuI&c&jtU+#NAB(rEH`+#H2s*`B&mO)nV}J*|+mzPTPlfn#xOWryw!}cktm5VBW0J
z#<w+};o5!DqJ_`n#{)cr^|8-H*u4)=w(s2tIZ6NTphao!_r-~Nf}41$rKIjz<!fAY
zg}oTQP$CgX5t#6teZP7t#nJ5crmQ`G3bp!@yZ>xfXL!?x<7yEY0?m04b#NIwfJzSS
zSGoE+3^)A94|wBc{6?TeF99g-uIDx_Dx6l8TXnFmXu+HkP^`J6y)|k&&~F17C4w{v
zqi&a8k~ZJ7qaQdb3!nux07x-+;KJy*J1fWm3*-a2*v+@c?~Mb|oLXyIprW#iBlp9w
zdVE$3?F@|yw9mA%;~eZgohWvXcXBnPkY|>9MVAA}hv{}n-P-PFf@roIo+V!{!!MZd
z%n2|Z#V8($h~n|K*gmus=5M$(dAjVZKEOc6c^BZFiti&C$;3`6NPtuJf{1XsRXRNm
zTzmjLtIs?nxbZc#*KjbPu(HCG{501u1S<Y^=TIRr-5ygL3-A4Ev&`H^HisP>1_!hv
zE&d8hGHQVxi1xGFig$*_*VamRwjXld2!8zFxtSIf4=(LoUA?R1ZX7;~dXZP_jiDF5
zFknE-&TM9u34LSB##@|9GX6e<f-<*V;)F-4mX4mPzV~`Jt$|UG8Z^i3zk@nMktVj`
z^qV}$kWJWLshhK~@TgF#z0H3!0%EdgQw}HEZyQM@tAhO?f?(mHo-Vd06o3<ogVTkG
z!bhw)B4Lxf)eNPT<I}u(xSIGxdczyI!1os^@I7U=oiK_!Bc2)H3_+l^Mn#&p->zzW
zOtyN-ROW5-$Gb&QB<da~pm&AQZF995wb0*le2LHf#&O7g)X1HCiQBGa--COLAV7zV
zowLBF*}uLjo^94c9lyTeN#MU!p8KSfkbzlbjnx3NaZ563I9_+)=wxYQdW6VH90`j3
z9p1I*(Ak9aiwl#<3GDAtLxOH;esrpa8Esr)tB!Yiq{hbh7R7O4Hg2x3bIs9=EqEzj
z3v8^^U_$HwbsEN#9>fcCH%E;hFL814RD^Wa8!eidF8-1%Gh{kf`Sa|;_@d!b=K1N^
zWI-`=ggFo)o?|}ATkGNJ`6TF3ggL?_TfAU$N%v+jbcLyT!LZ=%zS_m$fWgJZ`q|zC
zSrq_)HuxV4*h(e5Y0xf}H%?1x4gbSYB2vs;(nUNgbMj#2G0{D@Ss5>zSzDRUn9v&V
zv1O$ohDKCGziX8>nHD@eQz}?AW*=G4vL!Ec(n(TB!&3r3VL)#ZZw0W^w<)z(R|J2p
z2CZ=;Ekq(Z7PvSjD*tgxgOUI8_vX|_2hBk#g9_Mzf#~ITCy9<jPTm#L-j*+9tE6?w
z2`T(ji2cYCwv4lGK9i~vEDOl~>L`78LC#GKU$@GbzI%T7XPWnQ0H*OvEcR)m_WrD4
z^U+;!YLXm{fd!-QzpobL%gPJN*cO=&&c^Za(JOUlPsHTc`FFZml!IG`Q{Q-veS@Df
zO@%w1ot5ozScgL+SQ|xdNHFS%jJx>%(roO_7ZPtu`@(}O_fHBu++;t9Jk30)*%B$=
zp0L&W<Y4|{jK+7gDxD)2HqFa%(@i%k|Kpa#p|&CYWsFF{Et!Un%W|&u+B1Y~ZJy`B
zDiSfkp5{OHZQ6e6_ehKVYBz0<PdFK)#JV@fBIIn&n^lNb#@ZMg3c@y5ZjZG3S=D>4
zt#4q%+#rr&^wi5|otM{wmv5X#IA1Hg#MDg`!!Y^^^0qR}6%A9*4#Eqr$0-}YI@VWJ
z7;}vOZdTrHSy*05oBIBa$>;NFcMdVSRhknIV7XjL^Y<Iv_%Q3t9%9!dN&4;urzt3L
zRwwSw-EUdgpIk}f6B#%6&mo{WUqu_fBY`7IMKG@iT~oWlwpSacrlBFL*LremPTxOI
zP9LjYVgCDH{hGVEzVGC_l>=%yOVP}k<~xc!2qz<;^;I;{)`^xqWEE{vZg~zVy>nyE
zq3W|J%jxxw2IG0hwY?}9PN?dzOQJ7>1c?BIB8(bj6pR#hEHM&}AtlqC&HjwdG?A;v
zBQ%|Z+Kw;Q3!Uws0<Nswn46zjXtu*gBokrPH&NeWY@QDbVm|~W+HG&%V_IKr%<Q0U
zqOOf?!p#wT)qPh3mEsPQ_!%^`!3lzXbCzxf#EA6_LP=%1cfkXVjfl6WoB?V)@Zm6q
zr0DsWnDZJ<1-xnMj(`dp>H>X$M`E3FW>;QaEqKWf7st?b3@)!km~_8TT^OkLA#o2m
zrs>L!`0sE?qfHG65%Dpv5X(O@2*57Vpx`4fAL-J)&mZ^iA9Hmu%CS@29jbqtJ{xme
z;~v<CJr!ZWhy5x5m)o!fD?ECERrfi5MNH*pG;9@Sl-7i<T3M&UK=fN!V(_R((}#cJ
zJcOs{TzlW|xf2of)RAaz3wXgTxzD>qIEa254UL>lxu~hBF@E~SKwvnNef?1+GUNWq
zXn)yh_tbZmiH~Q^t}Y466ASu^UsiY(Z;pli+OqWnl1e4c58$-K)+@wZ)bk%pbK5Yi
zf&aYnv({xJ6DWS2MLK$S2I65>zV0=GsYDESw;?sbY;&oI++}%6ta-KtVz_?=FVo<T
zi&E!`^!hVAy^LjWVSx4y=Gv@jrH)v?moGLXB5CLg5NOjqHpHf#PZ+`?bven_LD>Z^
z_fTQc*smpUtmoIM^f5>0L#5gP(Ot>W`%YScSw=cC&OUXN!_bJx+n5!}wkHy;DB@Y=
zsF%Lv<Z@YA;a*NocuP~tgyXIdQ)-+U_w7vW=Bu@-=_Rx((`ab>3S;@azn`bOPw7@>
zBZ;jq<3mr$%0TZKj7C~C6=O~m0FeZ+$8ioB_GOk`3FdTImDG5~cSmgLEEmMrD@u+o
zS0AO`dN1Lj=(e_dk|tt2j|E3qr634bWWdS_bg@2u2kW?>Yrk?fi)6xvn=<2u*J7fR
zG#-7sEf&1J9CIL7Gfbi`o=<;I*_<*AE~!@J0wG@PY%6X@96zxx3Y_puL6pj5Q|fE^
z#&tyXehERYTKLLGV4LWF<cW6%1+22C@`3gpR9{T(qAhTuN*eA4IhGIkRni49f~~qL
zHjQHCdiP5&66<$|?q9#;$AVYTM3j@y2_YicICkamU>c$2;$VVhxaS)uo6ev9$*PCO
zkT?u2af`qsq+0)Tw}q~u>!F^TKzk3Z6ol=aw_1tb3TNpqXoebTy3`T&DMu92M>-H+
zcO3;4H6^XCGzUInj!`3(nJkYgj0M%e<2*ZrgKAaW(SPxhhVC(8J$q-A8?LfU90B~B
zwrs$g4?t?mZ;^<&+Sz`@<E1Gl#|6zQqnOv_od{kNea)|J%}WgFzy21>m41>5U0zZ<
zy8Y}-z(F0{(?=aOdB@rIu{dqq8)LZsF%m+!dwlcl3&-|jci!_45sY*A!|EKv1`=o6
zN`L1pq@>~vCAKZg(q7_IBOR_zqRWrpOiNkam9;eJT6)zSevyCW_;G>Daq&#nbkQT#
zyNPccwFyvGaB2MPeg57C{`bv;o<c;yNx^6swqbZM?fP2$?CbO?OYQu=LOJzEd@top
zg$4zc#`9rrRD@NQqA}6qYd@;n6E<`d;BfJutPO?@QspyE>EIGP9mW6}nWX6Wt|*~!
zRzrpZE(b$BrnhPFIIb>~+0lj%<@^ze>DggMjCkaKH{6z;W|JzGm_7tZaG*bRDZhN6
z0@n7eJMa>s(li5&-G0wp%qSX*{;M)77+nU%%ZBy|BIqKX(cx|{xDc<)Zz=uKc>HHD
zH*D(`j_TGfyTdfA_{f=$hX$F`Cg7^TS+<%4W}cJi_nMww?L}3M7S}!RPqZo`fZ5vG
z+IJt2x$}NBj@vwBlo+f6T3Pf{0ssGS*3WAi3y%Aq+N%+LkHz<8(C3jqS#QB5R9RU+
zo5t*#Fwz@*<+(2zb9&X7+3}4|rcRI!_U_syEIKvK-d*1?P!06qHB%ZQOlCH6p6kUA
z>#uy_UYZ_sY96ytYaV92Ul%)Kc|n9O#L?3YYR_Xvb4&~{0uj|DvG4*o_(%%`W%nEw
z5hpX&Sm`X5JECN=+!CPe5likETispK;!S4uef<x7xFjiENBDteSK{WOKrONy3H4zE
z&XCFa|B*W7#boE_QiWm3qh%ZUYT2LuyI*&ThzliTqObE(u2dqJ4+h-i(#LulfDkAG
zc3C7H%RolsHdp!k6XVH{Uvz=^z~&$1cNM$oVL`6zy`M1;Rkd0mw^v`%vj4BWK?@%p
z5ZR=Xh*VEZCYzMjiMA^LOfJGVUH&7R!o)J|%EP*L$-iX&{yjM!StAG3{}y6b01s){
VZ1v_t?~yYAth%n+D-|pJ{{XAH8SDT6

literal 0
HcmV?d00001

diff --git a/src/store/user.js b/src/store/user.js
index c74bf31..cb8b9dc 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -4,7 +4,7 @@ export const useUserStore = defineStore({
   id: 'user',
   state: () => {
     return {
-      token: '',
+      token: uni.getStorageSync('token') || '', // 从缓存读取token
       userInfo: {}, // 用户信息
       appInfo: {}, // 应用信息
       // 按钮权限编码
@@ -12,10 +12,107 @@ export const useUserStore = defineStore({
       // 权限菜单
       menuList: [],
       // 权限路由
-      permissionRoutes: []
+      permissionRoutes: [],
+      // 是否已登录
+      isLoggedIn: !!uni.getStorageSync('token')
     }
   },
   unistorage: true,
-  getters: {},
-  actions: {}
+  getters: {
+    // 获取用户昵称
+    nickname: (state) => state.userInfo.nickname || '未登录',
+    
+    // 获取用户头像
+    avatar: (state) => state.userInfo.avatar || '/static/images/default-avatar.png',
+    
+    // 获取用户ID
+    userId: (state) => state.userInfo.userId || '',
+    
+    // 检查是否已登录
+    hasLogin: (state) => state.isLoggedIn && !!state.token,
+    
+    // 检查是否首次登录
+    isFirstLogin: (state) => state.userInfo.isFirstLogin || false
+  },
+  actions: {
+    // 设置用户信息
+    setUserInfo(userInfo) {
+      this.userInfo = userInfo
+      this.isLoggedIn = true
+    },
+    
+    // 设置token
+    setToken(token) {
+      this.token = token
+      // 同时保存到本地缓存
+      uni.setStorageSync('token', token)
+    },
+    
+    // 登录
+    async login(loginData) {
+      try {
+        // 这里可以调用登录API
+        // const result = await userApi.login(loginData)
+        
+        // 模拟登录成功
+        const mockUserInfo = {
+          userId: '10086',
+          nickname: '小美',
+          avatar: '/static/images/default-avatar.png',
+          level: 'LV.5 美食达人'
+        }
+        
+        this.setUserInfo(mockUserInfo)
+        this.setToken('mock_token_' + Date.now())
+        
+        return {
+          success: true,
+          data: mockUserInfo
+        }
+      } catch (error) {
+        console.error('登录失败:', error)
+        return {
+          success: false,
+          message: error.message || '登录失败'
+        }
+      }
+    },
+    
+    // 登出
+    logout() {
+      this.token = ''
+      this.userInfo = {}
+      this.isLoggedIn = false
+      this.permissionCodes = []
+      this.menuList = []
+      this.permissionRoutes = []
+      // 清除本地缓存
+      uni.removeStorageSync('token')
+    },
+    
+    // 更新用户信息
+    updateUserInfo(userInfo) {
+      this.userInfo = { ...this.userInfo, ...userInfo }
+      // 如果更新了昵称，清除首次登录状态
+      if (userInfo.nickname) {
+        this.userInfo.isFirstLogin = false
+      }
+    },
+    
+    // 检查登录状态
+    checkLoginStatus() {
+      // 从缓存重新读取token
+      const cachedToken = uni.getStorageSync('token')
+      if (cachedToken && cachedToken !== this.token) {
+        this.token = cachedToken
+        this.isLoggedIn = true
+      }
+      return this.hasLogin
+    },
+    
+    // 清除首次登录状态
+    clearFirstLogin() {
+      this.userInfo.isFirstLogin = false
+    }
+  }
 })