diff --git a/miniprogram/pages/addUser/addUser.ts b/miniprogram/pages/addUser/addUser.ts index 3bf853d..8495dd5 100644 --- a/miniprogram/pages/addUser/addUser.ts +++ b/miniprogram/pages/addUser/addUser.ts @@ -420,6 +420,7 @@ Page({ const payload: Record = { ...baseSpread, + ...(editId ? {} : { relationType: 2 }), dataType: userType === 'family' ? 1 : 0, parentUserId: userInfo?.userId ?? '', sn: targetSn, diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts index 9d3c7fb..68c4bd1 100644 --- a/miniprogram/pages/userManagement/userManagement.ts +++ b/miniprogram/pages/userManagement/userManagement.ts @@ -391,12 +391,15 @@ Page({ this.setData({ syncShow: true, syncPercent: 0, syncStatus: '正在清空并重新下发...' }) leFuService.clearDeviceMembers() - .then(() => leFuService.syncMembersToDevice(syncDataList, (current, total) => { - this.setData({ - syncPercent: Math.round((current / total) * 100), - syncStatus: `正在同步 ${current}/${total}...`, + .then(() => { + if (!syncDataList.length) return + return leFuService.syncMembersToDevice(syncDataList, (current, total) => { + this.setData({ + syncPercent: Math.round((current / total) * 100), + syncStatus: `正在同步 ${current}/${total}...`, + }) }) - })) + }) .then(() => this._finishSync(reportUsers, '重新下发成功')) .catch((err: Error) => { this.setData({ syncShow: false }) @@ -485,6 +488,7 @@ Page({ if (!sn) return addSelfUser({ + relationType: 1, dataType: 0, parentUserId: userInfo.userId, sn,