help grounp photoUrl

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

@@ -46,8 +46,6 @@ export default class Index extends Component {
     bound: false,
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
-    avatarImg: 'http://pic1.zhimg.com/50/v2-fce4f8a778fe3f24bca2cafc709b6847_hd.jpg',//头像路径
-    avatarPopVisible: false,
   }
 
   componentWillMount() {
@@ -68,10 +66,28 @@ export default class Index extends Component {
   }
 
   componentDidShow() {
+
     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() {
@@ -90,7 +106,6 @@ export default class Index extends Component {
         })
       })
     } else {
-
       this.setState({ cardId: id }, this.loadCardDetail)
       addCardUv(id)
     }
@@ -509,9 +524,9 @@ export default class Index extends Component {
       icon: 'none'
     })
   }
+
   // 选择图片
   bindAlbumClick(e) {
-    console.log('222222222222222')
 
     e.stopPropagation()
 
@@ -524,24 +539,16 @@ export default class Index extends Component {
       sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
       success: res => {
         uploadFiles(res.tempFilePaths).then(data => {
-          this.setState({
-            avatarPopVisible: true,
-            avatarImg: data[0]
+          Taro.navigateTo({
+            url: `/pages/card/photo?photoUrl=${encodeURIComponent(data[0])}`
           })
         })
       },
-      complete: res => {
-        Taro.hideLoading()
-      }
-    })
-  }
-  saveBtn() {
-    this.setState({
-      avatarPopVisible: false,
     })
   }
+
   render() {
-    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId, avatarImg } = this.state
+    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
     const { person: { personType, personId, phone, tel } } = userInfo
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -573,13 +580,6 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-        {
-          avatarPopVisible &&
-          <View className="avatar-pop">
-            <Image src={avatarImg} className='avatar-img' onClick={this.bindAlbumClick} mode="aspectFill"></Image>
-            <Button className="save-btn" onClick={this.saveBtn}>保存</Button>
-          </View>
-        }
 
         {this.state.loaded && (
           <View className='mycard'>
@@ -589,7 +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>
-                  <Image src={require('@/assets/edit.png')} className='edit-img' onClick={this.bindAlbumClick} mode="aspectFill"></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/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/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/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