Leon преди 1 година
родител
ревизия
94e863628d

+ 5 - 2
src/features/trackSomething/components/DayNightCard.tsx

@@ -99,7 +99,10 @@ export default function DayNightCard(props: { isNight: boolean, switchChanged: F
                     t('feature.track_time_duration.third_ring.enter_location_desc')
             }</Text>
             {
-                authInfo && <Text style={{ color: '#9E9E9E', fontSize: rpxToPx(20) }} onClick={auth}>Edit Location</Text>
+                authInfo && <Text style={{ color: '#9E9E9E', fontSize: rpxToPx(20) }} onClick={(e)=>{
+                    e.stopPropagation()
+                    auth()
+                }}>Edit Location</Text>
             }
         </View>
     }
@@ -261,7 +264,7 @@ export default function DayNightCard(props: { isNight: boolean, switchChanged: F
         var split = new Date().toString().split(' ');
         var timezone = split[split.length - 2];
         if (!authInfo) {
-            return <View>
+            return <View style={{height:100,display:'flex',alignItems:'center',justifyContent:'center',width:rpxToPx(750)}}>
                 <Text>暂时位置信息</Text>
             </View>
         }

+ 8 - 4
src/features/trackTimeDuration/components/IndexItem.tsx

@@ -344,7 +344,10 @@ export default function Component(props: { type: string, data: any, time: any, s
     }
 
 
-    function goDetail() {
+    function goDetail(e) {
+        if (process.env.TARO_ENV=='weapp'){
+            e.stopPropagation()
+        }
         if (!user.isLogin) {
             jumpPage('/pages/account/ChooseAuth', 'ChooseAuth', navigation)
             return
@@ -422,11 +425,12 @@ export default function Component(props: { type: string, data: any, time: any, s
                     (props.data.scenario.name == 'SLEEP' || props.data.scenario.name == 'FAST_SLEEP') && <Text className="duration_value" style={{ color: global.sleepColor ? global.sleepColor : ColorType.sleep }}>{sleepDuration()}</Text>
                 }
             </View>
-            {
+            <Image className="arrow2" src={require('@/assets/images/arrow3.png')} />
+            {/* {
                 !props.showStage && <View className="record_arrow_bg" style={{ backgroundColor: global.isDebug ? 'red' : 'transparent' }}>
                     <View style={{ flex: 1 }} />
-                    <Image className="arrow2" src={require('@/assets/images/arrow3.png')} />
-                </View>}
+                    
+                </View>} */}
 
 
         </View>

+ 1 - 1
src/pages/clock/Index.tsx

@@ -305,7 +305,7 @@ export default function Page() {
     }
 
     global.updateFastSleepData = (data: any) => {
-        if (data.id == (homeData as any).id) {
+        if (data.id == (homeData as any).current_record.id) {
             var obj = JSON.parse(JSON.stringify(homeData))
             obj.current_record = data
             setHomeData(obj)