zhulixiangqing

src/components/achieveAvatar/index.js

@@ -34,11 +34,17 @@ export default class Index extends Component {
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
           console.log('更新信息')
-          this.toPage(true)
+          // this.toPage(true)
+          this.props.onSuccess();
         })
       },
       fail: () => {
-        this.toPage(false)
+        Taro.showToast({
+          title: '获取用户信息失败',
+          icon: 'none'
+        })
+        return
+        // this.toPage(false)
       }
     })
   }

src/pages/activity/detail/assemble.js

@@ -3,6 +3,7 @@ import './index.scss'
 import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
+import AchieveAvatar from '@components/achieveAvatar'
 import Poster from '@components/Poster'
 import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
@@ -72,7 +73,9 @@ export default class Detail extends Component {
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
-        this.initPageData()
+        if (this.toggleGrantAvatar()) {
+          this.initPageData()
+        }
       }
     })
   }
@@ -394,7 +397,7 @@ export default class Detail extends Component {
         if (res.confirm) {
 
           // 必须授权头像
-          if (this.toggleGrantAvatar()) {            
+          if (this.toggleGrantAvatar()) {
             createGroupActivity({
               groupActivityId: detail.groupActivityId,
               personId: person.personId,
@@ -402,16 +405,16 @@ export default class Detail extends Component {
               phone: person.tel || person.phone,
               avatarurl: person.avatarurl,
             }).then(res => {
-                this.setState({
-                  recordDetail: res.taShareRecord,
-                  recordId: res.taShareRecord.recordId,
-                  memberList: res.shareChildRecordList || [],
-                  isStarter: true,
-                  groupState: res.taShareRecord.status,
-                }, () => cb && cb())
-              
+              this.setState({
+                recordDetail: res.taShareRecord,
+                recordId: res.taShareRecord.recordId,
+                memberList: res.shareChildRecordList || [],
+                isStarter: true,
+                groupState: res.taShareRecord.status,
+              }, () => cb && cb())
+
             }).catch(err => {
-              console.log(err,'11111111111111')
+              console.log(err, '11111111111111')
               Taro.showToast({
                 title: '发起失败: ' + err.message,
                 icon: 'none'
@@ -479,6 +482,7 @@ export default class Detail extends Component {
       groupState,
       actionSheetVisible,
       grantPhoneVisible,
+      grantAvatarVisible,
       posterTpls,
       posters,
       qrCode,
@@ -522,7 +526,11 @@ export default class Detail extends Component {
 
         {
           grantPhoneVisible &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={this.initPageData} ></AchieveAvatar>
         }
         <BackHomeBtn></BackHomeBtn>
         {
@@ -559,7 +567,7 @@ export default class Detail extends Component {
                       <Block>
                         <Image className="status__img" style="margin:12rpx auto 24rpx auto" src={getThumbnail(successImg)}></Image>
                         {
-                          verificationCode&&<View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
+                          verificationCode && <View className="hexiaoma" style="margin:0 auto 40rpx auto">核销码: {verificationCode}</View>
                         }
                       </Block>
                     )
@@ -617,42 +625,42 @@ export default class Detail extends Component {
                 <View style="padding:0 40rpx 180rpx 40rpx">
                   <Image src={getThumbnail(detail.descImg)} mode="widthFix" style="width:100%;"></Image>
                 </View>
-                { (actState === ActBeforeStart||(isStarter && actState === ActInProcess && groupState === GroupInProcess)||(!isStarter && actState === ActInProcess && groupState != GroupInProcess )||(!isStarter && actState === ActInProcess && groupState === GroupInProcess))&&
-                <View className="btn-fixed">
-                  {
-                    actState === ActBeforeStart &&
-                    (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
-                  }
-                  {
-                    isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-                    (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
-                  }
-                  {
-                    !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
+                {(actState === ActBeforeStart || (isStarter && actState === ActInProcess && groupState === GroupInProcess) || (!isStarter && actState === ActInProcess && groupState != GroupInProcess) || (!isStarter && actState === ActInProcess && groupState === GroupInProcess)) &&
+                  <View className="btn-fixed">
+                    {
+                      actState === ActBeforeStart &&
+                      (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
+                    }
+                    {
+                      isStarter && actState === ActInProcess && groupState === GroupInProcess &&
+                      (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
+                    }
+                    {
+                      !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
 
-                    <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
-                      <FormIdCollector>
-                        <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
-                      </FormIdCollector>
-                    </View>
-                  }
-                  {
-                    !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-
-                    <View className="btn-box" style="margin: auto; padding: 0;">
-                      {
-                        (groupState === GroupInProcess && !isJoin) &&
-                        (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
-                      }                      
-                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
+                      <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
                         <FormIdCollector>
-                          <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                          <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
                         </FormIdCollector>
                       </View>
-                    </View>
+                    }
+                    {
+                      !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
 
-                  }
-                </View>
+                      <View className="btn-box" style="margin: auto; padding: 0;">
+                        {
+                          (groupState === GroupInProcess && !isJoin) &&
+                          (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
+                        }
+                        <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
+                          <FormIdCollector>
+                            <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                          </FormIdCollector>
+                        </View>
+                      </View>
+
+                    }
+                  </View>
                 }
               </ScrollView>