|
@@ -382,40 +382,43 @@ export default {
|
|
|
},
|
|
|
deviceList: [], // 设备列表
|
|
|
lastMsgTime: 0, // 最后一次设备消息时间
|
|
|
- memberId: '',
|
|
|
+ memberId: 50289,
|
|
|
bindSn: '',
|
|
|
bindShow: false
|
|
|
};
|
|
|
},
|
|
|
onLoad() {
|
|
|
- wx.getSetting({
|
|
|
- complete: (res) => {
|
|
|
- if (!res.authSetting['scope.userInfo']) {
|
|
|
- return
|
|
|
- }
|
|
|
- console.log('222222222222222222222222222')
|
|
|
- const memberId = Storage.getItem('uid')
|
|
|
- if (memberId) {
|
|
|
- this.memberId = memberId
|
|
|
- console.log('this.memberId===', this.memberId)
|
|
|
- this.API_getDeviceList()
|
|
|
- } else {
|
|
|
- this.checkHasLogin()
|
|
|
- const _this = this
|
|
|
- let initTimer = setInterval(function () {
|
|
|
- const memberId = Storage.getItem('uid')
|
|
|
- if (memberId) {
|
|
|
- _this.memberId = memberId
|
|
|
- clearInterval(initTimer)
|
|
|
- _this.API_getDeviceList()
|
|
|
- }
|
|
|
- }, 500)
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
-
|
|
|
-
|
|
|
+ this.API_getDeviceList()
|
|
|
},
|
|
|
+ // onLoad() {
|
|
|
+ // wx.getSetting({
|
|
|
+ // complete: (res) => {
|
|
|
+ // if (!res.authSetting['scope.userInfo']) {
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // console.log('222222222222222222222222222')
|
|
|
+ // const memberId = Storage.getItem('uid')
|
|
|
+ // if (memberId) {
|
|
|
+ // this.memberId = memberId
|
|
|
+ // console.log('this.memberId===', this.memberId)
|
|
|
+ // this.API_getDeviceList()
|
|
|
+ // } else {
|
|
|
+ // this.checkHasLogin()
|
|
|
+ // const _this = this
|
|
|
+ // let initTimer = setInterval(function () {
|
|
|
+ // const memberId = Storage.getItem('uid')
|
|
|
+ // if (memberId) {
|
|
|
+ // _this.memberId = memberId
|
|
|
+ // clearInterval(initTimer)
|
|
|
+ // _this.API_getDeviceList()
|
|
|
+ // }
|
|
|
+ // }, 500)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ //
|
|
|
+ //
|
|
|
+ // },
|
|
|
beforeDestroy() {
|
|
|
this.closeWebsocket()
|
|
|
},
|
|
@@ -423,14 +426,20 @@ export default {
|
|
|
const imei = Storage.getItem('nowChangeDevice')
|
|
|
if (imei) {
|
|
|
this.homeFrom.nowDevice = imei
|
|
|
- this.deviceAdded = true
|
|
|
- if (!this.connected && this.memberId) {
|
|
|
- this.init()
|
|
|
- }
|
|
|
- } else {
|
|
|
- this.deviceAdded = false
|
|
|
}
|
|
|
},
|
|
|
+ // onShow() {
|
|
|
+ // const imei = Storage.getItem('nowChangeDevice')
|
|
|
+ // if (imei) {
|
|
|
+ // this.homeFrom.nowDevice = imei
|
|
|
+ // this.deviceAdded = true
|
|
|
+ // if (!this.connected && this.memberId) {
|
|
|
+ // this.init()
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // this.deviceAdded = false
|
|
|
+ // }
|
|
|
+ // },
|
|
|
methods: {
|
|
|
handleShareClick() {
|
|
|
uni.navigateTo({
|