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

config/dev.js

@@ -3,13 +3,13 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://dev.fangdeal.cn"', //测试
-    WSS_HOST: '"wss://dev.fangdeal.cn"',
-    // HOST: '"http://192.168.2.43:8080"',
-    // WSS_HOST: '"ws://192.168.2.43:8080"',
+    // HOST: '"https://dev.fangdeal.cn"', //测试
+    // WSS_HOST: '"wss://dev.fangdeal.cn"',
+    HOST: '"http://192.168.2.43:8080"',
+    WSS_HOST: '"ws://192.168.2.43:8080"',
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
-    Version: "V3.5.26"
+    Version: "V3.5.28"
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://wx.fangdeal.cn"',
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
-    Version: "V3.5.26"
+    Version: "V3.5.28"
   },
   weapp: {},
   h5: {}

src/actions/project.js

@@ -39,9 +39,10 @@ export const dispatchIndexProjects = payload => createAction({
  * 获取项目信息
  * @param {*} id 
  */
-export const dispatchProjectDetail = id => createAction({
+export const dispatchProjectDetail = (id, params) => createAction({
   url: `${API_ITEMS_DETAIL}/${id}`,
-  type: PROJECT_DETAIL
+  type: PROJECT_DETAIL,
+  fetchOptions: params || {}
 })
 
 /**

src/constants/api.js

@@ -44,6 +44,7 @@ export const API_CHAT_READED = resolvePath('chat/message')
 export const API_CARDS_LIST = resolvePath('cards')
 export const API_CARDS_APPLY = resolvePath('cards/apply')
 export const API_FORM_ID = resolvePath('formid')
+export const API_UPDATE_PHOTO = resolvePath('userInfo/updatePhoto')
 
 // project
 export const API_ITEMS_LIST = resolvePath('building/list')

src/pages/activity/detail/assemble.js

@@ -371,8 +371,9 @@ export default class Detail extends Component {
     }
   }
 
-  currentPageAndParams(shareFrom) {
-    const { id, recordId } = this.state
+  currentPageAndParams() {
+    // currentPageAndParams(shareFrom) {
+    const { id, recordId = '' } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
@@ -383,11 +384,11 @@ export default class Detail extends Component {
       `recommender=${personId}`,
       `consultant=${consultant}`,
       `consultantId=${consultantId}`,
+      `recordId=${recordId}`
     ]
-    if (recordId && shareFrom != 'menu') {
-      queryParams.push(`recordId=${recordId}`)
-    }
-
+    // if (recordId && shareFrom != 'menu') {
+    //   queryParams.push(`recordId=${recordId}`)
+    // }
     const res = [
       'pages/activity/detail/assemble',
       queryParams.join('&'),
@@ -399,7 +400,8 @@ export default class Detail extends Component {
 
   onShareAppMessage = (res) => {
     const { shares, detail: { groupActivityId, activityName, mainImg, buildingId } } = this.state
-    const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
+    // const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
@@ -415,26 +417,8 @@ export default class Detail extends Component {
       data: '{}'
     }, 'group')
 
-    // savePoint({
-    //   event: 'share',
-    //   eventType: 'activity',
-    //   targetType: 'group',
-    //   propertyName: '拼团详情分享',
-    //   consultantId: consultantId,
-    //   sharePersonId: personId,
-    //   targetId: groupActivityId,
-    //   data: '{}'
-    // })
     const shareData = shares && shares.length ? shares[0] : { shareContentTitle: activityName, shareContentImg: mainImg };
 
-    // if (!shares || !shares.length) {
-    //   return {
-    //     title: shareData.shareContentTitle,
-    //     path: currentPage,//分享地址
-    //     imageUrl: shareData.shareContentImg
-    //   }
-    // }
-
     return {
       title: shareData.shareContentTitle,
       path: currentPage,//分享地址

src/pages/activity/detail/assistance.js

@@ -375,7 +375,8 @@ export default class Detail extends Component {
   }
 
   currentPageAndParams(shareFrom) {
-    const { id, initiateId } = this.state
+    // currentPageAndParams(shareFrom) {
+    const { id, initiateId = '' } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
@@ -386,11 +387,12 @@ export default class Detail extends Component {
       `recommender=${personId}`,
       `consultant=${consultant}`,
       `consultantId=${consultantId}`,
+      `initiateId=${initiateId}`
     ]
 
-    if (initiateId && shareFrom != 'menu') {
-      queryParams.push(`initiateId=${initiateId}`)
-    }
+    // if (initiateId && shareFrom != 'menu') {
+    //   queryParams.push(`initiateId=${initiateId}`)
+    // }
 
     const res = [
       'pages/activity/detail/assistance',
@@ -404,7 +406,8 @@ export default class Detail extends Component {
   onShareAppMessage = (res) => {
 
     const { shares, id, detail: { title, img, buildingId } } = this.state
-    const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
+    const currentPage = `/${this.currentPageAndParams().join('?')}`
+    // const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
     shareSavePoint({

src/pages/card/index.js

@@ -10,6 +10,7 @@ import AchievePhone from '@/components/achievePhone'
 import AchieveAvatar from '@/components/achieveAvatar'
 import { sceneInShare } from '@/utils/tools'
 import { ROLE_CODE } from '@/constants/user'
+import { uploadFiles } from '@/utils/request'
 import {
   addCardUv,
   //  addCardShareNum,
@@ -22,6 +23,7 @@ import { share as shareSavePoint } from '@/utils/shareSavePoint'
 import * as actions from '@/actions/card'
 import { dispatchProjectDetail } from '@/actions/project'
 import { getQrCodeParams } from '@/utils/qrcode'
+import { Button } from '@tarojs/components'
 
 
 @connect(
@@ -64,10 +66,28 @@ export default class Index extends Component {
   }
 
   componentDidShow() {
-      wx.setStorage({
-        key: "from-card",
-        data: "true"
+
+    wx.setStorage({
+      key: "from-card",
+      data: "true"
+    })
+    if (this.$router.params.loadInfo == 'need') {
+      Taro.navigateBack({ delta: 1 })
+      const { cardId } = this.state
+      const { dispatchCardInfo, dispatchProjectDetail } = this.props
+      Taro.showLoading()
+      dispatchCardInfo(cardId).then(res => {
+        Taro.hideLoading()
+        this.setState({
+          loaded: true,
+          isSave: res.isSave
+        })
+        let buildingId = (res.projects || [])[0]
+        if (buildingId) {
+          dispatchProjectDetail(buildingId)
+        }
       })
+    }
   }
 
   initPageData() {
@@ -86,7 +106,6 @@ export default class Index extends Component {
         })
       })
     } else {
-
       this.setState({ cardId: id }, this.loadCardDetail)
       addCardUv(id)
     }
@@ -505,6 +524,29 @@ export default class Index extends Component {
       icon: 'none'
     })
   }
+
+  // 选择图片
+  bindAlbumClick(e) {
+
+    e.stopPropagation()
+
+    Taro.showLoading({
+      title: '加载中',
+    })
+    Taro.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
+      sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
+      success: res => {
+        uploadFiles(res.tempFilePaths).then(data => {
+          Taro.navigateTo({
+            url: `/pages/card/photo?photoUrl=${encodeURIComponent(data[0])}`
+          })
+        })
+      },
+    })
+  }
+
   render() {
     const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
@@ -522,7 +564,7 @@ export default class Index extends Component {
       buildingId: buildingId || '',
       targetName: '个人主页',
       targetType: 'other',
-      targetId: cardId  || '',
+      targetId: cardId || '',
     }
     console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
     return (
@@ -547,6 +589,9 @@ export default class Index extends Component {
                 <View className='mycard__user__imgox'>
                   <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
+                  {
+                    isSelf && <Image src={require('@/assets/edit.png')} className='edit-img' onClick={this.bindAlbumClick} mode="aspectFill"></Image>
+                  }
                 </View>
                 <Image src={require('@/assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
               </View>

src/pages/card/index.scss

@@ -81,6 +81,14 @@
       border: 4px solid rgba(255, 255, 255, 1);
       z-index: 2;
     }
+    .edit-img {
+      position: absolute;
+      bottom: 0%;
+      left: 24%;
+      width: 36px;
+      height: 36px;
+      z-index: 3;
+    }
   }
 
   &__img {
@@ -621,4 +629,27 @@
       font-size: 36px;
     }
   }
+}
+.avatar-pop{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  background-color: #000;
+  z-index: 999;
+  text-align: center;
+  .avatar-img{
+    width: 400px ;
+    height: 400px ;
+    margin-top: 20vh;
+    border-radius: 200px;
+  }
+  .save-btn{
+    position: absolute;
+    width: 170px;
+    height: 70px;
+    line-height: 70px;
+    font-size: 28px;
+    bottom:10vh;
+    left: 290px;
+  }
 }

src/pages/card/photo.js

@@ -0,0 +1,62 @@
+import Taro, { Component } from '@tarojs/taro'
+import './index.scss'
+import { updatePhoto } from '@/services/card'
+import { connect } from '@tarojs/redux'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Panorama extends Component {
+  state = {
+    avatarImg: ''
+  }
+
+  // 选择图片
+  bindAlbumClick(e) {
+
+    e.stopPropagation()
+
+    Taro.showLoading({
+      title: '加载中',
+    })
+    Taro.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
+      sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
+      success: res => {
+        uploadFiles(res.tempFilePaths).then(data => {
+          this.setState({
+            avatarImg: data[0]
+          })
+        })
+      },
+      complete: res => {
+        Taro.hideLoading()
+      }
+    })
+  }
+  saveBtn() {
+    const { avatarImg } = this.state
+    const photoUrl = this.$router.params.photoUrl || avatarImg
+    const { userInfo: { person: { personId } } } = this.props
+    updatePhoto({ photoUrl }).then(res => {
+      // Taro.navigateBack({ delta: 1 })
+      Taro.redirectTo({ url: `/pages/card/index?id=${personId}&loadInfo=need` })
+    })
+  }
+
+  render() {
+
+    const { avatarImg } = this.state
+    const photoUrl = this.$router.params.photoUrl || avatarImg
+
+    return (
+      <View className="avatar-pop">
+        <Image src={photoUrl} className='avatar-img' onClick={this.bindAlbumClick} mode="aspectFill"></Image>
+        <Button className="save-btn" onClick={this.saveBtn}>保存</Button>
+      </View>
+
+    )
+  }
+}

src/pages/news/detail/index.js

@@ -15,6 +15,9 @@ import { ROLE_CODE } from '@/constants/user'
 import Consultant from '@/components/consultant'
 import AchievePhone from '@/components/achievePhone'
 import AchieveAvatar from '@/components/achieveAvatar'
+import { dispatchProjectDetail } from '@/actions/project'
+import * as actions from '@/actions/card'
+import ProjectItem from '../../project/item'
 // import AuthorizationComponent from '@/components/authorizationComponent'
 // import { reportClient } from '@/services/report'
 import {
@@ -27,7 +30,11 @@ import {
 import { connect } from '@tarojs/redux'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 
-@connect(state => state.user)
+// @connect(state => state.user)
+@connect(
+  ({ user, card, project }) => ({ ...user, ...card, ...project }),
+  { dispatchProjectDetail, ...actions }
+)
 export default class NewsDetail extends Component {
   config = {
     navigationBarTitleText: '资讯详情'
@@ -244,6 +251,7 @@ export default class NewsDetail extends Component {
     const consultant = this.$router.params.consultant || qrcodeParams.consultant
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
+    const { dispatchProjectDetail } = this.props
     Taro.showLoading()
     console.log(newsId, "newsIdnewsIdnewsIdnewsIdnewsId")
     queryNewsDetail(newsId).then(res => {
@@ -264,6 +272,9 @@ export default class NewsDetail extends Component {
         })
         console.info('资讯详情')
       })
+      if (res.buildingId) {
+        dispatchProjectDetail(res.buildingId, { showToast: false, })
+      }
 
       this.setState({
         detail: res,
@@ -353,14 +364,15 @@ export default class NewsDetail extends Component {
       buildingId: buildingId || '',
       data: '{}'
     }, 'news')
-
-
   }
-
+  toProjectDetail = () => {
+    const { projectDetail: { buildingId } } = this.props
+    this.navigateTo(`/pages/project/detail/index?id=${buildingId}`)
+  }
   render() {
     const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
-    const { userInfo = { person: {} } } = this.props
-    
+    const { userInfo = { person: {} }, cardInfo, projectDetail = {} } = this.props
+
     const achieveParams = {
       buildingId: detail.buildingId || '',
       targetName: detail.newsName || '',
@@ -403,6 +415,7 @@ export default class NewsDetail extends Component {
                   </View>
                 </ScrollView>
                 <Notice></Notice>
+                {projectDetail.buildingId && <View className="pro__info"><ProjectItem data={projectDetail} onClick={this.toProjectDetail.bind(this)} /></View>}
                 <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
                 {
                   consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>

src/pages/news/detail/index.scss

@@ -71,7 +71,10 @@
     margin-top: 30px;
   }
 }
-
+.pro__info {
+  padding: 30px  30px 50px 30px;
+  background: white;
+}
 
 .bot-nav {
   position: fixed;

src/pages/person/index.js

@@ -213,7 +213,7 @@ export default class Person extends Component {
 
   renderDetail() {
     const { users, menus, roleName } = this.state
-    const { user: { userInfo: { person: { org: { waterMark } = {} }, miniApp: { name } } } } = this.props
+    const { user: { userInfo: { person: { avatarurl, org: { waterMark } = {} }, miniApp: { name } } } } = this.props
 
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']
@@ -229,7 +229,8 @@ export default class Person extends Component {
           <View className="content">
             <View className="info-block">
               <View className="avatar" onClick={this.goPersonDetail}>
-                <Image className="info__headimg" src={users.avatar} />
+                <Image className="info__headimg" src={avatarurl} />
+                {/* <Image className="info__headimg" src={users.avatar} /> */}
                 <View className="info-intro">{roleName}</View>
               </View>
 

src/pages/project/detail/index.js

@@ -84,6 +84,8 @@ export default class Index extends Component {
     qrcodeParams: '',
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
+    maskVisible: false,
+    extendContent: []
   }
 
   componentWillPreload(params) {
@@ -125,11 +127,11 @@ export default class Index extends Component {
   componentDidShow() {
     console.log('3366633', this.$router.params)
 
-      const fromCard = !!wx.getStorageSync('from-card')
+    const fromCard = !!wx.getStorageSync('from-card')
 
-      if (fromCard) {
-        this.loadData()
-      }
+    if (fromCard) {
+      this.loadData()
+    }
   }
 
   componentWillUnmount() {
@@ -336,8 +338,11 @@ export default class Index extends Component {
     })
 
     dispatchProjectDetail(buildingId).then(res => {
+      const maskVisible = (res.extendContent || []).length
       this.setState({
         loaded: true,
+        maskVisible,
+        extendContent: res.extendContent[0],
         // circumOpts: newCircumOpts,
         isSaved: res.isSave
       }, () => {
@@ -1504,9 +1509,95 @@ export default class Index extends Component {
       </View>
     );
   }
+  handleMaskBannerClick(data) {
+    this.redirectTo(data)
+  }
+  redirectTo({ targetId, contentType, buildingId } = {}) {
+    switch (contentType) {
+      // 项目
+      case 'project':
+        Taro.navigateTo({
+          url: '/pages/project/detail/index?id=' + buildingId
+        })
+        return;
 
+      // 活动
+      case 'activity':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/index?id=' + targetId
+        })
+        return;
+
+      // 助力
+      case 'help':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assistance?id=' + targetId
+        })
+        return;
+
+      // 拼团
+      case 'group':
+        Taro.navigateTo({
+          url: '/pages/activity/detail/assemble?id=' + targetId
+        })
+        return;
+
+      // 资讯
+      case 'news':
+        Taro.navigateTo({
+          url: '/pages/news/detail/index?id=' + targetId
+        })
+        return;
+      // h5
+      case 'h5':
+        Taro.navigateTo({
+          url: '/pages/project/h5Page?id=' + targetId
+        })
+        return;
+      // live
+      case 'live':
+        Taro.navigateTo({
+          url: '/onlineSelling/pages/live/index?id=' + targetId
+        })
+        return;
+      // salesBatch
+      case 'salesBatch':
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/houseList/index?id=${targetId}`
+        })
+        return;
+
+      // 其他
+      case 'others':
+      default:
+        this.handleMaskClose()
+        return;
+    }
+  }
+  handleMaskClose() {
+    this.setState({
+      maskVisible: false
+    })
+  }
+  renderMaskBanner() {
+
+    const { extendContent = [] } = this.state
+    return (
+      <View className="mask-banner">
+        <View className="content">
+          <Image
+            mode="widthFix"
+            className="img"
+            src={transferImage(extendContent.image)}
+            onClick={this.handleMaskBannerClick.bind(this, extendContent)}>
+          </Image>
+          <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>
+        </View>
+      </View>
+    )
+  }
   render() {
-    const { grantPhoneVisible, grantAvatarVisible, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
+    const { grantPhoneVisible, grantAvatarVisible, maskVisible, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
     const { projectDetail, userInfo = { person: {} } } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
@@ -1533,6 +1624,9 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
+
+        {maskVisible && this.renderMaskBanner()}
+
         {
           loaded && (
             <View className='detail'>

src/pages/project/detail/index.scss

@@ -200,6 +200,42 @@
   }
 }
 
+.mask-banner {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.8);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+
+  .content {
+    width: 500px;
+    height: 600px;
+    position: absolute;
+    left: 50%;
+    top: 40%;
+    margin-left: -250px;
+    transform: translateY(-50%);
+    text-align: center;
+
+    .img {
+      width: 100%;
+      height: 600px;
+      border-radius: 30px;
+    }
+
+    .close {
+      font-size: 48px;
+      color: white;
+    }
+  }
+}
+
 .bt-nav {
   position: fixed;
   width: 100%;

src/pages/project/index.js

@@ -141,7 +141,7 @@ export default class Index extends Component {
 
     queryExtContents({ cityId: curCity.id }).then(res => {
       // 开屏广告
-      const maskBanner = (res || []).filter(x => x.showType === 'screen')[0] || {}
+      const maskBanner = (res || []).filter(x => x.showType === 'screen' && x.showPosition === 'index')[0] || {}
       const maskVisible = maskBanner.contentId && this.props.screenShow !== maskBanner.contentId
 
       // 首页 banner

src/routes.js

@@ -149,6 +149,12 @@ const routes = [
     pkg: 'main',
     type: 'card',
   },
+  {
+    name: '更换头像',
+    page: 'pages/card/photo',
+    pkg: 'main',
+    type: 'card',
+  },
   {
     name: '我的客户',
     page: 'pages/person/myGuest/index',

src/services/card.js

@@ -7,7 +7,8 @@ import {
   API_CARDS_LIKE,
   API_FORM_ID,
   API_CARDS_SHARE,
-  API_CARD_FAVOR
+  API_CARD_FAVOR,
+  API_UPDATE_PHOTO
 } from '@/constants/api'
 
 
@@ -42,6 +43,12 @@ export const addCardUv = id => fetch({ url: `${API_CARDS_UV}/${id}`, method: 'PO
  */
 export const addLike = id => fetch({ url: `${API_CARDS_LIKE}/${id}`, method: 'POST' })
 
+/**
+ * 置业顾问换头像
+ * @param {*} payload
+ */
+export const updatePhoto = payload => fetch({ url: API_UPDATE_PHOTO, payload, method: 'PUT' })
+
 /**
  * 名片取消点赞
  * @param {*} id  名片id