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

src/components/achieveAvatar/index.js

+import Taro, { Component } from '@tarojs/taro'
+import { connect } from '@tarojs/redux'
+import * as actions from '@actions/user'
+import './index.scss'
+
+@connect(state => state.user, { ...actions })
+
+export default class Index extends Component {
+
+  state = {}
+  componentDidMount() {
+    const { user = {} } = this.props
+    console.log('111')
+    if (user.avatar && typeof this.props.onSuccess === 'function') {
+      this.props.onSuccess();
+    }
+  }
+  getUserInfo() {
+    const { dispatchUpdateUserInfo } = this.props
+    const sessionKey = Taro.getStorageSync('sessionKey')
+    Taro.getUserInfo({
+      lang: 'zh_CN',
+      success: res => {
+        console.log(res, "res")
+        const payload = Object.assign(res, { sessionKey })
+        // const { userInfo: { nickName, gender, country, city, province } } = payload
+        // App.zhuge.identify(nickName, {
+        //   '昵称': nickName,
+        //   '性别': gender == 1 ? '男' : '女',
+        //   '国家': country,
+        //   '省份': province,
+        //   '城市': city
+        // })
+        // 用户信息保存至服务器
+        dispatchUpdateUserInfo(payload).then(res => {
+          console.log('更新信息')
+          // this.toPage(true)
+          this.props.onSuccess();
+        })
+      },
+      fail: () => {
+        Taro.showToast({
+          title: '获取用户信息失败',
+          icon: 'none'
+        })
+        return
+        // this.toPage(false)
+      }
+    })
+  }
+  toPage(succed) {
+    const router = Taro.getStorageSync('router')
+    const { query, path } = router
+
+    if (!succed && path === 'pages/signin/index') {
+      return
+    }
+    if (path === 'pages/project/index' || path === 'pages/shop/index' || path === 'pages/person/index') {
+      Taro.switchTab({
+        url: '/' + path
+      })
+      return
+    }
+    Taro.reLaunch({
+      url: `/${path}?${query.params}`
+    })
+  }
+
+  renderMaskBanner() {
+    return (
+      <View>
+        <View className="avatar-page">
+          <View className="content">
+            <View className="title">请允许获取昵称、头像、地区及性别</View>
+            <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
+            <View className="name">用户昵称</View>
+            <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
+          </View>
+        </View>
+      </View>
+    )
+  }
+  render() {
+    const { user = {} } = this.props
+
+    return (
+      <Block>
+        {this.renderMaskBanner()}
+        {/* {!user.avatar && this.renderMaskBanner()} */}
+      </Block>
+    )
+  }
+}

src/components/achieveAvatar/index.scss

+
+.avatar-page{
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.22);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  
+  .content {
+    width: 94vw;
+    height: 430px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-left: -47vw;
+    transform: translateY(-50%);
+    background-color: #fff;
+    border-radius: 12px;
+    padding: 40px;
+    text-align: center;
+    .title{
+      font-size: 34px;
+      color: #333;
+    }
+    .touxiang{
+      width: 110px;
+      height: 110px;
+      border-radius: 50%;
+      margin: 20px 0 10px 0;
+    }
+    .name{
+      font-size: 26px;
+      color: #333;
+    }
+  
+  
+    .btn{
+      width:290px;
+      height:90px;
+      background:rgba(187,156,121,1);
+      border-radius:12px;
+      font-size: 34px;
+      color: #fff;
+      line-height: 90px;
+      margin-top: 40px;
+    }
+  }
+}

src/pages/activity/detail/assemble.js

 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'
     ready.queue(() => {
       // 必须授权电话
       if (this.toggleGrantPhone()) {
-        this.initPageData()
+        if (this.toggleGrantAvatar()) {
+          this.initPageData()
+        }
       }
     })
   }
         if (res.confirm) {
 
           // 必须授权头像
-          if (this.toggleGrantAvatar()) {            
+          if (this.toggleGrantAvatar()) {
             createGroupActivity({
               groupActivityId: detail.groupActivityId,
               personId: person.personId,
               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'
       groupState,
       actionSheetVisible,
       grantPhoneVisible,
+      grantAvatarVisible,
       posterTpls,
       posters,
       qrCode,
 
         {
           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>
         {
                       <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>
                     )
                 <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>