pheno

src/pages/DepartmentSelection/index.jsx

@@ -105,7 +105,7 @@ export default (props) => {
     const activeIdaa = activeId === detail.id ? null : detail.id
     setActiveId(activeIdaa)
     setDeptName(detail?.name)
-    console.log('自己: detail.index || 0', activeId, detail);
+    console.log('自己: detail.index || 0', activeId, detail?.name);
 
   }
 

src/pages/index/index.jsx

@@ -9,9 +9,8 @@ import { useModel } from '../../store';
 import './style.less'
 
 export default (props) => {
-  const { deptName, person, sessionKey } = useModel('userData')
+  const { deptName, person, formValue } = useModel('userData')
 
-  const userId = '320888800110023011';
 
   const goUserInfo = () => {
     // 跳转到目的页面，在当前页面打开
@@ -20,18 +19,18 @@ export default (props) => {
     })
   }
   useEffect(() => {
+    console.log('formValue', formValue);
     if (deptName) {
       Taro.showModal({
         title: '提示',
         content: '未添加个人信息!',
+        showCancel: false,
         success: function (res) {
           if (res.confirm) {
             Taro.redirectTo({
               url: '/pages/setUserInfo/index'
             })
 
-          } else if (res.cancel) {
-            console.log('用户点击取消')
           }
         }
       })

src/pages/index/style.less

@@ -9,7 +9,7 @@
     height: 35vh;
     background: no-repeat, center center;
     background-size: 100% 100%;
-    background-color: #5575ee;
+    background-color: #009fab;
     padding: 0 7vw 0 7vw;
 
     &-User {
@@ -42,7 +42,7 @@
     position: relative;
     margin-top: -15vh;
     padding: 2em;
-    border: 1px solid rgba(0,0,0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 0.1);
 
     &-Times {
       padding-top: 3vh;

src/pages/setUserInfo/index.jsx

@@ -12,7 +12,8 @@ import './style.less'
 export default (props) => {
   const [phone, setPhone] = useState('')
 
-  const { deptName, person, sessionKey } = useModel('userData')
+  const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
+  console.log('formValue', formValue);
   let form = null
   const onSubmit = (e) => {
     form.validateFields((errorMessage, fieldValues) => {
@@ -20,7 +21,13 @@ export default (props) => {
         return console.info('errorMessage', errorMessage)
       } else {
         console.info(fieldValues)
+        // setFormValue(fieldValues)
+        // Taro.redirectTo({
+        //   url: '/pages/index/index'
+        // })
         setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
+          setFormValue(fieldValues)
+
           Taro.showToast({
             title: '保存成功',
             icon: 'none',
@@ -51,6 +58,7 @@ export default (props) => {
 
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
       setPhone(res?.phoneNumber)
+      setFormValue({ phone: res?.phoneNumber })
     })
 
   }
@@ -58,8 +66,11 @@ export default (props) => {
     <View className='page-index'>
       <Form
         initialValues={{
+          // ...formValue,
+          // phone: formValue?.phone || phone,
           phone: phone,
-          deptName: deptName,
+          deptName: deptName
+
 
         }}
         ref={(el) => (form = el)}
@@ -84,14 +95,13 @@ export default (props) => {
           validateTrigger='onBlur'
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请输入手机号' type='number' value={phone} maxlength={11} disabled />
+          <Input placeholder='请输入手机号' type='number' maxlength={11} disabled value={formValue?.phone || phone} />
           <Button
             plain
             hairline
             size='small'
             type='info'
             required
-
             openType='getPhoneNumber'
             onGetPhoneNumber={getPhone}
           >
@@ -120,7 +130,7 @@ export default (props) => {
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请选择科室' value={deptName} disabled onClick={goDepartmen} />
+          <Input placeholder='请选择科室' disabled onClick={goDepartmen} />
         </FormItem>
         <View className='buttom-box'>
           <Button

src/store/userData.js

@@ -8,6 +8,7 @@ export default () => {
   const [sessionKey, setSessionKey] = useState()
   const [userPhoneInfo, setUserPhoneInfo] = useState()
   const [deptName, setDeptName] = useState()
+  const [formValue, setFormValue] = useState({})
 
 
 
@@ -25,7 +26,7 @@ export default () => {
       setSessionKey(skey);
     })
   }
-  console.log("🚀 来自store的打印 person数据", person)
+  console.log("🚀 来自store的打印 person数据formValue", person, formValue)
 
   return {
     person,
@@ -40,6 +41,9 @@ export default () => {
     deptName,
     setDeptName,
 
+    formValue,
+    setFormValue,
+
 
     logins,
   }