Merge branch 'master' into dev

config/prod.js

     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     HOST: '"https://lt.pawoma.cn"',
     WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.2.3_2019-12-16'
+    Version:'V3.5.2.3_2019-12-17'
   },
   weapp: {},
   h5: {}

src/pages/project/h5Page.js

 import { ROLE_CODE } from '@constants/user'
 import { getQrCodeParams } from '@utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
+import { isEmpty } from '@utils/tools'
+
 const bgImg = require('@assets/helpgroup/bg.png')
 
 @connect(state => state.user, { ...actions })
     avatarVisible: false,
     phoneVisible: false,
     webViewVisible: false,
+    // pageHide: true,
     pageInfo: {},
     codeParams: '', // 解析二维码参数
+    h5Id: undefined,
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+
+  // componentDidHide() {
+  //   this.setState({ pageHide: true });
+  // }
+
+  // componentDidShow() {
+  //   this.setState({ pageHide: false });
+  // }
+
   // 埋点
   success() {
-    const { userInfo: { person } } = this.props
-
-    const router = Taro.getStorageSync('router')
+    const router = Taro.getStorageSync('router') || { query: {} }
     const firstShare = this.$router.params.firstShare || router.query.firstShare || ""
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const sharePersonId = this.$router.params.sharePersonId || router.query.sharePersonId || ""
-    const { pageInfo } = this.state
-    const targetId = pageInfo.drainageId || this.$router.params.id || router.query.id || ""
+    const { h5Id } = this.state
+
     savePoint({
       event: 'detail',
       eventType: 'h5',
       propertyName: 'h5活动',
       consultantId: consultant,
       sharePersonId: sharePersonId,
-      targetId: targetId,
+      targetId: h5Id,
       data: '{"firstShare":"' + firstShare + '"}'
     }).then(res => {
       this.setState({
       console.log('访问记录')
     })
   }
+
   // 分享好友
   onShareAppMessage = () => {
     const { pageInfo } = this.state
   //   })
   // }
 
-
   currentPageAndParams() {
     const { userInfo: { person } } = this.props
-    const router = Taro.getStorageSync('router')
+    const { h5Id } = this.state
+    const router = Taro.getStorageSync('router') || { query: {} }
 
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
-    const id = this.$router.params.id || router.query.id || ""
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
-      `id=${id}`
+      `id=${h5Id}`
     ]
 
     const res = [
 
     return res
   }
+
   componentWillMount() {
     ready.queue(() => {
+
       Taro.showLoading()
       if (this.$router.params.scene) {
 
           this.setState({
             codeParams: res['__raw'] || ''
           })
+
+          if (isEmpty(res.id)) {
+            Taro.showModal({
+              title: '提示',
+              content: '活动不存在',
+              success: (res) => {
+                if (res.confirm) {
+                  this.gotoIndex()
+                }
+              },
+            })
+            return;
+          }
+
+          if (!this.state.h5Id) {
+            this.loadH5Profile(res.id)
+          }
           // console.log(codeParams, "解析二维码返回值")
         })
       }
 
-      console.log(this.$router, "this.$router")
-      const router = Taro.getStorageSync('router')
-      console.log(router, "router")
-      const hFiveId = this.$router.params.id || router.query.id || ""
-      console.log(hFiveId, "hFiveId")
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
-      getHFiveDetail(hFiveId).then(res => {
-        Taro.hideLoading()
-        if (res.status == 1) {
-          this.setState({
-            pageInfo: res
-          })
-        } else {
-          Taro.showModal({
-            title: '提示',
-            content: '活动已下架',
-            showCancel: false,
-          }).then(() => {
-            Taro.switchTab({
-              url: '/pages/project/index'
-            })
-          })
-        }
-      })
+      const router = Taro.getStorageSync('router') || { query: {} }
+      const hFiveId = this.$router.params.id || router.query.id
+
+      if (!isEmpty(hFiveId)) {
+        this.loadH5Profile(hFiveId)
+      }
+
+      // 没有 H5ID, 也没有分享
+      if (isEmpty(hFiveId) && !this.$router.params.scene) {
+        Taro.showModal({
+          title: '提示',
+          content: '活动不存在',
+          success: (res) => {
+            if (res.confirm) {
+              this.gotoIndex()
+            }
+          },
+        })
+        return;
+      }
+
       const { userInfo: { person: { avatarurl, phone } } } = this.props
-      console.log(this.props, "this.propsthis.propsthis.props")
 
       if (avatarurl && avatarurl.indexOf('wx.qlogo.cn') != -1) {
         console.log(avatarurl, "有头像哦~")
       }
     })
   }
+
+  gotoIndex = () => {
+    Taro.switchTab({
+      url: '/pages/project/index'
+    })    
+  }
+
+  loadH5Profile = (id) => {
+    // h5id 、第一个分享人ID、置业顾问ID、分享人ID
+    getHFiveDetail(id).then(res => {
+      Taro.hideLoading()
+      if (res.status == 1) {
+        this.setState({
+          pageInfo: res,
+          h5Id: id,
+        })
+      } else {
+        Taro.showModal({
+          title: '提示',
+          content: '活动已下架',
+          showCancel: false,
+        }).then(() => {
+          this.gotoIndex()
+        })
+      }
+    })
+  }
+
   // 授权头像成功
   onAvatarSuccess() {
     this.setState({
       }
     })
   }
