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

src/app.js

@@ -5,7 +5,7 @@ import "@styles/icon.scss";
 import "@components/wxParse/wxParse.scss";
 import Index from './pages/auth/index'
 import { Provider } from '@tarojs/redux'
-import { getQueryString } from '@utils/tools'
+import { parseQueryString } from '@utils/tools'
 
 import {
   getCodeScene,
@@ -176,7 +176,7 @@ class App extends Component {
     })
   }
   componentDidMount() {
-    console.info('app componentDidMount')
+    // console.info('app componentDidMount')
   }
   componentWillMount(params) {
     // console.info('app componentWillMount', params)
@@ -185,7 +185,7 @@ class App extends Component {
 
   initData () {
     // console.info('app componentDidShow')
-    console.info('router1', this.$router.params)
+    console.info('router1', this.$router)
     console.info('ready status1', ready)
 
     // 获取城市列表
@@ -229,33 +229,39 @@ class App extends Component {
   getRouterParams() {
     return new Promise(resolve => {
       const router = this.$router.params
-      let { query: { scene: paramsId } } = router
-console.log(paramsId,'paramsId---')
+      const originQuery = { ...router.query };
+      let { query: { scene: paramsId }, scene } = router
+
+      // query 里面如果跟同级场景一样, 说明是小程序原生场景值
+      if (paramsId === scene) {
+        paramsId = undefined
+      }
+
       if (paramsId) {
         // 扫码进入
         getCodeScene(paramsId).then(res => {
           let params = JSON.parse(res).scene
-          let _from = getQueryString(params, 'from')
-          let _recommender = getQueryString(params, 'recommender')
-          let id = getQueryString(params, 'id')
-          let agentCode = getQueryString(params, 'agentCode')
+          let { from: _from, recommender: _recommender, id, ...left } = parseQueryString(params) || {}
+
           router.query = Object.assign(router.query, {
+            originQuery,
             id,
             paramsId,
             from: _from,
             recommender: _recommender,
             params,
             targetId: id,
-            agentCode
+            ...left,
           })
 
           resolve(router)
         })
       } else {
         router.query = Object.assign(router.query, {
-          paramsId: router.query.id ? router.query.id : '',
-          from: 'search',
-          recommender: router.query.recommender ? router.query.recommender : ''
+          originQuery,
+          paramsId: router.query.id || '',
+          from: router.query.from || 'search',
+          recommender: router.query.recommender || ''
         })
 
         resolve(router)

src/components/achieveAvatar/index.js

@@ -84,7 +84,6 @@ export default class Index extends Component {
   }
   render() {
     const { user = {} } = this.props
-    console.log('---------renderMaskBanner--------')
 
     return (
       <Block>

src/components/taro-plugin-canvas/index.js

@@ -288,8 +288,6 @@ export default class CanvasDrawer extends Component {
   }
 
   render() {
-    console.log('------render canvas----')
-
     const { pxWidth, pxHeight, debug } = this.state;
     if(pxWidth && pxHeight){
       return (

src/pages/activity/detail/assemble.js

@@ -367,7 +367,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = () => {
     const { shares, detail: { groupActivityId } } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
@@ -609,8 +609,8 @@ export default class Detail extends Component {
 
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
 
-    console.log('------posterData------', posterData)
-    console.log('------posterConfigs------', posterConfigs)
+    // console.log('------posterData------', posterData)
+    // console.log('------posterConfigs------', posterConfigs)
 
     const isJoin = memberList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
 

src/pages/activity/detail/assistance.js

@@ -370,7 +370,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = () => {
     const { shares, id } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 

src/pages/activity/index.js

@@ -57,8 +57,8 @@ export default class Index extends Component {
     if (cityId) {
       payload.cityId = cityId
     }
+
     // 从个人中心过来
-    console.log(this.router, "from")
     if (from === 'mine') {
       payload.mine = true
     }
@@ -114,7 +114,7 @@ export default class Index extends Component {
       const {records, list, total, current, pages} = res || {}
       const _list = records || list || []
       const newList = current <= 1 ? _list: this.state.list.concat(_list)
-console.log(res,'---res-------')
+
       this.setState({
         list: newList,
         isEmpty: total == 0,

src/pages/activity/item/index.js

@@ -16,7 +16,6 @@ export default class Item extends Component {
     const { data, style } = this.props
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
-        {console.log(data,'----data-----')}
          <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg ||data.listImgUrl|| data.imgUrl)}></Image>
         <View className="box">
           <View className="title">{data.title}</View>

src/pages/checkin/index.js

@@ -121,7 +121,7 @@ export default class checkin extends Component {
   render () {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
     const { activityStatus } = dynamic || {}
-    console.log(enlist, 'enlist')
+    // console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 

src/pages/city/index.js

@@ -74,7 +74,6 @@ export default class Index extends Component {
           scrollY>
 
           <View className="search-wrap">
-            {console.log(searchList, "-----------searchListview----------")}
             <Search placeholder="搜索意向城市" onInput={this.handleSearch} onSearch={this.handleSearch}></Search>
             {
               keywords && (
@@ -83,7 +82,6 @@ export default class Index extends Component {
                     searchList.length > 0 ? (
                       searchList.map(item => (
                         <View key={item.id} className="list-item" onClick={this.handleSelected.bind(this, item)}>{item.name}
-                          {console.log(item, "-------item------")}
                         </View>
                       ))
                     ) : <View className="empty">暂无结果</View>

src/pages/news/detail/index.js

@@ -41,8 +41,10 @@ export default class NewsDetail extends Component {
     consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
-  componentWillMount(routerProps) {
-    console.log(routerProps,"routerProps")
+  componentWillMount(options) {
+    console.log('================options========================', options)
+    console.log('===========wx.getLaunchOptionsSync()===========', wx.getLaunchOptionsSync())
+    console.log('================this.$router===================', this.$router)
 
     console.info('ready status3', ready)
     ready.queue(() => {
@@ -82,7 +84,8 @@ export default class NewsDetail extends Component {
 
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const { userInfo: { person: { phone, tel, userId } } } = this.props
 
     if (consultant && consultant != personId) {
       const realPhone = phone || tel
@@ -134,6 +137,30 @@ export default class NewsDetail extends Component {
       url: `/pages/project/index`
     })
   }
+
+  currentPageAndParams () {
+    const { detail: { newsId } } = this.state
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    let queryParams = [
+      `id=${newsId}`,
+      `from=news_share`,
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    const res = [
+      'pages/news/detail/index',
+      queryParams.join('&'),
+    ]
+
+    console.log('--page-params->', res)
+    return res
+  }
+
   onShareAppMessage = () => {
     const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
@@ -152,14 +179,19 @@ export default class NewsDetail extends Component {
       console.info('资讯详情分享')
     })
 
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: newsName, shareContentImg: newsImg };
+
     // 分享埋点
     addNewsShareNum(newsId)
-    console.log(`/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}`, "path")
+
+    const [path, params] = this.currentPageAndParams();
+
+    console.log('----share-url---->', `/${path}?${params}`)
 
     return {
-      title: shareContents[0].shareContentTitle || newsName,
-      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg || newsImg
+      title: shareData.shareContentTitle,
+      path: `/${path}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
     }
   }
 
@@ -223,27 +255,28 @@ export default class NewsDetail extends Component {
       }
       const { userInfo: { person, miniApp } } = this.props
       const { avatarurl, nickname, personId, personType, phone, tel, userId } = person
-      const { newsId, detail: { posters, newsName, createDate } } = this.state
-      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
-      const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
-      const phoneNum = phone || tel
-      const payload = {
-        "scene": `id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}&consultantId=${consultantId}`,
-        "page": 'pages/news/detail/index',
-      }
+      const { newsId, detail: { posters, newsName, createDate, newsImg = '' } } = this.state
+      // const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      // const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+      // const phoneNum = phone || tel
+
+      const [page, scene] = this.currentPageAndParams();
+
+      const payload = { page, scene }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
+      const posterDt = posters && posters.length ? posters[0] : { posterTitle: newsName, posterDescription: '', posterImg: newsImg }
+
       getMiniQrcode(payload).then(qrcode => {
         let data = {
           qrcode,//小程序二维码
           nickname,//访问者名字
           avatarurl: _avatarurl,//访问者头像
-          title: posters[0].posterTitle,//资讯海报标题
-          posterDescription: posters[0].posterDescription,//资讯海报描述
+          title: posterDt.posterTitle,//资讯海报标题
+          posterDescription: posterDt.posterDescription,//资讯海报描述
           createDate: createDate,//资讯时间
-          poster: posters[0].posterImg,
+          poster: posterDt.posterImg,
           miniAppName: miniApp.name,
-
         }
         resolve(data)
       })

src/pages/project/album/index.js

@@ -74,8 +74,6 @@ export default class Index extends Component {
     return (
       <View className='photos'>
         <View className="around-tab">
-          {console.log(listimg, '-----listimg---------')}
-          {console.log(imgList, '-------imgList-------')}
           {listimg.map((item, index) => {
             const { apartmentName } = item || {}
             const buildingImgList = item.buildingImgList || []

src/pages/project/banner/index.js

@@ -36,7 +36,7 @@ export default class SwiperBanner extends Component {
   render () {
     const { list, style, indicatorDots, current } = this.props
 
-    console.log('banner', list)
+    // console.log('banner', list)
     return (
       <View className='home-banner' style={style}>
         <Swiper

src/pages/project/detail/index.js

@@ -109,9 +109,9 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+
   // 报备客户
   reportClientFn() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const { userInfo: { person: { phone, tel, personId } } } = this.props
@@ -130,9 +130,33 @@ export default class Index extends Component {
       })
     }
   }
+
+  currentPageAndParams () {
+    const {
+      projectDetail: { buildingId },
+      userInfo: { person: { personId, personType, userId } }
+    } = this.props
+
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    const queryParams = [
+      `id=${buildingId}`,
+      'from=building_share',
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    return [
+      'pages/project/detail/index',
+      queryParams.join('&'),
+    ]
+  }
+
   onShareAppMessage = () => {
     const {
-      projectDetail: { shareContents, buildingName, buildingId, poster },
+      projectDetail: { shareContents, buildingName, buildingId, poster = '' },
       userInfo: { person: { personId, personType, userId } }
     } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
@@ -149,11 +173,15 @@ export default class Index extends Component {
     }).then(res => {
       console.log('项目详情分享')
     })
-    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+
+    const [page, params] = this.currentPageAndParams()
+
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: buildingName, shareContentImg: poster }
+
     return {
-      title: shareContents[0].shareContentTitle,//分享内容
-      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareData.shareContentTitle,//分享内容
+      path: `/${page}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
     }
   }
 
@@ -344,7 +372,6 @@ export default class Index extends Component {
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
 
-
   getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
@@ -382,13 +409,10 @@ export default class Index extends Component {
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
       } = this.props
       const { total = 0 } = uvList
-      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
-      const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
-      const phoneNum = person.phone || person.tel
-      const payload = {
-        "scene": `id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}&consultantId=${consultantId}`,
-        "page": 'pages/project/detail/index',
-      }
+
+      const [page, scene] = this.currentPageAndParams();   
+      const payload = {page, scene}
+
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
 
       getMiniQrcode(payload).then(qrcode => {

src/pages/project/h5Page.js

@@ -67,7 +67,7 @@ export default class Index extends Component {
   // 分享好友
   onShareAppMessage = () => {
     const { pageInfo } = this.state
-    const currentPage = this.currentPageAndParams().join('?')
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
     console.log(currentPage)
     return {
       title: pageInfo.shareTitle,
@@ -91,12 +91,14 @@ export default class Index extends Component {
     const { h5Id } = this.state
     const router = Taro.getStorageSync('router') || { query: {} }
 
-    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
+    // const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.personId : ""
+    const consultantId = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
-      `consultant=${consultant}`,
+      `consultant=${consultantId}`,
+      // `consultantId=${consultantId}`,
       `firstShare=${firstShare}`,
       `id=${h5Id}`
     ]
@@ -172,7 +174,6 @@ export default class Index extends Component {
         console.log(phone, "phone#########")
         // 头像手机号都有
         if (phone) {
-
           this.reportClient()
           this.success()
           this.setState({
@@ -245,6 +246,7 @@ export default class Index extends Component {
     }
     console.log("授权头像成功！")
   }
+
   // 授权用户信息
   getUserInfo() {
     const { dispatchUpdateUserInfo } = this.props
@@ -298,14 +300,12 @@ export default class Index extends Component {
 
   // 报备客户
   reportClient() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const {
-      userInfo: { person: { phone, tel, userId } }
-    } = this.props
+    const { userInfo: { person: { phone, tel, personId, userId, personType } } } = this.props
+    const isConsultant = personType == ROLE_CODE['CONSULTANT']
 
-    if (consultant && consultant != userId) {
+    if (isConsultant && consultant != userId) {
       const realPhone = phone || tel
       const payload = {
         realtyConsultant: consultant, //报备人 置业顾问
@@ -358,7 +358,7 @@ export default class Index extends Component {
 
     const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
 
-    console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
+    // console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
 
     return (
       <Block>

src/pages/project/index.js

@@ -138,7 +138,7 @@ export default class Index extends Component {
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId
     })[0]
-    console.log('-----defaultCity-->', defaultCity)
+    // console.log('-----defaultCity-->', defaultCity)
 
     Taro.getLocation().then(location => {
       Taro.setStorageSync('lat', location.latitude)
@@ -151,7 +151,7 @@ export default class Index extends Component {
         let curCity = cityList.filter(item => {
           return item.name == res.name || ''
         })
-        console.log('-----curCity-->', curCity)
+        // console.log('-----curCity-->', curCity)
         this.updateCity(curCity[0] || defaultCity)
       }).catch(err => {
         Taro.showToast({
@@ -463,7 +463,7 @@ export default class Index extends Component {
     const { proList: { records = [] } } = this.props
 
     const list = records.filter(item => item.isMain === 1)
-    console.log(records, 'proList')
+    // console.log(records, 'proList')
     return (
       <Block>
         {

src/pages/project/item/index.js

@@ -25,7 +25,6 @@ export default class Index extends Component {
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
-          {console.log(data, 'data')}
           <Image className='item__img' mode="aspectFill" src={transferImage(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}

src/reducers/city.js

@@ -11,7 +11,7 @@ const INITIAL_STATE = {
 export default function news(state = INITIAL_STATE, action) {
   switch (action.type) {
     case CITY_LIST: {
-      console.log(action.payload, "！！action.payload！！")
+      // console.log(action.payload, "！！action.payload！！")
       return {
         ...state,
         cityList: action.payload

src/utils/login.js

@@ -32,7 +32,6 @@ export default function (payload, callback) {
         // 用户信息已授权获取成功
         if (miniAuthorized) {
    
-          console.log(data, "data=============")
           // 保存用户信息
           // dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
           callback && callback(data)

src/utils/rtLog.js

@@ -1,19 +1,7 @@
 
-let logger;
-
-function getLogger() {
-  if (wx.canIUse('getRealtimeLogManager')) {
-    return wx.getRealtimeLogManager()
-  }
-
-  return undefined;
-}
+let logger = wx.getRealtimeLogManager ? wx.getRealtimeLogManager() : null;
 
 function info(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   // 本地打印
   console.info(...args)
 
@@ -24,10 +12,6 @@ function info(...args) {
 }
 
 function error(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   console.error(...args)
 
   if (logger) {
@@ -36,10 +20,6 @@ function error(...args) {
 }
 
 function warn(...args) {
-  if (!logger) {
-    logger = getLogger()
-  }
-
   console.warn(...args)
 
   if (logger) {