update

src/_health/components/card.scss

@@ -7,6 +7,7 @@
     width: 698px;
     flex-direction: column;
     overflow: hidden;
+    flex-shrink: 0;
     // -webkit-backface-visibility: hidden;
     // -webkit-mask-image: -webkit-radial-gradient(white,black);
     // flex-shrink: 0;

src/_health/components/choose_date_time.tsx

@@ -57,13 +57,14 @@ export default function ChooseDateTime(props: {
             }
 
             <View style={{
-                borderColor: props.showError ? 'red' : 'transparent',
+                borderColor: props.showError ? 'red' : (props.expand && chooseDate) ?props.color:'transparent',
                 borderWidth: rpxToPx(2),
                 borderRadius: rpxToPx(88 / 4),
                 borderStyle: 'solid'
             }}>
                 <NewButton
-                    type={(props.expand && chooseDate) ? NewButtonType.alpha : NewButtonType.gray}
+                    // type={(props.expand && chooseDate) ? NewButtonType.alpha : NewButtonType.gray}
+                    type={NewButtonType.gray}
                     color={props.color}
                     title={dateTitle()}
                     fontSize={rpxToPx(34)}
@@ -86,13 +87,14 @@ export default function ChooseDateTime(props: {
             </View>
             <View style={{ width: rpxToPx(12) }} />
             <View style={{
-                borderColor: props.showError ? 'red' : 'transparent',
+                borderColor: props.showError ? 'red' : (props.expand && !chooseDate) ? props.color : 'transparent',
                 borderWidth: rpxToPx(2),
                 borderRadius: rpxToPx(88 / 4),
                 borderStyle: 'solid'
             }}>
                 <NewButton
-                    type={(props.expand && !chooseDate) ? NewButtonType.alpha : NewButtonType.gray}
+                    // type={(props.expand && !chooseDate) ? NewButtonType.alpha : NewButtonType.gray}
+                    type={NewButtonType.gray}
                     color={props.color}
                     title={props.time}
                     fontSize={rpxToPx(34)}

src/_health/pages/log_time.tsx

@@ -731,14 +731,21 @@ export default function LogTime() {
             isSingle && isStart && showGoal && <Card>
                 <View style={{ position: 'relative' }}>
                     <View className="card_header" style={{ justifyContent: 'space-between' }}>
-                        <View className="h34" style={{marginLeft:rpxToPx(12)}}>{isFast ? 'Fast Goal' : 'Sleep Goal'}</View>
-                        <NewButton
-                            type={NewButtonType.gray}
-                            height={rpxToPx(84)}
-                            title={durationTime()}
-                            fontNormal
-                            onClick={() => { setExpandIndex(-1) }}
-                        />
+                        <View className="h34" style={{ marginLeft: rpxToPx(12) }}>{isFast ? 'Fast Goal' : 'Sleep Goal'}</View>
+                        <View style={{
+                            borderColor: expandIndex == -1 ? isFast ? MainColorType.fast : MainColorType.sleep : 'transparent',
+                            borderWidth: rpxToPx(2),
+                            borderRadius: rpxToPx(88 / 4),
+                            borderStyle: 'solid'
+                        }}>
+                            <NewButton
+                                type={NewButtonType.gray}
+                                height={rpxToPx(84)}
+                                title={durationTime()}
+                                fontNormal
+                                onClick={() => { setExpandIndex(-1) }}
+                            />
+                        </View>
                     </View>
                     {
                         expandIndex == -1 && <View style={{

src/_health/pages/long_fast.tsx

@@ -243,7 +243,7 @@ export default function LongFast() {
                 subtitle="Prolonged Fasting beyond 24 hours"
             />
             <Card>
-                <View className="long_fast_card" >
+                <View className="long_fast_card">
                     <View style={{ height: rpxToPx(96) }} />
                     <View className="h50 bold" style={{ color: MainColorType.fast }}>{timeText()}</View>
                     <View className="h24" style={{ color: MainColorType.g02, marginTop: rpxToPx(12) }}>Goal {goal()}</View>

src/_health/pages/schedules.tsx

@@ -522,6 +522,7 @@ export default function Schedules() {
             }
             {
                 showModal && <AddLabel labels={isEat ? labels : labels2} 
+                window={isEat?'EAT':'ACTIVE'}
                 color={isEat ? MainColorType.eat : MainColorType.active} 
                 disMiss={() => setShowModal(false)} />
             }