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

src/pages/activity/detail/assemble.js

@@ -526,29 +526,43 @@ export default class Detail extends Component {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_GROUP && x.isSubscribe == true))[0].tplId
     const that = this
-    wx.requestSubscribeMessage({
-      tmplIds: [tplId],
-      success(res) {
-
-      },
-      fail(res) {
-
-      },
-      complete() {
-        // 必须授权头像
-        if (that.toggleGrantAvatar()) {
-          const recordDetail = that.state.recordDetail
-          if (!recordDetail.recordId) {
-            // 如果是未发起的拼团, 先以当前人身份发起
-            that.startMine(() => {
-              that.toggleActionVisible()
-            })
-          } else {
-            that.toggleActionVisible()
-          }
-        }
+
+    // 必须授权头像
+    if (that.toggleGrantAvatar()) {
+      const recordDetail = that.state.recordDetail
+      if (!recordDetail.recordId) {
+        // 如果是未发起的拼团, 先以当前人身份发起
+        that.startMine(() => {
+          that.toggleActionVisible()
+        })
+      } else {
+        that.toggleActionVisible()
       }
-    })
+    }
+
+    // wx.requestSubscribeMessage({
+    //   tmplIds: [tplId],
+    //   success(res) {
+
+    //   },
+    //   fail(res) {
+
+    //   },
+    //   complete() {
+    //     // 必须授权头像
+    //     if (that.toggleGrantAvatar()) {
+    //       const recordDetail = that.state.recordDetail
+    //       if (!recordDetail.recordId) {
+    //         // 如果是未发起的拼团, 先以当前人身份发起
+    //         that.startMine(() => {
+    //           that.toggleActionVisible()
+    //         })
+    //       } else {
+    //         that.toggleActionVisible()
+    //       }
+    //     }
+    //   }
+    // })
 
   }
 

src/pages/activity/detail/assistance.js

@@ -470,45 +470,6 @@ export default class Detail extends Component {
 
   // 发起我的助力
   startMine = () => {
-    // 必须授权头像
-    if (this.toggleGrantAvatar()) {
-      const detail = this.state.detail
-      const person = this.props.userInfo.person
-
-      return new Promise((resolve, reject) => {
-        createHelpActivity({
-          buildingId: detail.buildingId,
-          helpActivityId: detail.helpActivityId,
-          personId: person.personId,
-          name: person.name || person.nickname,
-          phone: person.tel || person.phone,
-          avatarurl: person.avatarurl,
-        }).then(res => {
-          this.setState({
-            initiateDetail: res.helpInitiateRecord,
-            initiateId: res.helpInitiateRecord.helpRecordInitiateId,
-            helpList: res.helpRecordList,
-            isStarter: true,
-            helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
-          }, resolve)
-        }).catch(err => {
-          console.log('err:', err)
-          Taro.showToast({
-            title: '发起助力失败',
-            icon: 'none'
-          })
-          reject()
-        })
-      })
-    }
-
-    return Promise.reject()
-  }
-
-
-
-  // 请求好友助力
-  askForHelp = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
     const that = this
@@ -521,21 +482,59 @@ export default class Detail extends Component {
 
       },
       complete() {
+        
         // 必须授权头像
         if (that.toggleGrantAvatar()) {
-          const initiateDetail = that.state.initiateDetail
-          if (!initiateDetail.helpRecordInitiateId) {
-            // 如果是未发起的助力, 先以当前人身份发起
-            that.startMine().then(() => {
-              that.toggleActionVisible()
+          const detail = that.state.detail
+          const person = that.props.userInfo.person
+
+          return new Promise((resolve, reject) => {
+            createHelpActivity({
+              buildingId: detail.buildingId,
+              helpActivityId: detail.helpActivityId,
+              personId: person.personId,
+              name: person.name || person.nickname,
+              phone: person.tel || person.phone,
+              avatarurl: person.avatarurl,
+            }).then(res => {
+              that.setState({
+                initiateDetail: res.helpInitiateRecord,
+                initiateId: res.helpInitiateRecord.helpRecordInitiateId,
+                helpList: res.helpRecordList,
+                isStarter: true,
+                helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
+              }, resolve)
+            }).catch(err => {
+              console.log('err:', err)
+              Taro.showToast({
+                title: '发起助力失败',
+                icon: 'none'
+              })
+              reject()
             })
-          } else {
-            that.toggleActionVisible()
-          }
+          })
         }
+
       }
     })
 
+    return Promise.reject()
+  }
+
+  // 请求好友助力
+  askForHelp = () => {    
+    // 必须授权头像
+    if (this.toggleGrantAvatar()) {
+      const initiateDetail = this.state.initiateDetail
+      if (!initiateDetail.helpRecordInitiateId) {
+        // 如果是未发起的助力, 先以当前人身份发起
+        this.startMine().then(() => {
+          this.toggleActionVisible()
+        })
+      } else {
+        this.toggleActionVisible()
+      }
+    }
   }
 
   getQRCode() {

src/pages/project/detail/index.js

@@ -1195,15 +1195,15 @@ export default class Index extends Component {
 
   render() {
     const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible, consultData, consultShow } = this.state
-    const { projectDetail, userInfo } = this.props
+    const { projectDetail, userInfo = { person: {} } } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
     return (
       <Block>
         {
-          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone && !userInfo.person.tel) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           loaded && (