0813

components/Dialog.js

@@ -145,7 +145,9 @@ export default function Dialog(props) {
                             hideDialog();
                             if (showAllInfo.confirmCallback) {
                                 if (showAllInfo.isEdit) {
-                                    showAllInfo.confirmCallback(introduction);
+                                    showAllInfo.confirmCallback(
+                                      introduction || showAllInfo.defaultValue
+                                    );
                                 } else {
                                     showAllInfo.confirmCallback();
                                 }

map/SearchMapScreen.js

@@ -8,7 +8,7 @@ import { useModel } from "flooks";
 import { getLocation } from "../Utils/MapUtils";
 
 export default function SearchMapScreen({ navigation }) {
-  const { saveLocation } = useModel("userModel");
+  const { saveLocation, setchooseLocal } = useModel("userModel", true);
   const webRef = React.useRef();
   const { showDialog } = useModel("dialogModel", true);
   useMount(() => {
@@ -30,8 +30,6 @@ export default function SearchMapScreen({ navigation }) {
     });
   });
 
-  const [chooseLocal, setchooseLocal] = React.useState({});
-
   function showChange(val, title, max, type) {
     showDialog({
       pla: "",
@@ -42,7 +40,8 @@ export default function SearchMapScreen({ navigation }) {
       title,
       cancelable: true,
       confirmCallback: info => {
-        saveLocation(info, chooseLocal.lat, chooseLocal.lng).then(() => {
+        console.log("当前已经选择");
+        saveLocation(info).then(() => {
           navigation.goBack();
         });
       },
@@ -57,7 +56,7 @@ export default function SearchMapScreen({ navigation }) {
       style={{ flexGrow: 1, width: "100%" }}
       onMessage={({ nativeEvent }) => {
         const info = JSON.parse(nativeEvent.data);
-        setchooseLocal({ lat: info.latlng.lat, lng: info.latlng.lng });
+        setchooseLocal(info.latlng);
 
         showChange(info.poiaddress + info.poiname, "请录入详细地址", 100);
       }}

models/loadingModel.js

@@ -10,7 +10,6 @@ export default {
   },
   actions: ({ model, setState }) => ({
     loading() {
-      console.log("aaaaa");
       const { tKey } = model();
       if (!tKey) {
         const newKey = Toast.loading("Loading...", 0);

models/userModel.js

@@ -16,6 +16,7 @@ export default {
     refreashReason: "login",
     initRoute: "Login",
     userInfo: {},
+    chooseLocal: {},
   },
   actions: ({ model, setState }) => ({
     updateUser(userInfo) {
@@ -114,21 +115,29 @@ export default {
           warnning(e.error);
         });
     },
-    saveLocation(address, latitude, longitude) {
-      const { mid, registerInfo, updateMerchant } = model();
+    saveLocation(address) {
+      const { mid, registerInfo, updateMerchant, chooseLocal } = model();
+      console.log(mid);
+      console.log(chooseLocal);
+      const { lat, lng } = chooseLocal;
       if (mid) {
         const { loading, success } = model("loadingModel");
         loading();
         return updateMerchant({
           address,
-          latitude,
-          longitude,
+          latitude: lat,
+          longitude: lng,
         }).then(() => {
           success("设置成功");
         });
       }
       setState({
-        registerInfo: { ...registerInfo, address, latitude, longitude },
+        registerInfo: {
+          ...registerInfo,
+          address,
+          latitude: lat,
+          longitude: lng,
+        },
       });
       return Promise.resolve();
     },
@@ -141,6 +150,8 @@ export default {
       const { success } = model("loadingModel");
       const { httpPost, addAsyncStorage } = model("httpModel");
       const { saveVeriFied, registerVerifiedInfo } = model("verifiedModel");
+      console.log(data);
+      return;
       httpPost("/auth/merchantRegister", data, {}, true)
         .then(res => {
           return addAsyncStorage("token", res);
@@ -199,9 +210,13 @@ export default {
       aliAccountEvent(aliAccount);
       aliNameEvent(aliName);
     },
+    setchooseLocal(chooseLocal) {
+      setState({ chooseLocal });
+    },
     updateMerchant({ ...data }) {
-      const { mid, userInfo } = model();
+      const { mid, getUserInfo } = model();
       const { httpPost } = model("httpModel");
+      console.log(data);
       return httpPost(
         "/merchant/saveDTO",
         {
@@ -212,15 +227,7 @@ export default {
         true
       ).then(res => {
         // success("修改成功");
-        if (res) {
-          // setState({
-          //   userInfo: {
-          //     ...userInfo,
-          //     ...data,
-          //   },
-          //   ...data,
-          // });
-        }
+        return getUserInfo();
       });
     },
     uploadStoreImg(img, type) {

screens/HomeScreen.js

@@ -265,7 +265,7 @@ export default function HomeScreen({ navigation, route }) {
             userLogout();
           }}
         />
-        <MenuItem title="0813版本(地图组件bug)" />
+        <MenuItem title="0813版本(信息保存bug)" />
         <MenuItem title={`切换语言(${local})`} onPress={changeLocal} />
       </OverflowMenu>
     </>

screens/HomeScreenPage3.js

@@ -204,7 +204,10 @@ export default function HomePage3() {
       title,
       cancelable: true,
       confirmCallback: info => {
-        updateMerchant({ [key]: info });
+        loading();
+        updateMerchant({ [key]: info }).then(() => {
+          success("成功");
+        });
       },
     });
   }