diff --git a/App.vue b/App.vue
index ad9ea60..48576a1 100644
--- a/App.vue
+++ b/App.vue
@@ -2,11 +2,13 @@
+
+
+
diff --git a/components/my_exercise_plan/my_exercise_plan.vue b/components/my_exercise_plan/my_exercise_plan.vue
new file mode 100644
index 0000000..463ccba
--- /dev/null
+++ b/components/my_exercise_plan/my_exercise_plan.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/my_recipe_plan/my_recipe_plan.vue b/components/my_recipe_plan/my_recipe_plan.vue
new file mode 100644
index 0000000..69f53cc
--- /dev/null
+++ b/components/my_recipe_plan/my_recipe_plan.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/read/read.vue b/components/read/read.vue
new file mode 100644
index 0000000..409e02d
--- /dev/null
+++ b/components/read/read.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/tarbar_home/tarbar_home.vue b/components/tarbar_home/tarbar_home.vue
index f39988c..e80ba90 100644
--- a/components/tarbar_home/tarbar_home.vue
+++ b/components/tarbar_home/tarbar_home.vue
@@ -1,6 +1,6 @@
-
+
@@ -55,6 +55,12 @@ export default {
is_user_picked_up: false
};
},
+ props: {
+ extend_class: { // 接收外部传入的 class
+ type: String,
+ default: ''
+ }
+ },
methods: {
pick_up_home() {
diff --git a/pages.json b/pages.json
index 23e3005..2ef4fc6 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,7 @@
{
"pages": [
- /* {
+ /*---------------------------------------------------------动画过渡界面--------------------------------*/
+ /* {
"path": "pages/transition/page1/page1",
"style": {
"navigationStyle": "custom"
@@ -43,10 +44,9 @@
}
},*/
/*-----------------------------------------------------------------------动画过渡界面-------------------------------------------*/
+ /*-----------------------------------------------------------------------登录注册界面-----------------------------------------------*/
- /*
-
- {
+ /* {
"path": "pages/login/account_login/account_login",
"style": {
"navigationStyle": "custom"
@@ -71,54 +71,56 @@
}
},*/
/*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/
- /*
- {
+ /*-----------------------------------------------------------------------性别填写界面---------------------------------------------*/
+ /* {
"path": "pages/information/sex/sex",
"style": {
"navigationStyle": "custom"
}
},*/
/*----------------------------------------------性别填写界面--------------------------------------------------------------*/
- /*
- {
- "path": "pages/information/boy_weight_start/boy_weight_start",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/information/boy_weight_roll/boy_weight_roll",
- "style": {
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/information/boy_weight_end/boy_weight_end",
- "style": {
- "navigationStyle": "custom"
- }
- },*/
- /*------------------------------------------------男生填写体重------------------------------------------------------------*/
+ /*------------------------------------------------男生填写体重------------------------------------------------------*/
/* {
- "path": "pages/information/boy_height_start/boy_height_start",
+ "path": "pages/information/boy_weight_start/boy_weight_start",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/information/boy_weight_roll/boy_weight_roll",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/information/boy_weight_end/boy_weight_end",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },*/
+ /*------------------------------------------------男生填写体重------------------------------------------------------------*/
+ /*------------------------------------------------男生填写身高------------------------------------------------------------*/
+ /* {
+ "path": "pages/information/boy_height_start/boy_height_start",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "pages/information/boy_height_roll/boy_height_roll",
+ "path": "pages/information/boy_height_roll/boy_height_roll",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "pages/information/boy_height_end/boy_height_end",
+ "path": "pages/information/boy_height_end/boy_height_end",
"style": {
"navigationStyle": "custom"
}
},*/
/*---------------------------------------男生填写身高--------------------------------------------------------------*/
- /* {
+ /*------------------------------------------------女生填写身高------------------------------------------------------------*/
+ /* {
"path": "pages/information/girl_height_start/girl_height_start",
"style": {
"navigationStyle": "custom"
@@ -136,8 +138,9 @@
"navigationStyle": "custom"
}
},*/
- /*------------------------------------------------------------------------女生填写身高------------------------------------------------------------------*/
- /* {
+ /*------------------------------------------------女生填写身高------------------------------------------------------------*/
+ /*------------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
+ /* {
"path": "pages/information/girl_weight_start/girl_weight_start",
"style": {
"navigationStyle": "custom"
@@ -156,27 +159,42 @@
}
},*/
/*--------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
- /*{
+ /*----------------------------------------------------------填写使用目的--------------------------------------------------*/
+ /* {
"path": "pages/information/purpose/purpose",
"style": {
"navigationStyle": "custom"
}
},*/
- /*---------------------------------------------------------------爱好信息填写界面----------------------------------------------------*/
- /* {
+ /*------------------------------------------------填写使用目的-----------------------------------------------------------*/
+ /*---------------------------------------------------------------进入主页的过渡界面----------------------------------------------------*/
+ /*{
"path": "pages/transition/page8/page8",
"style": {
"navigationStyle": "custom"
}
},*/
/*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/
- /* {
- "path": "pages/homepages/homes/home/home",
- "style": {
- "navigationStyle": "custom"
- }
- },
- */
+
+ {
+ "path": "pages/homepages/homes/home/home",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }
+ /* {
+ "path": "pages/homepages/homes/my_recipe_plan/my_recipe_plan",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },*/
+ /* {
+ "path": "pages/homepages/temp/temp",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ }*/
+
/*{
"path": "pages/homepages/homes/ai_recognize_fruit/ai_recognize_fruit",
@@ -212,7 +230,7 @@
"navigationStyle": "custom"
}
}*/
- /*---------------------------------------------------------------------个人信息界面----------------------------------------------------*/
+ /*---------------------------------------------------------------------个人信息界面以及跳转的几个界面----------------------------------------------------*/
/*
{
"path": "pages/homepages/user/user_information/user_information",
@@ -253,7 +271,7 @@
}
}*/
/*--------------------------------------------------------知识图谱界面----------------------------------------------------------------------*/
- {
+ /* {
"path" : "pages/homepages/homes/dictionary/orange/orange",
"style" :
{
@@ -435,10 +453,11 @@
{
"navigationStyle": "custom"
}
- }
+ }*/
/*--------------------------------------------------------知识图谱界面----------------------------------------------------------------------*/
/*-------------------------------------------------------------------部分组件的测试类---------------------------------------------------*/
+
],
"uniIdRouter": {},
"tabBar": null
diff --git a/pages/homepages/homes/home/home.vue b/pages/homepages/homes/home/home.vue
index 9386528..97123af 100644
--- a/pages/homepages/homes/home/home.vue
+++ b/pages/homepages/homes/home/home.vue
@@ -1,16 +1,47 @@
-
- 这个是home界面
-
-
-
-
+
+ 首页
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
diff --git a/pages/homepages/homes/my_recipe_plan/my_recipe_plan.vue b/pages/homepages/homes/my_recipe_plan/my_recipe_plan.vue
new file mode 100644
index 0000000..342846f
--- /dev/null
+++ b/pages/homepages/homes/my_recipe_plan/my_recipe_plan.vue
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/homepages/temp/temp.vue b/pages/homepages/temp/temp.vue
new file mode 100644
index 0000000..4f802b0
--- /dev/null
+++ b/pages/homepages/temp/temp.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/login/account_login/account_login.vue b/pages/login/account_login/account_login.vue
index 93f79d2..20520c1 100644
--- a/pages/login/account_login/account_login.vue
+++ b/pages/login/account_login/account_login.vue
@@ -45,7 +45,7 @@
*验证码错误
- 忘了密码?
+ 忘记密码?
@@ -69,6 +69,7 @@
diff --git a/pages/login/register/register.vue b/pages/login/register/register.vue
index 132c5e5..a49155f 100644
--- a/pages/login/register/register.vue
+++ b/pages/login/register/register.vue
@@ -13,14 +13,14 @@
-
+
*该手机号不存在
-
+