bug fix

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.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    // HOST: '"http://192.168.2.51:8080"',
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
   },
   weapp: {},
   h5: {}

src/pages/activity/activity.js

@@ -38,32 +38,14 @@ export default class active extends Component {
       console.log('活动列表')
     })
   }
-  // componentWillMount() {
-  //   console.log(Taro.getApp().props, "Taro.getApp()")
-  //   if (Taro.getApp().props.projectIndex) {
-  //     this.setState({
-  //       current: 1
-  //     })
-  //   }
-  //   else {
-  //     this.setState({
-  //       current: 0
-  //     })
-  //   }
-  // }
-  // componentDidShow() {
-  //   if (Taro.getApp().props.projectIndex == 1) {
-  //     this.setState({
-  //       current: 1
-  //     })
-  //     Taro.getApp().props.projectIndex = 2
-  //   }
-  //   else {
-  //     this.setState({
-  //       current: 0
-  //     })
-  //   }
-  // }
+
+  componentDidShow() {
+    if (Taro.getApp().props.projectIndex == 1) {
+      this.setState({
+        current: 1
+      }, Taro.getApp().props.projectIndex = 0)
+    }
+  }
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)

src/pages/person/accessRecord.js

@@ -113,7 +113,7 @@ export default class Person extends Component {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     Taro.navigateTo({
-      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.userName)}`
+      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
     })
   }
   renderPop() {

src/pages/project/detail/index.js

@@ -28,6 +28,7 @@ import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
 import { ROLE_CODE } from '@constants/user'
 const buildBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/buildbg.png'
+const dotImg = require('@assets/dot.png')
 
 @connect(
   ({ user, project }) => ({ ...user, ...project }),
@@ -62,7 +63,7 @@ export default class Index extends Component {
     grantPhoneVisible: false, // 授权手机弹框
   }
 
-  componentWillMount () {
+  componentWillMount() {
     ready.queue(() => {
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
@@ -80,7 +81,7 @@ export default class Index extends Component {
         })
       }
 
-      
+
       const router = Taro.getStorageSync('router')
       const id = this.$router.params.id || router.query.id
 
@@ -100,12 +101,12 @@ export default class Index extends Component {
     })
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  initPageData (id) {
+  initPageData(id) {
     console.log('----项目ID---->', id)
 
     // const id='82b54f4a1f5b981df572253792afbfa1' 
@@ -135,7 +136,7 @@ export default class Index extends Component {
     })
   }
 
-  loadHelpGroupList () {
+  loadHelpGroupList() {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
@@ -157,7 +158,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail () {
+  loadDetail() {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -185,7 +186,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData () {
+  loadActivityData() {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -196,7 +197,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData () {
+  loadNewsData() {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -206,11 +207,11 @@ export default class Index extends Component {
     })
   }
 
-  navigateTo (url) {
+  navigateTo(url) {
     Taro.navigateTo({ url: url })
   }
   // 海报预览图
-  previewImage (arr) {
+  previewImage(arr) {
     // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
@@ -237,7 +238,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap () {
+  openMap() {
     const {
       buildingName,
       address,
@@ -264,13 +265,13 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum (index) {
+  toViewAlbum(index) {
     const { buildingId } = this.state
     console.log('1111111', index)
     this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}`)
   }
 
