[baozhangchao] 2 gadus atpakaļ
vecāks
revīzija
6579b53504

+ 2
- 2
config/dev.js Parādīt failu

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    // HOST: '"https://machine.njyunzhi.com"',
7
-    HOST: '"http://192.168.89.25:7080"',
6
+    HOST: '"https://machine.njyunzhi.com"',
7
+    // HOST: '"http://192.168.89.25:7080"',
8
     OSS: '""',
8
     OSS: '""',
9
     // VERSION: '"2.0.33"',
9
     // VERSION: '"2.0.33"',
10
   },
10
   },

+ 1
- 1
src/components/CustomNav/index.jsx Parādīt failu

47
 
47
 
48
   const handleAction = () => {
48
   const handleAction = () => {
49
     if (home || logo) return;
49
     if (home || logo) return;
50
-
51
     if (Taro.getCurrentPages().length > 1) {
50
     if (Taro.getCurrentPages().length > 1) {
51
+
52
       Taro.navigateBack({ delta: 1 })
52
       Taro.navigateBack({ delta: 1 })
53
     }
53
     }
54
   }
54
   }

+ 5
- 1
src/components/LoginModel/index.jsx Parādīt failu

16
 
16
 
17
 export default (props) => {
17
 export default (props) => {
18
 
18
 
19
-  const { isLoginVisible, loginType } = props
19
+  const { isLoginVisible, loginType, tab } = props
20
 
20
 
21
   const { person, setPerson } = useModel('userData')
21
   const { person, setPerson } = useModel('userData')
22
 
22
 
94
 
94
 
95
 
95
 
96
   const getUserLogin = () => {
96
   const getUserLogin = () => {
97
+    Taro.navigateTo({ url: `/pages/index/index?tab=${tab}` });
98
+
97
     if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
99
     if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
98
       console.log('提示')
100
       console.log('提示')
99
       Taro.showToast({
101
       Taro.showToast({
115
           setPerson(e.person)
117
           setPerson(e.person)
116
           // Taro.navigateTo({ url: path });
118
           // Taro.navigateTo({ url: path });
117
           if (loginType) {
119
           if (loginType) {
120
+
118
             Taro.navigateBack({
121
             Taro.navigateBack({
119
               delta: 1
122
               delta: 1
120
             })
123
             })
124
+
121
           } else {
125
           } else {
122
             myClosure()
126
             myClosure()
123
 
127
 

+ 0
- 5
src/layouts/index.jsx Parādīt failu

13
 export default (Child) => (props) => {
13
 export default (Child) => (props) => {
14
   const { person } = useModel('userData')
14
   const { person } = useModel('userData')
15
   const router = useRouter()
15
   const router = useRouter()
16
-  console.log("🚀 ~ file: index.jsx ~ line 16 ~ router", router)
17
-
18
-
19
   const { loginVisible } = useLogin()
16
   const { loginVisible } = useLogin()
20
 
17
 
21
-
22
-
23
   // 确保执行过 login 方法,拿到了 person
18
   // 确保执行过 login 方法,拿到了 person
24
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
19
   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
25
 
20
 

+ 2
- 2
src/pages/LoginPage/index.jsx Parādīt failu

11
   const [isShow, setIsShow] = useState(false)
11
   const [isShow, setIsShow] = useState(false)
12
 
12
 
13
   const $instance = Taro.getCurrentInstance()
13
   const $instance = Taro.getCurrentInstance()
14
-  const { login } = $instance.router.params
14
+  const { login, tab } = $instance.router.params
15
 
15
 
16
   useEffect(() => {
16
   useEffect(() => {
17
     setIsShow(true)
17
     setIsShow(true)
20
   return (
20
   return (
21
     <View className='page-index'>
21
     <View className='page-index'>
22
       <View>
22
       <View>
23
-        <LoginModel isLoginVisible={isShow} loginType={login} />
23
+        <LoginModel isLoginVisible={isShow} loginType={login} tab={tab} />
24
       </View>
24
       </View>
25
     </View>
25
     </View>
26
   )
26
   )

+ 8
- 23
src/pages/index/index.jsx Parādīt failu

37
 
37
 
38
 
38
 
39
   console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
39
   console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
40
-
41
   const [currentTab, setCurrentTab] = useState(0)
40
   const [currentTab, setCurrentTab] = useState(0)
42
-
43
   const [isDidShow, setIsDidShow] = useState(0)
41
   const [isDidShow, setIsDidShow] = useState(0)
44
-
45
-
46
   const [tabsIndex, setTabsIndex] = useState(0)
42
   const [tabsIndex, setTabsIndex] = useState(0)
47
 
43
 
48
 
44
 
51
 
47
 
52
 
48
 
53
   useDidShow(() => {
49
   useDidShow(() => {
54
-    setIsDidShow(isDidShow + 1)
50
+    console.log('useDidShow',);
51
+
55
     if (!person?.phone) {
52
     if (!person?.phone) {
56
       console.log('还是未登录',);
53
       console.log('还是未登录',);
57
       setCurrentTab(0)
54
       setCurrentTab(0)
58
-
59
-
60
-    } else {
61
-      setCurrentTab(tabsIndex)
62
-      // handleTabChange(tabsIndex)
63
-
64
-      console.log('已登陆',);
65
-
66
     }
55
     }
67
   })
56
   })
68
 
57
 
69
   useEffect(() => {
58
   useEffect(() => {
59
+    // setCurrentTab(index)
60
+
70
     if (tab) {
61
     if (tab) {
71
       setCurrentTab(tab - 0)
62
       setCurrentTab(tab - 0)
72
-
73
-
74
     }
63
     }
75
     // setIsShow(true)
64
     // setIsShow(true)
76
   }, [tab,])
65
   }, [tab,])
77
 
66
 
78
-
79
   const handleClick = (index) => {
67
   const handleClick = (index) => {
80
     // Taro.switchTab({
68
     // Taro.switchTab({
81
     //   url: '/pages/InformationPage/index'
69
     //   url: '/pages/InformationPage/index'
82
     // })
70
     // })
83
-
84
-
85
     if (!person?.phone) {
71
     if (!person?.phone) {
86
-      setTabsIndex(index)
87
-      Taro.navigateTo({ url: `/pages/LoginPage/index?login=true` })
72
+      Taro.navigateTo({ url: `/pages/LoginPage/index?login=true&tab=${index}` })
88
       // setIsShow(true)
73
       // setIsShow(true)
89
     } else {
74
     } else {
90
-      setCurrentTab(index)
91
-
75
+      Taro.redirectTo({ url: `/pages/index/index?tab=${index}` });
76
+      // setCurrentTab(index)
92
     }
77
     }
93
   }
78
   }
94
 
79
 
106
         {currentTab === 1 && <Orders router={router} />}
91
         {currentTab === 1 && <Orders router={router} />}
107
         {currentTab === 2 && <Information router={router} />}
92
         {currentTab === 2 && <Information router={router} />}
108
 
93
 
109
-        {currentTab === 3 && <Mine isDidShow={isDidShow} router={router} />}
94
+        {currentTab === 3 && <Mine router={router} />}
110
       </view>
95
       </view>
111
       <view className='index-tabbar'>
96
       <view className='index-tabbar'>
112
         <View
97
         <View

+ 0
- 1
src/pages/index/tabs/Information.jsx Parādīt failu

16
 
16
 
17
   const goInfoMationInfo = (res) => {
17
   const goInfoMationInfo = (res) => {
18
     Taro.navigateTo({ url: `/pages/InformationInfo/index?id=${res}` })
18
     Taro.navigateTo({ url: `/pages/InformationInfo/index?id=${res}` })
19
-
20
   }
19
   }
21
   useEffect(() => {
20
   useEffect(() => {
22
     getNewsList().then((res) => {
21
     getNewsList().then((res) => {