diff --git a/pages.json b/pages.json
index 4f7ca1f..45ba06f 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,7 @@
{
"pages": [
/*---------------------------------------------------------动画过渡界面--------------------------------*/
+/*
{
"path": "pages/transition/page1/page1",
"style": {
@@ -45,7 +46,7 @@
},
/*-----------------------------------------------------------------------动画过渡界面-------------------------------------------*/
/*-----------------------------------------------------------------------登录注册界面-----------------------------------------------*/
-
+/*
{
"path": "pages/login/account_login/account_login",
"style": {
@@ -72,7 +73,7 @@
},
/*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/
/*-----------------------------------------------------------------------性别填写界面---------------------------------------------*/
- {
+ /* {
"path": "pages/information/sex/sex",
"style": {
"navigationStyle": "custom"
@@ -80,7 +81,7 @@
},
/*----------------------------------------------性别填写界面--------------------------------------------------------------*/
/*------------------------------------------------男生填写体重------------------------------------------------------*/
- {
+ /* {
"path": "pages/information/boy_weight_start/boy_weight_start",
"style": {
"navigationStyle": "custom"
@@ -100,7 +101,7 @@
},
/*------------------------------------------------男生填写体重------------------------------------------------------------*/
/*------------------------------------------------男生填写身高------------------------------------------------------------*/
- {
+ /* {
"path": "pages/information/boy_height_start/boy_height_start",
"style": {
"navigationStyle": "custom"
@@ -120,7 +121,7 @@
},
/*---------------------------------------男生填写身高--------------------------------------------------------------*/
/*------------------------------------------------女生填写身高------------------------------------------------------------*/
- {
+ /* {
"path": "pages/information/girl_height_start/girl_height_start",
"style": {
"navigationStyle": "custom"
@@ -140,7 +141,7 @@
},
/*------------------------------------------------女生填写身高------------------------------------------------------------*/
/*------------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
- {
+ /* {
"path": "pages/information/girl_weight_start/girl_weight_start",
"style": {
"navigationStyle": "custom"
@@ -160,7 +161,7 @@
},
/*--------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
/*----------------------------------------------------------填写使用目的--------------------------------------------------*/
- {
+ /* {
"path": "pages/information/purpose/purpose",
"style": {
"navigationStyle": "custom"
@@ -168,7 +169,7 @@
},
/*------------------------------------------------填写使用目的-----------------------------------------------------------*/
/*---------------------------------------------------------------进入主页的过渡界面----------------------------------------------------*/
- {
+ /*{
"path": "pages/transition/page8/page8",
"style": {
"navigationStyle": "custom"
@@ -176,7 +177,7 @@
},
/*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/
/*------------------------------------------------------------------主页部分内容--------------------------------------------------------*/
- {
+ /*{
"path": "pages/homepages/homes/home/home",
"style": {
"navigationStyle": "custom"
@@ -250,7 +251,7 @@
}
}*/
/*-----------------------------------------------------------------------主界面----------------------------------------------------------*/
- {
+ /* {
"path": "pages/homepages/puppy_chat/puppy_chat",
"style": {
"navigationStyle": "custom"
@@ -278,6 +279,7 @@
"navigationStyle": "custom"
}
},
+ */
{
"path": "pages/homepages/user/bmi_information/bmi_information",
"style": {
@@ -290,6 +292,7 @@
"navigationStyle": "custom"
}
},
+ /*
{
"path": "pages/homepages/user/exercise_plans/exercise_plans",
"style": {
diff --git a/pages/homepages/user/basic_information/basic_information.vue b/pages/homepages/user/basic_information/basic_information.vue
index 4a47e2e..c1e0de1 100644
--- a/pages/homepages/user/basic_information/basic_information.vue
+++ b/pages/homepages/user/basic_information/basic_information.vue
@@ -3,18 +3,20 @@
-
+
-
- puppy
+
+
+ {{name}}
-
-
+
+
+ {{selftext}}
-
+
@@ -22,14 +24,37 @@
@@ -129,11 +154,21 @@ export default {
position: absolute;
font-size: 1.4em;
text-align: center;
- width: 100%;
- height: 20%;
- top: 17%;
+ width: 65%;
+ height: 40%;
+ top: 24%;
+ left: 20%;
+ color:#000000;
+}
+.w_name{
+ position: absolute;
+ font-size: 1.4em;
+ text-align: center;
+ width: 65%;
+ height: 40%;
+ top: 26%;
+ left: 20%;
color:#000000;
- font-weight: bold;
}
.self_but{
position: absolute;
@@ -145,11 +180,20 @@ export default {
}
.self_write{
position: absolute;
- font-size: 1em;
- text-align: center;
- width: 100%;
- height: 20%;
+ font-size: 1.4em;
+ width: 70%;
+ height: 80%;
+ top: 4%;
+ right: 10%;
+ color:#000000;
+}
+.self_read{
+ position: absolute;
+ font-size: 1.4em;
+ width: 70%;
+ height: 80%;
top: 4%;
+ right: 10%;
color:#000000;
}
.button{
diff --git a/pages/homepages/user/bmi_information/bmi_information.vue b/pages/homepages/user/bmi_information/bmi_information.vue
index fef9dff..6f06de5 100644
--- a/pages/homepages/user/bmi_information/bmi_information.vue
+++ b/pages/homepages/user/bmi_information/bmi_information.vue
@@ -1,24 +1,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -54,6 +37,16 @@ export default {
};
},
methods:{
+ navigateTo(page) {
+ uni.navigateTo({
+ url: page
+ });
+ },
+
+ goto_user(){
+ this.navigateTo(`/pages/homepages/user/user/user`);
+ },
+
submit(){
// 这里替换成你的后端API端点
const url = app.globalData.fit_journey_ai_address+`/bmi`;
diff --git a/pages/homepages/user/user/user.vue b/pages/homepages/user/user/user.vue
index 4ea233c..b1804bd 100644
--- a/pages/homepages/user/user/user.vue
+++ b/pages/homepages/user/user/user.vue
@@ -1,27 +1,29 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
- aaaaaaaaa
+ {{user_name}}
20000J
17000J
- 180cm
- 75kg
- 24.9
- 44.5
- 34.0
- 42.5
+ {{user_height}}cm
+ {{user_weight}}kg
+ {{user_bmi}}
+ {{user_xw}}
+ {{user_yw}}
+ {{user_tw}}
+ 很健康
@@ -31,15 +33,46 @@
export default {
data() {
return {
- sex : 1//1为男,0为女
+ sex : 1,//1为男,0为女
+ user_name:'puppy',
+ user_height:'180',
+ user_weight:'75',
+ user_xw:'44.5',
+ user_yw:'34.0',
+ user_tw:'42.5',
+ user_bmi:'23.1'
};
},
+ onLoad(options){
+ if (options.user_name) {
+ this.user_name = options.user_name;
+ };
+ },
methods:{
navigateTo(page) {
uni.navigateTo({
url: page
});
},
+ goto_user(){
+ this.navigateTo(`/pages/homepages/user/basic_information/basic_information`);
+ },
+
+ goto_bmi(){
+ this.navigateTo(`/pages/homepages/user/bmi_information/bmi_information`);
+ },
+
+ goto_eat(){
+ this.navigateTo(`/pages/homepages/user/recipe_and_calorie/recipe_and_calorie`);
+ },
+
+ goto_exer(){
+ this.navigateTo(`/pages/homepages/user/exercise_plans/exercise_plans`);
+ },
+
+ goto_login(){
+ this.navigateTo(`/pages/login/account_login/account_login`);
+ },
}
}
@@ -117,46 +150,48 @@ export default {
width: 2%;
opacity: 1;
right: 50%;
- bottom: 48.5%;
- border: 2px solid #0c0b0b ;
+ bottom: 48.4%;
}
.button{
position: absolute;
height: 4%;
width: 90%;
left: 5%;
- top: 90.5%;
+ top: 90.5%;
+}
+.pie{
+ position: absolute;
+ height: 18%;
+ width: 85%;
+ left: 5%;
+ top: 18%;
}
.id{
position: absolute;
- height: 5%;
-
opacity: 1;
- right: 13%; /* 距右边 10% */
- bottom: 90.2%;
- border: 2px solid #0c0b0b ;
+ left: 37%; /* 距右边 10% */
+ top: 4.7%;
+ font-size: 1.5rem;
}
.hot_in{
position: absolute;
height: 0.2%;
width: 5%;
opacity: 1;
- right: 77%; /* 距右边 10% */
- bottom: 87%;
+ left: 20%; /* 距右边 10% */
+ top: 12.7%;
font-size: 0.5rem;
color: #ffffff;
- border: 2px solid #b14141;
}
.hot_out{
position: absolute;
height: 0.2%;
width: 5%;
opacity: 1;
- right: 27%; /* 距右边 10% */
- bottom: 87%;
+ left: 71%; /* 距右边 10% */
+ top: 12.7%;
font-size: 0.5rem;
color: #ffffff;
- border: 2px solid #0c0b0b ;
}
.height{
position: absolute;
@@ -215,4 +250,13 @@ export default {
bottom: 29.3%;
font-size: 1.2rem;
}
+.bmi_state{
+ position: absolute;
+ text-align: center;
+ opacity: 1;
+ left: 68%;
+ top: 49.4%;
+ font-size: 0.2em;
+ color: #000000;
+}
\ No newline at end of file
diff --git a/static/homepages/user/basic_information/back.png b/static/homepages/user/basic_information/back.png
new file mode 100644
index 0000000..ac33336
Binary files /dev/null and b/static/homepages/user/basic_information/back.png differ
diff --git a/static/homepages/user/basic_information/but.png b/static/homepages/user/basic_information/but.png
new file mode 100644
index 0000000..1d1793a
Binary files /dev/null and b/static/homepages/user/basic_information/but.png differ
diff --git a/static/homepages/user/basic_information/button.png b/static/homepages/user/basic_information/button.png
new file mode 100644
index 0000000..7ef651c
Binary files /dev/null and b/static/homepages/user/basic_information/button.png differ
diff --git a/static/homepages/user/basic_information/head.png b/static/homepages/user/basic_information/head.png
new file mode 100644
index 0000000..34d2844
Binary files /dev/null and b/static/homepages/user/basic_information/head.png differ
diff --git a/static/homepages/user/basic_information/head_pic.png b/static/homepages/user/basic_information/head_pic.png
new file mode 100644
index 0000000..f7a9513
Binary files /dev/null and b/static/homepages/user/basic_information/head_pic.png differ
diff --git a/static/homepages/user/basic_information/img.png b/static/homepages/user/basic_information/img.png
new file mode 100644
index 0000000..32bee67
Binary files /dev/null and b/static/homepages/user/basic_information/img.png differ
diff --git a/static/homepages/user/basic_information/self_back.png b/static/homepages/user/basic_information/self_back.png
new file mode 100644
index 0000000..db07d5c
Binary files /dev/null and b/static/homepages/user/basic_information/self_back.png differ
diff --git a/static/homepages/user/basic_information/user_back.png b/static/homepages/user/basic_information/user_back.png
new file mode 100644
index 0000000..60c727c
Binary files /dev/null and b/static/homepages/user/basic_information/user_back.png differ
diff --git a/static/homepages/user/basic_information/user_name.png b/static/homepages/user/basic_information/user_name.png
new file mode 100644
index 0000000..b62051b
Binary files /dev/null and b/static/homepages/user/basic_information/user_name.png differ
diff --git a/static/homepages/user/user/background.png b/static/homepages/user/user/background.png
deleted file mode 100644
index 7a6666f..0000000
Binary files a/static/homepages/user/user/background.png and /dev/null differ
diff --git a/static/homepages/user/user/ad_button.png b/static/homepages/user/user/pictures/ad_button.png
similarity index 100%
rename from static/homepages/user/user/ad_button.png
rename to static/homepages/user/user/pictures/ad_button.png
diff --git a/static/homepages/user/user/bmi_button.png b/static/homepages/user/user/pictures/bmi_button.png
similarity index 100%
rename from static/homepages/user/user/bmi_button.png
rename to static/homepages/user/user/pictures/bmi_button.png
diff --git a/static/homepages/user/user/button.png b/static/homepages/user/user/pictures/button.png
similarity index 100%
rename from static/homepages/user/user/button.png
rename to static/homepages/user/user/pictures/button.png
diff --git a/static/homepages/user/user/eat_button.png b/static/homepages/user/user/pictures/eat_button.png
similarity index 100%
rename from static/homepages/user/user/eat_button.png
rename to static/homepages/user/user/pictures/eat_button.png
diff --git a/static/homepages/user/user/female.png b/static/homepages/user/user/pictures/female.png
similarity index 100%
rename from static/homepages/user/user/female.png
rename to static/homepages/user/user/pictures/female.png
diff --git a/static/homepages/user/user/head_button.png b/static/homepages/user/user/pictures/head_button.png
similarity index 100%
rename from static/homepages/user/user/head_button.png
rename to static/homepages/user/user/pictures/head_button.png
diff --git a/static/homepages/user/user/head_pic.png b/static/homepages/user/user/pictures/head_pic.png
similarity index 100%
rename from static/homepages/user/user/head_pic.png
rename to static/homepages/user/user/pictures/head_pic.png
diff --git a/static/homepages/user/user/male.png b/static/homepages/user/user/pictures/male.png
similarity index 100%
rename from static/homepages/user/user/male.png
rename to static/homepages/user/user/pictures/male.png
diff --git a/static/homepages/user/user/pictures/pie.png b/static/homepages/user/user/pictures/pie.png
new file mode 100644
index 0000000..ec55b3f
Binary files /dev/null and b/static/homepages/user/user/pictures/pie.png differ
diff --git a/static/homepages/user/user/point.png b/static/homepages/user/user/pictures/point.png
similarity index 100%
rename from static/homepages/user/user/point.png
rename to static/homepages/user/user/pictures/point.png