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

src/pages/agent/index.js

@@ -6,7 +6,7 @@ import Poster from './poster'
 import { agentCurrent } from '@services/agent'
 import BackHomeBtn from '@components/BackHomeBtn'
 import { getMiniQrcode } from '@services/common'
-const topImg ='https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/top.jpg'
+const topImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/top.jpg'
 @connect(state => state.user, { ...actions })
 
 export default class Index extends Component {
@@ -38,7 +38,7 @@ export default class Index extends Component {
 
   }
   onShareAppMessage = () => {
-    const { agent: { nickname,personId,agentCode } } = this.state
+    const { agent: { nickname, personId, agentCode } } = this.state
     return {
       title: `${nickname}邀请你成为经纪人`,
       path: `/pages/agent/become/index?id=${personId}&from=share&recommender=${personId}&agentCode=${agentCode}`,//分享地址
@@ -53,7 +53,7 @@ export default class Index extends Component {
         return
       }
       const { userInfo: { person } } = this.props
-      const { agent: { avatarurl, phone, agentCode },qrcode } = this.state
+      const { agent: { avatarurl, phone, agentCode }, qrcode } = this.state
       let data = {
         codeImg: qrcode,
         avatarurl: avatarurl,//访问者头像
@@ -81,7 +81,7 @@ export default class Index extends Component {
     }
   }
   render() {
-    const { posterVisible, posterData, posterShow, agent,qrcode } = this.state
+    const { posterVisible, posterData, posterShow, agent, qrcode } = this.state
     return (
       <Block>
         {/* 生成海报 */}
@@ -91,7 +91,7 @@ export default class Index extends Component {
           <View className='agent_info'>
             <Image src={agent.avatarurl} className='agent_avatar'></Image>
             <View className='agent_info-center'>
-              <View>手机号：<Text className='agent_info-tel'>{agent.phone}</Text></View>
+              <View>手机号：<Text className='agent_info-tel'>{agent.tel || agent.phone}</Text></View>
               <View>我的推荐码：<Text className='agent_info-code'>{agent.agentCode}</Text></View>
             </View>
             <Image src={qrcode} className='agent_code'></Image>

src/pages/agent/recommend/index.js

@@ -12,7 +12,7 @@ export default class Index extends Component {
     navigationBarTitleText: '新增客户'
   }
   state = {
-    name: '',//客户姓名
+    name: '',//客户姓名 
     sex: '',//性别
     phone: '',//电话
     floor: '',//楼盘
@@ -61,11 +61,13 @@ export default class Index extends Component {
   componentWillMount() {
     // const defaultHouseVal = Taro.getStorageSync('targetHouse')
 
-    const { type,cityId } = this.$router.params
-    console.log(this.$router.params,"cityId")
+    const { type } = this.$router.params
+   
     this.setState({
-      reType: type
+      reType: type,
+      sex: '',
     }, () => {
+      console.log(this.state.sex, "sex")
       console.log('buildingName' + this.props.proList.records[0].buildingName)
       if (this.state.reType != 'index') {
         this.setState({

src/pages/im/index.js

@@ -375,7 +375,13 @@ export default class Chat extends Component {
     // 发送消息
     socket.sendNotice(payload, res => {
       console.log('发送成功')
+
       this.appendData(payload)
+      this.setState({
+        inputText: '',
+        imageFile: '',
+        msgList: list
+      }, this.toBottom)
     })
   }
 
@@ -398,11 +404,7 @@ export default class Chat extends Component {
         list: [data]
       })
     }
-    this.setState({
-      inputText: '',
-      imageFile: '',
-      msgList: list
-    }, this.toBottom)
+ 
     this.setState({
       inputText: '',
       imageFile: '',
@@ -574,7 +576,7 @@ export default class Chat extends Component {
           <View className="import-top">
             <Input
               className="import-top__input"
-              cursor-spacing={0}
+              cursor-spacing={6}
               value={inputText}
               onInput={this.bindTextInput}
               onConfirm={this.bindInputConfirm}

src/pages/person/personDetail/editDetail/index.js

@@ -98,12 +98,26 @@ export default class editDetail extends Component {
         this.Alert('请输入渠道码')
         return;
       }
-
     }
-    becomeChannel({
-      personType: this.state.personType,//经纪人类型
-      channelCode: this.state.channelCode//渠道码
-    }).then((data) => {
+
+    if (this.state.personType == 'channel agent' || this.state.personType == 'estate agent') {
+      becomeChannel({
+        personType: this.state.personType,//经纪人类型
+        channelCode: this.state.channelCode//渠道码
+      }).then((data) => {
+        const playload = {
+          name: this.state.name,
+          avatar: avatar,
+          phone: this.state.phone
+        }
+        editAgent(playload).then(res => {
+          Taro.switchTab({
+            url: '/pages/person/index'
+          })
+        })
+
+      })
+    } else {
       const playload = {
         name: this.state.name,
         avatar: avatar,
@@ -114,7 +128,7 @@ export default class editDetail extends Component {
           url: '/pages/person/index'
         })
       })
-    })
+    }
   }
   Alert(content, title) {
     title = title ? title : "温馨提示";

src/pages/person/profile/index.js

@@ -20,7 +20,7 @@ export default class Profile extends Component {
     documentTitle: '',
     verfyList: [], // 审核列表
     descVisible: false,
-    showWhich: true,
+
 
   }
 
@@ -33,18 +33,20 @@ export default class Profile extends Component {
     getVerifyList().then(res => {
       this.setState({
         verfyList: res || []
-      }, () => {
-        if (this.state.verfyList.length == 0) {
-          this.setState({
-            showWhich: true
-          })
-        } else {
-          this.setState({
-            showWhich: false
-          })
-        }
+      },
+      //  () => {
+      //   if (this.state.verfyList.length == 0) {
+      //     this.setState({
+      //       showWhich: true
+      //     })
+      //   } else {
+      //     this.setState({
+      //       showWhich: false
+      //     })
+      //   }
 
-      })
+      // }
+    )
       Taro.hideLoading()
     }).catch((err) => {
       Taro.hideLoading()
@@ -59,12 +61,16 @@ export default class Profile extends Component {
   bindAlbumClick(e) {
     this.setState({
       descVisible: true,
-      showWhich: false
+      // showWhich: false
     })
     e.stopPropagation()
-    Taro.showLoading({
-      title: '上传中',
+    this.setState({
+      descVisible: true,
+      // showWhich: false
     })
+    // Taro.showLoading({
+    //   title: '上传中',
+    // })
     Taro.chooseImage({
       sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
       sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
@@ -82,9 +88,9 @@ export default class Profile extends Component {
           })
         })
       },
-      complete: res => {
-        Taro.hideLoading()
-      }
+      // complete: res => {
+      //   Taro.hideLoading()
+      // }
     })
   }
   // 删除图片
@@ -192,13 +198,13 @@ export default class Profile extends Component {
 
 
   render() {
-    const { imgList, documentTitle, verfyList, descVisible, showWhich } = this.state
+    const { imgList, documentTitle, verfyList, descVisible } = this.state
 
     return (
       <View className="profile-page" style={`background: url(${profileBg}) no-repeat top;background-size: 100% 100%;`}>
         <ScrollView scrollY scrollWithAnimation style="height: 100vh">
 
-          {(!verfyList.length && showWhich) &&
+          {(!verfyList.length && !descVisible) &&
             <View className="up-images">
               {this.renderUpImages()}
 
@@ -210,7 +216,7 @@ export default class Profile extends Component {
               </View>
             </View>
           }
-          {(verfyList.length || !showWhich) &&
+          {(verfyList.length||descVisible) &&
             <View>
 
               {descVisible &&

src/utils/im.js

@@ -138,7 +138,12 @@ class IMManager {
           console.log('socket发送成功')
         },
         fail(err) {
+
           console.log(err, '发送失败了')
+          Taro.showToast({
+            title: '发送失败',
+            icon: 'none'
+          })
         }
       })
     } else {