diff --git a/pages.json b/pages.json index a12fd74..4c050a2 100644 --- a/pages.json +++ b/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" diff --git a/pages/homepages/homes/ai_recognize_hot/ai_recognize_hot.vue b/pages/homepages/homes/ai_recognize_hot/ai_recognize_hot.vue index 6691d22..392e995 100644 --- a/pages/homepages/homes/ai_recognize_hot/ai_recognize_hot.vue +++ b/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) { diff --git a/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue b/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue index c28b6a2..f90f49b 100644 --- a/pages/homepages/homes/ai_recognize_recipe/ai_recognize_recipe.vue +++ b/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=""; diff --git a/pages/homepages/homes/choice_book/choice_book.vue b/pages/homepages/homes/choice_book/choice_book.vue index 342846f..42310dd 100644 --- a/pages/homepages/homes/choice_book/choice_book.vue +++ b/pages/homepages/homes/choice_book/choice_book.vue @@ -7,8 +7,45 @@ diff --git a/pages/homepages/homes/dictionary/Page/Page.vue b/pages/homepages/homes/dictionary/Page/Page.vue deleted file mode 100644 index 342846f..0000000 --- a/pages/homepages/homes/dictionary/Page/Page.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/pages/homepages/homes/dictionary/fried egg/fried egg.vue b/pages/homepages/homes/dictionary/fried_egg/fried_egg.vue similarity index 100% rename from pages/homepages/homes/dictionary/fried egg/fried egg.vue rename to pages/homepages/homes/dictionary/fried_egg/fried_egg.vue diff --git a/pages/homepages/homes/dictionary/kiwi fruit/kiwi fruit.vue b/pages/homepages/homes/dictionary/kiwi_fruit/kiwi_fruit.vue similarity index 100% rename from pages/homepages/homes/dictionary/kiwi fruit/kiwi fruit.vue rename to pages/homepages/homes/dictionary/kiwi_fruit/kiwi_fruit.vue diff --git a/pages/homepages/homes/dictionary/page1/page1.vue b/pages/homepages/homes/dictionary/page1/page1.vue deleted file mode 100644 index 342846f..0000000 --- a/pages/homepages/homes/dictionary/page1/page1.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/pages/homepages/homes/dictionary/pulled noodles/pulled noodles.vue b/pages/homepages/homes/dictionary/pulled_noodles/pulled_noodles.vue similarity index 100% rename from pages/homepages/homes/dictionary/pulled noodles/pulled noodles.vue rename to pages/homepages/homes/dictionary/pulled_noodles/pulled_noodles.vue diff --git a/pages/homepages/homes/knowledge_dictionary/knowledge_dictionary.vue b/pages/homepages/homes/knowledge_dictionary/knowledge_dictionary.vue index 342846f..46cb2f1 100644 --- a/pages/homepages/homes/knowledge_dictionary/knowledge_dictionary.vue +++ b/pages/homepages/homes/knowledge_dictionary/knowledge_dictionary.vue @@ -1,5 +1,18 @@ @@ -7,11 +20,172 @@ diff --git a/pages/homepages/puppy_chat/puppy_chat.vue b/pages/homepages/puppy_chat/puppy_chat.vue index 26c5333..80f4208 100644 --- a/pages/homepages/puppy_chat/puppy_chat.vue +++ b/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 { diff --git a/pages/homepages/user/basic_information/basic_information.vue b/pages/homepages/user/basic_information/basic_information.vue index c1e0de1..6d4d0ae 100644 --- a/pages/homepages/user/basic_information/basic_information.vue +++ b/pages/homepages/user/basic_information/basic_information.vue @@ -61,7 +61,7 @@ export default {