diff --git a/starCloud.js b/starCloud.js index 08d961b..5195bb4 100644 --- a/starCloud.js +++ b/starCloud.js @@ -561,7 +561,7 @@ export const useStarCloudStore = defineStore('starCloud', { this.searchDeviceList = list callback( - new Result(Result.Success, { + new Result(Result.Success.code, { list }) ) @@ -666,10 +666,17 @@ export const useStarCloudStore = defineStore('starCloud', { if (bindLockResult.code === Result.Success.code) { this.updateLockInfo({ lockId: bindLockResult.data.lockId, - keyId: bindLockResult.data.keyId + keyId: bindLockResult.data.keyId, + adminPwd: password }) } - return bindLockResult + return new Result( + bindLockResult.code, + { + lock: this.lockInfo + }, + bindLockResult.message + ) } return connectResult }, @@ -806,19 +813,19 @@ export const useStarCloudStore = defineStore('starCloud', { username: accountInfo.username, password: accountInfo.password, token: userInfo.access_token, - uid: userInfo.cloudUid + uid: userInfo.uid } setStorage('starCloudToken', userInfo.access_token) - accounts[userInfo.cloudUid] = { - uid: userInfo.cloudUid, + accounts[userInfo.uid] = { + uid: userInfo.uid, username: accountInfo.username, password: accountInfo.password, token: userInfo.access_token } setStorage('starCloudAccount', accounts) - userInfos[userInfo.cloudUid] = userInfo + userInfos[userInfo.uid] = userInfo setStorage('starCloudUser', userInfo) // 获取服务器时间 @@ -929,7 +936,7 @@ export const useStarCloudStore = defineStore('starCloud', { await this.getServerTimestamp() const nowTime = this.serverTimestamp const date = new Date() - const localTime = Math.floor(date.getTime() / 1000) - date.getTimezoneOffset() * 60 + const localTime = this.serverTimestamp - date.getTimezoneOffset() * 60 for (let i = 0; i < name.length; i++) { contentArray[i + 2] = name.charCodeAt(i)