Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		| @@ -204,8 +204,18 @@ export default { | |||||||
|         if (res?.data) { |         if (res?.data) { | ||||||
|           this.forms = { |           this.forms = { | ||||||
|             ...res.data, |             ...res.data, | ||||||
|             girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList : [], |             girdMemberManageList: res.data.girdMemberManageList ? res.data.girdMemberManageList.map(v => { | ||||||
|             girdMemberList: res.data.girdMemberList ? res.data.girdMemberList : [], |               return { | ||||||
|  |                 ...v, | ||||||
|  |                 id: v.wxUserId | ||||||
|  |               } | ||||||
|  |             }) : [], | ||||||
|  |             girdMemberList: res.data.girdMemberList ? res.data.girdMemberList.map(v => { | ||||||
|  |               return { | ||||||
|  |                 ...v, | ||||||
|  |                 id: v.wxUserId | ||||||
|  |               } | ||||||
|  |             }) : [] | ||||||
|           }; |           }; | ||||||
|           this.parentGirdInfo = res.data.parentGirdInfo; |           this.parentGirdInfo = res.data.parentGirdInfo; | ||||||
|           this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName; |           this.forms.parentGirdName = res.data.parentGirdInfo && res.data.parentGirdInfo.girdName; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user