个人主页代码回滚

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/card/index.js

@@ -1,13 +1,13 @@
 import Taro, { Component } from '@tarojs/taro'
 import './index.scss'
-
 import Notice from '@components/Notice'
 import Poster from './poster'
 import ProjectItem from '../project/item'
 import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-
+import AchievePhone from '@components/achievePhone'
+import { sceneInShare } from '@utils/tools'
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
@@ -25,7 +25,7 @@ import { dispatchProjectDetail } from '@actions/project'
 
 export default class Index extends Component {
   config = {
-    navigationBarTitleText: '个人主页' 
+    navigationBarTitleText: '个人主页'
   }
   state = {
     cardId: null,
@@ -35,29 +35,57 @@ export default class Index extends Component {
     actionSheetHide: true, // 控制分享弹窗modal
     recordId: null,
     isSave: false,
+    bound: false,
     modalStatus: false,
+    grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
+      // const router = Taro.getStorageSync('router')
+      // const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
+      // 分享场景需要先授权手机, 再授权头像
+      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
+        }
+
 
-      if(router.query.id){
-        this.setState({
-          cardId: id,
-          modalStatus: true
-        }, this.loadCardDetail)
-      }else{
         this.setState({
-          cardId: id,
-          modalStatus: false
-        }, this.loadCardDetail)
+          grantPhoneVisible: true,
+        })
       }
 
-      addCardUv(id)
+      this.initPageData()
     })
   }
+  initPageData() {
+    const router = Taro.getStorageSync('router')
+    const id = this.$router.params.id || router.query.id
+
+    if (router.query.id) {
+      this.setState({
+        cardId: id,
+        modalStatus: true
+      }, this.loadCardDetail)
+    } else {
+      this.setState({
+        cardId: id,
+        modalStatus: false
+      }, this.loadCardDetail)
+    }
+
+    addCardUv(id)
+  }
+
+  componentWillReceiveProps(nextProps) {
+    const { userInfo: { person: { phone, tel } } } = nextProps
+    this.handleModalConfirm(tel || phone)
+  }
+
 
   componentWillUnmount() {
     const { recordId } = this.state
@@ -74,7 +102,7 @@ export default class Index extends Component {
         loaded: true,
         isSave: res.isSave
       })
-      let buildingId = res.projects[0]
+      let buildingId = (res.projects || [])[0]
       if (buildingId) {
         dispatchProjectDetail(buildingId)
       }
@@ -263,7 +291,7 @@ export default class Index extends Component {
         resolve(posterData)
         return
       }
-      const { userInfo: { person }, projectDetail: { buildingId }, cardInfo } = this.props
+      const { userInfo: { person, miniApp }, projectDetail: { buildingId }, cardInfo } = this.props
       const { id } = cardInfo
       const { personId } = person
       const payload = {
@@ -271,7 +299,7 @@ export default class Index extends Component {
         "page": 'pages/card/index',
       }
       getMiniQrcode(payload).then(qrcode => {
-        let data = Object.assign({ qrcode }, cardInfo)
+        let data = Object.assign({ qrcode, miniAppName: miniApp.name }, cardInfo)
         resolve(data)
       })
     })
@@ -321,25 +349,46 @@ export default class Index extends Component {
     })
   }
 
