From a3291e89539f1352ead656dc26b67d74a51b0e77 Mon Sep 17 00:00:00 2001
From: Gary <3489015381@qq.com>
Date: Tue, 19 Nov 2024 16:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=89=8D=E5=90=8E=E7=AB=AF?=
=?UTF-8?q?=E4=BA=A4=E4=BA=92url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 5 +-
manifest.json | 54 ++-
pages.json | 394 +++++++++---------
.../homepages/homes/dictionary/Page/Page.vue | 17 +
.../homes/dictionary/page1/page1.vue | 17 +
pages/transition/page2/page2.vue | 2 +-
6 files changed, 280 insertions(+), 209 deletions(-)
create mode 100644 pages/homepages/homes/dictionary/Page/Page.vue
create mode 100644 pages/homepages/homes/dictionary/page1/page1.vue
diff --git a/App.vue b/App.vue
index a43f866..ad9ea60 100644
--- a/App.vue
+++ b/App.vue
@@ -22,12 +22,13 @@ import ai_recongize_recipe from './components/ai_recongize_recipe/ai_recongize_r
export default {
globalData: {
// 定义后端数据库地址信息
- fit_journey_basic_address: 'http://127.0.0.1:8081',
+ fit_journey_basic_address: 'http://47.122.61.54:8086',//TODO:已完成
fit_journey_community_address: 'http://localhost:8082',
- fit_journey_ai_address: 'http://127.0.0.1:8085',
+ fit_journey_ai_address: 'http://127.0.0.1:8081',
fit_journey_login_address: 'http://localhost:8084',
fit_journey_recipe_address: 'http://localhost:8083',
fit_journey_exercise_address: 'http://localhost:8086',
+ fit_journey_admin_address: 'http://47.122.61.54:8085',//TODO:已完成
// TODO: 后期需要把 token 更换成从 localStorage 中获取
token: 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxODUxOTgwMTI1O' +
diff --git a/manifest.json b/manifest.json
index e7745dd..c0f1e17 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
{
- "name" : "fitjourney前端代码",
- "appid" : "",
- "description" : "",
+ "name" : "fit journey",
+ "appid" : "__UNI__1A765D2",
+ "description" : "fit journey是一款基于AI的应用 支持多平台",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
@@ -41,17 +41,50 @@
]
},
/* ios打包配置 */
- "ios" : {},
+ "ios" : {
+ "dSYMs" : false
+ },
/* SDK配置 */
- "sdkConfigs" : {}
+ "sdkConfigs" : {
+ "oauth" : {},
+ "ad" : {}
+ },
+ "icons" : {
+ "ios" : {
+ "iphone" : {
+ "app@2x" : "unpackage/res/icons/120x120.png",
+ "app@3x" : "unpackage/res/icons/180x180.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "notification@3x" : "unpackage/res/icons/60x60.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "settings@3x" : "unpackage/res/icons/87x87.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png",
+ "spotlight@3x" : "unpackage/res/icons/120x120.png"
+ },
+ "appstore" : "unpackage/res/icons/1024x1024.png",
+ "ipad" : {
+ "app" : "unpackage/res/icons/76x76.png",
+ "app@2x" : "unpackage/res/icons/152x152.png",
+ "notification" : "unpackage/res/icons/20x20.png",
+ "notification@2x" : "unpackage/res/icons/40x40.png",
+ "proapp@2x" : "unpackage/res/icons/167x167.png",
+ "settings" : "unpackage/res/icons/29x29.png",
+ "settings@2x" : "unpackage/res/icons/58x58.png",
+ "spotlight" : "unpackage/res/icons/40x40.png",
+ "spotlight@2x" : "unpackage/res/icons/80x80.png"
+ }
+ },
+ "android" : {
+ "hdpi" : "unpackage/res/icons/72x72.png",
+ "xhdpi" : "unpackage/res/icons/96x96.png",
+ "xxhdpi" : "unpackage/res/icons/144x144.png",
+ "xxxhdpi" : "unpackage/res/icons/192x192.png"
+ }
+ }
}
},
/* 快应用特有相关 */
"quickapp" : {},
-
-
-
-
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "",
@@ -72,5 +105,6 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "3"
+ "vueVersion" : "3",
+ "fallbackLocale" : "zh-Hans"
}
diff --git a/pages.json b/pages.json
index 057edd6..23e3005 100644
--- a/pages.json
+++ b/pages.json
@@ -170,14 +170,14 @@
}
},*/
/*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/
- /* {
- "path": "pages/homepages/homes/home/home",
- "style": {
- "navigationStyle": "custom"
- }
- },
- */
-
+ /* {
+ "path": "pages/homepages/homes/home/home",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ */
+
/*{
"path": "pages/homepages/homes/ai_recognize_fruit/ai_recognize_fruit",
"style": {
@@ -246,196 +246,198 @@
}*/
/*---------------------------------------------------------主页跳转的几个界面-------------------------------------------------------*/
- /* {
- "path": "components/ai_recongize_fruit/ai_recongize_fruit",
- "style": {
+ /* {
+ "path": "components/ai_recongize_fruit/ai_recongize_fruit",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }*/
+ /*--------------------------------------------------------知识图谱界面----------------------------------------------------------------------*/
+ {
+ "path" : "pages/homepages/homes/dictionary/orange/orange",
+ "style" :
+ {
"navigationStyle": "custom"
}
- }*/
- {
- "path" : "pages/homepages/homes/dictionary/orange/orange",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
-
- {
- "path" : "pages/homepages/homes/dictionary/apple/apple",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/watermelon/watermelon",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/banana/banana",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/avocado/avocado",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/bread/bread",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/broccoli/broccoli",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/carrot/carrot",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/corn/corn",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/eggplant/eggplant",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/fried egg/fried egg",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/garlic/garlic",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/grape/grape",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/kiwi fruit/kiwi fruit",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/lemon/lemon",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/loquat/loquat",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/mango/mango",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/mushroom/mushroom",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/papaya/papaya",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/pear/pear",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/pepper/pepper",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/pineapple/pineapple",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/pizza/pizza",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/pulled noodles/pulled noodles",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/radish/radish",
- "style" :
- {
- "navigationStyle": "custom"
- }
- },
- {
- "path" : "pages/homepages/homes/dictionary/strawberry/strawberry",
- "style" :
- {
- "navigationStyle": "custom"
- }
- }
-
+ },
+
+ {
+ "path" : "pages/homepages/homes/dictionary/apple/apple",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/watermelon/watermelon",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/banana/banana",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/avocado/avocado",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/bread/bread",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/broccoli/broccoli",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/carrot/carrot",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/corn/corn",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/eggplant/eggplant",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/fried egg/fried egg",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/garlic/garlic",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/grape/grape",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/kiwi fruit/kiwi fruit",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/lemon/lemon",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/loquat/loquat",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/mango/mango",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/mushroom/mushroom",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/papaya/papaya",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/pear/pear",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/pepper/pepper",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/pineapple/pineapple",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/pizza/pizza",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/pulled noodles/pulled noodles",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/radish/radish",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/homepages/homes/dictionary/strawberry/strawberry",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
+ }
+ /*--------------------------------------------------------知识图谱界面----------------------------------------------------------------------*/
+
/*-------------------------------------------------------------------部分组件的测试类---------------------------------------------------*/
],
"uniIdRouter": {},
diff --git a/pages/homepages/homes/dictionary/Page/Page.vue b/pages/homepages/homes/dictionary/Page/Page.vue
new file mode 100644
index 0000000..342846f
--- /dev/null
+++ b/pages/homepages/homes/dictionary/Page/Page.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/homepages/homes/dictionary/page1/page1.vue b/pages/homepages/homes/dictionary/page1/page1.vue
new file mode 100644
index 0000000..342846f
--- /dev/null
+++ b/pages/homepages/homes/dictionary/page1/page1.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/transition/page2/page2.vue b/pages/transition/page2/page2.vue
index fae9289..620ae51 100644
--- a/pages/transition/page2/page2.vue
+++ b/pages/transition/page2/page2.vue
@@ -29,7 +29,7 @@ export default {
flex-direction: column; /* 纵向排列 */
align-items: center; /* 水平居中 */
justify-content: flex-end; /* 使内容向底部对齐 */
- position: relative; /* 为绝对定位子元素提供相对定位的上下文 */
+ position: relative; //相对自身位置进行偏移的定位方式
}
.button {