update

src/context/locales/en.js

@@ -94,7 +94,7 @@ export default {
             title: 'Edit profile',
             nickname: 'Nickname',
             save: 'Save',
-            nickname_footer:'Tip: Envisioning the kind of person you aspire to be, name yourself accordingly.'
+            nickname_footer:'Envision the kind of person you aspire to be, and name yourself accordingly.'
         }
     },
     feature: {
@@ -221,9 +221,10 @@ export default {
             note:'Note',
             night_tip:'Times displayed represent global annual averages for sunset and sunrise. Actual times vary based on your location and season.',
             day_tip:'Times displayed represent global annual averages for sunrise and sunset. Actual times vary based on your location and season.',
-            alert_location_required:'Location Required',
-            alert_night_content:'Enable location so we can calculate the daily sunset and sunrise times in your city.',
-            alert_day_content:'Enable location so we can calculate the daily sunrise and sunset times in your city.',
+            alert_required_night:'Location Required',
+            alert_required_day:'Location Required',
+            alert_night_content:'To accurately calculate daily sunset and sunrise times for your city, please enable location service.',
+            alert_day_content:'To accurately calculate daily sunrise and sunset times for your city, please enable location service.',
             choose_location:'Enable location',
             view_more:'More',
             got_it:'Got it',
@@ -381,7 +382,7 @@ export default {
                 tab_fast: 'Fast',
                 tab_sleep: 'Sleep',
                 delete: 'Delete',
-                none:'None',
+                none:'Not available',
                 
             },
 

src/context/locales/zh.js

@@ -93,7 +93,7 @@ export default {
             title: '编辑资料',
             nickname: '昵称',
             save: '保存',
-            nickname_footer:'提示：想象你想要成为的样子, 并以此取名。不断暗示自己愈发美丽、健康！'
+            nickname_footer:'想象你要成为的样子, 并以此取个名字。'
         }
 
 
@@ -224,19 +224,20 @@ export default {
             get_local_time_sunrise: '显示当地白天时间',
             to: '至',
             note: '提示',
-            night_tip:'当前显示时间为全球各地年均日落日出时间,\n实际时间会根据您所在地理位置和季节有所变化。',
-            day_tip:'当前显示时间为全球各地平均日出日落时间,\n实际时间会根据您所在地理位置和季节有所变化。',
-            alert_location_required:'需要位置计算日出日落',
-            alert_night_content: '根据位置信息, 以计算您所在城市每天日落日出时间。',
-            alert_day_content: '根据位置信息, 以计算您所在城市每天日出日落时间。',
+            night_tip:'当前显示时间为全球各地年均日落日出时间;\n实际时间根据您所在地理位置和季节有所变化。',
+            day_tip:'当前显示时间为全球各地年均日出日落时间;\n实际时间根据您所在地理位置和季节有所变化。',
+            alert_required_night:'需要位置计算日落日出',
+            alert_required_day:'需要位置计算日出日落',
+            alert_night_content: '为了准确计算当地每天日落日出时间, 请选择位置。',
+            alert_day_content: '为了准确计算当地每天日出日落时间, 请选择位置。',
             choose_location:'选择位置',
             view_more:'更多',
             got_it: '我知道了',
             more: '更多',
             night_alert_title: '夜间环已开启',
-            night_alert_content: '登录后, 您可以查看当地夜间时间段 (日落至日出)。',
+            night_alert_content: '登录后, 您可以查看当地夜间时段 (日落至日出)。',
             day_alert_title: '白天环已开启',
-            day_alert_content: '登录后, 您可以查看当地白天时间段 (日出至日落)。'
+            day_alert_content: '登录后, 您可以查看当地白天时段 (日出至日落)。'
         },
         track_time_duration: {
             common: {
@@ -261,17 +262,17 @@ export default {
                 fast_end_title: '断食结束提醒',
                 wake_title: '起床提醒',
 
-                schedule_fast_content: '开启后, 您将在设定的开始时间获得提醒。',
-                schedule_sleep_content: '开启后, 您将在设定的就寝时间获得提醒。',
-                schedule_mix_content: '开启后, 您将在设定的断食开始时间及就寝时间获得提醒。',
-                post_fast_content: '开启后, 您将在{{time}} 获得结束提醒。',
-                post_sleep_content: '开启后, 您将在{{time}} 获得起床提醒。',
+                schedule_fast_content: '开启后, 您将在设定的断食时间收到提醒。',
+                schedule_sleep_content: '开启后, 您将在设定的就寝时间收到提醒。',
+                schedule_mix_content: '开启后, 您将在设定的断食及就寝时间收到提醒。',
+                post_fast_content: '开启后, 您将在{{time}} 收到断食结束提醒。',
+                post_sleep_content: '开启后, 您将在{{time}} 收到起床提醒。',
 
-                enable_schedule_fast_content: '每日 {{time}} 提醒您开始断食。',
-                enable_schedule_sleep_content: '每日 {{time}} 提醒您就寝。',
-                enable_schedule_mix_content: '每日 {{time1}} 提醒您开始断食,\n每日 {{time2}} 提醒您就寝。',
-                enable_post_fast_content: '{{time}} 提醒您结束断食。',
-                enable_post_sleep_content: '{{time}} 提醒您起床。',
+                enable_schedule_fast_content: '每天 {{time}} 您将通过公众号收到断食提醒。',
+                enable_schedule_sleep_content: '每天 {{time}} 您将通过公众号收到就寝提醒。',
+                enable_schedule_mix_content: '每天 {{time1}} 及 {{time2}} 您将通过公众号收到断食及就寝提醒。',
+                enable_post_fast_content: '{{time}} 您将通过公众号收到断食结束提醒。',
+                enable_post_sleep_content: '{{time}} 您将通过公众号收到起床提醒。',
 
                 later: '稍后',
                 open: '立即开启',
@@ -368,7 +369,7 @@ export default {
             record_fast_sleep: {
                 header: {
                     latest_record: '最近',
-                    btn_show_all: '查看历史'
+                    btn_show_all: '显示历史'
                 },
                 item: {
                     fast: '断食',
@@ -383,7 +384,7 @@ export default {
                 tab_fast: '断食',
                 tab_sleep: '睡眠',
                 delete: '删除',
-                none:'无'
+                none:'无可用记录'
             },
 
             action_sheet: {

src/features/auth/components/CreatePassword.tsx

@@ -45,13 +45,6 @@ export default function Component(prop: { name?: string, email?: string }) {
   useEffect(() => {
     if (user.isLogin) {
       navigation.pop(3)
-      return
-      Taro.navigateBack({
-        delta: 2
-      })
-      Taro.redirectTo({
-        url: '/pages/clock/ChooseScenario'
-      })
     }
   }, [user.isLogin])
 

src/features/auth/components/login.tsx

@@ -43,8 +43,10 @@ export default function Login(props: { register: () => void }) {
                 Taro.navigateBack({
                     delta: 2
                 })
+                console.log('login 2 navi back')
             }
             else {
+                console.log('login 1 navi back')
                 Taro.navigateBack({
                     delta: 1
                 })

src/features/food/FoodConsole.scss

@@ -128,8 +128,12 @@
 
 /* #ifdef weapp */
 .myswitch{
-    width: 100px !important;
-    height: 50px !important;
+    // width: 100px !important;
+    // height: 50px !important;
+    transform: scale(0.85);
+    transform-origin: right center;
+    margin-right: -10px;
+
 }
 
 /* #endif */

src/features/trackTimeDuration/components/DayNightCard.scss

@@ -11,7 +11,7 @@
 .day_night_title {
     font-size: 32px;
     line-height: 32px;
-
+    opacity: 0.6;
 }
 
 .free {

src/features/trackTimeDuration/components/DayNightCard.tsx

@@ -655,7 +655,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
             return
         }
         Taro.showModal({
-            title: t('feature.day_night.alert_location_required'),
+            title: props.isNight ? t('feature.day_night.alert_required_night') : t('feature.day_night.alert_required_day'),
             content: props.isNight ? t('feature.day_night.alert_night_content') : t('feature.day_night.alert_day_content'),
             confirmText: t('feature.day_night.choose_location'),
             cancelText: t('feature.day_night.view_more'),
@@ -684,7 +684,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
                     }
 
                     <View style={{ flex: 1 }} />
-                    <View style={{ height: rpxToPx(50),display:'flex',alignItems:'center',flexDirection:'row' }}>
+                    <View style={{ height: rpxToPx(50), display: 'flex', alignItems: 'center', flexDirection: 'row' }}>
                         <Switch checked={props.isNight ? dayStore.showDayRing : dayStore.showDayRing}
                             className='switch'
                             color={props.isNight ? ColorType.night : ColorType.day}
@@ -753,7 +753,7 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
                                         <View className={props.isNight ? 'night_location_btn' : 'day_location_btn'} onClick={auth}>{getLocation()}</View>
                                     </View>
                                     :
-                                    <View style={{ display: 'flex', flexDirection: 'row', marginTop: rpxToPx(18)}} onClick={auth}>
+                                    <View style={{ display: 'flex', flexDirection: 'row', marginTop: rpxToPx(18) }} onClick={auth}>
                                         <View className={props.isNight ? 'night_location_btn' : 'day_location_btn'} onClick={auth}>
                                             {props.isNight ? t('feature.day_night.get_local_time') : t('feature.day_night.get_local_time_sunrise')}
                                         </View>

src/features/trackTimeDuration/components/Discovery.scss

@@ -24,6 +24,7 @@
     line-height: 32px;
     color: #fff;
     font-weight: 400;
+    opacity: 0.6;
 }
 
 .duration_value2 {

src/features/trackTimeDuration/components/IndexItem.scss

@@ -49,6 +49,7 @@
     line-height: 32px;
     color: #fff;
     font-weight: 400;
+    opacity: 0.6;
 }
 
 .duration_value2 {

src/features/trackTimeDuration/components/RecordFastSleep.tsx

@@ -144,6 +144,21 @@ const RecordFastSleep = memo((props: { data: any, type: string, index: number })
         setDiffTimeZone(isDiff)
         setMultiTimeZone(isMulti)
     }
+
+    function tapDel(){
+        Taro.showModal({
+            title: t('feature.common.modal.delete_item_title'),
+            content: t('feature.common.modal.delete_item_content'),
+            success: function (res) {
+                if (res.confirm) {
+                    del();
+                }
+                else {
+                    setShowDel(false)
+                }
+            }
+        })
+    }
     function del() {
         var id = props.data.id
         delRecord(id
@@ -631,7 +646,7 @@ const RecordFastSleep = memo((props: { data: any, type: string, index: number })
                 onClick={showDetail}
             >{recordDetail()}
             </RecordItem>
-            <View className={showDel ? 'btnDelete btnDeleteAni' : 'btnDelete'} onClick={del}>{t('feature.track_time_duration.record_fast_sleep.delete')}</View>
+            <View className={showDel ? 'btnDelete btnDeleteAni' : 'btnDelete'} onClick={tapDel}>{t('feature.track_time_duration.record_fast_sleep.delete')}</View>
 
         </View>
         {/* {

src/features/trackTimeDuration/components/SetSchedule.weapp.tsx

@@ -151,6 +151,7 @@ export default function Component() {
         // global.checkData()
         global.indexPageRefresh()
 
+        console.log('set schedule 3 navi back')
         Taro.navigateBack({ delta: 3 }).then(res => {
 
         })
@@ -228,6 +229,7 @@ export default function Component() {
       dispatch(setStep('fast'))
       // global.checkData()
       Taro.navigateBack({ delta: 4 })
+      console.log('set schedule 4 navi back')
 
       debugger
       setTimeout(() => {

src/features/trackTimeDuration/components/StageSelector.scss

@@ -38,6 +38,11 @@
 
 }
 
+.switch_stage{
+    transform: scale(0.85);
+    transform-origin: right center;
+    margin-right: -10px;
+}
 
 /*
 .stage_btn {
@@ -62,18 +67,18 @@
 }
 */
 
-.single_check_text_nor{
+.single_check_text_nor2{
     color: $fastColor;
-    font-weight: bold;
+    // font-weight: bold;
     font-size: 32px;
     flex: 1;
     color: #fff;
 }
 
-.single_check_text_sel{
+.single_check_text_sel2{
     color: $fastColor;
     // color: #000;
-    font-weight: bold;
+    // font-weight: bold;
     font-size: 32px;
     flex: 1;
 }

src/features/trackTimeDuration/components/StageSelector.tsx

@@ -39,7 +39,7 @@ export default function () {
                             setMultiData(JSON.parse(JSON.stringify(multiData)))
                             // setCount((prevCounter) => prevCounter + 1)
                         }}>
-                            <Text className={item.checked ? "single_check_text_sel" : "single_check_text_nor"}>{item.title}</Text>
+                            <Text className={item.checked ? "single_check_text_sel2" : "single_check_text_nor2"}>{item.title}</Text>
                             {
                                 item.checked ? <IconCheck width={rpxToPx(48)} height={rpxToPx(48)} color={ColorType.fast}/> :
                                     <IconPlus color='#fff' />
@@ -50,19 +50,19 @@ export default function () {
             </View> : <View>
 
                 <View className={selIndex == 0 ? "single_check_sel1" : "single_check_nor1"} onClick={() => { setSelIndex(0); global.updateMixItem([true, false, false]); }}>
-                    <Text className={selIndex == 0 ? "single_check_text_sel" : "single_check_text_nor"}>{t('feature.track_time_duration.stage.a')}</Text>
+                    <Text className={selIndex == 0 ? "single_check_text_sel2" : "single_check_text_nor2"}>{t('feature.track_time_duration.stage.a')}</Text>
                     {
                         selIndex == 0 && <IconCheck width={rpxToPx(48)} height={rpxToPx(48)} color={ColorType.fast}/>//<Image src={require('@assets/images/check_fast.png')} className="single_checked" />
                     }
                 </View>
                 <View className={selIndex == 1 ? "single_check_sel1" : "single_check_nor1"} onClick={() => { setSelIndex(1); global.updateMixItem([false, true, false]); }}>
-                    <Text className={selIndex == 1 ? "single_check_text_sel" : "single_check_text_nor"}>{t('feature.track_time_duration.stage.b')}</Text>
+                    <Text className={selIndex == 1 ? "single_check_text_sel2" : "single_check_text_nor2"}>{t('feature.track_time_duration.stage.b')}</Text>
                     {
                         selIndex == 1 && <IconCheck width={rpxToPx(48)} height={rpxToPx(48)} color={ColorType.fast}/>//<Image src={require('@assets/images/check_fast.png')} className="single_checked" />
                     }
                 </View>
                 <View className={selIndex == 2 ? "single_check_sel1" : "single_check_nor1"} onClick={() => { setSelIndex(2); global.updateMixItem([false, false, true]); }}>
-                    <Text className={selIndex == 2 ? "single_check_text_sel" : "single_check_text_nor"}>{t('feature.track_time_duration.stage.c')}</Text>
+                    <Text className={selIndex == 2 ? "single_check_text_sel2" : "single_check_text_nor2"}>{t('feature.track_time_duration.stage.c')}</Text>
                     {
                         selIndex == 2 && <IconCheck width={rpxToPx(48)} height={rpxToPx(48)} color={ColorType.fast}/>//<Image src={require('@assets/images/check_fast.png')} className="single_checked" />
                     }
@@ -74,7 +74,7 @@ export default function () {
                 
                 <Text style={{ marginRight: 10 }}>{t('feature.track_time_duration.stage.multi_selection')}</Text>
                 <View style={{ flex: 1 }} />
-                <Switch color={ColorType.fast} onChange={(e) => {
+                <Switch className="switch_stage" color={ColorType.fast} onChange={(e) => {
                     setIsMulti(e.detail.value)
                     if (e.detail.value) {
                         multiData[0].checked = selIndex == 0

src/features/trackTimeDuration/components/TimelineFastSleep.tsx

@@ -178,7 +178,7 @@ export default function TimelineFastSleep(props: { data: any, title?: string, fi
                 title: getStatus(true, true, props.data) == 'padding' ?
                     t('feature.track_time_duration.common.start_fast') :
                     t('feature.track_time_duration.common.started_fasting'),
-                content: props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.fast, false, true) + scenario.schedule.fast.start_time : formateDate(props.data.status, props.data.fast, false, true) + formateTime(props.data.fast, false, true),
+                content: props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.fast, false, true)+' ' + scenario.schedule.fast.start_time : formateDate(props.data.status, props.data.fast, false, true)+' ' + formateTime(props.data.fast, false, true),
                 date: desc,
                 // (diffTimeZone ? timeZone : showDate(props.data.fast, false) ? formateDate(props.data.fast, false) : ''),
                 color: global.fastColor ? global.fastColor : ColorType.fast
@@ -188,7 +188,7 @@ export default function TimelineFastSleep(props: { data: any, title?: string, fi
     if (props.data.sleep && props.data.scenario != 'FAST') {
 
         var status = getStatus(false, true, props.data)
-        var strContent = props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.sleep, false, false) + scenario.schedule.sleep.start_time : formateDate(props.data.status, props.data.sleep, false, false) + formateTime(props.data.sleep, false, false)
+        var strContent = props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.sleep, false, false)+' ' + scenario.schedule.sleep.start_time : formateDate(props.data.status, props.data.sleep, false, false)+' ' + formateTime(props.data.sleep, false, false)
 
 
         var timeZone = ''
@@ -220,7 +220,7 @@ export default function TimelineFastSleep(props: { data: any, title?: string, fi
             timeZone = ' ' + props.data.sleep.real_end_time_zone
         }
         var status = getStatus(false, false, props.data)
-        var strContent: string = props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.sleep, true, false) + scenario.schedule.sleep.end_time : formateDate(props.data.status, props.data.sleep, true) + formateTime(props.data.sleep, true, false)
+        var strContent: string = props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.sleep, true, false) +' '+ scenario.schedule.sleep.end_time : formateDate(props.data.status, props.data.sleep, true)+' ' + formateTime(props.data.sleep, true, false)
         var strDate = multTimeZone ? timeZone : ''
 
         if (props.data.status != 'WAIT_FOR_START' && props.data.status != 'COMPLETED') {
@@ -259,6 +259,9 @@ export default function TimelineFastSleep(props: { data: any, title?: string, fi
         if ((diffTimeZone && !multTimeZone) && props.data.status == 'COMPLETED') {
             timeZone = ''
         }
+        if (!diffTimeZone && !multTimeZone &&props.data.status == 'COMPLETED'){
+            timeZone = ''
+        }
 
         timelineItems.push(
             {
@@ -266,7 +269,7 @@ export default function TimelineFastSleep(props: { data: any, title?: string, fi
                 title: getStatus(true, false, props.data) == 'padding' ?
                     t('feature.track_time_duration.common.end_fast') :
                     t('feature.track_time_duration.common.ended_fasting'),
-                content: props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.fast, true, true) + scenario.schedule.fast.end_time : formateDate(props.data.status, props.data.fast, true) + formateTime(props.data.fast, true, true),
+                content: props.data.status == 'WAIT_FOR_START' ? formateDate(props.data.status, props.data.fast, true, true)+' ' + scenario.schedule.fast.end_time : formateDate(props.data.status, props.data.fast, true)+' ' + formateTime(props.data.fast, true, true),
                 // date: multTimeZone ? timeZone : '',
                 date: timeZone,
                 // (diffTimeZone ? timeZone : showDate(props.data.fast, true) ? formateDate(props.data.fast, true) : ''),

src/features/workout/Result.tsx

@@ -143,6 +143,7 @@ export default function Component() {
             }
             global.refreshWorkout()
             Taro.navigateBack()
+            console.log('result navi back')
         })
     }
 

src/pages/account/ChooseAuth.tsx

@@ -35,38 +35,38 @@ export default function Page() {
         if (user.isLogin) {
             if (user.is_new_user) {
                 console.log('new user')
-                if  (user.scenario_select_count==0){
+                if (user.scenario_select_count == 0) {
                     console.log('new')
                     Taro.redirectTo({
                         url: '/pages/clock/ChooseScenario'
                     })
-                    setTimeout(()=>{
+                    setTimeout(() => {
                         Taro.navigateTo({
-                            url:'/pages/account/ProfileSetting?newuser=1'
+                            url: '/pages/account/ProfileSetting?newuser=1'
                         })
-                    },100)
+                    }, 100)
                 }
                 else {
                     console.log('replace')
                     Taro.redirectTo({
-                        url:'/pages/account/ProfileSetting?newuser=1'
+                        url: '/pages/account/ProfileSetting?newuser=1'
                     })
                 }
-                
-                
+
+
             }
             else {
                 console.log('old user')
-                if (user.scenario_select_count > 0) {
-                    Taro.navigateBack({
-                        delta: 1
-                    })
-                }
-                else {
-                    Taro.redirectTo({
-                        url: '/pages/clock/ChooseScenario'
-                    })
-                }
+                // if (user.scenario_select_count > 0) {
+                //     Taro.navigateBack({
+                //         delta: 1
+                //     })
+                // }
+                // else {
+                //     Taro.redirectTo({
+                //         url: '/pages/clock/ChooseScenario'
+                //     })
+                // }
             }
 
 
@@ -109,6 +109,22 @@ export default function Page() {
             console.log(res)
             dispatch(loginSuccess(res));
             setBtnDisable(false)
+
+            if (!(res as any).is_new_user){
+                if ((res as any).scenario_select_count > 0) {
+                    console.log('choose auth navi back')
+                    Taro.navigateBack({
+                        delta: 1
+                    })
+                }
+                else {
+                    Taro.redirectTo({
+                        url: '/pages/clock/ChooseScenario'
+                    })
+                }
+            }
+            
+            debugger
         }).catch(e => {
             setBtnDisable(false)
         })
@@ -130,8 +146,8 @@ export default function Page() {
         jumpPage('/pages/account/Auth', 'Auth', navigation)
     }
 
-    function login1(){
-        jumpPage('/pages/account/Auth', 'Auth', navigation,{isLogin:true})
+    function login1() {
+        jumpPage('/pages/account/Auth', 'Auth', navigation, { isLogin: true })
     }
 
     return <View className="container choose_container">
@@ -140,10 +156,10 @@ export default function Page() {
         {
             process.env.TARO_ENV == 'weapp' ? <ChooseScenarioBtn disable={btnDisable} title={t('page.choose_auth.btn_wechat')} onClick={getCode} background={ColorType.fast} /> :
                 <ChooseScenarioBtn disable={btnDisable} title={t('page.choose_auth.btn_login')} onClick={login1} background={ColorType.fast} />
-                // <Text style={{color:'red'}} onClick={createAccount1}>{t('page.choose_auth.btn_signup')}</Text>
+            // <Text style={{color:'red'}} onClick={createAccount1}>{t('page.choose_auth.btn_signup')}</Text>
         }
 
-        <View style={{height:30}}/>
+        <View style={{ height: 30 }} />
         {
             process.env.TARO_ENV == 'rn' && <ChooseScenarioBtn disable={btnDisable} title={t('page.choose_auth.btn_signup')} onClick={createAccount1} background={ColorType.fast} />
         }

src/pages/account/EditPage.tsx

@@ -72,6 +72,7 @@ export default function Page() {
             setTimeout(() => {
                 if (process.env.TARO_ENV == 'weapp') {
                     Taro.navigateBack()
+                    console.log('edit page navi back')
                 }
                 else {
                     navigation.goBack()

src/pages/account/ProfileSetting.tsx

@@ -156,6 +156,7 @@ export default function Page() {
             <ChooseScenarioBtn disable={router.params.newuser == '1' && (user.avatar == header || user.nickname == name)} title={t('feature.common.picker_confirm_btn')} onClick={() => {
                 if (process.env.TARO_ENV == 'weapp') {
                     Taro.navigateBack()
+                    console.log('profile setting navi back')
                 }
                 else {
                     navigation.goBack()

src/pages/account/Setting.tsx

@@ -44,6 +44,7 @@ export default function Page() {
                                 url: '/pages/clock/Clock'
                             })
                             Taro.navigateBack();
+                            console.log('setting navi back')
                         }
                         else {
                             navigation.goBack()

src/services/user.tsx

@@ -116,13 +116,6 @@ export const logout = () => {
             return reject(e)
         })
     })
-
-    // request({
-    //     url: API_LOGOUT, method: 'GET', data: {}
-    // }).then(_ => {
-    //     dispatch(logoutSuccess());
-    //     Taro.navigateBack();
-    // })
 }
 
 export const clear = () => (dispatch: any) => {
@@ -131,6 +124,7 @@ export const clear = () => (dispatch: any) => {
     }).then(_ => {
         dispatch(clearSuccess());
         Taro.navigateBack();
+        console.log('clear navi back')
     })
 }