0601

App.js

@@ -166,12 +166,10 @@ export default function App(props) {
     }
   }, [initRouteName]);
 
-  if (
-    (!isLoadingComplete && !props.skipLoadingScreen) ||
-    initRouteName === ""
-  ) {
+  if (!isLoadingComplete && !props.skipLoadingScreen && !!initRouteName) {
     return null;
   }
+
   return (
     <>
       <IconRegistry icons={EvaIconsPack} />

Utils/ListUtil.js

@@ -2,11 +2,18 @@
 /* eslint-disable no-underscore-dangle */
 export default class ListUtil {
   constructor(list) {
+    let _list = [];
     if (list && list.constructor === String) {
-      this.list = list.split(",");
+      _list = list.split(",");
     } else {
-      this.list = list || [];
+      _list = list || [];
     }
+
+    _list = [...new Set(_list)];
+    _list = _list.filter(item => {
+      return item !== "" && item != null;
+    });
+    this.list = _list;
   }
 
   getLength() {

components/UpLoadImage.js

@@ -74,30 +74,30 @@ export default function UpLoadImage(props) {
           return renderPulseIcon(imgprops);
         }}
       />
-      {/* {props.hasCancel == true && props.value && (
-                <Button
-                    size='tiny'
-                    status='danger'
-                    accessoryLeft={ForwardIcon}
-                    appearance='imgButton'
-                    style={{
-                        position: "absolute",
-                        right: -5,
-                        top: -5,
-                        borderRadius: 30,
-                    }}
-                    onPress={() => {
-                        showDialog({
-                            bodyText: removeTips,
-                            status: "danger",
-                            cancelable: true,
-                            confirmCallback: () => {
-                                props.delEvent();
-                            },
-                        });
-                    }}
-                />
-            )} */}
+      {/* {props.hasCancel === true && props.value && (
+        <Button
+          size="tiny"
+          status="danger"
+          accessoryLeft={ForwardIcon}
+          appearance="imgButton"
+          style={{
+            position: "absolute",
+            right: -5,
+            top: -5,
+            borderRadius: 30,
+          }}
+          onPress={() => {
+            showDialog({
+              bodyText: removeTips,
+              status: "danger",
+              cancelable: true,
+              confirmCallback: () => {
+                props.delEvent();
+              },
+            });
+          }}
+        />
+      )} */}
     </>
   );
 }

models/index.js

@@ -10,7 +10,7 @@ import complaintModel from "./complaintModel";
 import emailModel from "./emailModel";
 import moenyRecordModel from "./moenyRecordModel";
 import loadingModel from "./loadingModel";
-
+import verifiedModel from "./verifiedModel";
 
 setModel("loadingModel", loadingModel);
 setModel("emailModel", emailModel);
@@ -23,3 +23,4 @@ setModel("wordsModel", wordsModel);
 setModel("httpModel", httpModel);
 setModel("appUserModel", appUserModel);
 setModel("moenyRecordModel", moenyRecordModel);
+setModel("verifiedModel", verifiedModel);

models/userModel.js

@@ -26,10 +26,12 @@ export default {
       setState({ initApp: false });
       const { updateUser } = model();
       const { httpGet } = model("httpModel");
+      const { changeVerfied } = model("verifiedModel");
       return httpGet("/merchant/my").then(res => {
         const _res = { ...res };
         if (_res) {
           updateUser(_res);
+          changeVerfied(_res.userId);
         }
       });
     },
@@ -228,6 +230,7 @@ export default {
           registerInfo: null,
           initApp: true,
           refreashReason: "loginOut",
+          userId: "",
         });
         success("退出成功");
       });

models/verifiedModel.js

