diff --git a/src/api/index.js b/src/api/index.js
index 23e7ea4..069e023 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -30,13 +30,18 @@ const API = {
addFood: data => net.post('/food', data, true), // 添加菜品菜谱
updateFood: data => net.put('/food', data, true), // 更新菜品菜谱
deleteFood: data => net.delete('/food', data, true), // 删除菜品菜谱
- createOrder: data => net.post('/order', data, true), // 创建订单
+
// 菜品分类相关接口
getFoodCategoryList: (params = {}) => net.get('/food/category/list', params, true), // 获取菜品分类列表(支持 page/pageSize)
addFoodCategory: data => net.post('/food/category', data, true), // 添加菜品分类
updateFoodCategory: data => net.put('/food/category', data, true), // 更新菜品分类
- deleteFoodCategory: data => net.delete('/food/category', data, true) // 删除菜品分类
+ deleteFoodCategory: data => net.delete('/food/category', data, true), // 删除菜品分类
+ // 订单相关接口
+ createOrder: data => net.post('/order', data, true), // 创建订单
+ getOrderList: (params = {}) => net.get('/order/list', params, true), // 获取订单列表,只需要userId和date参数
+ getOrderDetail: (id) => net.get(`/order/${id}`, {}, true), // 获取订单详情
+ deleteOrder: data => net.delete('/order', data, true), // 删除订单
};
export default API
diff --git a/src/pages.json b/src/pages.json
index 3d25108..fe7ba69 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -104,6 +104,13 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/order/my-orders",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "pages/diary/diary",
"style": {
diff --git a/src/pages/order/my-orders.vue b/src/pages/order/my-orders.vue
new file mode 100644
index 0000000..bbe420a
--- /dev/null
+++ b/src/pages/order/my-orders.vue
@@ -0,0 +1,185 @@
+
+
+
+ 一共记录了{{ total }}个订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ food.name }}
+ x1
+
+
+
+
+
+
+ {{ food.name }}
+
+
+
+
+
+
+
+
+
+
+ 这里空空如也~
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/profile/profile.vue b/src/pages/profile/profile.vue
index ec957a5..c76f6e3 100644
--- a/src/pages/profile/profile.vue
+++ b/src/pages/profile/profile.vue
@@ -12,10 +12,6 @@
{{ userInfo.nickname }}
ID: {{ userInfo.userId }}
-
-
- {{ userInfo.level }}
-
@@ -33,9 +29,9 @@
-
+
- 我的菜谱
+ 我的订单
@@ -47,67 +43,14 @@
-
+
- 我的目标
+ 我的模板
-
- 设置
-
-
-
-
-
- 应用设置
-
-
-
-
-
-
- 隐私设置
-
-
-
-
-
-
- 消息通知
-
-
-
-
-
-
- 其他
-
-
-
-
-
- 帮助中心
-
-
-
-
-
-
- 意见反馈
-
-
-
-
-
-
- 关于我们
-
-
-
-
@@ -305,8 +248,8 @@ const editProfile = () => {
}
const goToMyRecipes = () => {
- uni.switchTab({
- url: '/pages/recipe/recipe'
+ uni.navigateTo({
+ url: '/pages/order/my-orders'
})
}
@@ -452,34 +395,23 @@ onMounted(() => {
}
}
- .user-info {
- flex: 1;
+ .user-info {
+ flex: 1;
+ margin-left: 20rpx;
- .user-name {
- display: block;
- font-size: 36rpx;
- font-weight: bold;
- margin-bottom: 10rpx;
- }
+ .user-name {
+ display: block;
+ font-size: 36rpx;
+ font-weight: bold;
+ margin-bottom: 8rpx;
+ }
- .user-id {
- display: block;
- font-size: 24rpx;
- opacity: 0.8;
- margin-bottom: 15rpx;
- }
-
- .user-level {
- display: flex;
- align-items: center;
- gap: 8rpx;
-
- .level-text {
+ .user-id {
+ display: block;
font-size: 24rpx;
- opacity: 0.9;
+ opacity: 0.8;
}
}
- }
.user-actions {
.action-btn {