Jelajahi Sumber

feature: 解决华为手机小程序页面banner页面图标显示在图下方的问题

332777428@qq.com 6 bulan lalu
induk
melakukan
9a32a34e4b

+ 1 - 1
pages/pageA/index/index.js

@@ -52,7 +52,7 @@ Page({
     interval: 3000, // 切换时间间隔
     duration: 500, // 滑动动画时长
     circular: true, // 衔接滑动
-    indexPage: 2,
+    indexPage: 0,
     ///是否展示频道
     showChannel: false,
     ////首页

+ 6 - 5
pages/pageB/deviceConnect2/deviceConnect2.js

@@ -103,11 +103,12 @@ Page({
         // 搜索到蓝牙
         if (options.result) {
           var devicesList = options.data.filter((v) => {
-            var isLeXin=v.name.indexOf(lexin_devices.leXin) !== -1;
-            var isJunZheng1=v.name.indexOf(lexin_devices.junZheng1) !== -1;
-            var isJunZheng2=v.name.indexOf(lexin_devices.junZheng2) !== -1;
-            var isJunZheng3=v.name.indexOf(lexin_devices.junZheng3) !== -1;
-            return isLeXin||(isJunZheng1&&!isJunZheng3)||(isJunZheng2&&!isJunZheng3);
+            var isLeXin = v.name.indexOf(lexin_devices.leXin) !== -1;
+            /// AIrSMArT_861210052356337
+            var isJunZheng1 = v.name.indexOf(lexin_devices.junZheng1) !== -1;
+            var isJunZheng2 = v.name.indexOf(lexin_devices.junZheng2) !== -1;
+            var isJunZheng3 = v.name.indexOf(lexin_devices.junZheng3) !== -1;
+            return isLeXin || (isJunZheng1 && !isJunZheng3) || (isJunZheng2 && !isJunZheng3);
           });
 
           if (!strings.isEmpty(devicesList)) {

+ 6 - 1
pages/pageB/deviceConnect3/deviceConnect3.js

@@ -1,4 +1,3 @@
-
 const app = getApp();
 let xBlufi = require("../../../utils/blufi/xBlufi.js");
 import strings from '../../../utils/strings.js';
@@ -31,6 +30,7 @@ Page({
   onLoad: function (options) {
     var that = this;
     var param = options.param;
+    console.log("ddddd==aaa==" + JSON.stringify(param));
     if (!strings.isEmpty(param)) {
       param = JSON.parse(param);
       that.setData({
@@ -70,9 +70,12 @@ Page({
   // {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
   funListenDeviceMsgEvent: function (options) {
     var that = this;
+    console.log("ddddd==00==" + options.type);
+    console.log("ddddd==11==" + JSON.stringify(options));
     switch (options.type) {
       // {"type":"2","result":true,"data":{"deviceId":"7C:DF:A1:FD:3A:F2","serviceId":"0000FFFF-0000-1000-8000-00805F9B34FB",
       // "characteristicId":"0000FF01-0000-1000-8000-00805F9B34FB"}}
+      // 2
       case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
         if (options.result) {
           console.log('初始化成功');
@@ -91,6 +94,7 @@ Page({
         // {"type":"4","result":false,"data":{"progress":0,"ssid":""}}
         // {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
         ///连接结果
+        // 4
       case xBlufi.XBLUFI_TYPE.TYPE_CONNECT_ROUTER_RESULT:
         if (!options.result) {
           errTi = setTimeout(() => {
@@ -138,6 +142,7 @@ Page({
         break;
 
         ///设备连接状态回调
+        // -2
       case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
         that.setData({
           connected: options.result