Leon 1 yıl önce
ebeveyn
işleme
ebbe5cc9b7

+ 10 - 3
src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -62,6 +62,9 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
             if (!user.test_user) {
                 return
             }
+            if (!global.memberAlert) {
+                return;
+            }
             global.ring = ring;
             const currentStatus = props.access.fast_sleep.current.qualification.status
             const preStatus = props.access.fast_sleep.previous.qualification.status
@@ -170,9 +173,13 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
 
         }
         global.checkAccess = (acccessData: any) => {
+            debugger
             if (!user.test_user) {
                 return
             }
+            if (!global.memberAlert) {
+                return;
+            }
             const currentStatus = acccessData.current.qualification.status
             const preStatus = acccessData.previous.qualification.status
             access = acccessData
@@ -526,7 +533,7 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
                     showCancel && <View className="fast_alert_cancel" onClick={cancel}>{cancelText}</View>
                 }
                 {
-                    user.test_user && <View style={{ display: 'flex', flexDirection: 'column' }}>
+                    user.test_user && global.memberAlert && <View style={{ display: 'flex', flexDirection: 'column' }}>
                         <Text style={{ color: '#fff', fontSize: 12 }}>member status:{props.access.member.status}</Text>
                         <Text style={{ color: '#fff', fontSize: 12 }}>current status:{props.access.fast_sleep.current.qualification.status}</Text>
                         <Text style={{ color: '#fff', fontSize: 12 }}>previous status:{props.access.fast_sleep.previous.qualification.status}</Text>
@@ -542,10 +549,10 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
     }
     return <View>
         {
-            user.test_user && showFastAlert && process.env.TARO_ENV == 'weapp' && alertPop()
+            user.test_user && global.memberAlert && showFastAlert && process.env.TARO_ENV == 'weapp' && alertPop()
         }
         {
-            user.test_user && showFastAlert && isFocused && process.env.TARO_ENV == 'rn' && <Modal transparent={true}>
+            user.test_user && global.memberAlert && showFastAlert && isFocused && process.env.TARO_ENV == 'rn' && <Modal transparent={true}>
                 <View style={{ backgroundColor: 'rgba(0,0,0,0.95)', width: '100%', height: '100%', alignItems: 'center', justifyContent: 'center' }}>
                     {alertPop()}
                 </View>

+ 17 - 1
src/pages/account/Profile.tsx

@@ -29,6 +29,7 @@ export default function Page() {
     const user = useSelector((state: any) => state.user);
     const [switchOn, setSwitchOn] = useState(false)
     const [triggered, setTriggered] = useState(true)
+    const [memberAlert, setMemberAlert] = useState(global.memberAlert)
 
     let navigation;
     if (useNavigation) {
@@ -57,6 +58,15 @@ export default function Page() {
         global.isDebug = e.detail.value
     }
 
+    function alertChanged(e) {
+        setMemberAlert(e.detail.value)
+        global.memberAlert = e.detail.value
+        Taro.setStorage({
+            key: 'memberAlert',
+            data: e.detail.value
+        })
+    }
+
     useDidShow(() => {
         // global.updateTab(3)
     })
@@ -98,7 +108,7 @@ export default function Page() {
 
     function tapBalance(e) {
         if (user.isLogin) {
-            jumpPage('','ProductList',navigation)
+            jumpPage('', 'ProductList', navigation)
         }
         else {
             jumpPage('/pages/account/ChooseAuth', 'ChooseAuth', navigation)
@@ -196,10 +206,16 @@ export default function Page() {
                         <Image className="cell_arrow" src={require('@/assets/images/arrow3.png')} />
                     </View>
                     <View className="cell_line" style={{ marginLeft: rpxToPx(46), marginRight: rpxToPx(46) }}></View>
+                    <View className="cell_center">
+                        <Text className="cell_title">member alert</Text>
+                        <Switch checked={memberAlert} onChange={alertChanged} />
+                    </View>
+                    <View className="cell_line" style={{ marginLeft: rpxToPx(46), marginRight: rpxToPx(46) }}></View>
                     <View className="cell_bottom">
                         <Text className="cell_title">{t('page.more.debug_mode')}</Text>
                         <Switch checked={switchOn} onChange={switchChanged} />
                     </View>
+                    
                 </View>
             }
 

+ 4 - 1
src/pages/clock/Clock.tsx

@@ -22,7 +22,7 @@ export default function Clock() {
     if (useNavigation) {
         navigation = useNavigation()
     }
-    
+
 
     if (process.env.TARO_ENV == 'weapp') {
         useShareAppMessage((e) => {
@@ -39,6 +39,7 @@ export default function Clock() {
                 headerTitle: '',
             });
         }
+        global.memberAlert = false;
         if (process.env.TARO_ENV == 'weapp') {
             loadWXCache()
         }
@@ -56,6 +57,7 @@ export default function Clock() {
         if (gps) {
             global.locationDetail = JSON.parse(gps)
         }
+        global.memberAlert = Taro.getStorageSync('memberAlert') || false
         var userData = Taro.getStorageSync('userData')
         if (userData) {
             dispatch(getInfoSuccess(JSON.parse(userData)));
@@ -66,6 +68,7 @@ export default function Clock() {
     async function loadRNCache() {
         var showDayRing = await getStorage('showDayRing') || false;
         var showNightRing = await getStorage('showNightRing') || false;
+        global.memberAlert = await getStorage('memberAlert') || false
         dispatch(showDay(showDayRing))
         dispatch(showNight(showNightRing))
         var gps = await getStorage('gps')