|
@@ -310,12 +310,12 @@ Page({
|
|
onTapToChannel() {
|
|
onTapToChannel() {
|
|
var that = this;
|
|
var that = this;
|
|
var actionIndex = that.data.actionIndex;
|
|
var actionIndex = that.data.actionIndex;
|
|
- if (!strings.isEmpty(actionIndex)) {
|
|
|
|
|
|
+ if (strings.isEmpty(actionIndex)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
var channelData = that.getChannelData();
|
|
var channelData = that.getChannelData();
|
|
if (channelData.length > actionIndex) {
|
|
if (channelData.length > actionIndex) {
|
|
- wx.setStorageSync("channelDeta", channelData[that.data.actionIndex]);
|
|
|
|
|
|
+ wx.setStorageSync("channelDeta", channelData[actionIndex]);
|
|
wx.navigateTo({
|
|
wx.navigateTo({
|
|
url: './../channelDetails/channelDetails'
|
|
url: './../channelDetails/channelDetails'
|
|
});
|
|
});
|
|
@@ -426,7 +426,6 @@ Page({
|
|
if (deviceListSelect === null || deviceList.length <= deviceListSelect) {
|
|
if (deviceListSelect === null || deviceList.length <= deviceListSelect) {
|
|
return
|
|
return
|
|
};
|
|
};
|
|
-
|
|
|
|
var device = deviceList[deviceListSelect];
|
|
var device = deviceList[deviceListSelect];
|
|
wx.navigateTo({
|
|
wx.navigateTo({
|
|
url: './../deviceWake/deviceWake?deviceId=' + device.deviceId + "&clientType=" + device.ProdModel,
|
|
url: './../deviceWake/deviceWake?deviceId=' + device.deviceId + "&clientType=" + device.ProdModel,
|