Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    // HOST: '"http://192.168.0.238:8080"',
+    // WSS_HOST: '"ws://192.168.0.238:8080"',
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -7,8 +7,8 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.0.218:8080"',
     HOST: '"https://dev.jinchengjiaye.com"',
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    //   HOST: '"https://lt.pawoma.cn"',
-    //   WSS_HOST: '"wss://lt.pawoma.cn"',
+      // HOST: '"https://lt.pawoma.cn"',
+      // WSS_HOST: '"wss://lt.pawoma.cn"',
   },
   weapp: {},
   h5: {}

src/components/achieveAvatar/index.js

@@ -0,0 +1,93 @@
+import Taro, { Component } from '@tarojs/taro'
+import { connect } from '@tarojs/redux'
+import * as actions from '@actions/user'
+import './index.scss'
+
+@connect(state => state.user, { ...actions })
+
+export default class Index extends Component {
+
+  state = {}
+  componentDidMount() {
+    const { user = {} } = this.props
+    console.log('111')
+    if (user.avatar && typeof this.props.onSuccess === 'function') {
+      this.props.onSuccess();
+    }
+  }
+  getUserInfo() {
+    const { dispatchUpdateUserInfo } = this.props
+    const sessionKey = Taro.getStorageSync('sessionKey')
+    Taro.getUserInfo({
+      lang: 'zh_CN',
+      success: res => {
+        console.log(res, "res")
+        const payload = Object.assign(res, { sessionKey })
+        // const { userInfo: { nickName, gender, country, city, province } } = payload
+        // App.zhuge.identify(nickName, {
+        //   '昵称': nickName,
+        //   '性别': gender == 1 ? '男' : '女',
+        //   '国家': country,
+        //   '省份': province,
+        //   '城市': city
+        // })
+        // 用户信息保存至服务器
+        dispatchUpdateUserInfo(payload).then(res => {
+          console.log('更新信息')
+          // this.toPage(true)
+          this.props.onSuccess();
+        })
+      },
+      fail: () => {
+        Taro.showToast({
+          title: '获取用户信息失败',
+          icon: 'none'
+        })
+        return
+        // this.toPage(false)
+      }
+    })
+  }
+  toPage(succed) {
+    const router = Taro.getStorageSync('router')
+    const { query, path } = router
+
+    if (!succed && path === 'pages/signin/index') {
+      return
+    }
+    if (path === 'pages/project/index' || path === 'pages/shop/index' || path === 'pages/person/index') {
+      Taro.switchTab({
+        url: '/' + path
+      })
+      return
+    }
+    Taro.reLaunch({
+      url: `/${path}?${query.params}`
+    })
+  }
+
+  renderMaskBanner() {
+    return (
+      <View>
+        <View className="avatar-page">
+          <View className="content">
+            <View className="title">请允许获取昵称、头像、地区及性别</View>
+            <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
+            <View className="name">用户昵称</View>
+            <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
+          </View>
+        </View>
+      </View>
+    )
+  }
+  render() {
+    const { user = {} } = this.props
+
+    return (
+      <Block>
+        {this.renderMaskBanner()}
+        {/* {!user.avatar && this.renderMaskBanner()} */}
+      </Block>
+    )
+  }
+}

src/components/achieveAvatar/index.scss

@@ -0,0 +1,54 @@
+
+.avatar-page{
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.22);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  
+  .content {
+    width: 94vw;
+    height: 430px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -47vw;
+    transform: translateY(-50%);
+    background-color: #fff;
+    border-radius: 12px;
+    padding: 40px;
+    text-align: center;
+    .title{
+      font-size: 34px;
+      color: #333;
+    }
+    .touxiang{
+      width: 110px;
+      height: 110px;
+      border-radius: 50%;
+      margin: 20px 0 10px 0;
+    }
+    .name{
+      font-size: 26px;
+      color: #333;
+    }
+  
+  
+    .btn{
+      width:290px;
+      height:90px;
+      background:rgba(187,156,121,1);
+      border-radius:12px;
+      font-size: 34px;
+      color: #fff;
+      line-height: 90px;
+      margin-top: 40px;
+    }
+  }
+}

