fix #6097

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() {