邀请同学app登录bug (!120) · Merge Requests · fe / yohobuywap-node

Merged

Merge Request !120 opened 8 years ago by李靖 @lijing_yoho

邀请同学app登录bug

Edited 7 years ago

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/promotion origin/feature/promotion

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout release/5.4
git merge --no-ff feature/promotion

Step 4. Push the result of the merge to GitLab

git push origin release/5.4

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

The changes were merged into release/5.4. The source branch has been removed.

@chengyao started a discussion on an outdated diff 8 years ago

apps/activity/models/promotion.js

          // 已登录，为分享链接
          // 已登录，为分享链接，验证是否已认证
          return service.all([
              _studentInfo(params)
              _studentInfo(params),
              checkStudent(params),
              _getCollege(params)
          ]).then(result => {
              if (result && result[0] && result[0].data) {
              if (result && result[1] === 1) {
                  resu.studentState = {
                      reg: true
+                 }
                  if (result[2] && result[2].data) {
                      resu = Object.assign(resu, {schoolName: '' || '您认证时未选择学校'});