src/components/achievePhone/index.js

@@ -12,7 +12,6 @@ export default class Index extends Component {
 
   componentDidMount() {
     const { user = {}} = this.props
-    console.log('111')
     if (user.phone && typeof this.props.onSuccess === 'function') {
       this.props.onSuccess();
     }
@@ -25,10 +24,15 @@ export default class Index extends Component {
           title: '获取手机号失败',
           icon: 'none'
         })
+
+        if (typeof this.props.onCancel === 'function') {
+          this.props.onCancel();
+        }
+
         return
       } else {        
         if (typeof this.props.onSuccess === 'function') {
-          this.props.onSuccess();
+          this.props.onSuccess(phoneNumber);
         }
       }
     })

src/components/authorize/index.js

@@ -27,7 +27,9 @@ export default class Index extends Component {
         return
       } else {
         this.props.dispatchUpdateUserInfoNew(this.state.user.id)
+        console.log(this.props.from,"this.props.from")
         if (this.props.from) {
+          console.log('跳转啦啦啦啦啦啦啦啦')
           Taro.reLaunch({
             url: this.props.from
           })
@@ -36,7 +38,6 @@ export default class Index extends Component {
             url: '/pages/person/index'
           })
         }
-
       }
     })
   }

src/pages/activity/activity.js

@@ -52,7 +52,7 @@ export default class active extends Component {
   }
 
   renderLogin() {
-    return <Authorize from="/pages/activity/activity"></Authorize>
+    return <Authorize></Authorize>
   }
 
   render() {

src/pages/activity/detail/assemble.js

@@ -3,6 +3,7 @@ import './index.scss'
 import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
+import AchieveAvatar from '@components/achieveAvatar'
 import Poster from '@components/Poster'
 import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
@@ -72,7 +73,9 @@ export default class Detail extends Component {
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
-        this.initPageData()
+        if (this.toggleGrantAvatar()) {
+          this.initPageData()
+        }
       }
     })
   }
@@ -122,13 +125,16 @@ export default class Detail extends Component {
     }
   }
 
-  // 调起授权电话
-  toggleGrantPhone = () => {
+
+   // 调起授权电话
+   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
   }
@@ -140,7 +146,8 @@ export default class Detail extends Component {
       this.setState({ grantAvatarVisible: true })
       return false
     }
-
+    console.log(avatarurl,"avatarurl")
+    console.log(this.props.userInfo,"this.props")
     return true
   }
 
