bug #5281

src/pages/activity/activity.js

@@ -34,9 +34,9 @@ export default class active extends Component {
   }
 
   render() {
-    const { person: { phone } } = this.props.user.userInfo
+    const { person: { phone, tel } } = this.props.user.userInfo
 
-    return !phone ? this.renderLogin() : (
+    return !phone && !tel ? this.renderLogin() : (
       <View style="height:100vh">
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/activity/detail/assemble.js

@@ -106,8 +106,8 @@ export default class Detail extends Component {
 
   // 调起授权电话
   toggleGrantPhone = () => {
-    const { userInfo: { person: { phone } } } = this.props
-    if (!phone) {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
     }

src/pages/activity/detail/assistance.js

@@ -105,8 +105,8 @@ export default class Detail extends Component {
 
   // 调起授权电话
   toggleGrantPhone = () => {
-    const { userInfo: { person: { phone } } } = this.props
-    if (!phone) {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
     }

src/pages/person/index.js

@@ -206,11 +206,11 @@ export default class Person extends Component {
   }
 
   render() {
-    const { phone } = this.state.user
+    const { phone, tel } = this.state.user
     return (
       <View className='wrap'>
-        {phone && this.renderDetail()}
-        {!phone && this.renderLogin()}
+        {(phone || tel) && this.renderDetail()}
+        {!phone && !tel  && this.renderLogin()}
       </View>
     )
   }

src/pages/person/menus.js

@@ -1,6 +1,6 @@
 import { ROLE_CODE } from '@constants/user'
 
-export const icons = {
+const icons = {
   homepage: require('@assets/mine/homepage.png'),
   recommend: require('@assets/mine/recommend.png'),
   development: require('@assets/mine/development.png'),
@@ -21,7 +21,7 @@ const CONSULTANT = ROLE_CODE['CONSULTANT']
 const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
 const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
 
-export const menus = [
+const menus = [
   [
     {
       name: '我的主页',
@@ -121,3 +121,4 @@ export const menus = [
   ],
 ]
 
+export { icons, menus }

src/pages/shop/index.js

@@ -295,11 +295,11 @@ export default class Shop extends Component {
   }
 
   render() {
-    const { person: { phone } } = this.props.userInfo
+    const { person: { phone, tel } } = this.props.userInfo
 
     return (
       <View className='wrap'>
-        {!phone ? this.renderLogin() : this.renderDetail()}
+        {!phone && !tel ? this.renderLogin() : this.renderDetail()}
       </View>
     )
   }