diff --git a/App.vue b/App.vue index 735cfae..6098689 100644 --- a/App.vue +++ b/App.vue @@ -17,9 +17,9 @@ export default { // 定义后端数据库地址信息 fit_journey_basic_address: 'http://127.0.0.1:8081', fit_journey_community_address: 'http://localhost:8082', - fit_journey_ai_address: 'http://localhost:8083', + fit_journey_ai_address: 'http://127.0.0.1:8085', fit_journey_login_address: 'http://localhost:8084', - fit_journey_recipe_address: 'http://localhost:8085', + fit_journey_recipe_address: 'http://localhost:8083', fit_journey_exercise_address: 'http://localhost:8086', // TODO: 后期需要把 token 更换成从 localStorage 中获取 diff --git a/package.json b/package.json new file mode 100644 index 0000000..8d8e221 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "name": "fitjourney前端代码", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "private": true, + "dependencies": { + "echarts": "^5.5.1" + } +} diff --git a/pages.json b/pages.json index 9ff64bd..7312ccc 100644 --- a/pages.json +++ b/pages.json @@ -71,15 +71,15 @@ } },*/ /*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/ - + /* { "path": "pages/information/sex/sex", "style": { "navigationStyle": "custom" } - }, + },*/ /*----------------------------------------------性别填写界面--------------------------------------------------------------*/ - + /* { "path": "pages/information/boy_weight_start/boy_weight_start", "style": { @@ -97,9 +97,9 @@ "style": { "navigationStyle": "custom" } - }, + },*/ /*------------------------------------------------男生填写体重------------------------------------------------------------*/ - { + /* { "path": "pages/information/boy_height_start/boy_height_start", "style": { "navigationStyle": "custom" @@ -116,9 +116,9 @@ "style": { "navigationStyle": "custom" } - }, + },*/ /*---------------------------------------男生填写身高--------------------------------------------------------------*/ - { + /* { "path": "pages/information/girl_height_start/girl_height_start", "style": { "navigationStyle": "custom" @@ -135,9 +135,9 @@ "style": { "navigationStyle": "custom" } - }, - /*--------------------------------------女生填写身高------------------------------------------------------------------*/ - { + },*/ + /*------------------------------------------------------------------------女生填写身高------------------------------------------------------------------*/ + /* { "path": "pages/information/girl_weight_start/girl_weight_start", "style": { "navigationStyle": "custom" @@ -154,86 +154,89 @@ "style": { "navigationStyle": "custom" } - }, - /*----------------------------------------女生填写体重------------------------------------------------------------------*/ - { + },*/ + /*--------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/ + /*{ "path": "pages/information/purpose/purpose", "style": { "navigationStyle": "custom" } - } - /*---------------------------------------------------------------信息填写界面----------------------------------------------------*/ - /* { - "path": "pages/homepages/home/home", + },*/ + /*---------------------------------------------------------------爱好信息填写界面----------------------------------------------------*/ + /* { + "path": "pages/transition/page8/page8", "style": { "navigationStyle": "custom" } },*/ - /*--------------------------------------------------------------主界面----------------------------------------------------------*/ - /*{ - "path": "pages/homepages/puppy_chat/puppy_chat", + /*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/ + /* { + "path": "pages/homepages/homes/home/home", "style": { "navigationStyle": "custom" } },*/ - /*-------------------------------------------------------------聊天界面--------------------------------------------------------*/ + { + "path": "pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe", + "style": { + "navigationStyle": "custom" + } + } + /*-----------------------------------------------------------------------主界面----------------------------------------------------------*/ /* { - "path": "pages/homepages/community/community", + "path": "pages/homepages/puppy_chat/puppy_chat", "style": { "navigationStyle": "custom" } - },*/ - /*-------------------------------------------------------------社区界面------------------------------------------------------*/ + }*/ + /*----------------------------------------------------------------------聊天界面--------------------------------------------------------*/ /* { - "path": "pages/homepages/user/user/user", + "path": "pages/homepages/community/community", "style": { "navigationStyle": "custom" } },*/ - /*---------------------------------------------------------------个人信息界面----------------------------------------------------*/ + /*---------------------------------------------------------------------社区界面------------------------------------------------------*/ /*{ - "path": "pages/transition/page8/page8", + "path": "pages/homepages/user/user/user", "style": { "navigationStyle": "custom" } }*/ - /*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/, + /*---------------------------------------------------------------------个人信息界面----------------------------------------------------*/ + /* { "path": "pages/homepages/user/user_information/user_information", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, { - "path": "pages/homepages/user/bmi_imformation/bmi_imformation", + "path": "pages/homepages/user/bmi_information/bmi_information", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, { "path": "pages/homepages/user/basic_information/basic_information", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, { "path": "pages/homepages/user/exercise_plans/exercise_plans", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, { "path": "pages/homepages/user/recipe_and_calorie/recipe_and_calorie", "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } - } + }*/ /*---------------------------------------------------------主页跳转的几个界面-------------------------------------------------------*/ + ], "uniIdRouter": {}, "tabBar": null diff --git a/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue b/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue new file mode 100644 index 0000000..c3e1a56 --- /dev/null +++ b/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/pages/homepages/home/home.vue b/pages/homepages/homes/home/home.vue similarity index 100% rename from pages/homepages/home/home.vue rename to pages/homepages/homes/home/home.vue diff --git a/pages/homepages/puppy_chat/puppy_chat.vue b/pages/homepages/puppy_chat/puppy_chat.vue index caa91d0..3915fa7 100644 --- a/pages/homepages/puppy_chat/puppy_chat.vue +++ b/pages/homepages/puppy_chat/puppy_chat.vue @@ -2,6 +2,8 @@ 这个是puppy_chat界面 + + diff --git a/pages/homepages/user/bmi_imformation/bmi_imformation.vue b/pages/homepages/user/bmi_information/bmi_information.vue similarity index 100% rename from pages/homepages/user/bmi_imformation/bmi_imformation.vue rename to pages/homepages/user/bmi_information/bmi_information.vue diff --git a/pages/homepages/user/user/user.vue b/pages/homepages/user/user/user.vue index 980e300..e8bd631 100644 --- a/pages/homepages/user/user/user.vue +++ b/pages/homepages/user/user/user.vue @@ -1,18 +1,77 @@ diff --git a/static/homepages/homes/ai_recognize_recipe/css/ai_recongnize_recipe.scss b/static/homepages/homes/ai_recognize_recipe/css/ai_recongnize_recipe.scss new file mode 100644 index 0000000..776cc79 --- /dev/null +++ b/static/homepages/homes/ai_recognize_recipe/css/ai_recongnize_recipe.scss @@ -0,0 +1,68 @@ + +.background { + background-image: url("@/static/homepages/homes/ai_recognize_recipe/pictures/background.png"); + background-size: cover; + background-position: center; + height: 100vh; + display: flex; + flex-direction: column; /* 纵向排列 */ + align-items: center; /* 水平居中 */ + justify-content: flex-end; /* 使内容向底部对齐 */ + position: relative; /* 为绝对定位子元素提供相对定位的上下文 */ +} +.upload_picture{ + position: absolute; /* 绝对定位 */ + width: 90%; + height: 30%; + top: 43%; /* 距离底部 20% 的位置 */ + left: 50%; /* 水平居中 */ + transform: translateX(-50%); /* 通过 translateX 使其居中 */ +} +.button { + position: absolute; /* 绝对定位 */ + width: 15%; + height: 7%; + top: 1%; /* 距离底部 20% 的位置 */ + left: 8%; /* 水平居中 */ + transform: translateX(-50%); /* 通过 translateX 使其居中 */ +} +.calorie_container { + background-image: url("@/static/homepages/homes/ai_recognize_recipe/pictures/calorie.png"); + background-size: cover; + background-position: center; + display: flex; /* 使用 flex 布局 */ + flex-direction: column; + align-items: center; /* 水平居中 */ + justify-content: center; /* 垂直居中 */ + position: absolute; + width: 40%; + height: 25%; + bottom: 2%; + left: 6%; +} +.calorie_text { + font-size: 23px; + color: #c63030; + font-weight: bold; + margin-top: 100%; /* 向下移动 100% */ +} +.name_container{ + background-image: url("@/static/homepages/homes/ai_recognize_recipe/pictures/name.png"); + background-size: cover; + background-position: center; + display: flex; /* 使用 flex 布局 */ + flex-direction: column; + align-items: center; /* 水平居中 */ + justify-content: center; /* 垂直居中 */ + position: absolute; + width: 40%; + height: 26%; + bottom: 2%; + left: 54%; +} +.name_text { + font-size: 23px; + color: #c63030; + font-weight: 800; + margin-top: 100%; /* 向下移动 100% */ +} \ No newline at end of file diff --git a/static/homepages/homes/ai_recognize_recipe/pictures/background.png b/static/homepages/homes/ai_recognize_recipe/pictures/background.png new file mode 100644 index 0000000..d8362f5 Binary files /dev/null and b/static/homepages/homes/ai_recognize_recipe/pictures/background.png differ diff --git a/static/homepages/homes/ai_recognize_recipe/pictures/button.png b/static/homepages/homes/ai_recognize_recipe/pictures/button.png new file mode 100644 index 0000000..f3f43e8 Binary files /dev/null and b/static/homepages/homes/ai_recognize_recipe/pictures/button.png differ diff --git a/static/homepages/homes/ai_recognize_recipe/pictures/calorie.png b/static/homepages/homes/ai_recognize_recipe/pictures/calorie.png new file mode 100644 index 0000000..bdb9312 Binary files /dev/null and b/static/homepages/homes/ai_recognize_recipe/pictures/calorie.png differ diff --git a/static/homepages/homes/ai_recognize_recipe/pictures/name.png b/static/homepages/homes/ai_recognize_recipe/pictures/name.png new file mode 100644 index 0000000..2c71c16 Binary files /dev/null and b/static/homepages/homes/ai_recognize_recipe/pictures/name.png differ diff --git a/static/homepages/homes/ai_recognize_recipe/pictures/photo.png b/static/homepages/homes/ai_recognize_recipe/pictures/photo.png new file mode 100644 index 0000000..97240d5 Binary files /dev/null and b/static/homepages/homes/ai_recognize_recipe/pictures/photo.png differ diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json index 27774d0..66669e1 100644 --- a/unpackage/dist/cache/.vite/deps/_metadata.json +++ b/unpackage/dist/cache/.vite/deps/_metadata.json @@ -1,8 +1,15 @@ { - "hash": "3dcffc29", + "hash": "0aaf698d", "configHash": "cc60d382", - "lockfileHash": "e3b0c442", - "browserHash": "e601f541", - "optimized": {}, + "lockfileHash": "22a0e42d", + "browserHash": "eed84a77", + "optimized": { + "echarts": { + "src": "../../../../../node_modules/echarts/index.js", + "file": "echarts.js", + "fileHash": "12ff8916", + "needsInterop": false + } + }, "chunks": {} } \ No newline at end of file