Leon hace 1 año
padre
commit
423e3235ae

+ 8 - 2
src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -63,6 +63,9 @@ export default function CheckAccess(props: { record: any, count: number }) {
             if (!user.test_user) {
                 return
             }
+            if (!global.memberAlert) {
+                return;
+            }
             global.ring = ring;
             const currentStatus = obj.access.current.qualification.status
             const preStatus = obj.access.previous.qualification.status
@@ -141,6 +144,9 @@ export default function CheckAccess(props: { record: any, count: number }) {
             if (!user.test_user) {
                 return
             }
+            if (!global.memberAlert) {
+                return;
+            }
             const currentStatus = acccessData.current.qualification.status
             const preStatus = acccessData.previous.qualification.status
             access = acccessData
@@ -481,10 +487,10 @@ export default function CheckAccess(props: { record: any, count: number }) {
     }
     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 && rnKeep && process.env.TARO_ENV == 'rn' && <Modal transparent={true}>
+            user.test_user && global.memberAlert && showFastAlert && rnKeep && 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>

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

@@ -93,7 +93,7 @@ export default function ChooseScenario() {
     }
 
     function chooseType(index: number) {
-        if (user.test_user) {
+        if (user.test_user && global.memberAlert) {
             const { qualification } = access.current
             if (qualification.status != "PROVISIONAL_QUALIFIED" && index == 1) {
                 const { streak_fast_min_required } = qualification.condition;

+ 5 - 2
src/pages/clock/Clock.tsx

@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
 export default function ClockMain() {
     const dispatch = useDispatch();
     const [loaded, setLoaded] = useState(false)
-    const {t} = useTranslation()
+    const { t } = useTranslation()
 
     if (process.env.TARO_ENV == 'weapp') {
         useShareAppMessage((e) => {
@@ -20,8 +20,9 @@ export default function ClockMain() {
             }
         })
     }
-    
+
     useEffect(() => {
+        global.memberAlert = false;
         if (process.env.TARO_ENV == 'weapp') {
             loadWXCache()
         }
@@ -33,6 +34,7 @@ export default function ClockMain() {
     function loadWXCache() {
         var showDayRing = Taro.getStorageSync('showDayRing') || false;
         var showNightRing = Taro.getStorageSync('showNightRing') || false;
+        global.memberAlert = Taro.getStorageSync('memberAlert') || false;
         dispatch(showDay(showDayRing))
         dispatch(showNight(showNightRing))
         var gps = Taro.getStorageSync('gps')
@@ -49,6 +51,7 @@ export default function ClockMain() {
     async function loadRNCache() {
         var showDayRing = await getStorage('showDayRing') || false;
         var showNightRing = await getStorage('showNightRing') || false;
+        global.memberAlert = await getStorage('showNightRing') || false;
         dispatch(showDay(showDayRing))
         dispatch(showNight(showNightRing))
         var gps = await getStorage('gps')