deftName add

src/pages/DepartmentSelection/index.jsx

@@ -95,8 +95,8 @@ export default (props) => {
       console.log('父级: detail.index || 0', departItem[detail.index]);
 
     } else {
-      setDeptName(departItem[detail.index]?.name)
-      console.log('没有子节点: children || 0', departItem[detail.index]?.name);
+      setDeptName(departItem[detail.index])
+      console.log('没有子节点: children || 0', departItem[detail.index]);
 
     }
 

src/pages/index/index.jsx

@@ -20,27 +20,8 @@ export default (props) => {
     })
   }
   useEffect(() => {
-    setUseInfo(person)
     console.log('person?.idNo', person?.idNo);
-    if (person?.idNo) {
-      console.log('没有身份证',);
-      Taro.showModal({
-        title: '提示',
-        content: '未添加个人信息!',
-        showCancel: false,
-        success: function (res) {
-          if (res.confirm) {
-            Taro.redirectTo({
-              url: '/pages/setUserInfo/index'
-            })
 
-          }
-        }
-      })
-
-    } else {
-      console.log('有身份证',);
-    }
   }, [person])
 
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
@@ -51,10 +32,10 @@ export default (props) => {
       {/* <View className='index-UserQRcode-headerInfo' style={{ backgroundImage: `url(${userBck})` }}> */}
       <View className='index-UserQRcode-headerInfo' >
         <View className='index-UserQRcode-headerInfo-User'>
-          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：{useInfo?.personName}</View>
+          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：{person?.personName}</View>
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
         </View>
-        <View className='index-UserQRcode-headerInfo-UserID'>科室：{useInfo?.deptName}</View>
+        <View className='index-UserQRcode-headerInfo-UserID'>科室：{person?.deptName}</View>
       </View>
       <View className='index-UserQRcode-cententQR'>
         <View className='index-UserQRcode-cententQR-Barcode'>

src/pages/setUserInfo/index.jsx

@@ -8,16 +8,14 @@ import { getPhoneuser, setUserInfo } from "../../services/user";
 // import BottomMoadl from '@/components/BottomMoadl/index'
 import './style.less'
 
+let form = null
 
 export default (props) => {
   const [phone, setPhone] = useState('18052044111')
 
-  const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
+  const { deptName, person, sessionKey, setPerson, formValue } = useModel('userData')
   console.log('formValue', formValue);
-  let form = null
-  useEffect(() => {
-    form.getFieldsValue(person)
-  }, [person])
+
   const onSubmit = (e) => {
     form.validateFields((errorMessage, fieldValues) => {
       if (errorMessage && errorMessage.length) {
@@ -30,8 +28,9 @@ export default (props) => {
         // Taro.redirectTo({
         //   url: '/pages/index/index'
         // })
-        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then(() => {
+        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then((e) => {
           // setFormValue(fieldValues)
+          setPerson(e);
           Taro.showToast({
             title: '保存成功',
             icon: 'none',
@@ -54,11 +53,24 @@ export default (props) => {
     })
 
   }
+  useDidShow(() => {
+
+
+  }, [deptName])
 
   useEffect(() => {
-    console.log('form', form);
-    form.setFields(person)
-  }, [form, person])
+    if (person) {
+      form.setFields(person)
+
+    }
+    console.log('deptName', deptName);
+    if (deptName) {
+      form.setFieldsValue('deptName', deptName?.name)
+
+      // form.setFieldsValue({ name: 'deptName', modelValue: deptName?.deptName })
+
+    }
+  }, [deptName, person])
 
 
   const getPhone = (e) => {
@@ -68,7 +80,10 @@ export default (props) => {
 
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
       setPhone(res?.phoneNumber)
-      setFormValue({ phone: res?.phoneNumber })
+      console.log('form', form);
+      form.setFieldsValue('phone', res?.phoneNumber)
+      // form.setFieldsValue({ phone: res.phoneNumber })
+      // setFormValue({ phone: res?.phoneNumber })
     })
 
   }

src/store/userData.js

@@ -1,4 +1,5 @@
 import { useState } from "react"
+import Taro from "@tarojs/taro"
 
 import { login } from "../services/user"
 
@@ -20,10 +21,31 @@ export default () => {
     console.log('login');
 
     login(params).then((res) => {
+
       const { person: taPerson, sessionKey: skey } = res;
       // taPerson.phone = null
+
       setPerson(taPerson);
       setSessionKey(skey);
+      if (!res.person) {
+        console.log('没有身份证',);
+        Taro.showModal({
+          title: '提示',
+          content: '未添加个人信息!',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              Taro.redirectTo({
+                url: '/pages/setUserInfo/index'
+              })
+
+            }
+          }
+        })
+
+      } else {
+        console.log('有身份证',);
+      }
     })
   }
   console.log("🚀 来自store的打印 person数据formValue", person, formValue)