Merge remote-tracking branch 'fitjourney前端代码仓库/master'

# Conflicts:
#	pages.json
#	pages/homepages/user/bmi_information/bmi_information.vue

pages.json

@@ -1,7 +1,6 @@
 {
   "pages": [
     /*---------------------------------------------------------动画过渡界面--------------------------------*/
-/*
        {
       "path": "pages/transition/page1/page1",
       "style": {
@@ -46,7 +45,7 @@
     },
     /*-----------------------------------------------------------------------动画过渡界面-------------------------------------------*/
     /*-----------------------------------------------------------------------登录注册界面-----------------------------------------------*/
-/*
+
      {
       "path": "pages/login/account_login/account_login",
       "style": {
@@ -73,7 +72,7 @@
     },
     /*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/
     /*-----------------------------------------------------------------------性别填写界面---------------------------------------------*/
-     /*  {
+       {
       "path": "pages/information/sex/sex",
       "style": {
         "navigationStyle": "custom"
@@ -81,7 +80,7 @@
     },
     /*----------------------------------------------性别填写界面--------------------------------------------------------------*/
     /*------------------------------------------------男生填写体重------------------------------------------------------*/
-  /*   {
+     {
      "path": "pages/information/boy_weight_start/boy_weight_start",
      "style": {
        "navigationStyle": "custom"
@@ -101,7 +100,7 @@
    },
     /*------------------------------------------------男生填写体重------------------------------------------------------------*/
     /*------------------------------------------------男生填写身高------------------------------------------------------------*/
-    /*  {
+      {
     "path": "pages/information/boy_height_start/boy_height_start",
       "style": {
         "navigationStyle": "custom"
@@ -121,7 +120,7 @@
     },
     /*---------------------------------------男生填写身高--------------------------------------------------------------*/
     /*------------------------------------------------女生填写身高------------------------------------------------------------*/
-    /*   {
+       {
       "path": "pages/information/girl_height_start/girl_height_start",
       "style": {
         "navigationStyle": "custom"
@@ -141,7 +140,7 @@
     },
     /*------------------------------------------------女生填写身高------------------------------------------------------------*/
     /*------------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
-    /*   {
+       {
       "path": "pages/information/girl_weight_start/girl_weight_start",
       "style": {
         "navigationStyle": "custom"
@@ -161,7 +160,7 @@
     },
     /*--------------------------------------------------------------------女生填写体重------------------------------------------------------------------*/
     /*----------------------------------------------------------填写使用目的--------------------------------------------------*/
-      /*  {
+        {
       "path": "pages/information/purpose/purpose",
       "style": {
         "navigationStyle": "custom"
@@ -169,7 +168,7 @@
     },
     /*------------------------------------------------填写使用目的-----------------------------------------------------------*/
     /*---------------------------------------------------------------进入主页的过渡界面----------------------------------------------------*/
-    /*{
+    {
       "path": "pages/transition/page8/page8",
       "style": {
         "navigationStyle": "custom"
@@ -177,7 +176,7 @@
     },
     /*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/
     /*------------------------------------------------------------------主页部分内容--------------------------------------------------------*/
-    /*{
+    {
       "path": "pages/homepages/homes/home/home",
       "style": {
         "navigationStyle": "custom"
@@ -237,28 +236,15 @@
       }
     },//阅读专区的两个界面
 
-
-
-
-
-
-
-
-    /* {
-      "path": "pages/homepages/temp/temp",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    }*/
     /*-----------------------------------------------------------------------主界面----------------------------------------------------------*/
-    /* {
+     {
       "path": "pages/homepages/puppy_chat/puppy_chat",
       "style": {
         "navigationStyle": "custom"
       }
     },
     /*----------------------------------------------------------------------聊天界面--------------------------------------------------------*/
-    /* {
+   /*  {
       "path": "pages/homepages/community/community",
       "style": {
         "navigationStyle": "custom"
@@ -272,14 +258,13 @@
       }
     },
     /*---------------------------------------------------------------------个人信息界面以及跳转的几个界面----------------------------------------------------*/
-    /*
-    {
-      "path": "pages/homepages/user/user_information/user_information",
+
+   /* {
+      "path": "pages/homepages/user/basic_information/basic_information",
       "style": {
         "navigationStyle": "custom"
       }
     },
-	*/
     {
       "path": "pages/homepages/user/bmi_information/bmi_information",
       "style": {
@@ -291,9 +276,8 @@
       "style": {
         "navigationStyle": "custom"
       }
-    },
-	/*
-    {
+    },*/
+  /*  {
       "path": "pages/homepages/user/exercise_plans/exercise_plans",
       "style": {
         "navigationStyle": "custom"

pages/homepages/homes/ai_recognize_hot/ai_recognize_hot.vue

@@ -38,7 +38,11 @@ export default {
       const app = getApp();
       const serverAddress = app.globalData.fit_journey_ai_address;
       console.log("后端服务器的地址是："+serverAddress);
-
+    /*  uni.showToast({
+        title: 'AI正在识别中呢~',
+        icon: 'loading',
+        duration: 2000
+      });*/
       // 调用选择图片的 API
 	  uni.file
       uni.chooseImage({
@@ -58,6 +62,18 @@ export default {
 							  filePath: filePath,
 							  name: 'file', // 后端接收的文件参数名称
 							  success: (uploadFileRes) => {
+
+
+
+                  uni.showToast({
+                    title: 'AI正在识别中呢~',
+                    icon: 'loading',
+                    duration: 2000
+                  });
+
+
+
+
 								console.log('上传结果:', uploadFileRes);
 								const response = JSON.parse(uploadFileRes.data); // 解析返回的数据
 								if (response && response.data) {

pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue

@@ -41,7 +41,7 @@
 
         can_generate_button_click: true, // 控制生成按钮是否可点击
 				recipeImage: null, // 用于存储图片的本地路径
-        result: '这个',
+        result: '对不起，AI生成有点慢哦，请耐心等待~',
         token:uni.getStorageSync("access_token"),
 			};
 		},
@@ -55,7 +55,7 @@
         uni.showToast({
           title: '正在生成...',
           icon: 'loading',
-          duration: 12000, // Toast 显示时间为 2 秒
+          duration: 15000, // Toast 显示时间为 2 秒
         });
         //向后端发送请求生成结果
         const app= getApp();
@@ -90,7 +90,7 @@
         setTimeout(() => {
           this.can_generate_button_click= false;
           this.is_create_success = 0;
-        }, 12000);
+        }, 20000);
        /* //在20秒的时候清空result
         setTimeout(() => {
         this.result="";

pages/homepages/homes/choice_book/choice_book.vue

@@ -7,8 +7,45 @@
 <script>
 export default {
   data() {
-    return {};
+    return {
+      token: uni.getStorageSync("access_token")
+    };
+  },
+  methods:{
+    go_to_apple()//苹果
+    {
+      uni.navigateTo({
+        url: "/pages/homepages/homes//pages/homepages/homes/dictionary/apple/apple"
+      })
+    },
+    go_to_orange()//橘子
+    {
+      uni.navigateTo({
+        url: "/pages/homepages/homes/dictionary/orange/orange"
+      })
+    },
+    go_to_peach()//桃子
+    {
+      uni.navigateTo({
+        url: "/pages/homepages/homes/choice_book/choice_book"
+      })
+    },
+    go_to_watermelon()//西瓜
+    {
+      uni.navigateTo({
+        url: "/pages/homepages/homes//pages/homepages/homes/dictionary/apple/apple"
+      })
+    },
+
+
+
+
+
+
+
+
   }
+
 }
 </script>
 

pages/homepages/homes/dictionary/Page/Page.vue

@@ -1,17 +0,0 @@
-<template>
-  <view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {};
-  }
-}
-</script>
-
-<style lang="scss">
-
-</style>

pages/homepages/homes/dictionary/page1/page1.vue

@@ -1,17 +0,0 @@
-<template>
-  <view>
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {};
-  }
-}
-</script>
-
-<style lang="scss">
-
-</style>

pages/homepages/homes/knowledge_dictionary/knowledge_dictionary.vue

@@ -1,5 +1,18 @@
 <template>
-  <view>
+  <view class="background">
+    <image class="go_back_button" @click="go_back" src="@/static/homepages/homes/knowledge_dictionary/pictures/go_back_button.png" ></image>
+    <input> </input>
+    <image class="search_button" @click="search" src="@/static/homepages/homes/knowledge_dictionary/pictures/search_button.png"></image>
+
+
+
+
+    <image class="strawberry_image" @click="go_to_strawberry" src="@/static/homepages/homes/knowledge_dictionary/pictures/strawberry.png"></image>
+    <image class="peach_image" @click="go_to_peach"  src="@/static/homepages/homes/knowledge_dictionary/pictures/peach.png"></image>
+    <image class="carrot_image" @click="go_to_carrot"   src="@/static/homepages/homes/knowledge_dictionary/pictures/carrot.png"></image>
+    <image class="pineapple_image"   @click="go_to_pineapple"  src="@/static/homepages/homes/knowledge_dictionary/pictures/pineapple.png"></image>
+    <image class="orange_image"  @click="go_to_orange"  src="@/static/homepages/homes/knowledge_dictionary/pictures/orange.png"></image>
+    <image class="banana_image"   @click="go_to_banana"   src="@/static/homepages/homes/knowledge_dictionary/pictures/banana.png"></image>
 
   </view>
 </template>
@@ -7,11 +20,172 @@
 <script>
 export default {
   data() {
-    return {};
+    return {
+      url :""//用传递后端的url
+    };
+  },
+  methods:{
+    search(){
+
+      //和后端对接进行搜索 后端返回跳转界面的URL
+      uni.showToast({
+        title: '搜索成功！',
+        icon: 'none',
+        duration: 2000
+      })
+       uni.showToast({
+         title: '搜索失败，知识库知识有限哦~',
+         icon: 'none',
+         duration: 2000
+       })
+
+
+
+    },
+    go_back(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/home/home'
+      })
+      uni.showToast({
+        title: '正在返回主页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_strawberry(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/strawberry/strawberry'
+      })
+      uni.showToast({
+        title: '正在前往草莓知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_peach(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/pear/pear'
+      })
+      uni.showToast({
+        title: '正在前往桃子知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_carrot(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/carrot/carrot'
+      })
+      uni.showToast({
+        title: '正在前往胡萝卜知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_pineapple(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/pineapple/pineapple'
+      })
+      uni.showToast({
+        title: '正在前往菠萝知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_orange(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/orange/orange'
+      })
+      uni.showToast({
+        title: '正在前往橙子知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
+    go_to_banana(){
+      uni.navigateTo({
+        url: '/pages/homepages/homes/dictionary/banana/banana'
+      })
+      uni.showToast({
+        title: '正在前往香蕉知识页面',
+        icon: 'none',
+        duration: 2000
+      })
+    },
   }
 }
 </script>
 
 <style lang="scss">
+.background{
+  background-image: url("@/static/homepages/homes/knowledge_dictionary/pictures/background.png");
+  background-size: cover;
+  background-position: center;
+  height: 101vh;
+  display: flex;
+  flex-direction: column; /* 纵向排列 */
+  align-items: center; /* 水平居中 */
+  justify-content: flex-end; /* 使内容向底部对齐 */
+  position: relative;
+}
+.go_back_button{
+  position: absolute;
+  height: 8%;
+  width: 15%;
+  top: 5%;
+  left: 5%;
+}
+.search_button{
+  position: absolute;
+  height: 5%;
+  width: 10%;
+  top: 43.5%;
+  left: 83%;
+}
+
+.strawberry_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 60%;
+  left: 2%;
+}
+
+.peach_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 60%;
+  left: 34%;
+}
+.carrot_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 60%;
+  left: 67%;
+}
+.pineapple_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 78%;
+  left: 1%;
+}
 
