[AI Generated]: feat(*): 完善数据页切换成员、首页接口对接及我的页缓存信息展示
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
padding: 0 30rpx;
|
||||
margin-bottom: 40rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
/* 表单卡片 */
|
||||
|
||||
@@ -130,7 +130,7 @@ Page({
|
||||
this.setData({
|
||||
sn: deviceInfo?.serialNumber ?? '',
|
||||
connected: lefuService.isConnected,
|
||||
'deviceCard.name': deviceInfo?.name ?? '',
|
||||
'deviceCard.name': deviceInfo?.modelNumber ?? '智能体重秤',
|
||||
})
|
||||
if (deviceInfo?.serialNumber) {
|
||||
this._loadData(deviceInfo.serialNumber)
|
||||
@@ -139,7 +139,7 @@ Page({
|
||||
lefuService.onDeviceInfo((info) => {
|
||||
this.setData({
|
||||
sn: info.serialNumber ?? '',
|
||||
'deviceCard.name': info.name ?? '',
|
||||
'deviceCard.name': info.modelNumber ?? '智能体重秤',
|
||||
})
|
||||
if (!this.data.memberList.length && info.serialNumber) {
|
||||
this._loadData(info.serialNumber)
|
||||
|
||||
@@ -67,12 +67,8 @@ Page({
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.setData({
|
||||
'device.connected': lefuService.isConnected,
|
||||
'device.name': lefuService.deviceInfo?.name ?? '智能体重秤',
|
||||
})
|
||||
lefuService.onDeviceInfo((info) => {
|
||||
this.setData({ 'device.name': info.name ?? '智能体重秤' })
|
||||
this.setData({ 'device.name': info.modelNumber ?? '智能体重秤' })
|
||||
})
|
||||
lefuService.onDeviceConnect(() => {
|
||||
this.setData({ 'device.connected': true })
|
||||
@@ -83,6 +79,11 @@ Page({
|
||||
},
|
||||
|
||||
onShow() {
|
||||
// 每次进入 tab 同步最新设备状态
|
||||
this.setData({
|
||||
'device.connected': lefuService.isConnected,
|
||||
'device.name': lefuService.deviceInfo?.modelNumber ?? '智能体重秤',
|
||||
})
|
||||
this.loadData()
|
||||
},
|
||||
|
||||
|
||||
@@ -65,13 +65,13 @@ Page({
|
||||
wx.setStorageSync('userInfo', result.user)
|
||||
|
||||
/* 上次连接设备不为空对象则直接进首页 */
|
||||
// const connectDeviceInfo = result.user?.connectDeviceInfo
|
||||
// if (connectDeviceInfo && connectDeviceInfo !== '{}') {
|
||||
// wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo))
|
||||
// wx.reLaunch({ url: '/pages/home/home' })
|
||||
// } else {
|
||||
const connectDeviceInfo = result.user?.connectDeviceInfo
|
||||
if (connectDeviceInfo && connectDeviceInfo !== '{}') {
|
||||
wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo))
|
||||
wx.reLaunch({ url: '/pages/home/home' })
|
||||
} else {
|
||||
wx.reLaunch({ url: '/pages/connectedDevice/connectedDevice' })
|
||||
// }
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.setData({ loading: false })
|
||||
|
||||
Reference in New Issue
Block a user