zls

.gitignore

@@ -3,4 +3,5 @@ dist/
 .rn_temp/
 node_modules/
 .DS_Store
-*.rar
+*.rar
+*.zip

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.172:8080"',
-    // WSS_HOST: '"ws://192.168.0.172:8080"',
+    // HOST: '"http://192.168.0.84:8080"',
+    // WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/app.js

@@ -164,6 +164,10 @@ class App extends Component {
         console.info('router2:', router)
         console.info('-----------')
         const { query: payload } = router
+
+        payload.path = router.path
+        payload.scene = router.scene
+
         // login
         login(payload, res => {
           // 获取未读消息
@@ -209,8 +213,8 @@ class App extends Component {
   componentDidMount() {
     console.info('app componentDidMount')
   }
-  componentWillMount() {
-    console.info('app componentWillMount')
+  componentWillMount(params) {
+    console.info('app componentWillMount', params)
   }
 
   getRouterParams() {

src/components/charts/Line.js

@@ -163,9 +163,8 @@ export default class LineChart extends Component {
 
   render() {
     // this.refreshChart(this.props.source)
-
     return (
-      <View style="width:100vw;height:530rpx;position: relative;">
+      <View style="width:100vw;height:480rpx;position: relative;">
         <View className="map-container">
           <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>
         </View>

src/components/charts/style.scss

@@ -1,9 +1,10 @@
 .map-container {
-  position: absolute;
-  top: 80px;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  // position: absolute;
+  // top: 80px;
+  // bottom: 0;
+  // left: 0;
+  // right: 0;
+  margin-top: 60px;
   width:100vw;
   height:400px;
   display: flex;

src/pages/activity/detail/assemble.js

@@ -402,8 +402,6 @@ export default class Detail extends Component {
               phone: person.tel || person.phone,
               avatarurl: person.avatarurl,
             }).then(res => {
-              console.log(res,'888888')
-              if(res){
                 this.setState({
                   recordDetail: res.taShareRecord,
                   recordId: res.taShareRecord.recordId,
@@ -411,7 +409,7 @@ export default class Detail extends Component {
                   isStarter: true,
                   groupState: res.taShareRecord.status,
                 }, () => cb && cb())
-              }
+              
             }).catch(err => {
               console.log(err,'11111111111111')
               Taro.showToast({

src/pages/activity/detail/assistance.js

@@ -614,14 +614,6 @@ export default class Detail extends Component {
                       </View>
                     )
                   }
-                  <View className="btn-box" style="padding:25px 0;">
-
-                    <View className="set-btn" style="border:none">
-                      <FormIdCollector>
-                        <Button className= "set-btn" onClick={this.startMine}>发起我的助力</Button>
-                      </FormIdCollector>
-                    </View>
-                  </View>
                 </View>
                 <View className="assistance-text"><Text className="acitivty-desc">活动说明</Text>-------------------------------------------------------------- </View>
                 <View style="padding:0 40rpx">

src/pages/activity/detail/index.js

@@ -280,19 +280,18 @@ export default class Detail extends Component {
     }
 
     signupActivity(payload).then(res => {
-      if (res) {
-        Taro.showToast({
-          title: '报名成功'
-        })
-        this.setState({
-          isSign: true,
-          canChoose: 'none'
-        })
-      }else{
-        this.setState({
-          canChoose: 'none'
-        })
-      }
+
+      Taro.showToast({
+        title: '报名成功'
+      })
+      this.setState({
+        isSign: true,
+        canChoose: 'none'
+      })
+      setTimeout(() => {
+        this.loadDetail()
+      }, 500)
+
     })
 
     savePoint({
@@ -328,7 +327,7 @@ export default class Detail extends Component {
               </View>
               <ScrollView
                 scrollY
-                className="detail-wrap">
+                className="detail-wrap" style="margin-top:-40rpx">
                 <View className="detail bottom-box">
                   {detail.isEnlist == 0 &&
                     <View className="detail-sign__num">不需要报名</View>
@@ -397,7 +396,7 @@ export default class Detail extends Component {
                     ))))
                 }
                 {detail.activityStatus == 2 &&
-                  <Button disabled='true' className='submit-btn hasSigned' >立即报名</Button>
+                  <Button disabled='true' className='submit-btn hasSigned' >{isSign ? '已报名' : '立即报名'}</Button>
                 }
 
                 {/* {phone ? (

src/pages/activity/detail/index.scss

@@ -90,11 +90,11 @@
 }
 .detail {
   background: white;
-  border-top-left-radius: 28px;
-  border-top-right-radius: 28px;
+  border-radius: 28px 28px 0 0;
   padding: 30px 40px 0 40px;
   position: relative;
   overflow: hidden;
+  
 
   .status__img{
     width: 176px;
@@ -154,21 +154,20 @@
     top: -22px;
     right: -18px;
     width: 200px;
-    height: 88px;
+    height: 74px;
     display: flex;
     justify-content: center;
     align-items: center;
     background: rgba(255, 237, 237, 0.85);
     border-radius: 36px;
     color: #FF5757;
-    font-size: 28px;
-    padding-top: 17px;
+    font-size: 26px;
+    padding-top: 14px;
   }
 
   &-title {
     font-size: $font-size-title-large;
-    line-height: 1.5;
-    margin-bottom: 20px;
+    margin-top: 20px;
   }
 
   &-top {
@@ -180,11 +179,12 @@
 
       .row-label {
         font-size: 32px;
+        color:#999;
       }
 
       .row-content {
         padding-left: 10px;
-        color: $text-color-lighter;
+        color: #333;
       }
     }
   }

src/pages/activity/detail/poster.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -80,7 +80,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         width: 560,
         zIndex: 999

src/pages/agent/recommend/index.js

@@ -271,16 +271,15 @@ export default class Index extends Component {
       status: 1
     }
     recommendClient(param).then(res => {
-      if (res) {
-        Taro.showToast({
-          title: '提交成功'
-        })
-        setTimeout(() => {
-          Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
-        }, 700)
-        this.clearInputEvent()
-      }
-
+      // if (res) {
+      Taro.showToast({
+        title: '提交成功'
+      })
+      setTimeout(() => {
+        Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
+      }, 700)
+      this.clearInputEvent()
+      // }
     })
   }
   // 性别
@@ -446,7 +445,7 @@ export default class Index extends Component {
             <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" style={this.state.floorColor}>
+                <View class="picker overtext" style={this.state.floorColor}>
                   {this.state.floorArray[this.state.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="" />)
@@ -456,7 +455,7 @@ export default class Index extends Component {
           <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" style={this.state.adviserColor}>
+              <View class="picker overtext" style={this.state.adviserColor}>
                 {this.state.adviserArray[this.state.adviserID].name}
               </View>
             </Picker>

src/pages/agent/recommend/index.scss

@@ -2,6 +2,10 @@
 .ani {
   position: absolute;
 }
+.overtext{
+  max-width: 100%;
+  @include text-ellipsis;
+}
 
 .recommend__customers {
   position: relative;

src/pages/card/index.js

@@ -6,7 +6,9 @@ import Poster from './poster'
 import ProjectItem from '../project/item'
 import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
+import AchievePhone from '@components/achievePhone'
 import ready from '@utils/ready'
+import { sceneInShare } from '@utils/tools'
 
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
@@ -36,33 +38,61 @@ export default class Index extends Component {
     recordId: null,
     isSave: false,
     modalStatus: false,
+    grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
 
-      if (router.query.id) {
-        this.setState({
-          cardId: id,
-          modalStatus: true
-        }, this.loadCardDetail)
-      } else {
+      // 分享场景需要先授权手机, 再授权头像
+      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({
-          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)
+  }
   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
@@ -388,8 +418,19 @@ export default class Index extends Component {
       modalStatus: false
     })
   }
+  
+  handleAuthPhoneSuccess = () => {
+    const { person = {} } = this.props.userInfo || {}
+    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+      Taro.reLaunch({ url: '/pages/auth/index' })
+      return
+    }
+
+    this.initPageData()
+  }
+
   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
@@ -407,7 +448,10 @@ export default class Index extends Component {
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
-
+        {
+          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+        }
         {
           visibleConfirmModal && (
             <View className="modal">

src/pages/im/index.js

@@ -7,12 +7,13 @@ import FormIdCollector from '@components/formIdCollector'
 import BackHomeBtn from '@components/BackHomeBtn'
 
 import { queryChatHistory } from '@services/chat'
-import { uploadFiles } from '@utils/request'
+import { uploadFiles, fetch } from '@utils/request'
 import { deepClone } from '@utils/tools'
 
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
+import { API_QUERY_USERINFO_BYID } from '@constants/api'
 import { dispatchCardInfo } from '@actions/card'
 
 // import { dispatchUserPhone } from '@actions/user'
@@ -114,7 +115,7 @@ export default class Chat extends Component {
         return;
       }
 
-      const chatting = {
+      let chatting = {
         personId: sendId === mineId ? receiverId : sendId,
         nickname: sendId === mineId ? decodeURIComponent(receiverName) : decodeURIComponent(sendName),
         avatarurl: null,
@@ -124,22 +125,29 @@ export default class Chat extends Component {
       // 设置页面 title
       Taro.setNavigationBarTitle({ title: chatting.nickname || '聊天' })
 
-      this.setState({ chatting, me }, () => {
-        this.loadList(res => {
-          this.toBottom()
-
-          const { records } = res
-          const newMsg = records[0]
-          const isCardMsg = newMsg && newMsg.messageType === MESSAGETYPE.CARD
-
-          // 如果最新一条消息不是卡片类型 则自动发送卡片信息
-          if (!isCardMsg) {
-            setTimeout(() => {
-              this.sendCardMsg()
-            }, 500)
-          }
+      // 获取聊天对象信息
+      fetch({ url: `${API_QUERY_USERINFO_BYID}/${chatting.personId}` }).then(res => {
+        // res 为 person 信息
+        chatting.avatarurl = res.avatarurl
+        chatting.personType = res.personType
+
+        this.setState({ chatting, me }, () => {
+          this.loadList(res => {
+            this.toBottom()
+  
+            const { records } = res
+            const newMsg = records[0]
+            const isCardMsg = newMsg && newMsg.messageType === MESSAGETYPE.CARD
+  
+            // 如果最新一条消息不是卡片类型 则自动发送卡片信息
+            if (!isCardMsg) {
+              setTimeout(() => {
+                this.sendCardMsg()
+              }, 500)
+            }
+          });
         });
-      });
+      })
 
       socket.wss.onMessage(res => {    
         const data = JSON.parse(res.data)
@@ -364,7 +372,7 @@ export default class Chat extends Component {
  
     this.setState({
       inputText: '',
-      msgList: list
+      // msgList: list
     }, this.toBottom)
   }
 
@@ -386,6 +394,8 @@ export default class Chat extends Component {
         list: [data]
       })
     }
+
+    this.setState({ msgList: list })
   }
 
   handleIssueClick = (message, e) => {
@@ -407,7 +417,6 @@ export default class Chat extends Component {
   }
 
   bindTextInput = (e) => {
-    console.log('--------->', e)
     this.setState({
       inputText: e.detail.value
     })

src/pages/news/detail/poster.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
         fontSize: 30,
         color: 'black',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -80,7 +80,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         width: 560,
         zIndex: 999

src/pages/person/customerAnalysis/analysis.js

@@ -179,9 +179,7 @@ export default class analysis extends Taro.Component {
               </View>
               {
                 chartInfo.length &&
-
                 <LineChart source={chartInfo} />
-
               }
               {
                 !chartInfo.length &&
@@ -192,7 +190,6 @@ export default class analysis extends Taro.Component {
                 </View>
                 </View>
               }
-
               {
                 sexInfo.length &&
                 <View>
@@ -206,7 +203,6 @@ export default class analysis extends Taro.Component {
                   </View>
                 </View>
               }
-
             </View>
           </AtTabsPane>
           <AtTabsPane current={current} index={1}>
@@ -222,9 +218,7 @@ export default class analysis extends Taro.Component {
                 </View>
               </View>
               {chartInfo2.length &&
-
                 <LineChart source={chartInfo2} />
-
               }
               {
                 !chartInfo2.length &&
@@ -235,7 +229,6 @@ export default class analysis extends Taro.Component {
                 </View>
                 </View>
               }
-
               {
                 sexInfo.length &&
                 <View>

src/pages/person/customerAnalysis/index.js

@@ -62,7 +62,7 @@ export default class customer extends Taro.Component {
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
     const { customerNum, current } = this.state
     return (
-      <AtTabs className="tab-box" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
+      <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
         <AtTabsPane current={current} index={0} >
           <View >
             {

src/pages/person/customerAnalysis/index.scss

@@ -113,6 +113,11 @@
     }
   }
 }
+.overflow-tab{
+  .at-tabs-pane{
+    overflow-y: hidden;
+  }
+}
 .empty{
   width:100%;
   height:40vh;
@@ -250,7 +255,7 @@
       }
     }
     .tab-pane3{
-      padding: 20px 40px;
+      padding: 20px 30px;
     }
   }
   .tab-pane4{

src/pages/person/customerAnalysis/item/index.scss

@@ -15,6 +15,7 @@
   width: 98%;
   margin: 0 1%;
   position: relative;
+  margin-bottom: 16px ;
   .type{
     position: absolute;
     left:0;

src/pages/person/customerAnalysis/myCustomer.js

@@ -59,6 +59,9 @@ export default class myCustomer extends Taro.Component {
     if (value == 1) {
       this.queryVisitRecord(1);
     } else if (value == 2) {
+      this.setState({
+        activityList: []
+      })
       this.queryActivityList(1);
     } else if (value == 3) {
       this.queryFollowRecord(1);
@@ -461,7 +464,7 @@ export default class myCustomer extends Taro.Component {
           </View>
           <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
         </View>
-        <AtTabs height="calc(100vh - 320rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 300rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View className="tab-pane1 pane">
               <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
@@ -477,7 +480,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane2 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 300rpx)"
                 needInit
                 isEmpty={isEmpty}
                 emptyText="暂无访问记录~"
@@ -513,7 +516,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane3 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 300rpx)"
                 needInit
                 isEmpty={isEmpty2}
                 emptyText="暂无活动信息~"
@@ -528,13 +531,13 @@ export default class myCustomer extends Taro.Component {
                   <View className="empty__text">暂无活动信息~</View> */}
                     </View>
                   }
-                  {activityList.length &&
-                    activityList.map(item => (
-                      <ActivityItem
-                        data={item}
-                        key={item.id + 'activity'}>
-                      </ActivityItem>
-                    ))
+                  {activityList.length && activityList.map(item => (
+                    <ActivityItem
+                      data={item}
+                      key={item.id + 'activity'}
+                    >
+                    </ActivityItem>
+                  ))
                   }
                 </View>
               </ListView>

src/pages/person/profile/index.js

@@ -24,7 +24,7 @@ export default class Profile extends Component {
 
   }
 
-  componentDidShow() {
+  componentWillMount() {
     this.getProfile()
   }
 

src/pages/project/detail/Around/Pannel.js

@@ -41,7 +41,7 @@ export default class Pannel extends Component {
     let currentMarkerPos = undefined
 
     if (props.active !== undefined && props.active != (this.state.currentMarker || {}).id) {
-      for (let i = 0; i < markerList.length; i ++) {
+      for (let i = 0; i < markerList.length; i++) {
         if (markerList[i].id === props.active) {
           activeIndex = i;
           break;
@@ -73,7 +73,7 @@ export default class Pannel extends Component {
     console.log(e)
   }
 
-  render () {  
+  render() {
     const { manualData = [] } = this.props.dataset || {}
     const activeKey = this.props.active
 
@@ -87,7 +87,7 @@ export default class Pannel extends Component {
               const { id, name, distance } = item || {}
               const dist = distance >= 1000 ? `${Number(distance / 1000).toFixed(1)}km` : `${distance}m`
               const active = activeKey === id
-  
+
               return (
                 <View className={`around-cell ${active ? 'active' : ''}`} key={`auto-${id}`} id={id} onClick={this.setCurrent(item)}>
                   <View className="around-cell__body">{`${index + 1}、${name}`}</View>

src/pages/project/detail/index.js

@@ -7,6 +7,7 @@ import Poster from './poster'
 import PoiAround from '@components/amap/PoiAround'
 import Around from './Around'
 import BackHomeBtn from '@components/BackHomeBtn'
+import AchievePhone from '@components/achievePhone'
 import {
   addItemUv,
   addItemShareNum,
@@ -20,7 +21,7 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
-import { getDownloadURL, getThumbnail } from '@utils/tools'
+import { getDownloadURL, getThumbnail, sceneInShare } from '@utils/tools'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -57,39 +58,27 @@ export default class Index extends Component {
     btnstate: 1,// 1显示视频 0显示图片
     albumCurrent: 0,
     videoPlayShow: 'flex',
+    grantPhoneVisible: false, // 授权手机弹框
   }
 
   componentWillMount() {
-    // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
-
     ready.queue(() => {
-      const router = Taro.getStorageSync('router')
-      const id = this.$router.params.id || router.query.id
-      // const id='82b54f4a1f5b981df572253792afbfa1' 
-      this.setState({
-        buildingId: id
-      }, () => {
-        this.loadDetail()
-        this.loadNewsData()
-        this.loadActivityData()
-        this.loadHelpGroupList()
-
-        addItemUv(id)
-        // 埋点
-        savePoint({
-          event: 'detail',
-          eventType: 'building',
-          propertyName: '项目详情',
-          targetId: id,
-          buildingId: id,
-          data: '{}'
-        }).then(res => {
-          this.setState({
-            recordId: res.recordId
-          })
-          console.log('项目详情')
+    
+      // 分享场景需要先授权手机, 再授权头像
+      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,
         })
-      })
+      }
+
+      this.initPageData()
     })
   }
 
@@ -97,10 +86,34 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
-  componentDidMount() {
-    const options = wx.getLaunchOptionsSync()
-    console.log(options, "-------------options---------")
-    // if()
+  initPageData() {
+    const router = Taro.getStorageSync('router')
+    const id = this.$router.params.id || router.query.id
+    // const id='82b54f4a1f5b981df572253792afbfa1' 
+    this.setState({
+      buildingId: id
+    }, () => {
+      this.loadDetail()
+      this.loadNewsData()
+      this.loadActivityData()
+      this.loadHelpGroupList()
+
+      addItemUv(id)
+      // 埋点
+      savePoint({
+        event: 'detail',
+        eventType: 'building',
+        propertyName: '项目详情',
+        targetId: id,
+        buildingId: id,
+        data: '{}'
+      }).then(res => {
+        this.setState({
+          recordId: res.recordId
+        })
+        console.log('项目详情')
+      })
+    })
   }
 
   loadHelpGroupList() {
@@ -157,7 +170,7 @@ export default class Index extends Component {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
-      console.log(res,'Activity')
+      console.log(res, 'Activity')
       this.setState({
         activityList: res.list || []
       })
@@ -479,6 +492,16 @@ 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()
+  }
+
   renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
@@ -795,7 +818,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')
@@ -991,14 +1014,18 @@ export default class Index extends Component {
   }
 
   render() {
-    const { posterStatus, posterData, loaded, btnstate } = this.state
-    const { projectDetail } = this.props
+    const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible } = this.state
+    const { projectDetail, userInfo } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
 
     return (
       <Block>
+        {
+          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+        }
         {
           loaded && (
             <View className='detail'>
@@ -1101,7 +1128,7 @@ export default class Index extends Component {
 
                       {/* 围观人数 */}
                       <View className='watch__people__num'>
-                        <View className='top__txt'>{total}人围观</View>
+                        <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={item.photoOravatar} className='user__img' key={item.personId} />)}

src/pages/project/detail/index.scss

@@ -610,13 +610,12 @@
 
       .top__txt {
         font-size: 26px;
-        width: 20%;
+        width: 30%;
         color: rgba(0, 0, 0, 0.37);
       }
 
       .bottom__img {
-        margin-top: 20px;
-        width: 80%;
+        width: 70%;
         display: flex;
         align-items: center;
         margin-left: 5px;

src/pages/project/detail/poster.js

@@ -70,7 +70,7 @@ export default class Index extends Component {
         fontSize: 28,
         color: '#999',
         baseLine: 'middle',
-        lineNum: 2,
+        lineNum: 1,
         lineHeight: 48,
         // textAlign: 'center',
         width: 560,
@@ -117,6 +117,7 @@ export default class Index extends Component {
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
+        lineNum: 1,
         width: 150,
         zIndex: 11
       },

src/pages/project/item/index.js

@@ -25,7 +25,7 @@ export default class Index extends Component {
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
-          {console.log(data,'data')}
+          {console.log(data, 'data')}
           <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
@@ -38,7 +38,7 @@ export default class Index extends Component {
             </View>
           </View>
 
-          <View className='item__right__region row'><Text className="location-icon iconfont icon-daohangdizhi"></Text>{data.buildingArea||''}</View>
+          <View className='item__right__region row'><Text className="location-icon iconfont icon-daohangdizhi"></Text>{data.buildingArea || ''}</View>
           {buildingTag.length > 0 && (
             <View className="item__tags row">
               {buildingTag.slice(0, 3).map(tag => <View className='tag' key={tag.tagId}>{tag.tagName}</View>)}
@@ -54,13 +54,11 @@ export default class Index extends Component {
 
           {total > 0 && (
             <View className='item__bottom__right'>
-              <Text className='item__bottom__seenum'>{total}人围观</Text>
-
+              <Text className='item__bottom__seenum'>{data.pvNum || 0}人围观</Text>
               <View className='see__img'>
                 {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={getThumbnail(item.photoOravatar)}></Image>)}
                 {records.length > 4 && <Image className="dot-img" src={getThumbnail(dotImg)}></Image>}
               </View>
-
             </View>
           )}
         </View>

src/pages/signin/index.js

@@ -31,7 +31,6 @@ export default class Index extends Component {
         }
       })
     })
-
   }
 
   getPhoneNumber(e) {

src/utils/login.js

@@ -2,9 +2,12 @@ import Taro from '@tarojs/taro';
 import { getStore } from '@tarojs/redux'
 import { USER_INFO } from '@constants/user'
 import { wxLogin } from '@services/login'
+import { sceneInShare } from '@utils/tools'
 import ready from '@utils/ready'
 let loading = false
-export default function (params, callback) {
+export default function (payload, callback) {
+  const { path, scene, ...params } = payload
+
   if (loading) {
     return
   }
@@ -34,9 +37,19 @@ export default function (params, callback) {
           callback && callback(data)
 
         } else {
-          Taro.reLaunch({
-            url: '/pages/auth/index'
-          })
+
+          // 非扫码进入项目详情或者卡片主页, 跳转到授权头像
+          // 否则不跳
+          const noAuthPages = [
+            'pages/project/detail/index',
+            'pages/card/index',
+          ]
+
+          if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
+            Taro.reLaunch({
+              url: '/pages/auth/index'
+            })
+          }
         }
         ready.open()
 

src/utils/request.js

@@ -81,7 +81,7 @@ export const fetch = async (options) => {
   }).catch((err) => {
     
     let errMessage = `请求失败: ${err.errMsg}`
-    if (err.errMsg === 'request:fail timeout') {
+    if (err.errMsg) {
       errMessage = '请检查网络'
     }
 

src/utils/tools.js

@@ -1,5 +1,17 @@
 import Taro from '@tarojs/taro';
 
+/**
+ * 是否分享场景(含扫码)
+ * @param {*} scene 
+ */
+export function sceneInShare(scene) {
+  return [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048].indexOf(scene) > -1
+}
+
+/**
+ * 造空数组
+ * @param {int}} n 
+ */
 export function times(n) {
   return n > 0 ? '*'.repeat(n - 1).split('*') : []
 }