-  handleModalConfirm() {
+  handleModalConfirm(phoneNumber) {
     const {
-      cardInfo: { id, projects },
-      userInfo: { person: { phone, tel } }
+      cardInfo: { id, projects = [] },
+      userInfo: { person: { phone, tel, personType, avatarurl } }
     } = this.props
-
+    if (personType === ROLE_CODE['CONSULTANT']) {
+      return
+    }
     const buildingId = projects[0]
 
-    const payload = {
-      realtyConsultant: id, //报备人 置业顾问
-      buildingId,
-      phone: phone || tel
-    }
-    reportClient(payload).then(res => {
-      this.hideModal()
-      Taro.showToast({
-        title: '报备成功'
+    const realPhone = phoneNumber || phone || tel
+
+    // TODO:
+    // 此处使用头像控制, 后期需要去掉这个条件
+    if (realPhone && id && buildingId && !this.state.bound && (avatarurl || '').indexOf('wx.qlogo.cn') > -1) {
+      const payload = {
+        realtyConsultant: id, //报备人 置业顾问
+        buildingId,
+        phone: realPhone
+      }
+
+      reportClient(payload).then(res => {
+        this.hideModal()
+        this.setState({ bound: true })
+
+        if (res !== 'bound') {
+          Taro.showToast({
+            title: '恭喜您绑定成功'
+          })
+        }
+      }).catch(err => {
+        console.error(err)
+        this.setState({ bound: true })
+
+        Taro.showToast({
+          title: err.message || err,
+          icon: 'none'
+        })
       })
-    })
+    }
   }
 
   // 卡片收藏
@@ -388,42 +437,65 @@ export default class Index extends Component {
       modalStatus: false
     })
   }
+  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: '未授权手机号无法成为报备客户',
+      icon: 'none'
+    })
+  }
   render() {
-    const { makePosterStatus, posterData, modalStatus } = this.state
+    const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
-    const { buildingId } = projectDetail
+    const { buildingId, address } = projectDetail
 
     const visitorList = visitors ? visitors.slice(0, 5) : []
     const isSelf = personId === id
 
     const isConsultant = personType === ROLE_CODE['CONSULTANT']
-    const hadPhone = (phone || tel) ? true : false
+    const hadPhone = (phone || tel) ? true : false  // nb
     const visibleChatBtn = !isConsultant && !isSelf
     // const visibleConfirmModal = modalStatus && !isReport && !isSelf && (personType === ROLE_CODE['DRIFT'] || personType === ROLE_CODE['CUSTOMER'])
     const visibleConfirmModal = modalStatus && !isReport && !isSelf
+    const showAuthPhone = grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone
     return (
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
 
         {
-          visibleConfirmModal && (
-            <View className="modal">
-              <View className="modal-mask" onClick={this.hideModal}></View>
-              <View className="modal-body">
-                <View className="modal-body__con">请确认是否成为他的客户？</View>
-                {
-                  hadPhone ? (
-                    <Button onClick={this.handleModalConfirm} className='modal-body__btn'>确认</Button>
-                  ) : (
-                      <Button open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone} className='modal-body__btn'>确认</Button>
-                    )
-                }
-              </View>
-            </View>
-          )
+          showAuthPhone &&
+          <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+        }
+        {
+          // !showAuthPhone && visibleConfirmModal && (
+          //   <View className="modal">
+          //     <View className="modal-mask" onClick={this.hideModal}></View>
+          //     <View className="modal-body">
+          //       <View className="modal-body__con">请确认是否成为他的客户？</View>
+          //       {
+          //         hadPhone ? (
+          //           <Button onClick={this.handleModalConfirm} className='modal-body__btn'>确认</Button>
+          //         ) : (
+          //             <Button open-type="getPhoneNumber" onGetphonenumber={this.handleGetPhone} className='modal-body__btn'>确认</Button>
+          //           )
+          //       }
+          //     </View>
+          //   </View>
+          // )
         }
 
         {this.state.loaded && (
@@ -435,7 +507,7 @@ export default class Index extends Component {
                   <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
                 </View>
-                <Image src={require('@assets/person/top.png')} className='top-img' mode="widthFix"></Image>
+                <Image src={require('@assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
               </View>
 
               <View className='mycard__user__information'>
@@ -516,7 +588,7 @@ export default class Index extends Component {
                   </View>
                   <View className='detailed__add' onClick={this.getLocation}>
                     <View className='detailed__add__txt'>
-                      <Text className='add__txt' space='emsp'>地址　</Text> {cardInfo.address}
+                      <Text className='add__txt' space='emsp'>地址　</Text> {address}
                     </View>
                     <Text className='iconfont icon-daohangdizhi add__img'></Text>
                   </View>