张延森 5 年前
父节点
当前提交
7a6f8d049d

+ 2
- 2
src/pages/activity/activity.js 查看文件

34
   }
34
   }
35
 
35
 
36
   render() {
36
   render() {
37
-    const { person: { phone } } = this.props.user.userInfo
37
+    const { person: { phone, tel } } = this.props.user.userInfo
38
 
38
 
39
-    return !phone ? this.renderLogin() : (
39
+    return !phone && !tel ? this.renderLogin() : (
40
       <View style="height:100vh">
40
       <View style="height:100vh">
41
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
41
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
42
           <AtTabsPane current={this.state.current} index={0} >
42
           <AtTabsPane current={this.state.current} index={0} >

+ 2
- 2
src/pages/activity/detail/assemble.js 查看文件

106
 
106
 
107
   // 调起授权电话
107
   // 调起授权电话
108
   toggleGrantPhone = () => {
108
   toggleGrantPhone = () => {
109
-    const { userInfo: { person: { phone } } } = this.props
110
-    if (!phone) {
109
+    const { userInfo: { person: { phone, tel } } } = this.props
110
+    if (!phone && !tel) {
111
       this.setState({ grantPhoneVisible: true })
111
       this.setState({ grantPhoneVisible: true })
112
       return false
112
       return false
113
     }
113
     }

+ 2
- 2
src/pages/activity/detail/assistance.js 查看文件

105
 
105
 
106
   // 调起授权电话
106
   // 调起授权电话
107
   toggleGrantPhone = () => {
107
   toggleGrantPhone = () => {
108
-    const { userInfo: { person: { phone } } } = this.props
109
-    if (!phone) {
108
+    const { userInfo: { person: { phone, tel } } } = this.props
109
+    if (!phone && !tel) {
110
       this.setState({ grantPhoneVisible: true })
110
       this.setState({ grantPhoneVisible: true })
111
       return false
111
       return false
112
     }
112
     }

+ 3
- 3
src/pages/person/index.js 查看文件

206
   }
206
   }
207
 
207
 
208
   render() {
208
   render() {
209
-    const { phone } = this.state.user
209
+    const { phone, tel } = this.state.user
210
     return (
210
     return (
211
       <View className='wrap'>
211
       <View className='wrap'>
212
-        {phone && this.renderDetail()}
213
-        {!phone && this.renderLogin()}
212
+        {(phone || tel) && this.renderDetail()}
213
+        {!phone && !tel  && this.renderLogin()}
214
       </View>
214
       </View>
215
     )
215
     )
216
   }
216
   }

+ 3
- 2
src/pages/person/menus.js 查看文件

1
 import { ROLE_CODE } from '@constants/user'
1
 import { ROLE_CODE } from '@constants/user'
2
 
2
 
3
-export const icons = {
3
+const icons = {
4
   homepage: require('@assets/mine/homepage.png'),
4
   homepage: require('@assets/mine/homepage.png'),
5
   recommend: require('@assets/mine/recommend.png'),
5
   recommend: require('@assets/mine/recommend.png'),
6
   development: require('@assets/mine/development.png'),
6
   development: require('@assets/mine/development.png'),
21
 const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
21
 const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
22
 const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
22
 const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
23
 
23
 
24
-export const menus = [
24
+const menus = [
25
   [
25
   [
26
     {
26
     {
27
       name: '我的主页',
27
       name: '我的主页',
121
   ],
121
   ],
122
 ]
122
 ]
123
 
123
 
124
+export { icons, menus }

+ 2
- 2
src/pages/shop/index.js 查看文件

295
   }
295
   }
296
 
296
 
297
   render() {
297
   render() {
298
-    const { person: { phone } } = this.props.userInfo
298
+    const { person: { phone, tel } } = this.props.userInfo
299
 
299
 
300
     return (
300
     return (
301
       <View className='wrap'>
301
       <View className='wrap'>
302
-        {!phone ? this.renderLogin() : this.renderDetail()}
302
+        {!phone && !tel ? this.renderLogin() : this.renderDetail()}
303
       </View>
303
       </View>
304
     )
304
     )
305
   }
305
   }