From 6d356d54d641f5ffc7b2fb85bc286c94cb6314e3 Mon Sep 17 00:00:00 2001
From: Miao_Spring <539943419@qq.com>
Date: Mon, 18 Dec 2023 19:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C=E4=BC=98=E8=89=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=B7=AE=E2=80=9D=E8=AF=84=E5=88=86=E7=BB=86=E5=88=99?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/pages/index/index.ts   | 10 ++++------
 miniprogram/pages/index/index.wxml | 11 ++++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts
index 87c8ede..6600de8 100644
--- a/miniprogram/pages/index/index.ts
+++ b/miniprogram/pages/index/index.ts
@@ -154,6 +154,8 @@ Page({
         remarkTemp: '',
         resultTitle: "查询结果",
 
+        showLib : false,
+
         // 没用到
         pageStack: [],
 
@@ -537,6 +539,7 @@ Page({
 
     popup_lib() {
         this.data.pageStack.push("lib")
+        this.setData({showLib : true})
         this.startPage_Bottons_leave()
         this.animate('#page_lib', [
             { opacity: 0, translateY: 0 }, { opacity: 1, translateY: "-100%", ease: 'ease-in-out', },
@@ -551,12 +554,7 @@ Page({
         this.animate('#page_lib', [
             { opacity: 1, translateY: "-100%" }, { opacity: 0, translateY: "0", ease: 'ease-in-out' },
         ], 1000, () => {
-            // for(var n of this.data.data_lib){
-            //     n.hidden=false
-            // }
-            // this.setData(
-            //     {"data.data_lib":this.data.data_lib}
-            // )
+            this.setData({showLib : false})
         })
     },
 
diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
index 4d21572..b2e5440 100644
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -55,7 +55,7 @@
                 <image src="./static/icons/back_black.svg" mode="aspectFit" />
             </view>
         </view>
-        <view class="content">
+        <view class="content" wx:if="{{ showLib }}">
             <view class="search lib_search">
                 <view class="search_bar lib_search_input">
                     <view class="search_icon">
@@ -65,7 +65,7 @@
                 </view>
                 <!-- <view class="search_button" bind:tap="readInput_lib">搜索</view> -->
             </view>
-            <view wx:for="{{ data_lib }}" wx:for-item="n">
+            <view wx:for="{{ data_lib }}" wx:for-item="n" >
                 <view class="ingredient_card" hidden="{{ hidden_lib[n.name.zh] }}" style="background-color: {{ n.riskBgColor }};">
                     <view class="node_content">
                         <view class="node_name" bind:tap="text2speech" data-name="{{n.name.zh}}">{{ n.name.zh }}</view>
@@ -188,9 +188,10 @@
         <view class="content">
             <!-- 丑出天际 -->
             <view class="result_isSafe" style="background-color: {{ data_resultPage.circleColor }}">
-                <view hidden="{{ !(data_resultPage.scores < 33) }}">差</view>
-                <view hidden="{{ !(data_resultPage.scores >= 33 && data_resultPage.scores < 66) }}">良</view>
-                <view hidden="{{ !(data_resultPage.scores >= 66) }}" style="color:rgb(241, 255, 250)">优</view>
+                <view hidden="{{ !(data_resultPage.scores < 60) }}">差</view>
+                <view hidden="{{ !(data_resultPage.scores >= 60 && data_resultPage.scores < 80) }}">中</view>
+                <view hidden="{{ !(data_resultPage.scores >= 80 && data_resultPage.scores < 90) }}">良</view>
+                <view hidden="{{ !(data_resultPage.scores >= 90) }}" style="color:rgb(241, 255, 250)">优</view>
             </view>
             <!-- 我就知道GPT写不出来 -->
             <view class="result_circle">