@@ -6,10 +6,23 @@ export default {
     registerVerifiedInfo: {},
   },
   actions: ({ model, setState }) => ({
+    changeVerfied(userId) {
+      const { httpGet } = model("httpModel");
+      return httpGet(
+        "/verified/my",
+        {
+          userId,
+        },true
+      ).then(res => {
+        setState({
+          verifiedInfo: res,
+        });
+      });
+    },
     getVerfied() {
       const { httpGet } = model("httpModel");
-      const { userId } = model("userModel");
-      if (userId) {
+      const { userId, mid } = model("userModel");
+      if (mid) {
         return httpGet(
           "/verified/my",
           {
@@ -26,12 +39,17 @@ export default {
     },
     saveVeriFied({ ...info }) {
       const { httpPost } = model("httpModel");
-      const { userId } = model("userModel");
-      if (userId) {
-        return httpPost("/verified/save", {
-          ...info,
-          userId,
-        }).then(res => {
+      const { userId, mid } = model("userModel");
+      if (userId && mid) {
+        return httpPost(
+          "/verified/save",
+          {
+            ...info,
+            userId,
+          },
+          { body: "json" },
+          true
+        ).then(res => {
           setState({
             verifiedInfo: res,
           });

screens/Attestation/LegalPersonScreen.js

@@ -2,17 +2,15 @@
 import * as WebBrowser from "expo-web-browser";
 import * as React from "react";
 import { StyleSheet, View } from "react-native";
-import { useModel, setModel } from "flooks";
+import { useModel } from "flooks";
 import { useTheme, Text, Button, Layout } from "@ui-kitten/components";
 import { useFocusEffect } from "@react-navigation/native";
-import verifiedModel from "../../models/verifiedModel";
 import NavHeaderBar from "../../components/NavHeaderBar";
 import UpLoadImage from "../../components/UpLoadImage";
 import FormInput from "../../components/FormInput";
 import ListUtil from "../../Utils/ListUtil";
 import ScrollPage from "../../components/ScrollPage";
 
-setModel("verifiedModel", verifiedModel);
 
 const styles = StyleSheet.create({
   container: {

screens/HomeScreen.js

@@ -260,7 +260,7 @@ export default function HomeScreen({ navigation, route }) {
             userLogout();
           }}
         />
-        <MenuItem title="05.31.0.1版本" />
+        <MenuItem title="06.01.1版本" />
       </OverflowMenu>
     </>
   );

screens/HomeScreenPage3.js

@@ -285,9 +285,7 @@ export default function HomePage3() {
           accessoryRight={ForwardIcon}
           style={styles.menuItem}
           onPress={() => {
-            RootNavigation.navigate("EditBanner", {
-              type: "qualification",
-            });
+            RootNavigation.navigate("Qualification");
           }}
         />
       </Menu>

screens/RegisterSeScreen.js

@@ -52,13 +52,10 @@ export default function RegisterScreen() {
   const theme = useTheme();
   const { changeBackground } = useModel("barModel");
   const { httpGet } = useModel("httpModel", true);
-  const {
-    mid,
-    registerSecend,
-    registerInfo,
-    getNowUser,
-    checkAgain,
-  } = useModel("userModel");
+  const { mid, registerSecend, registerInfo, userInfo, checkAgain } = useModel(
+    "userModel"
+  );
+  const { verifiedInfo, registerVerifiedInfo } = useModel("verifiedModel");
   const {
     guideHome_title1,
     guideHome_title2,
@@ -98,11 +95,6 @@ export default function RegisterScreen() {
   const [doorHeadImg, changeDoorHeadeImg] = React.useState("");
   const [img, changeImg] = React.useState("");
 
-  const {
-    getVerfied,
-    verifiedInfo,
-    registerVerifiedInfo,
-      } = useModel("verifiedModel");
 
   // 法人信息
   const [realName, setRealName] = React.useState("");
@@ -153,7 +145,6 @@ export default function RegisterScreen() {
   }, [registerInfo]);
   React.useEffect(() => {
     if (mid) {
-      let userInfo = getNowUser();
       if (userInfo.category.length > 0) {
         changeCategory(userInfo.category[0].id);
       }
@@ -166,8 +157,9 @@ export default function RegisterScreen() {
       changeQualification(userInfo.qualification);
       changeDoorHeadeImg(userInfo.doorHeadImg);
       changeImg(userInfo.img);
+      console.log(userInfo);
 
-      getVerfied();
+      
     }
   }, [mid]);
 
@@ -324,7 +316,7 @@ export default function RegisterScreen() {
                   status="primary"
                   disabled={!canNext}
                   onPress={() => {
-                    let categorys = [...categoryList].filter(item => {
+                    const categorys = [...categoryList].filter(item => {
                       return item.id === category;
                     });
                     checkAgain({