-  onViewFans () {
+  onViewFans() {
     const { buildingId } = this.state
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
@@ -299,7 +300,7 @@ export default class Index extends Component {
     }
   }
 
-  getPhoneNumber (e, item) {
+  getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
@@ -308,7 +309,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData () {
+  getPosterData() {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -380,14 +381,14 @@ export default class Index extends Component {
     })
   }
 
-  handleTelClick (item, e) {
+  handleTelClick(item, e) {
     e.stopPropagation()
     Taro.makePhoneCall({
       phoneNumber: item.phone
     })
   }
 
-  handleChatClick (item, e) {
+  handleChatClick(item, e) {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     Taro.navigateTo({
@@ -395,24 +396,24 @@ export default class Index extends Component {
     })
   }
 
-  handleConsuItemClick (item) {
+  handleConsuItemClick(item) {
     Taro.navigateTo({
       url: `/pages/card/index?id=${item.id}`
     })
   }
 
-  handleMoreClick () {
+  handleMoreClick() {
     // App.zhuge.track('查看置业顾问列表')
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })
   }
 
-  handleStopPropagation (e) {
+  handleStopPropagation(e) {
     e.stopPropagation()
   }
 
-  toRecomonedPage () {
+  toRecomonedPage() {
     const {
       userInfo: { person: { personType } }
     } = this.props
@@ -423,55 +424,55 @@ export default class Index extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=projectDeatil` 
+        url: `/pages/agent/recommend/index?type=projectDeatil`
       })
     }
   }
 
-  toHome () {
+  toHome() {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
 
-  HandleCircumTabClick (id) {
+  HandleCircumTabClick(id) {
     this.setState({
       curTab: id
     })
   }
 
-  handleNewsMoreClick () {
+  handleNewsMoreClick() {
     Taro.navigateTo({
       url: `/pages/news/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handNewsItemClick (id) {
+  handNewsItemClick(id) {
     Taro.navigateTo({
       url: '/pages/news/detail/index?id=' + id
     })
   }
 
-  handleActivityMoreClick () {
+  handleActivityMoreClick() {
     Taro.navigateTo({
       url: `/pages/activity/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handActivityItemClick (item) {
+  handActivityItemClick(item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/index?id=' + item.dynamicId
     })
   }
 
-  handlePreviewHxImage (current, urls) {
+  handlePreviewHxImage(current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  handleFavor () {
+  handleFavor() {
     const { buildingId, isSaved } = this.state
     if (isSaved) {
       cancelFavorProject(buildingId).then(res => {
@@ -501,12 +502,12 @@ export default class Index extends Component {
       console.log('活动项目收藏')
     })
   }
-  handleToolsClick () {
+  handleToolsClick() {
     Taro.navigateTo({
       url: `/pages/toolKit/index`
     })
   }
-  moreFloor () {
+  moreFloor() {
     Taro.navigateTo({
       url: `/pages/project/floor/index`
     })
@@ -522,7 +523,7 @@ export default class Index extends Component {
     this.initPageData(this.state.buildingId)
   }
 
-  renderBottomMenu () {
+  renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -557,14 +558,14 @@ export default class Index extends Component {
     )
   }
 
-  previewHouseImage (current, urls) {
+  previewHouseImage(current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  renderBuildingProjectTypeList () {
+  renderBuildingProjectTypeList() {
     const { statusOpts } = this.state
     const { projectDetail: { buildingProjectType = [], status, marketStatus } } = this.props
     return (
@@ -624,7 +625,7 @@ export default class Index extends Component {
   }
 
 
-  renderPhotoAlbum () {
+  renderPhotoAlbum() {
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     // const imgList = list.reduce((prev, cur) => {
@@ -685,7 +686,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -702,7 +703,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -745,7 +746,6 @@ export default class Index extends Component {
                           <Text className="name">{item.userName}</Text>
                           <Text className='txt'>{item.description || ' '}</Text>
                         </View>
-
                       </View>
                       <View className="flex item-btn__box">
 
@@ -775,7 +775,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -784,7 +784,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -805,17 +805,17 @@ export default class Index extends Component {
     )
   }
 
-  handleHelpClick (item) {
+  handleHelpClick(item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assistance?id=' + item.activityId
     })
   }
-  handleGroupClick (item) {
+  handleGroupClick(item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assemble?id=' + item.activityId
     })
   }
-  renderGroup () {
+  renderGroup() {
     const { groupList } = this.state
     return (
       <Block>
@@ -838,7 +838,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList () {
+  renderHouseTypeList() {
     const { statusOpts, statusBgColors } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -886,7 +886,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities () {
+  renderActivities() {
 
 
     const { activityList } = this.state
@@ -923,7 +923,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -955,7 +955,7 @@ export default class Index extends Component {
     )
   }
   // 开始播放
-  plagVideo () {
+  plagVideo() {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
     // this.setState({
@@ -963,7 +963,7 @@ export default class Index extends Component {
     // })
     videoContext.play()
   }
-  bindended () {
+  bindended() {
     let videoContext = wx.createVideoContext('myVideo')
     console.log('111111')
     // videoContext.stop()//停止
@@ -978,15 +978,15 @@ export default class Index extends Component {
     console.log(e, '111111')
 
     let videoContext = wx.createVideoContext('myVideo')
-    if (e.detail.fullScreen ) {
+    if (e.detail.fullScreen) {
       console.log(videoContext, '22222')
-videoContext.poster = undefined
+      videoContext.poster = undefined
       console.log(videoContext, '22222')
     }
     else {
       console.log(videoContext, '33333')
       console.log(imgSrc, 'imgSrc')
-      videoContext.poster = imgSrc 
+      videoContext.poster = imgSrc
       console.log(videoContext, '33333')
     }
     // VideoContext.pause()
@@ -1004,7 +1004,7 @@ videoContext.poster = undefined
   // }
 
 
-  renderVideo () {
+  renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -1035,7 +1035,7 @@ videoContext.poster = undefined
           // muted={false}
 
           showMuteBtn='true'
-        onPlay={this.onPlay}
+          onPlay={this.onPlay}
         // show-center-play-btn='false'
         // onPause= {this.onPause}
 
@@ -1056,14 +1056,14 @@ videoContext.poster = undefined
     )
   }
 
-  changeCurrent (current) {
-    console.log(current,'current')
+  changeCurrent(current) {
+    console.log(current, 'current')
     this.setState({
       current: current + 1
     })
   }
 
-  render () {
+  render() {
     const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible } = this.state
     const { projectDetail, userInfo } = this.props
     const { uvList = {} } = projectDetail
@@ -1081,22 +1081,22 @@ videoContext.poster = undefined
             <View className='detail'>
               <Notice></Notice>
               {/* {(projectDetail.videoUrl == null || btnstate === 0) && ( */}
-                <View
-                  className="pro__banner"
-                  onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
-                  <Banner
-                    list={projectDetail.buildingImg}
-                    indicatorDots={false}
-                    // current
-                    // isChange = {true}
-                    onChange={this.changeCurrent.bind(this)}
-                    style={{
-                      height: '600rpx'
-                    }}
-
-                  ></Banner>
-                  <Text className="pro__banner-text">{this.current}/{(projectDetail.buildingImg && projectDetail.buildingImg.length) || 0}</Text>
-                </View>
+              <View
+                className="pro__banner"
+                onClick={this.previewImage.bind(this, projectDetail.buildingImg)}>
+                <Banner
+                  list={projectDetail.buildingImg}
+                  indicatorDots={false}
+                  // current
+                  // isChange = {true}
+                  onChange={this.changeCurrent.bind(this)}
+                  style={{
+                    height: '600rpx'
+                  }}
+
+                ></Banner>
+                <Text className="pro__banner-text">{this.current}/{(projectDetail.buildingImg && projectDetail.buildingImg.length) || 0}</Text>
+              </View>
               {/* )} */}
 
               {/* {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()} */}
@@ -1182,17 +1182,15 @@ videoContext.poster = undefined
                         <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>
                         <View className='bottom__img' onClick={this.onViewFans.bind(this)}>
                           <View className="records">
-                            {records.slice(0, 9).map(item => <Image src={transferImage(item.photoOravatar)} className='user__img' key={item.personId} />)}
-                            {records.length > 9 && <Text> ···</Text>}
+                            {records.slice(0, 8).map(item => <Image src={transferImage(item.photoOravatar)} className='user__img' key={item.personId} />)}
+                            {records.length > 8 && <Image className="dot-img" src={transferImage(dotImg)}></Image>}
                           </View>
-
                           <Text className="iconfont icon-more"></Text>
                         </View>
                       </View>
                       <View className='more-btn' onClick={this.moreFloor}>更多楼盘信息</View>
                     </View>
                   </View>
-
                   {/* 项目顾问 */}
                   {this.renderConsuler()}
 

src/pages/project/detail/index.scss

@@ -638,6 +638,10 @@
             box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.14);
             border: 2px solid rgba(255, 255, 255, 1);
           }
+          .dot-img{
+            width: 40px;
+            height: 30px;
+          }
         }
 
         .iconfont {
@@ -681,6 +685,7 @@
       .name-txt {
         display: flex;
         flex-direction: column;
+        max-width: 400px;
 
         .name {
           font-size: 32px;

src/pages/project/h5Page.js

@@ -155,9 +155,20 @@ export default class Index extends Component {
   onAvatarSuccess() {
     this.setState({
       avatarVisible: false,
-      phoneVisible: true,
-    })
 
+    })
+    const { userInfo: { person: { phone } } } = this.props
+    if (phone) {
+      this.setState({
+        phoneVisible: false,
+        webViewVisible: true,
+      })
+      this.success()
+    } else {
+      this.setState({
+        phoneVisible: true,
+      })
+    }
     console.log("授权头像成功！")
   }
   // 授权用户信息
@@ -175,12 +186,6 @@ export default class Index extends Component {
           this.onAvatarSuccess();
           console.log('获取用户信息成功')
           Taro.hideLoading()
-          const { userInfo: { person: { phone } } } = this.props
-          if (phone) {
-            this.setState({
-              phoneVisible: false,
-            })
-          }
         })
       },
       fail: (err) => {
@@ -226,7 +231,8 @@ export default class Index extends Component {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone
+        phone: realPhone,
+        showToast: false
       }
       reportClient(payload).then(res => {
         console.log('恭喜您绑定成功')

src/pages/project/index.js

@@ -476,10 +476,11 @@ export default class Index extends Component {
     })
   }
   toNewsList() {
+    Taro.getApp().props.projectIndex = 1
     Taro.switchTab({
-      url: `/pages/activity/activity?projectIndex=1`,
-      success: res => {
-        Taro.getApp().props.projectIndex = 1
+      url: `/pages/activity/activity`,
+      fail: res => {
+        Taro.getApp().props.projectIndex = 0
       }
     })
   }

src/utils/request.js

@@ -70,17 +70,19 @@ export const fetch = async (options) => {
           })
         }
       }
+      if (showToast) {
 
-      Taro.showToast({
-        title: message,
-        icon: 'none'
-      })
+        Taro.showToast({
+          title: message,
+          icon: 'none'
+        })
+      }
 
       throw res.data
     }
   }).catch((err) => {
-    console.error(err,url)
-    
+    console.error(err, url)
+
     let errMessage = `请求失败: ${err.errMsg}`
     if (err.errMsg) {
       errMessage = '请检查网络'