@@ -394,7 +401,7 @@ export default class Detail extends Component {
         if (res.confirm) {
 
           // 必须授权头像
-          if (this.toggleGrantAvatar()) {            
+          if (this.toggleGrantAvatar()) {
             createGroupActivity({
               groupActivityId: detail.groupActivityId,
               personId: person.personId,
@@ -402,16 +409,16 @@ export default class Detail extends Component {
               phone: person.tel || person.phone,
               avatarurl: person.avatarurl,
             }).then(res => {
-                this.setState({
-                  recordDetail: res.taShareRecord,
-                  recordId: res.taShareRecord.recordId,
-                  memberList: res.shareChildRecordList || [],
-                  isStarter: true,
-                  groupState: res.taShareRecord.status,
-                }, () => cb && cb())
-              
+              this.setState({
+                recordDetail: res.taShareRecord,
+                recordId: res.taShareRecord.recordId,
+                memberList: res.shareChildRecordList || [],
+                isStarter: true,
+                groupState: res.taShareRecord.status,
+              }, () => cb && cb())
+
             }).catch(err => {
-              console.log(err,'11111111111111')
+              console.log(err, '11111111111111')
               Taro.showToast({
                 title: '发起失败: ' + err.message,
                 icon: 'none'
@@ -479,6 +486,7 @@ export default class Detail extends Component {
       groupState,
       actionSheetVisible,
       grantPhoneVisible,
+      grantAvatarVisible,
       posterTpls,
       posters,
       qrCode,
@@ -522,7 +530,11 @@ export default class Detail extends Component {
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={this.initPageData} ></AchieveAvatar>
         }
         <BackHomeBtn></BackHomeBtn>
         {
@@ -558,7 +570,9 @@ export default class Detail extends Component {
                     (
                       <Block>
                         <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(successImg)}></Image>
-                        <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
+                        {
+                          verificationCode && <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
+                        }
                       </Block>
                     )
                   }
@@ -615,42 +629,42 @@ export default class Detail extends Component {
                 <View style="padding:0 40rpx 180rpx 40rpx">
                   <Image src={getThumbnail(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
                 </View>
-                { (actState === ActBeforeStart||(isStarter && actState === ActInProcess && groupState === GroupInProcess)||(!isStarter && actState === ActInProcess && groupState != GroupInProcess )||(!isStarter && actState === ActInProcess && groupState === GroupInProcess))&&
-                <View className="btn-fixed">
-                  {
-                    actState === ActBeforeStart &&
-                    (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
-                  }
-                  {
-                    isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-                    (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
-                  }
-                  {
-                    !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
+                {(actState === ActBeforeStart || (isStarter && actState === ActInProcess && groupState === GroupInProcess) || (!isStarter && actState === ActInProcess && groupState != GroupInProcess) || (!isStarter && actState === ActInProcess && groupState === GroupInProcess)) &&
+                  <View className="btn-fixed">
+                    {
+                      actState === ActBeforeStart &&
+                      (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
+                    }
+                    {
+                      isStarter && actState === ActInProcess && groupState === GroupInProcess &&
+                      (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
+                    }
+                    {
+                      !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
 
-                    <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
-                      <FormIdCollector>
-                        <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
-                      </FormIdCollector>
-                    </View>
-                  }
-                  {
-                    !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-
-                    <View className="btn-box" style="margin: auto; padding: 0;">
-                      {
-                        (groupState === GroupInProcess && !isJoin) &&
-                        (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
-                      }                      
-                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
+                      <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
                         <FormIdCollector>
-                          <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                          <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                         </FormIdCollector>
                       </View>
-                    </View>
+                    }
+                    {
+                      !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
+
+                      <View className="btn-box" style="margin: auto; padding: 0;">
+                        {
+                          (groupState === GroupInProcess && !isJoin) &&
+                          (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
+                        }
+                        <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
+                          <FormIdCollector>
+                            <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                          </FormIdCollector>
+                        </View>
+                      </View>
 
-                  }
-                </View>
+                    }
+                  </View>
                 }
               </ScrollView>
 

src/pages/activity/detail/assistance.js

@@ -3,6 +3,7 @@ import './index.scss'
 import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
+import AchieveAvatar from '@components/achieveAvatar'
 import Poster from '@components/Poster'
 import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
@@ -69,9 +70,11 @@ export default class Detail extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-      // 必须先授权电话
+      // 必须授权电话
       if (this.toggleGrantPhone()) {
-        this.initPageData()
+        if (this.toggleGrantAvatar()) {
+          this.initPageData()
+        }
       }
     })
   }
@@ -128,6 +131,8 @@ export default class Detail extends Component {
       this.setState({ grantPhoneVisible: true })
       return false
     }
+    console.log('phone:',phone,'tel:',tel,'!!!!!')
+    console.log(this.props,'this.propsphone!!!!!')
 
     return true
   }
@@ -139,7 +144,8 @@ export default class Detail extends Component {
       this.setState({ grantAvatarVisible: true })
       return false
     }
-
+    console.log(avatarurl,"avatarurl")
+    console.log(this.props.userInfo,"this.props")
     return true
   }
 
@@ -470,6 +476,7 @@ export default class Detail extends Component {
       helpState,
       actionSheetVisible,
       grantPhoneVisible,
+      grantAvatarVisible,
       posterTpls,
       posters,
       qrCode,
@@ -505,10 +512,13 @@ export default class Detail extends Component {
             <Poster configs={posterConfigs} onCancel={this.togglePosterVisible} onFinish={this.togglePosterVisible}></Poster>
           )
         }
-
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={this.initPageData} ></AchieveAvatar>
         }
         <BackHomeBtn></BackHomeBtn>
         {

src/pages/agent/recommend/index.js

@@ -411,29 +411,30 @@ export default class Index extends Component {
   }
   // 性别
   radioChange(e) {
-    console.log(e.detail.value)
     this.setState({
       sex: e.detail.value
     })
   }
-  renderLogin () {
-    return <Authorize from="/pages/agent/recommend/index"></Authorize>
+  renderLogin() {
+    const from = "/pages/agent/recommend/index"
+    return <Authorize from={from}></Authorize>
   }
 
   renderDetail() {
-    const { reType } = this.state
+    const { reType, name, phone, floorArray, floorID, floorColor, intention, adviserArray, adviserID, adviserColor, remarks, radioList } = this.state
+ 
     return (
       <View className='recommend__customers'>
         <View className='submit__infor ani'>
           <View className='info info__1'>
             <Text className='customers__txt'>客户姓名</Text>
-            <Input className="input customers__name" name="name" data-id='name' value={this.state.name} onInput={this.BindInfo.bind(this)} placeholder="请输入" />
+            <Input className="input customers__name" name="name" data-id='name' value={name} onInput={this.BindInfo.bind(this)} placeholder="请输入" />
           </View>
           <View className='info info__2'>
             <Text className='customers__txt'>客户性别</Text>
             <View className='radio-list input'>
               <RadioGroup onChange={this.radioChange}>
-                {this.state.radioList.map((item, i) => {
+                {radioList.map((item, i) => {
                   return (
                     <Label className='radio-list__label' for={i} key={i}>
                       <Radio className='radio-list__radio' color={item.color} value={item.value} checked={item.checked} >{item.text}</Radio>
@@ -445,31 +446,31 @@ export default class Index extends Component {
           </View>
           <View className='info info__3'>
             <Text className='customers__txt'>电话号码</Text>
-            <Input type='number' className="input customers__sex" name="phone" data-id="phone" value={this.state.phone} onInput={this.BindInfo.bind(this)} placeholder="请输入" />
+            <Input type='number' className="input customers__sex" name="phone" data-id="phone" value={phone} onInput={this.BindInfo.bind(this)} placeholder="请输入" />
           </View>
           <View className='info info__4'>
             <Text className='customers__txt'>意向楼盘</Text>
             {
-              reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={this.state.floorID} range={this.state.floorArray} range-key="buildingName">
-                <View class="picker overtext" style={this.state.floorColor}>
-                  {this.state.floorArray[this.state.floorID].buildingName}
+              reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={floorID} range={floorArray} range-key="buildingName">
+                <View class="picker overtext" style={floorColor}>
+                  {floorArray[floorID].buildingName}
                 </View>
-              </Picker>) : (<Input className="input customers__name" style='color:#999;' disabled='disabled' name="name" value={this.state.intention} onInput={this.bindFloorChange.bind(this)} placeholder="" />)
+              </Picker>) : (<Input className="input customers__name" style='color:#999;' disabled='disabled' name="name" value={intention} onInput={this.bindFloorChange.bind(this)} placeholder="" />)
             }
 
           </View>
           <View className='info info__4__1'>
             <Text className='customers__txt'>置业顾问</Text>
-            <Picker className='input customers__adviser' onChange={this.bindAdviserChange} value={this.state.adviserID} range={this.state.adviserArray} range-key="name">
-              <View class="picker overtext" style={this.state.adviserColor}>
-                {this.state.adviserArray[this.state.adviserID].name}
+            <Picker className='input customers__adviser' onChange={this.bindAdviserChange} value={adviserID} range={adviserArray} range-key="name">
+              <View class="picker overtext" style={adviserColor}>
+                {adviserArray[adviserID].name}
               </View>
             </Picker>
           </View>
 
           <View className='info info__6'>
             <Text className='customers__txt'>客户描述</Text>
-            <Input className="input customers__remarks" data-id="remarks" name="remarks" value={this.state.remarks} onInput={this.BindInfo.bind(this)} placeholder="(选填)" />
+            <Input className="input customers__remarks" data-id="remarks" name="remarks" value={remarks} onInput={this.BindInfo.bind(this)} placeholder="(选填)" />
           </View>
         </View>
         <View className='submit-btn'>
@@ -480,12 +481,15 @@ export default class Index extends Component {
     );
   }
   render() {
-    const { person: { phone, tel } } = this.props.userInfo
+
+
+    const { person: { phone, tel, personId } } = this.props.userInfo
+    const visable = (!phone && !tel)
+
     return (
       <View style="width:100%;height:100%">
-    {console.log(this.props.userInfo,'this.props.userInfo')}
-      {(!phone && !tel) ? this.renderLogin() : this.renderDetail()}
-    </View>
+        {visable ? this.renderLogin() : this.renderDetail()}
+      </View>
     );
   }
 }

src/pages/card/index.js

@@ -37,6 +37,7 @@ export default class Index extends Component {
     actionSheetHide: true, // 控制分享弹窗modal
     recordId: null,
     isSave: false,
+    bound: false,
     modalStatus: false,
     grantPhoneVisible: false, // 授权手机弹框
   }
@@ -61,6 +62,7 @@ export default class Index extends Component {
       this.initPageData()
     })
   }
+
   initPageData() {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id
@@ -79,20 +81,16 @@ export default class Index extends Component {
 
     addCardUv(id)
   }
+
+  componentWillReceiveProps(nextProps) {
+    const { userInfo: { person: { phone, tel } } } = nextProps
+    this.handleModalConfirm(tel || phone)
+  }
+
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
-  componentDidMount() {
-    const options = wx.getLaunchOptionsSync()
-    const sceneList = [ 1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048]
-
-    if (sceneList.indexOf(options.scene) != -1) {
-      this.setState({
-        grantPhoneVisible: true,
-      })
-    }
-  }
 
   loadCardDetail() {
     const { cardId } = this.state
@@ -104,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)
       }
@@ -351,25 +349,48 @@ 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 realPhone = phoneNumber || phone || tel
 
-    const payload = {
-      realtyConsultant: id, //报备人 置业顾问
-      buildingId,
-      phone: phone || tel
-    }
-    reportClient(payload).then(res => {
-      this.hideModal()
-      Taro.showToast({
-        title: '报备成功'
+    // 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'
+        })
       })
-    })
+
+    }
   }
 
   // 卡片收藏
@@ -419,14 +440,23 @@ export default class Index extends Component {
     })
   }
   
-  handleAuthPhoneSuccess = () => {
+  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() {
@@ -440,34 +470,36 @@ export default class Index extends Component {
     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>)}
         {
-          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+          showAuthPhone &&
+          <AchievePhone user={userInfo.person} onCancel={this.handeAuthPhoneFail} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
-          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 && 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 && (

src/pages/person/index.js

@@ -92,10 +92,7 @@ export default class Person extends Component {
       }
     }
     else {
-
-
-      putRegisterConsultant().then(res => {
-    
+      putRegisterConsultant().then(res => {    
 
         // if (res) {
           Taro.showToast({
@@ -160,7 +157,7 @@ export default class Person extends Component {
   }
 
   renderLogin () {
-    return <Authorize from="/pages/person/index"></Authorize>
+    return <Authorize></Authorize>
   }
 
   renderDetail () {

src/pages/shop/index.js

@@ -197,7 +197,7 @@ export default class Shop extends Component {
   }
 
   renderLogin () {
-    return <Authorize from="/pages/shop/index"></Authorize>
+    return <Authorize></Authorize>
   }
   handleBannerClick = (item) => {
     console.log(this, "this")

src/utils/request.js

@@ -79,6 +79,7 @@ export const fetch = async (options) => {
       throw res.data
     }
   }).catch((err) => {
+    console.error(err)
     
     let errMessage = `请求失败: ${err.errMsg}`
     if (err.errMsg) {