vbea 2 лет назад
Родитель
Сommit
da06d26ffb
1 измененных файлов с 31 добавлено и 7 удалено
  1. 31 7
      Strides-APP/app/pages/wallet/TopupNew.js

+ 31 - 7
Strides-APP/app/pages/wallet/TopupNew.js

@@ -3,7 +3,7 @@
  * @邠心vbe on 2023/02/02
  */
 import React, { Component } from 'react';
-import { View, Text, StyleSheet, Switch } from 'react-native';
+import { View, Text, StyleSheet, Switch, AppState, Linking } from 'react-native';
 import apiWallet from '../../api/apiWallet';
 import BadgeSelectItem from '../../components/BadgeSelectItem';
 import Button, { ElevationObject } from '../../components/Button';
@@ -26,8 +26,10 @@ export default class TopupNew extends Component {
       selectIndex: 0,
       payType: {},
       balance: 0,
-      agree: true
+      agree: false,
+      isCallback: true
     };
+    this.stateListener;
   }
 
   componentDidMount() {
@@ -39,6 +41,20 @@ export default class TopupNew extends Component {
       }, true);
     });
     this.getTopupList();
+    this.stateListener = AppState.addEventListener("change", state => {
+      if (state == 'active' && this.state.isCallback) {
+        this.setState({
+          agree: true,
+          isCallback: false
+        })
+      }
+    });
+  }
+
+  componentWillUnmount() {
+    if (this.stateListener) {
+      this.stateListener?.remove();
+    }
   }
 
   getTopupList() {
@@ -121,9 +137,16 @@ export default class TopupNew extends Component {
   }
 
   changeAgree(ag) {
-    this.setState({
-      agree: ag
-    })
+    if (ag) {
+      this.setState({
+        isCallback: true
+      })
+      Linking.openURL(app.storeUrl.refundUrl);
+    } else {
+      this.setState({
+        agree: ag
+      });
+    }
   }
 
   render() {
@@ -171,8 +194,9 @@ export default class TopupNew extends Component {
                           })
                         }}>
                         <Text style={[styles.topupText, index == this.state.selectIndex && {color: colorAccent}]}>
+                          <Text style={{fontSize: 16}}>{item.currencySymbol} </Text>
                           {item.amount}
-                          <Text style={{fontSize: 16}}> {item.currency}</Text>
+                          {/* <Text style={{fontSize: 16}}> {item.currency}</Text> */}
                         </Text>
                       </BadgeSelectItem>
                     );
@@ -206,7 +230,7 @@ export default class TopupNew extends Component {
               <TextView style={styles.agreeText} onPress={() => this.changeAgree(!this.state.agree)}>
                 {$t('sign.iHaveReadAndAgree')}
               </TextView>
-              <TextView style={styles.agreeLink} onPress={() => startPage(PageList.refundPolicy)}>Refund Policy</TextView>
+              <TextView style={styles.agreeLink} onPress={() => this.changeAgree(true)}>Refund Policy</TextView>
             </View>
           </View>
         }