card

src/app.js

@@ -183,7 +183,10 @@ class App extends Component {
     })
 
     socket.reconnect()
-    this.initData()
+
+    // this.initData()
+
+
   }
 
   componentDidMount() {
@@ -213,6 +216,7 @@ class App extends Component {
       this.updateTrack()
       this.updateTrack = undefined
     }
+    this.initData()
   }
 
   wxPreloadData() {

src/pages/card/index.js

@@ -7,6 +7,7 @@ import BackHomeBtn from '@/components/BackHomeBtn'
 import getUserPhone from '@/utils/getUserPhone'
 import ready from '@/utils/ready'
 import AchievePhone from '@/components/achievePhone'
+import AchieveAvatar from '@/components/achieveAvatar'
 import { sceneInShare } from '@/utils/tools'
 import { ROLE_CODE } from '@/constants/user'
 import {
@@ -41,23 +42,21 @@ export default class Index extends Component {
     recordId: null,
     isSave: false,
     bound: false,
-    grantPhoneVisible: false, // 授权手机弹框
+    grantPhoneVisible: false, // 授权电话
+    grantAvatarVisible: false, // 授权头像
   }
 
   componentWillMount() {
     ready.queue(() => {
       // 分享场景需要先授权手机, 再授权头像
-      const options = wx.getLaunchOptionsSync()
-      if (sceneInShare(options.scene)) {
-        const { person = {} } = this.props.userInfo || {}
-        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
-          Taro.reLaunch({ url: '/pages/auth/index' })
-          return
-        }
-        this.setState({
-          grantPhoneVisible: true,
-        })
+      // const options = wx.getLaunchOptionsSync()
+      // if (sceneInShare(options.scene)) {
+
+      // 必须授权电话
+      if (this.toggleGrantPhone()) {
+        this.toggleGrantAvatar()
       }
+      // }
 
       this.initPageData()
     })
@@ -84,6 +83,33 @@ export default class Index extends Component {
     }
   }
 
+  // 调起授权电话
+  toggleGrantPhone = () => {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
+      this.setState({ grantPhoneVisible: true })
+      return false
+    }
+    console.log('phone:', phone, 'tel:', tel, '!!!!!')
+    console.log(this.props, 'this.propsphone!!!!!')
+
+    return true
+  }
+
+  // 调起授权头像
+  toggleGrantAvatar = () => {
+    const { userInfo: { person: { avatarurl } } } = this.props
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+      this.setState({ grantAvatarVisible: true })
+      return false
+    }
+
+    console.log(avatarurl, "avatarurl")
+    console.log(this.props.userInfo, "this.props")
+    return true
+  }
+
   componentWillReceiveProps(nextProps) {
     const { userInfo: { person: { phone, tel } } } = nextProps
     this.handleModalConfirm(tel || phone)
@@ -455,18 +481,6 @@ export default class Index extends Component {
     }
   }
 
-  handleAuthPhoneSuccess = (phone) => {
-    const { person = {} } = this.props.userInfo || {}
-    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
-      Taro.reLaunch({ url: '/pages/auth/index' })
-      return
-    }
-
-    this.setState({ grantPhoneVisible: false })
-    this.initPageData()
-    // this.handleModalConfirm(phone)
-  }
-
   handeAuthPhoneFail = () => {
     Taro.showToast({
       title: '未授权手机号无法成为报备客户',
@@ -474,7 +488,7 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { makePosterStatus, posterData, grantPhoneVisible } = this.state
+    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -486,15 +500,18 @@ export default class Index extends Component {
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
     const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
-    const showAuthPhone = grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone
     return (
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
 
         {
-          showAuthPhone &&
-          <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+          grantPhoneVisible &&
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
 
         {this.state.loaded && (
@@ -560,7 +577,7 @@ export default class Index extends Component {
                     <View className="fans__num">
                       <Image className='nb' src={require('@/assets/person/nb.png')}></Image>
                       <Text>人气</Text>
-                      <Text>{cardInfo.hotNum}</Text>
+                      <Text>{cardInfo.hotNum || 0}</Text>
                     </View>
                   </View>
                   <View className="like-info__zan" onClick={this.onLike}>

src/pages/project/detail/index.js

@@ -712,15 +712,7 @@ export default class Index extends Component {
     })
   }
 
-  // handleAuthPhoneSuccess = () => {
-  //   const { person = {} } = this.props.userInfo || {}
-  //   if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
-  //     Taro.reLaunch({ url: '/pages/auth/index' })
-  //     return
-  //   }
-
-  //   this.initPageData(this.state.buildingId)
-  // }
+ 
   // 调起授权电话
   toggleGrantPhone = () => {
     const { userInfo: { person: { phone, tel } } } = this.props