Merge branch 'dev' into piaoPay
Showing
3 changed files
with
11 additions
and
2 deletions
This file is too large to display.
| ... | @@ -135,10 +135,14 @@ function addMember() { | ... | @@ -135,10 +135,14 @@ function addMember() { |
| 135 | if(group.type == '4'){ | 135 | if(group.type == '4'){ |
| 136 | proxy.$refs['dialogAddWDSF'].open(params) | 136 | proxy.$refs['dialogAddWDSF'].open(params) |
| 137 | } else { | 137 | } else { |
| 138 | proxy.$refs['dialogAddCoachEn'].open(params) | 138 | proxy.$refs['dialogAddCoach'].open(params) |
| 139 | } | 139 | } |
| 140 | } else { | 140 | } else { |
| 141 | proxy.$refs['dialogAddCoach'].open(params) | 141 | if(group.type == '4'){ |
| 142 | proxy.$refs['dialogAddCoachEn'].open(params) | ||
| 143 | } else { | ||
| 144 | proxy.$refs['dialogAddCoach'].open(params) | ||
| 145 | } | ||
| 142 | } | 146 | } |
| 143 | 147 | ||
| 144 | } | 148 | } | ... | ... |
| ... | @@ -344,6 +344,11 @@ function bigNext(){ | ... | @@ -344,6 +344,11 @@ function bigNext(){ |
| 344 | birth: wdsfData.value.birthday, | 344 | birth: wdsfData.value.birthday, |
| 345 | passportNumber: wdsfData.value.passportNumber, | 345 | passportNumber: wdsfData.value.passportNumber, |
| 346 | } | 346 | } |
| 347 | if (Array.isArray(wdsfData.value.passportUrl)) { | ||
| 348 | obj.passportUrl = wdsfData.value.passportUrl[0].url | ||
| 349 | } else { | ||
| 350 | obj.passportUrl = wdsfData.value.passportUrl || '' | ||
| 351 | } | ||
| 347 | upgradePersonal(obj).then(res=>{ | 352 | upgradePersonal(obj).then(res=>{ |
| 348 | if(res.data){ | 353 | if(res.data){ |
| 349 | userStore.getInfo().then(res=>{ | 354 | userStore.getInfo().then(res=>{ | ... | ... |
-
Please register or sign in to post a comment