commit

project.config.json.rej

@@ -1,9 +0,0 @@
-diff a/project.config.json b/project.config.json	(rejected hunks)
-@@ -2,6 +2,7 @@
- 	"miniprogramRoot": "dist/",
- 	"projectname": "mini-chengjiao",
- 	"description": "知与行联调",
-+	"appid": "wxd9ee3a9480a4e544",
- 	"setting": {
- 		"urlCheck": false,
- 		"es6": false,

src/components/empty-page/index.scss

@@ -1,8 +1,9 @@
 @import "@styles/theme.scss";
 .empty{
-  width:100vw;
+  width:100%;
   height:80vh;
   display: flex;
+  margin:  0 auto;
   flex-direction: column;
   justify-content: center;
   align-items: center;

src/pages/activity/activity.js

@@ -4,7 +4,7 @@ import FormIdCollector from '@components/formIdCollector'
 import './index.scss'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
-import { queryActivityList } from '@services/activity'
+// import { queryActivityList } from '@services/activity'
 import Activity from './index'
 import News from '../news/index'
 import { savePoint, updatePoint } from '@services/common'
@@ -39,7 +39,7 @@ export default class active extends Component {
     })
   }
   componentWillMount() {
-    if (this.$router.params.projectIndex) {
+    if (Taro.getApp().props.projectIndex) {
       this.setState({
         current: 1
       })

src/pages/im/index.js

@@ -127,6 +127,7 @@ export default class Chat extends Component {
 
       // 获取聊天对象信息
       fetch({ url: `${API_QUERY_USERINFO_BYID}/${chatting.personId}` }).then(res => {
+        console.log(res, "rees")
         // res 为 person 信息
         chatting.avatarurl = res.avatarurl
         chatting.personType = res.personType
@@ -357,6 +358,15 @@ export default class Chat extends Component {
   sendMessage = (message, messageType = MESSAGETYPE.TEXT) => {
     const { me, chatting } = this.state
 
+    if (!message || !message.trim()) {
+      console.log(message.trim(), "messagemessagemessage")
+      // Taro.showToast({
+      //   icon: 'none',
+      //   title: '不能发空消息哦~'
+      // })
+      return
+    }
+  
     const payload = {
       sendPerson: me.personId,
       receivePerson: chatting.personId,

src/pages/person/accessRecord.js

@@ -9,7 +9,7 @@ import dayjs from 'dayjs';
 @connect(state => state.user)
 export default class Person extends Component {
   config = {
-    navigationBarTitleText: '访问记录'
+    navigationBarTitleText: '访客信息'
   }
 
   state = {
@@ -27,13 +27,13 @@ export default class Person extends Component {
     savePoint({
       event: 'list',
       eventType: 'activity',
-      propertyName: '访问记录',
+      propertyName: '访客信息',
       data: '{}'
     }).then(res => {
       this.setState({
         recordId: res.recordId
       })
-      console.log('访问记录')
+      console.log('访客信息')
     })
   }
   componentWillUnmount() {
@@ -105,7 +105,7 @@ export default class Person extends Component {
       })
 
     }).catch(err => {
-      console.log(err, "获取更多访问记录err")
+      console.log(err, "获取更多访客信息err")
       Taro.hideLoading()
     })
   }
@@ -146,7 +146,7 @@ export default class Person extends Component {
           className="wrap"
           needInit
           isEmpty={isEmpty}
-          emptyText="暂无访问记录~"
+          emptyText="暂无访客信息~"
           hasMore={hasMore}
           onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
           onScrollToLower={fn => this.onScrollToLower(fn)}

src/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -261,7 +261,7 @@ export default class transactionCustomer extends Taro.Component {
           <Input class="input" placeholderClass='placeholder' autoFocus onInput={this.changeInput} placeholder="请输入用户名/手机号" />
           <Button className="btn" onClick={this.searchBtn} >搜索</Button>
         </View>
-        <View style="padding:10px">
+        <View style="padding:0 10px 10px 10px">
           <ListView
             className="wrap"
             needInit

src/pages/person/customerAnalysis/index.js

@@ -64,7 +64,7 @@ export default class customer extends Taro.Component {
     const tabList = [{ title: '跟进客户' }, { title: '成交客户' }]
     const { customerNum, current } = this.state
     return (
-      <AtTabs className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
+      <AtTabs className="tab-customer" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
         <AtTabsPane current={current} index={0}>
           <Followup />
           {/* <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">

src/pages/person/customerAnalysis/index.scss

@@ -23,11 +23,6 @@
 }
 
 
-
-
-
-
-
 .daily-month{
   display: flex;
   align-items: center;
@@ -65,7 +60,7 @@
     width: 86%;
     background-color: #fff;
     box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
-    margin: 20px auto 10px auto;
+    margin: 20px auto 20px auto;
     border-radius: 44px;
   }
   .at-tabs__item{
@@ -91,10 +86,8 @@
     height: 0!important;
   }
 
- 
 }
 .tab-bar{
-  margin-top: 30px;
   .at-tabs__header{
     width: 80%;
     background-color: none;
@@ -108,7 +101,34 @@
     flex: none;
     color: #666;
     font-size: 28px;
-    padding: 12px 20px;
+    padding: 20px;
+  }
+  .at-tabs__item--active{
+    color: $primary-color;
+    background-color: #fff;
+  }
+  .at-tabs__item-underline{
+    height: 4px;
+    background-color: $primary-color;
+    width: 60%;
+    margin-left: 20%;
+  }
+}
+.tab-customer{
+  .at-tabs__header{
+    width: 80%;
+    background-color: none;
+    box-shadow:none;
+    margin: 0 auto;
+    border-radius: 0;
+    border: none;
+  }
+  .at-tabs__item{
+    width:50%;
+    flex: none;
+    color: #666;
+    font-size: 28px;
+    padding: 20px;
   }
   .at-tabs__item--active{
     color: $primary-color;

src/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -1,8 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
-import Authorize from '@components/authorize'
 import ListView from '@components/ListView'
 import './index.scss'
-import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 import { queryCustomerList, addFollowRecord } from '@services/person'
 import { transferImage } from '@utils/tools'
@@ -27,10 +25,6 @@ export default class transactionCustomer extends Taro.Component {
     pageIndex: 1
   }
 
-  componentWillUnmount() {
-    const { recordId } = this.state
-    recordId && updatePoint(recordId)
-  }
   componentDidShow() {
     Taro.showLoading()
     this.loadList(1)
@@ -97,7 +91,7 @@ export default class transactionCustomer extends Taro.Component {
     const { customerList, isEmpty, hasMore } = this.state
 
     return (
-      <View style="padding:10px">
+      <View style="padding:0 10px 10px 10px">
         <ListView
           className="wrap"
           needInit

src/pages/person/menus.js

@@ -60,7 +60,7 @@ const menus = [
       style: '',
     },
     {
-      name: '访问记录',
+      name: '访客信息',
       url: '/pages/person/accessRecord',
       icon: icons.accessrecord,
       extends: undefined,

src/pages/project/h5Page.js

@@ -5,7 +5,7 @@ import './index.scss'
 import { getHFiveDetail } from '@services/user'
 import ready from '@utils/ready'
 import { reportClient } from '@services/report'
-import { connect, getStore } from '@tarojs/redux'
+import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 const bgImg = require('@assets/helpgroup/bg.png')
@@ -14,25 +14,32 @@ const bgImg = require('@assets/helpgroup/bg.png')
 export default class Index extends Component {
 
   state = {
+    recordId: undefined, // 埋点ID
     avatarVisible: true,
     phoneVisible: false,
     webViewVisible: false,
-    pageInfo: {}
+    pageInfo: {},
+    codeParams: '', // 解析二维码参数
   }
 
-
-
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
+  }
   // 埋点
   success() {
     const { userInfo: { person } } = this.props
-    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || ""
+
+    const router = Taro.getStorageSync('router')
+    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 || ""
     savePoint({
       event: 'detail',
       eventType: 'h5',
       propertyName: 'h5活动',
       consultantId: consultant,
-      sharePersonId: this.$router.params.sharePersonId,
+      sharePersonId: sharePersonId,
       data: '{"firstShare":"' + firstShare + '"}'
     }).then(res => {
       this.setState({
@@ -41,6 +48,7 @@ export default class Index extends Component {
       console.log('访问记录')
     })
   }
+  // 分享好友
   onShareAppMessage = () => {
     const { pageInfo } = this.state
     const currentPage = this.currentPageAndParams().join('?')
@@ -50,15 +58,16 @@ export default class Index extends Component {
       imageUrl: pageInfo.shareImg
     }
   }
-  getQRCode() {
-    const [page, scene] = this.currentPageAndParams()
-    const payload = { page, scene }
-    return new Promise((resolve) => {
-      getMiniQrcode(payload).then(qrCode => {
-        this.setState({ qrCode }, resolve)
-      })
-    })
-  }
+  // // 生成二维码
+  // getQRCode() {
+  //   const [page, scene] = this.currentPageAndParams()
+  //   const payload = { page, scene }
+  //   return new Promise((resolve) => {
+  //     getMiniQrcode(payload).then(qrCode => {
+  //       this.setState({ qrCode }, resolve)
+  //     })
+  //   })
+  // }
 
 
   currentPageAndParams() {
@@ -82,32 +91,45 @@ export default class Index extends Component {
     return res
   }
   componentWillMount() {
-
     ready.queue(() => {
+
+      if (this.$router.params.scene) {
+        getQrCodeParams(this.$router.params.scene).then((_, codeParams) => {
+          this.setState({
+            codeParams: codeParams || ''
+          })
+          console.log(res, "解析二维码返回值")
+        })
+      }
       // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
       getHFiveDetail(this.$router.params.id).then(res => {
         this.setState({
           pageInfo: res
         })
       })
-      const { userInfo: { person, miniAuthorized } } = this.props
+      const { userInfo: { person: { avatarurl, phone } } } = this.props
       console.log(this.props, "this.props")
-      // if(person.avatarurl)
-      if (miniAuthorized) {
+      if (avatarurl && avatarurl.indexOf('wx.qlogo.cn') != -1) {
+        console.log(avatarurl, "有头像哦~")
+        this.setState({
+          avatarVisible: false,
+        })
         // 头像手机号都有
-        if (person.phone) {
-          this.onAvatarSuccess();
+        if (phone) {
+
+          this.reportClient()
           this.success()
           this.setState({
-            avatarVisible: false,
             phoneVisible: false,
             webViewVisible: true,
           })
         } else {
-          this.onAvatarSuccess();
+          this.setState({
+            phoneVisible: true,
+          })
         }
       } else {
-        if (person.phone) {
+        if (phone) {
           this.setState({
             phoneVisible: false,
           })
@@ -115,7 +137,6 @@ export default class Index extends Component {
       }
     })
   }
-
   // 授权头像成功
   onAvatarSuccess() {
     this.setState({
@@ -126,12 +147,9 @@ export default class Index extends Component {
   }
   // 授权用户信息
   getUserInfo() {
-    const { dispatchUpdateUserInfo, extraInfo, miniApp, person, miniAuthorized } = this.props
+    const { dispatchUpdateUserInfo } = this.props
     const sessionKey = Taro.getStorageSync('sessionKey')
 
-    const { dispatch } = getStore()
-
-    dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp, miniAuthorized } })
     Taro.showLoading()
     Taro.getUserInfo({
       lang: 'zh_CN',
@@ -156,7 +174,7 @@ export default class Index extends Component {
       }
     })
   }
-
+  // 授权手机号
   getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
       if (!phoneNumber) {
@@ -167,6 +185,7 @@ export default class Index extends Component {
       } else {
         console.log('授权手机成功')
         this.success()
+        this.reportClient()
         this.setState({
           phoneVisible: false,
           webViewVisible: true,
@@ -176,18 +195,18 @@ export default class Index extends Component {
   }
   // 报备客户
   reportClient() {
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
     const {
-      cardInfo: { id, projects = [] },
-      userInfo: { person: { phone, tel } }
+      userInfo: { person: { phone, tel, userId } }
     } = this.props
-    const buildingId = projects[0]
-    const realPhone = phoneNumber || phone || tel
-    const payload = {
-      realtyConsultant: id, //报备人 置业顾问
-      buildingId,
-      phone: realPhone
-    }
-    if (person.personId != cardInfo.id) {
+
+    if (consultant && consultant != userId) {
+      const realPhone = phone || tel
+      const payload = {
+        realtyConsultant: consultant, //报备人 置业顾问
+        phone: realPhone
+      }
       reportClient(payload).then(res => {
         console.log('恭喜您绑定成功')
       }).catch(err => {
@@ -219,18 +238,18 @@ export default class Index extends Component {
     )
   }
   render() {
-    const { pageInfo, webViewVisible, qrCode } = this.state
+    const { pageInfo, webViewVisible, codeParams } = this.state
     const { userInfo: { person } } = this.props
     const webUrlParams = [
       `personId=${person.personId}`,
       `h5id=${this.$router.params.id}`,
-      `qrCode=${qrCode}`,
+      `codeParams=${encodeURIComponent(codeParams)}`,
     ].join('&')
 
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && <WebView src={`${pageInfo.h5Address}?${encodeURIComponent(webUrlParams)}`} />}
+        {webViewVisible && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
       </Block>
     )
   }

src/pages/project/index.js

@@ -54,9 +54,7 @@ export default class Index extends Component {
     this.qqmapsdk = new QQMapWX({
       key: 'TIIBZ-ZJG33-52T3L-Y3X4Q-NWKLV-KUB3B'
     })
-
     ready.queue(() => {
-      this.loadOpenScreenBanner()
       this.getLocation()
 
       savePoint({
@@ -70,8 +68,11 @@ export default class Index extends Component {
         })
         console.log('进入首页')
       })
+
     })
   }
+
+
   toChatList() {
     // const { dispatch } = getStore()
     // dispatch({ type: DECREASE_UNREADNUM })
@@ -90,6 +91,7 @@ export default class Index extends Component {
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
+
   }
 
   getLocation() {
@@ -151,11 +153,16 @@ export default class Index extends Component {
     this.loadNewsList()
     this.loadActivityList()
     this.loadList()
-  }
 
+  }
   loadOpenScreenBanner() {
-    const payload = {
-      // showPosition: 'index'
+    const { curCity } = this.props
+
+    const payload = {}
+    if (curCity.id) {
+      payload.cityId = curCity.id
+    } else {
+
     }
     // 获取开屏广告图
     queryBanners('screen', payload).then(res => {
@@ -171,6 +178,15 @@ export default class Index extends Component {
       })
     })
   }
+  componentWillReceiveProps(nextProps) {
+    console.log(nextProps.curCity, "curCitycurCitycurCitycurCitycurCity")
+    console.log(this.state.maskBanner, "maskBannermaskBannermaskBannermaskBannermaskBanner")
+
+    if (!this.state.maskBanner && JSON.stringify(nextProps.curCity) != '{}') {
+
+      this.loadOpenScreenBanner()
+    }
+  }
   loadBannerList() {
     const { curCity } = this.props
     console.log(this.props, 'this.props')
@@ -462,7 +478,10 @@ export default class Index extends Component {
   }
   toNewsList() {
     Taro.switchTab({
-      url: `/pages/activity/activity?projectIndex=1`
+      url: `/pages/activity/activity?projectIndex=1`,
+      success: res => {
+        Taro.getApp().props.projectIndex = 1
+      }
     })
   }
 

src/pages/project/index.scss

@@ -186,7 +186,7 @@
     box-shadow:0px 2px 4px 0px rgba(187,156,121,0.22);
     border-radius:12px;
     width:690px;
-height:172px;
+    height:172px;
     // padding: 0px 20px;
 
     .section-content_img{

src/utils/login.js

@@ -28,7 +28,7 @@ export default function (payload, callback) {
         Taro.setStorageSync('token', token)
         Taro.setStorageSync('sessionKey', sessionKey)
 
-        dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp, miniAuthorized } })
+        dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
 
         // 用户信息已授权获取成功
         if (miniAuthorized) {

src/utils/qrcode.js

@@ -0,0 +1,30 @@
+import { parseQueryString } from './tools'
+import { getCodeScene  } from '@services/common'
+
+/**
+ * 获取二维码参数
+ * 微信小程序  基础库 2.1.2 开始支持
+ * @param {*} scene 场景值
+ */
+export function getQrCodeParams(sceneID) {
+  if (!sceneID) {
+    console.error('未解析到二维码场景值')
+    return Promise.reject('未解析到二维码场景值')
+  }
+
+  console.log('解析到二维码场景 ID', sceneID)
+
+  return new Promise((resolve, reject) => {
+    getCodeScene(sceneID).then((res) => {
+      const data = typeof res === 'string' ? JSON.parse(res) : res
+      const params = parseQueryString(data.scene || '')
+
+      console.log('解析到二维码场景参数: ', params)
+
+      resolve(params, data.scene)
+    }).catch(err => {
+      console.error('解析二维码场景参数失败', err)
+      reject('解析二维码场景参数失败')
+    })
+  })
+}