+
   // 授权手机号
   getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
       }
     })
   }
+
   // 报备客户
   reportClient() {
 
-    const router = Taro.getStorageSync('router')
+    const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const {
       userInfo: { person: { phone, tel, userId } }
     } = this.props
-    // debugger
+
     if (consultant && consultant != userId) {
       const realPhone = phone || tel
       const payload = {
   }
 
   renderMaskBanner() {
-    const { avatarVisible, phoneVisible, pageInfo } = this.state
+    const { avatarVisible, phoneVisible, pageInfo, h5Id } = this.state
     return (
       <View>
         <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
         <View className="middle-page">
-          {avatarVisible &&
+          {avatarVisible && h5Id &&
             <View className="content">
               <View className="title">授权头像，围观活动</View>
               <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
               <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
             </View>
           }
-          {phoneVisible &&
+          {phoneVisible && h5Id &&
             <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
           }
         </View>
     )
   }
   render() {
-    const router = Taro.getStorageSync('router')
-    const { pageInfo, webViewVisible, codeParams } = this.state
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const { pageInfo, webViewVisible, codeParams, pageHide, h5Id } = this.state
     const { userInfo: { person } } = this.props
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const h5id = this.$router.params.id || router.query.id || ""
     const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
     const webUrlParams = [
       `personId=${person.personId}`,
-      `h5id=${h5id}`,
+      `h5id=${h5Id}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
       `codeParams=${encodeURIComponent(codeParams)}`,
     ].join('&')
 
-    console.log('----web-h5------>', `${pageInfo.h5Address}?${webUrlParams}`)
+    const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
 
-    const showH5 = pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
+    console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
 
     return (
       <Block>

src/pages/project/index.js

 import Authorize from '@components/authorize'
 
 
-const accountInfo = wx.getAccountInfoSync();
+const { miniProgram: { appId } } = wx.getAccountInfoSync();
+
+// 分享图
+let shareImageOfApp;
+// banner 广告图
+let advImageOfApp;
+
+switch (appId) {
+  case 'wx755faa4b3ec76cd3':
+    // 尾房宝
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg';
+    advImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg';
+    break;
+
+  case 'wx1d981b76761246ce':
+    // 橙蕉嘉房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E5%98%89%E6%88%BF.jpg';
+    break;
+
+  case 'wxa431cc21403b51bb':
+    // 橙蕉海房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E6%B5%B7%E6%88%BF.jpg';
+    break;
+
+  case 'wx25c971cd14b0e11d':
+    // 橙蕉越房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E8%B6%8A%E6%88%BF.jpg';
+    break;
+
+  case 'wx593a402c7c27beb9':
+    // 橙蕉金房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E9%87%91%E6%88%BF.jpg';
+    break;
+
+  default:
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg';
+    break;
+}
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user }),
     keywords: '',
     loaded: false,
     maskBanner: '',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
-    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
-    // adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
+    shareImg: shareImageOfApp,
+    adImage: advImageOfApp,
     bannerList: [],
     helpGroupList: [],
     newsList: [],

src/utils/request.js

 import Taro from '@tarojs/taro'
 import { API_UPLOAD_IMAGE } from '@constants/api'
 import login from '@utils/login'
+import rtLog from './rtLog'
+
 const CODE_SUCCESS = 1000
 const CODE_UNLOGIN = 1001
 const CODE_AUTH_EXPIRED = 1002
       throw res.data
     }
   }).catch((err) => {
-    console.error(err, url)
+    rtLog.error('[request]', "==================================")
+    rtLog.error('[request]', err)
+    rtLog.error('[request]', url)
+    rtLog.error('[request]', wx.getLaunchOptionsSync())
+    rtLog.error('[request]', "==================================")
 
     let errMessage = `请求失败: ${err.errMsg}`
     if (err.errMsg) {

src/utils/rtLog.js

+
+let logger;
+
+function getLogger() {
+  if (wx.canIUse('getRealtimeLogManager')) {
+    return wx.getRealtimeLogManager()
+  }
+
+  return undefined;
+}
+
+function info(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  // 本地打印
+  console.info(...args)
+
+  // 远程提交
+  if (logger) {
+    logger.info(...args)
+  }
+}
+
+function error(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  console.error(...args)
+
+  if (logger) {
+    logger.error(...args)
+  }
+}
+
+function warn(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  console.warn(...args)
+
+  if (logger) {
+    logger.warn(...args)
+  }
+}
+
+export default { info, error, warn }

src/utils/tools.js

 import Taro from '@tarojs/taro';
 
+/**
+ * 是否为空
+ * @param {*} o 
+ */
+export function isEmpty(o) {
+  if (typeof o === 'string') {
+    if (!o || o === 'null' || o === 'undefined') {
+      return true
+    }
+  }
+
+  if (typeof o === 'object') {
+    return !Object.keys(o).length
+  }
+
+  if (Array.isArray(o)) {
+    return !o.length
+  }
+
+  if (o === null || o === undefined) {
+    return true
+  }
+
+  return false
+}
+
 /**
  * 是否分享场景(含扫码)
  * @param {*} scene