Browse Source

feature: 解决频道1点击不进去的问题

Damon 7 months atrás
parent
commit
e5771fd51b
3 changed files with 26 additions and 30 deletions
  1. 2 2
      pages/deviceWake/deviceWake.wxml
  2. 24 22
      pages/index/index.js
  3. 0 6
      utils/lexin/jump.js

+ 2 - 2
pages/deviceWake/deviceWake.wxml

@@ -65,14 +65,14 @@
           <image src="./../../img/b.png" mode="heightFix"></image>
         </view>
       </view>
-      <view class="page__bd" style="opacity: {{switch2Checked ? 1 : 0.4}};">
+      <!-- <view class="page__bd" style="opacity: {{switch2Checked ? 1 : 0.4}};">
         <text>唤醒音</text>
         <view class="choice">
           <view class="mode" wx:if="{{!switch2Checked}}"></view>
           <text bindtap="goWakeList">{{wakeName}}</text>
           <image src="./../../img/b.png" mode="heightFix"></image>
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
   <Toast visible="{{toast_visible}}" toast-data='{{toastData}}' twoButCallback="{{twoButCallback}}"></Toast>

+ 24 - 22
pages/index/index.js

@@ -35,11 +35,11 @@ Page({
     isLogin: false,
     greeting: "",
     bannerList: [{
-      "pic": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20241028142233669038262.png"
-    },
-    {
-      "pic": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20240823145816541223911.png"
-    }
+        "pic": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20241028142233669038262.png"
+      },
+      {
+        "pic": "https://music-play.oss-cn-shenzhen.aliyuncs.com/device/20240823145816541223911.png"
+      }
     ],
     autoplay: true,
     interval: 3000, // 切换时间间隔
@@ -264,7 +264,7 @@ Page({
       case "connect":
         lexin_subscribe.subscribeAllDevice();
         break;
-      ///再走有在线
+        ///再走有在线
       case "message_onoffline":
         lexin_connect.searchOnlineDevice(payloads, function (list) {
           that.updateDeviceList(list, false, false);
@@ -371,6 +371,24 @@ Page({
     });
   },
 
+  ///去频道详情
+  onTapToChannel() {
+    var that = this;
+    var actionIndex = that.data.actionIndex;
+    if (actionIndex == null) {
+      return;
+    }
+
+    var channelData = that.getChannelData();
+    if (channelData.length > actionIndex) {
+      store.setStore("channelDeta", channelData[actionIndex]);
+      wx.navigateTo({
+        url: './../channelDetails/channelDetails'
+      });
+    }
+  },
+
+  ///选择对应的频道
   getchannelData(clientType) {
     var that = this;
     listByDevice({
@@ -401,22 +419,6 @@ Page({
     })
   },
 
-  ///去频道详情
-  onTapToChannel() {
-    var that = this;
-    var actionIndex = that.data.actionIndex;
-    if (strings.isEmpty(actionIndex)) {
-      return;
-    }
-    var channelData = that.getChannelData();
-    if (channelData.length > actionIndex) {
-      store.setStore("channelDeta", channelData[actionIndex]);
-      wx.navigateTo({
-        url: './../channelDetails/channelDetails'
-      });
-    }
-  },
-
   onTapIndex(e) {
     var that = this;
     var index = e.currentTarget.dataset.index;

+ 0 - 6
utils/lexin/jump.js

@@ -14,11 +14,6 @@ function toChannelIndex(index, callback) {
     return;
   }
 
-  var actionIndex = pages[0].getActionIndex();
-  if (actionIndex == null) {
-    return;
-  }
-
   if (index == actionIndex) {
     return;
   };
@@ -67,7 +62,6 @@ function toChannelIndex(index, callback) {
     DstDeviceName: deviceMacId,
     other
   });
-
 };
 
 ///关于我们