[baozhangchao] 3 年之前
父節點
當前提交
0355de1e18

+ 1
- 1
src/pages/DepartmentSelection/index.jsx 查看文件

105
     const activeIdaa = activeId === detail.id ? null : detail.id
105
     const activeIdaa = activeId === detail.id ? null : detail.id
106
     setActiveId(activeIdaa)
106
     setActiveId(activeIdaa)
107
     setDeptName(detail?.name)
107
     setDeptName(detail?.name)
108
-    console.log('自己: detail.index || 0', activeId, detail);
108
+    console.log('自己: detail.index || 0', activeId, detail?.name);
109
 
109
 
110
   }
110
   }
111
 
111
 

+ 3
- 4
src/pages/index/index.jsx 查看文件

9
 import './style.less'
9
 import './style.less'
10
 
10
 
11
 export default (props) => {
11
 export default (props) => {
12
-  const { deptName, person, sessionKey } = useModel('userData')
12
+  const { deptName, person, formValue } = useModel('userData')
13
 
13
 
14
-  const userId = '320888800110023011';
15
 
14
 
16
   const goUserInfo = () => {
15
   const goUserInfo = () => {
17
     // 跳转到目的页面,在当前页面打开
16
     // 跳转到目的页面,在当前页面打开
20
     })
19
     })
21
   }
20
   }
22
   useEffect(() => {
21
   useEffect(() => {
22
+    console.log('formValue', formValue);
23
     if (deptName) {
23
     if (deptName) {
24
       Taro.showModal({
24
       Taro.showModal({
25
         title: '提示',
25
         title: '提示',
26
         content: '未添加个人信息!',
26
         content: '未添加个人信息!',
27
+        showCancel: false,
27
         success: function (res) {
28
         success: function (res) {
28
           if (res.confirm) {
29
           if (res.confirm) {
29
             Taro.redirectTo({
30
             Taro.redirectTo({
30
               url: '/pages/setUserInfo/index'
31
               url: '/pages/setUserInfo/index'
31
             })
32
             })
32
 
33
 
33
-          } else if (res.cancel) {
34
-            console.log('用户点击取消')
35
           }
34
           }
36
         }
35
         }
37
       })
36
       })

+ 2
- 2
src/pages/index/style.less 查看文件

9
     height: 35vh;
9
     height: 35vh;
10
     background: no-repeat, center center;
10
     background: no-repeat, center center;
11
     background-size: 100% 100%;
11
     background-size: 100% 100%;
12
-    background-color: #5575ee;
12
+    background-color: #009fab;
13
     padding: 0 7vw 0 7vw;
13
     padding: 0 7vw 0 7vw;
14
 
14
 
15
     &-User {
15
     &-User {
42
     position: relative;
42
     position: relative;
43
     margin-top: -15vh;
43
     margin-top: -15vh;
44
     padding: 2em;
44
     padding: 2em;
45
-    border: 1px solid rgba(0,0,0, 0.1);
45
+    border: 1px solid rgba(0, 0, 0, 0.1);
46
 
46
 
47
     &-Times {
47
     &-Times {
48
       padding-top: 3vh;
48
       padding-top: 3vh;

+ 15
- 5
src/pages/setUserInfo/index.jsx 查看文件

12
 export default (props) => {
12
 export default (props) => {
13
   const [phone, setPhone] = useState('')
13
   const [phone, setPhone] = useState('')
14
 
14
 
15
-  const { deptName, person, sessionKey } = useModel('userData')
15
+  const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
16
+  console.log('formValue', formValue);
16
   let form = null
17
   let form = null
17
   const onSubmit = (e) => {
18
   const onSubmit = (e) => {
18
     form.validateFields((errorMessage, fieldValues) => {
19
     form.validateFields((errorMessage, fieldValues) => {
20
         return console.info('errorMessage', errorMessage)
21
         return console.info('errorMessage', errorMessage)
21
       } else {
22
       } else {
22
         console.info(fieldValues)
23
         console.info(fieldValues)
24
+        // setFormValue(fieldValues)
25
+        // Taro.redirectTo({
26
+        //   url: '/pages/index/index'
27
+        // })
23
         setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
28
         setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
29
+          setFormValue(fieldValues)
30
+
24
           Taro.showToast({
31
           Taro.showToast({
25
             title: '保存成功',
32
             title: '保存成功',
26
             icon: 'none',
33
             icon: 'none',
51
 
58
 
52
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
59
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
53
       setPhone(res?.phoneNumber)
60
       setPhone(res?.phoneNumber)
61
+      setFormValue({ phone: res?.phoneNumber })
54
     })
62
     })
55
 
63
 
56
   }
64
   }
58
     <View className='page-index'>
66
     <View className='page-index'>
59
       <Form
67
       <Form
60
         initialValues={{
68
         initialValues={{
69
+          // ...formValue,
70
+          // phone: formValue?.phone || phone,
61
           phone: phone,
71
           phone: phone,
62
-          deptName: deptName,
72
+          deptName: deptName
73
+
63
 
74
 
64
         }}
75
         }}
65
         ref={(el) => (form = el)}
76
         ref={(el) => (form = el)}
84
           validateTrigger='onBlur'
95
           validateTrigger='onBlur'
85
           valueFormat={(e) => e.detail.value}
96
           valueFormat={(e) => e.detail.value}
86
         >
97
         >
87
-          <Input placeholder='请输入手机号' type='number' value={phone} maxlength={11} disabled />
98
+          <Input placeholder='请输入手机号' type='number' maxlength={11} disabled value={formValue?.phone || phone} />
88
           <Button
99
           <Button
89
             plain
100
             plain
90
             hairline
101
             hairline
91
             size='small'
102
             size='small'
92
             type='info'
103
             type='info'
93
             required
104
             required
94
-
95
             openType='getPhoneNumber'
105
             openType='getPhoneNumber'
96
             onGetPhoneNumber={getPhone}
106
             onGetPhoneNumber={getPhone}
97
           >
107
           >
120
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
130
           // taro的input的onInput事件返回对应表单的最终值为e.detail.value
121
           valueFormat={(e) => e.detail.value}
131
           valueFormat={(e) => e.detail.value}
122
         >
132
         >
123
-          <Input placeholder='请选择科室' value={deptName} disabled onClick={goDepartmen} />
133
+          <Input placeholder='请选择科室' disabled onClick={goDepartmen} />
124
         </FormItem>
134
         </FormItem>
125
         <View className='buttom-box'>
135
         <View className='buttom-box'>
126
           <Button
136
           <Button

+ 5
- 1
src/store/userData.js 查看文件

8
   const [sessionKey, setSessionKey] = useState()
8
   const [sessionKey, setSessionKey] = useState()
9
   const [userPhoneInfo, setUserPhoneInfo] = useState()
9
   const [userPhoneInfo, setUserPhoneInfo] = useState()
10
   const [deptName, setDeptName] = useState()
10
   const [deptName, setDeptName] = useState()
11
+  const [formValue, setFormValue] = useState({})
11
 
12
 
12
 
13
 
13
 
14
 
25
       setSessionKey(skey);
26
       setSessionKey(skey);
26
     })
27
     })
27
   }
28
   }
28
-  console.log("🚀 来自store的打印 person数据", person)
29
+  console.log("🚀 来自store的打印 person数据formValue", person, formValue)
29
 
30
 
30
   return {
31
   return {
31
     person,
32
     person,
40
     deptName,
41
     deptName,
41
     setDeptName,
42
     setDeptName,
42
 
43
 
44
+    formValue,
45
+    setFormValue,
46
+
43
 
47
 
44
     logins,
48
     logins,
45
   }
49
   }