Merge branch 'master' of https://bdgit.educoder.net/fzu102201435/front

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": {

pages/homepages/user/basic_information/basic_information.vue

@@ -3,18 +3,20 @@
     <view class="user_head">
       <image class="head" src="/static/homepages/user/basic_information/head.png"></image>
 	  <image class="head_pic" src="/static/homepages/user/basic_information/head_pic.png"></image>
-      <image class="head_but" @click="" src="/static/homepages/user/basic_information/but.png"></image>
+      <image class="head_but" @click="change_head()" src="/static/homepages/user/basic_information/but.png"></image>
     </view>
 	<view class="self_back">
 		<view class="name">
-		  <image class="user_name_but" @click="" src="/static/homepages/user/basic_information/but.png"></image>
-		  <text class="name_text">puppy</text>
+		  <image class="user_name_but" @click="change_name()" src="/static/homepages/user/basic_information/but.png"></image>
+		  <input v-if="n_writeable===true" class="name_text" v-model="name"></input>
+		  <view v-else class="w_name">{{name}}</view>
 		</view>
 		<view class="self">
-		  <image class="self_but" @click="" src="/static/homepages/user/basic_information/but.png"></image>
-		  <text class="self_write"></text>
+		  <image class="self_but" @click="change_self()" src="/static/homepages/user/basic_information/but.png"></image>
+		  <textarea v-if="s_writeable===true" v-model="selftext" class="self_write"></textarea>
+		  <view v-else class="self_read">{{selftext}}</view>
 		</view>
-		<image class="button" src="/static/homepages/user/basic_information/button.png"></image>
+		<image class="button" @click="save_change()" src="/static/homepages/user/basic_information/button.png"></image>
 	</view>
   </view>
 </template>
@@ -22,14 +24,37 @@
 <script>
 export default {
   data() {
-    return {};
+    return {
+		name:'puppy',
+		selftext:'您的个人简介',
+		n_writeable:false,
+		s_writeable:false,
+	};
   },
   methods:{
+	change_self(){
+		console.log('selftext:', this.selftext);
+		this.s_writeable=true;
+	},
+	change_name(){
+		console.log('name:', this.name);
+		this.n_writeable=true;
+	},
+
     navigateTo(page) {
       uni.navigateTo({
         url: page
       });
     },
+	save_change()
+	{
+		console.log('name:', this.name);
+		console.log('selftext:', this.selftext);
+		const NAME=this.name;
+		this.n_writeable=false;
+		this.s_writeable=false;
+		this.navigateTo(`/pages/homepages/user/user/user?user_name=${NAME}`);
+	},
   }
 }
 </script>
@@ -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{

pages/homepages/user/bmi_information/bmi_information.vue

@@ -1,24 +1,7 @@
-<template>
-  <view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {};
-  }
-}
-</script>
-
-<style lang="scss">
-
-</style>
 <template>
     <view>
         <image class="background"  src="/static/homepages/user/bmi_information/pictures/background.png"></image>
-		<image class="back_button" src="/static/homepages/user/bmi_information/pictures/button.png"></image>
+		<image class="back_button" @click="goto_user()" src="/static/homepages/user/bmi_information/pictures/button.png"></image>
 		<image class="text_background_one" src="/static/homepages/user/bmi_information/pictures/text_background.png"></image>
 		<image class="text_background_two" src="/static/homepages/user/bmi_information/pictures/text_background.png"></image>
 		<image class="text_background_three" src="/static/homepages/user/bmi_information/pictures/text_background.png"></image>
@@ -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`;

pages/homepages/user/user/user.vue

@@ -1,27 +1,29 @@
 <template>
 <view class="background">
-	<image class="head_pic" src="@/static/homepages/user/user/head_pic.png"></image>
-	<image class="head_button" src="../../../../static/homepages/user/user/head_button.png"></image>
-	<image class="bmi_button" src="../../../../static/homepages/user/user/bmi_button.png"></image>
-	<image class="eat_button" src="../../../../static/homepages/user/user/eat_button.png"></image>
-	<image class="ad_button" src="../../../../static/homepages/user/user/ad_button.png"></image>
-	<image class="button" src="../../../../static/homepages/user/user/button.png"></image>
-	<image class="point" src="../../../../static/homepages/user/user/point.png"></image>
+	<image class="head_pic" src="@/static/homepages/user/user/pictures/head_pic.png"></image>
+	<image class="head_button" @click="goto_user()" src="@/static/homepages/user/user/pictures/head_button.png"></image>
+	<image class="bmi_button" @click="goto_bmi()" src="@/static/homepages/user/user/pictures/bmi_button.png"></image>
+	<image class="eat_button" @click="goto_eat()" src="@/static/homepages/user/user/pictures/eat_button.png"></image>
+	<image class="ad_button" @click="goto_exer()" src="@/static/homepages/user/user/pictures/ad_button.png"></image>
+	<image class="button" @click="goto_login()" src="@/static/homepages/user/user/pictures/button.png"></image>
+	<image class="point" src="@/static/homepages/user/user/pictures/point.png"></image>
+	<image class="pie" src="@/static/homepages/user/user/pictures/pie.png"></image>
 
 
-	<image  v-if="sex===0" class="user" src="../../../../static/homepages/user/user/female.png"></image>
-  <image  v-if="sex===1" class="user" src="../../../../static/homepages/user/user/male.png"></image>
+	<image  v-if="sex===0" class="user" src="@/static/homepages/user/user/pictures/female.png"></image>
+    <image  v-if="sex===1" class="user" src="@/static/homepages/user/user/pictures/male.png"></image>
 
 
-	<text class="id">aaaaaaaaa</text>
+	<text class="id">{{user_name}}</text>
 	<text class="hot_in">20000J</text>
 	<text class="hot_out">17000J</text>
-	<text class="height">180cm</text>
-	<text class="weight">75kg</text>
-	<text class="bmi">24.9</text>
-	<text class="xw">44.5</text>
-	<text class="yw">34.0</text>
-	<text class="tw">42.5</text>
+	<text class="height">{{user_height}}cm</text>
+	<text class="weight">{{user_weight}}kg</text>
+	<text class="bmi">{{user_bmi}}</text>
+	<text class="xw">{{user_xw}}</text>
+	<text class="yw">{{user_yw}}</text>
+	<text class="tw">{{user_tw}}</text>
+	<text class="bmi_state">很健康</text>
 
   </view>
   <tarbar_user></tarbar_user>
@@ -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`);
+	},
   }
 }
 </script>
@@ -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;
+}
 </style>