张延森 3 gadus atpakaļ
vecāks
revīzija
5c88108c44

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

@@ -3,8 +3,8 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 5
   defineConstants: {
6
-    HOST: '"https://xlk.njyz.tech"',
7
-    // HOST: '"https://xlj.newlandsh.com"',
6
+    // HOST: '"https://xlk.njyz.tech"',
7
+    HOST: '"https://xlj.newlandsh.com"',
8 8
     // HOST: '"http://127.0.0.1:8081"',
9 9
     WSS_HOST: '"wss://xlk.njyz.tech"',
10 10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

+ 1
- 1
config/prod.js Parādīt failu

@@ -10,7 +10,7 @@ module.exports = {
10 10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
11 11
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
12 12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13
-    Version: '"V0.0.34-20210810"'
13
+    Version: '"V0.0.35-20210810"'
14 14
   },
15 15
   mini: {},
16 16
   h5: {

+ 6
- 6
src/app.config.js Parādīt failu

@@ -22,12 +22,12 @@ export default {
22 22
         iconPath: './assets/tabbar/index1.png',
23 23
         selectedIconPath: './assets/tabbar/index2.png',
24 24
       },
25
-      {
26
-        pagePath: "pages/video/index",
27
-        text: "视频",
28
-        iconPath: './assets/tabbar/video1.png',
29
-        selectedIconPath: './assets/tabbar/video2.png',
30
-      },
25
+      // {
26
+      //   pagePath: "pages/video/index",
27
+      //   text: "视频",
28
+      //   iconPath: './assets/tabbar/video1.png',
29
+      //   selectedIconPath: './assets/tabbar/video2.png',
30
+      // },
31 31
       {
32 32
         pagePath: "pages/chat/index",
33 33
         text: "消息",

+ 9
- 3
src/components/Auth/AuthPage/index.jsx Parādīt failu

@@ -7,12 +7,18 @@ import useAuth from '../useAuth'
7 7
 import './index.scss'
8 8
 
9 9
 export default (props) => {
10
+  const {
11
+    consultant,
12
+    router,
13
+    page,
14
+  } = props
10 15
 
11 16
   const [loading, setLoading] = useState(false)
12
-  const { updatePhoneNumber } = useAuth()
17
+  const { updatePhoneNumber } = useAuth(consultant, router, page)
13 18
   
14
-  const handlePhoneNumber = (detail) => {
15
-    const { errMsg, ...data } = detail || {}
19
+  const handlePhoneNumber = (e) => {
20
+    const { errMsg, ...data } = e?.detail || {}
21
+    debugger
16 22
     if (errMsg === 'getPhoneNumber:ok') {
17 23
       setLoading(true)
18 24
       updatePhoneNumber(data).then(() => {

+ 1
- 0
src/components/Auth/useAuth.js Parādīt failu

@@ -23,6 +23,7 @@ export default function useAuth(consultant, router, page) {
23 23
 
24 24
   const updatePhoneNumber = useCallback((data) => {
25 25
     return new Promise((resolve, reject) => {
26
+      debugger
26 27
       const sessionKey = Taro.getStorageSync('sessionKey')
27 28
       const { id: targetId, recommender } = router.params
28 29
       const buildingId = router.path.indexOf('pages/index/buildingInfo/index') > -1 ? targetId : undefined

+ 1
- 1
src/layout/index.js Parādīt failu

@@ -125,7 +125,7 @@ export default (ChildComponent) => (props) => {
125 125
       </Overlay>
126 126
 
127 127
       {/* 授权头像-全屏 */}
128
-      { authPage && !isSinglePage && <AuthPage /> }
128
+      { authPage && !isSinglePage && <AuthPage consultant={consultant} router={router} page={page} /> }
129 129
 
130 130
       {/* 显示分享朋友圈 */}
131 131
       <ShareToCircle visible={shareTimelineVisible && !isSinglePage} onClose={() => setShareTimelineVisible(false)} />