Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -345,8 +345,8 @@
|
|||||||
this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
|
this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
const chartData = this.formatList([res.data])
|
const chartData = this.formatList([res.data])
|
||||||
if (res.data && res.data.parentGirdInfo) {
|
if (res.data) {
|
||||||
const parentGirdInfo = res.data.parentGirdInfo
|
const parentGirdInfo = res.data
|
||||||
const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
|
const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
|
||||||
return {
|
return {
|
||||||
...v,
|
...v,
|
||||||
@@ -395,7 +395,6 @@
|
|||||||
}
|
}
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
if (res.code == 0) {
|
if (res.code == 0) {
|
||||||
console.log(res.data)
|
|
||||||
const userList = res.data.records.map(v => {
|
const userList = res.data.records.map(v => {
|
||||||
return {
|
return {
|
||||||
...v,
|
...v,
|
||||||
|
|||||||
Reference in New Issue
Block a user