张延森 4 年之前
父節點
當前提交
1f6cea2445
共有 3 個檔案被更改,包括 54 行新增70 行删除
  1. 15
    19
      src/compents/getphone/index.jsx
  2. 32
    38
      src/pages/customer/index.js
  3. 7
    13
      src/pages/index/index.jsx

+ 15
- 19
src/compents/getphone/index.jsx 查看文件

@@ -10,8 +10,6 @@ export default function GetUserPhone(props) {
10 10
 
11 11
     const user = useSelector(state => state.user)
12 12
     const dispatch = useDispatch()
13
-    const [showPannel, setShowPannel] = useState(true)
14
-    //   const { user, setUser } = useModel('user')
15 13
 
16 14
     const ToGetUserPhone = (e) => { // 授权手机号
17 15
         const { errMsg, ...data } = e.detail
@@ -32,13 +30,11 @@ export default function GetUserPhone(props) {
32 30
                     props.onOk(res)
33 31
                 }
34 32
             }).catch((er) => {
35
-                setShowPannel(true)
36 33
                 if (props.onError) {
37 34
                     props.onError(er.message || er.errMsg || er)
38 35
                 }
39 36
             })
40 37
         } else {
41
-            setShowPannel(true)
42 38
             if (props.onError) {
43 39
                 props.onError(errMsg)
44 40
             }
@@ -46,26 +42,26 @@ export default function GetUserPhone(props) {
46 42
     }
47 43
 
48 44
     const handleCancel = () => {
49
-        setShowPannel(false)
45
+        // setShowPannel(false)
50 46
         if (props.onCancel) {
51 47
             props.onCancel()
52 48
         }
53 49
     }
54 50
 
55
-
56
-
57
-    return (props.visible && <AtModal isOpened={showPannel}>
58
-        <AtModalHeader>您暂未授权手机号</AtModalHeader>
59
-        <AtModalAction>
60
-            <Button onClick={handleCancel}>取消</Button>
61
-            <Button
62
-                className='flex-item'
63
-                open-type='getPhoneNumber'
64
-                lang='zh_CN'
65
-                onGetphonenumber={ToGetUserPhone}
66
-                onClick={() => setShowPannel(false)}
67
-            >去授权</Button> </AtModalAction>
68
-    </AtModal>)
51
+    return (
52
+        <AtModal isOpened={props.visible} closeOnClickOverlay={false}>
53
+            <AtModalHeader>您暂未授权手机号</AtModalHeader>
54
+            <AtModalAction>
55
+                <Button onClick={handleCancel}>取消</Button>
56
+                <Button
57
+                    className='flex-item'
58
+                    open-type='getPhoneNumber'
59
+                    lang='zh_CN'
60
+                    onGetphonenumber={ToGetUserPhone}
61
+                >去授权</Button>
62
+            </AtModalAction>
63
+        </AtModal>
64
+    )
69 65
 
70 66
     // return props.visible && (
71 67
     //     <view style={{textAlign:'center'}}> 

+ 32
- 38
src/pages/customer/index.js 查看文件

@@ -16,48 +16,42 @@ const index = (props) => {
16 16
  
17 17
   const user = useSelector(state => state.user)
18 18
 
19
-  const [pageState, setPageState] = useState(false)
20
-  useEffect(() => {
21
-    
19
+  const [pageState, setPageState] = useState('3')
22 20
 
23
-    if(orderId){
24
-      request({url:'',}).then(res=>{
25
-        setPageState('1')
21
+  useEffect(() => {
22
+    if(props.orderId){
23
+      request({url: `/taHouseOrder/{props.orderId}`,}).then(res=>{
24
+        const data = res.data.data
25
+        if (data.status !== 1) {
26
+          setPageState('1')
27
+        }
26 28
       })
27
-    }else{
28
-      setPageState('1')
29 29
     }
30
-
31
-  }, [])
32
-
33
-
34
-  const onTabClick = (e) => {
35
-    console.log(e, '111')
36
-    
37
-  }
38
-
39
-  const onRegisterChange = (e) => {
40
-    console.log(e, '111')
41
-  }
42
-
30
+  }, [props.orderId])
43 31
  
44
-  return <View className='index'>
45
-
46
-
47
-     {pageState&&<View>
48
-{pageState=='1'&&<Register oderId={orderId}></Register>  }
49
-    <Layout>
50
-    
51
-    {pageState=='2'&&<Guide houseId={houseId}></Guide>  }
52
-    {pageState=='3'&&<Recommend houseId={houseId}></Recommend>  }
53
-    </Layout>
54
-    
55
-    {pageState!='1' &&<Tab value={['入住指引','房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'),(e) => setPageState('3')]}></Tab>}
56
-
57
-    </View>}
58
-
59
-    
60
-  </View>
32
+  return (
33
+    <View className='index'>
34
+        {pageState && (
35
+          <View>
36
+            {pageState=='1'&&<Register oderId={orderId}></Register>}
37
+
38
+            <Layout>
39
+              {pageState=='2'&&<Guide houseId={houseId}></Guide>  }
40
+              {pageState=='3'&&<Recommend houseId={houseId}></Recommend>  }
41
+            </Layout>
42
+          
43
+            {pageState!='1' && (
44
+              <Tab
45
+                value={['入住指引','房东推荐']}
46
+                pageState={pageState}
47
+                onClick={[(e) => setPageState('2'),(e) => setPageState('3')]} />
48
+            )}      
49
+          </View>
50
+        )}
51
+    </View>
52
+  )
53
+  
54
+  
61 55
 }
62 56
 
63 57
 export default index

+ 7
- 13
src/pages/index/index.jsx 查看文件

@@ -24,32 +24,26 @@ const index = (props) => {
24 24
   // const [userRole, setUserRole] = useState('1')
25 25
   // const [pageState, SetPageState] = useState('1')
26 26
   // const [list, setList] = useState([])
27
-  const [visible, setVisible] = useState(false)
27
+  // const [visible, setVisible] = useState(false)
28
+  const [showAuthPhone, setShowAuthPhone] = useState(false)
28 29
 
29 30
   useEffect(() => {
30
-    if (user.personId && !user.phone) {
31
-      setVisible(true)
32
-    }
33
-    if (user.personId && user.phone) {
34
-      setVisible(false)
35
-    }
36
-  }, [user.phone, user.personId])
37
-
31
+    setShowAuthPhone(!user.phone)
32
+  }, [user.phone])
38 33
 
39 34
   const onOk = (res) => {
40
-
41 35
     dispatch({ type: 'LOGIN', user: res.data.data })
42
-    setVisible(false)
36
+    setShowAuthPhone(false)
43 37
   }
44 38
 
45 39
   const onCancel = (e) => {
46
-    setVisible(false)
40
+    setShowAuthPhone(false)
47 41
   }
48 42
 
49 43
   return <View className='index'>
50 44
 
51 45
     {user.personId && <View>
52
-      <GetPhone visible={visible} onOk={onOk} onCancel={onCancel} ></GetPhone>
46
+      <GetPhone visible={showAuthPhone} onOk={onOk} onCancel={onCancel} ></GetPhone>
53 47
       {user.role == roleList.customer && <Customer houseId={houseId} orderId={orderId}></Customer>}
54 48
       {user.role == roleList.landlord && <Landlord ></Landlord>}
55 49
     </View>}