+.orange_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 78%;
+  left: 34%;
+}
+
+.banana_image{
+  position: absolute;
+  height: 15%;
+  width: 30%;
+  top: 78%;
+  left: 67%;
+}
 </style>

pages/homepages/puppy_chat/puppy_chat.vue

@@ -85,10 +85,10 @@ export default {
       // 获取发送消息的用户的消息数量
       const userMessageCount = this.send_messages.filter(msg => msg.sender === 'user').length;
 
-      if (userMessageCount >= 2) {
+      if (userMessageCount >= 1) {
         // 如果用户已经发送了2条消息，提示用户不能再发送
         uni.showToast({
-          title: "AI 可是要交钱的哦,最多发送两条消息",
+          title: "AI 可是要交钱的哦,最多发送1条消息,刷新之后再试试吧~",
           icon: "none",
         });
       } else {

pages/homepages/user/basic_information/basic_information.vue

@@ -61,7 +61,7 @@ export default {
 
 <style lang="scss">
 .background{
-	background-image: url("/static/homepages/user/basic_information/img.png");
+	background-image: url("@/static/homepages/user/basic_information/img.png");
 	background-size: cover;
 	background-position: center;
 	height: 100vh;
@@ -72,7 +72,7 @@ export default {
 	position: relative;
 }
 .self_back{
-	background-image: url("/static/homepages/user/basic_information/back.png");
+	background-image: url("@/static/homepages/user/basic_information/back.png");
 	background-size: cover;
 	flex:1;
 	height: 80vh;
@@ -101,7 +101,6 @@ export default {
 	flex:1;
 	align-items: center;
 	position: absolute;
-	height: 36vh;
 	width: 45vh;
 	right: 10.5%;
 	bottom: 23%;

pages/homepages/user/exercise_plans/exercise_plans.vue

@@ -17,7 +17,6 @@
 		<image class="submit_button" @click="submit()" src="/static/homepages/user/exercise_plans/pictures/submit_button.png"></image>
     </view>
 </template>
-
 <script>
     export default {
         data() {

pages/homepages/user/user/user.vue

@@ -88,7 +88,6 @@ export default {
 	justify-content: center;
 	overflow: hidden;
 	position: relative;
-  border:  2px solid #0c0b0b  ;
 }
 .head_pic{
 	position: absolute;

static/homepages/puppy_chat/css/puppy_chat.scss

@@ -4,6 +4,7 @@
   height: 75%;
   top: 4%;
   z-index: -3;
+
 }
 
 .chat {
@@ -19,7 +20,6 @@
   flex-direction: column;  /* 消息从上往下显示 */
 
 }
-
 .chat_area {
   margin-bottom: 10px;
   padding: 10px;
@@ -30,18 +30,15 @@
   flex-direction: row;  /* 头像和消息水平排列 */
   align-items: center;  /* 内容垂直居中 */
 }
-
 .user_message {
   background-color: #7879F1; /* 用户消息气泡背景色 */
-
   color: white;
-  margin-top: 22%;  /* 让用户的消息气泡靠右 */
+  margin-top: 2%;  /* 让用户的消息气泡靠右 */
   margin-right: 5%;  /* AI消息靠左 */
   margin-left: auto;  /* 让AI的消息气泡靠右 */
   text-align: left;
   word-break: break-word;  /* 自动换行 */
 }
-
 .ai_message {
   background-color: #e5e5ea; /* AI消息气泡背景色 */
   color: black;
@@ -50,40 +47,33 @@
   text-align: left;
   word-break: break-word;  /* 自动换行 */
 }
-
 .avatar_container {
   display: flex;
   right: 10%;
   justify-content: center;
   align-items: center;
 }
-
 .ai_avatar_container {
   margin-right: 10px;  /* AI头像与气泡的间距 */
 }
-
 .user_avatar_container {
   margin-left: 10px;  /* 用户头像与气泡的间距 */
 }
-
 .ai_avatar, .user_avatar {
   right: 5%;
   width: 40px;  /* 头像的大小 */
   height: 40px;  /* 头像的大小 */
   border-radius: 50%;  /* 头像圆形 */
 }
-
 .message_content {
   max-width: 80%;  /* 限制消息气泡的最大宽度 */
 }
-
 .input_box {
-  position: absolute;
+  position: fixed;
   width: 100%;
   height: 9%;
   top: 79%;
 }
-
 .input_box_background {
   position: absolute;
   width: 98%;
@@ -91,7 +81,6 @@
   left: 1%;
   top: 5%;
 }
-
 .input_words {
   position: absolute;
   width: 70%;
@@ -99,7 +88,6 @@
   left: 5%;
   top: 10%;
 }
-
 .send_button {
   position: absolute;
   width: 12%;