xujing hace 5 años
padre
commit
53913420a1

+ 1
- 1
src/components/achievePhone/index.js Ver fichero

@@ -18,7 +18,7 @@ export default class Index extends Component {
18 18
 
19 19
   }
20 20
   getPhoneNumber(e) {
21
-    getUserPhone(e, (phoneNumber) => {
21
+    getUserPhone(e, { buildingId: this.props.buildingId }, (phoneNumber) => {
22 22
       if (!phoneNumber) {
23 23
         Taro.showToast({
24 24
           title: '获取手机号失败',

+ 1
- 1
src/components/authorize/index.js Ver fichero

@@ -19,7 +19,7 @@ export default class Index extends Component {
19 19
   }
20 20
 
21 21
   getPhoneNumber(e) {
22
-    getUserPhone(e, (phoneNumber) => {
22
+    getUserPhone(e, { buildingId: '' }, (phoneNumber) => {
23 23
       if (!phoneNumber) {
24 24
         Taro.showToast({
25 25
           title: '获取手机号失败',

+ 4
- 4
src/onlineSelling/components/GrantProfile/index.js Ver fichero

@@ -4,7 +4,7 @@ import AchievePhone from '@/components/achievePhone'
4 4
 import AchieveAvatar from '@/components/achieveAvatar'
5 5
 import { isEmpty } from '@/utils/tools'
6 6
 
7
-function noop(){}
7
+function noop() { }
8 8
 
9 9
 export default function GrantProfile(props) {
10 10
   if (isEmpty(props.person)) return <Block />;
@@ -13,16 +13,16 @@ export default function GrantProfile(props) {
13 13
 
14 14
   const noPhone = !(tel || phone)
15 15
   const noAvatar = !avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1
16
-  
16
+
17 17
   const grantPhone = (props.phone || props.both) && noPhone
18 18
   const grantAvatar = (props.avatar || props.both) && noAvatar
19
-  
19
+
20 20
   if (!grantPhone && !grantAvatar) {
21 21
     if (props.onSuccess) {
22 22
       props.onSuccess()
23 23
     }
24 24
   }
25
-  
25
+
26 26
   return (
27 27
     <Block>
28 28
       {

+ 1
- 1
src/onlineSelling/pages/detail/index.js Ver fichero

@@ -180,7 +180,7 @@ export default class Index extends Component {
180 180
       <Block>
181 181
         {
182 182
           grantPhoneVisible &&
183
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
183
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={houseDetail.buildingId}></AchievePhone>
184 184
         }
185 185
         {
186 186
           grantAvatarVisible &&

+ 1
- 1
src/pages/activity/detail/assemble.js Ver fichero

@@ -707,7 +707,7 @@ export default class Detail extends Component {
707 707
 
708 708
         {
709 709
           grantPhoneVisible &&
710
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
710
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
711 711
         }
712 712
         {
713 713
           grantAvatarVisible &&

+ 1
- 1
src/pages/activity/detail/assistance.js Ver fichero

@@ -668,7 +668,7 @@ export default class Detail extends Component {
668 668
         }
669 669
         {
670 670
           grantPhoneVisible &&
671
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
671
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
672 672
         }
673 673
         {
674 674
           grantAvatarVisible &&

+ 1
- 1
src/pages/activity/detail/index.js Ver fichero

@@ -468,7 +468,7 @@ export default class Detail extends Component {
468 468
 
469 469
         {
470 470
           grantPhoneVisible &&
471
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
471
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
472 472
         }
473 473
         {
474 474
           grantAvatarVisible &&

+ 1
- 1
src/pages/card/index.js Ver fichero

@@ -515,7 +515,7 @@ export default class Index extends Component {
515 515
 
516 516
         {
517 517
           grantPhoneVisible &&
518
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
518
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={buildingId}></AchievePhone>
519 519
         }
520 520
         {
521 521
           grantAvatarVisible &&

+ 1
- 1
src/pages/news/detail/index.js Ver fichero

@@ -368,7 +368,7 @@ export default class NewsDetail extends Component {
368 368
 
369 369
         {
370 370
           grantPhoneVisible &&
371
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
371
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={detail.buildingId}></AchievePhone>
372 372
         }
373 373
         {
374 374
           grantAvatarVisible &&

+ 1
- 1
src/pages/project/detail/index.js Ver fichero

@@ -1482,7 +1482,7 @@ export default class Index extends Component {
1482 1482
       <Block>
1483 1483
         {
1484 1484
           grantPhoneVisible &&
1485
-          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
1485
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar} buildingId={projectDetail.buildingId}></AchievePhone>
1486 1486
         }
1487 1487
         {
1488 1488
           grantAvatarVisible &&

+ 3
- 3
src/utils/getUserPhone.js Ver fichero

@@ -9,12 +9,12 @@ import {
9 9
   UPDATE_USER_INFO
10 10
 } from '@/constants/user'
11 11
 
12
-export default function(e, cb) {
12
+export default function (e, buildingId, cb) {
13 13
   const {
14 14
     dispatch
15 15
   } = getStore()
16 16
   const sessionKey = Taro.getStorageSync('sessionKey')
17
-  let payload = Object.assign(e.detail, {
17
+  let payload = Object.assign(e.detail, buildingId, {
18 18
     sessionKey
19 19
   })
20 20
 
@@ -25,7 +25,7 @@ export default function(e, cb) {
25 25
       dispatch({
26 26
         type: UPDATE_USER_INFO,
27 27
         payload: {
28
-          phone:phoneNumber
28
+          phone: phoneNumber
29 29
         }
30 30
       })
31 31
       cb && cb(phoneNumber)