Quellcode durchsuchen

feature:修改首页tabbar的报错,删除不用的代码

unknown vor 1 Jahr
Ursprung
Commit
da598fc404
5 geänderte Dateien mit 41 neuen und 73 gelöschten Zeilen
  1. 2 2
      app.js
  2. 2 1
      app.json
  3. 34 31
      custom-tab-bar/tabbar.js
  4. 3 7
      pages/home/home.js
  5. 0 32
      utils/eventBus.js

+ 2 - 2
app.js

@@ -1,6 +1,6 @@
 // app.ts
 import mqtt from './utils/mqtt';
-const eventBus = require('./utils/eventBus')
+const {eventBus} = require('./custom-tab-bar/tabbar')
 
 //连接的服务器域名
 // const host = 'wxs://mqtt.test.radio1964.com';
@@ -101,7 +101,7 @@ App({
   changeUserRight() {
     const i = wx.getStorageSync('rightId') || 0
     const id = i === 0 ? 1 : 0
-    wx.setStorageSync('rightId', id)
+    wx.setStorageSync('rightId', id) || 0
     getApp().eventBus.emit('rightChange', id)
   },
 

+ 2 - 1
app.json

@@ -55,7 +55,8 @@
     "selectedColor": "#1AAD19",  
     "backgroundColor": "#FFFFFF",  
     "borderStyle": "black",  
-    "position": "bottom" 
+    "position": "bottom",
+    "custom": true
   },
   "window": {
     "backgroundTextStyle": "light",

+ 34 - 31
custom-tab-bar/tabbar.js

@@ -1,33 +1,33 @@
-const eventBus = {
-  // 存储所有事件和对应的订阅者
-  eventList: new Map(),
-  // 订阅事件
-  on(event, callback) {
-    if (!this.eventList.has(event)) {
-      this.eventList.set(event, new Set())
-    }
-    this.eventList.get(event).add(callback)
-  },
-  // 取消订阅事件
-  off(event, callback) {
-    if (this.eventList.has(event)) {
-      const callbacks = this.eventList.get(event)
-      callbacks.delete(callback)
-      if (callbacks.size === 0) {
-        this.eventList.delete(event)
-      }
-    }
-  },
-  // 发布事件
-  emit(event, ...args) {
-    if (this.eventList.has(event)) {
-      const callbacks = this.eventList.get(event)
-      callbacks.forEach((callback) => {
-        callback.call(null, ...args)
-      })
-    }
-  }
-}
+const eventBus = { 
+  // 存储所有事件和对应的订阅者 
+  eventList: new Map(), 
+  // 订阅事件 
+  on(event, callback) { 
+    if (!this.eventList.has(event)) { 
+      this.eventList.set(event, new Set()) 
+    } 
+    this.eventList.get(event).add(callback) 
+  }, 
+  // 取消订阅事件 
+  off(event, callback) { 
+    if (this.eventList.has(event)) { 
+      const callbacks = this.eventList.get(event) 
+      callbacks.delete(callback) 
+      if (callbacks.size === 0) { 
+        this.eventList.delete(event) 
+      } 
+    } 
+  }, 
+  // 发布事件 
+  emit(event, ...args) { 
+    if (this.eventList.has(event)) { 
+      const callbacks = this.eventList.get(event) 
+      callbacks.forEach((callback) => { 
+        callback.call(null, ...args) 
+      }) 
+    } 
+  } 
+} 
 
 function selectIndex(index) {
   var pages = getCurrentPages();
@@ -41,14 +41,17 @@ function selectIndex(index) {
 }
 
 function eventOn(curPage) {
+
   getApp().eventBus.on('rightChange', data => {
     // var pages = getCurrentPages();
     // var curPage = pages[pages.length - 1]
+
     if (data !== curPage.data.rightId) {
+      console.log("页面:");
+
       curPage.setData({
         rightId: data
       })
-      console.log("页面:"+curPage.data.rightId);
       if (curPage.data.rightId === 2) {
         let num = curPage.data.rightId === 1 ? 2 : 1
         if (typeof curPage.getTabBar === 'function' &&

+ 3 - 7
pages/home/home.js

@@ -138,18 +138,14 @@ Page({
    */
   onShow(options) {
     selectIndex(0);
-
-
     if (this.data.isLoginWx) {
       var key = 'home_device_list' + wx.getUserInfo().userId;
-      var saveStr = wx.getStorageSync(key) ?? "[]";
+      var saveStr = wx.getStorageSync(key) || "[]";
       var devList = JSON.parse(saveStr);
-
       this.setData({
         deviceList: devList
       });
     }
-
   },
   addDeviceTap() {
     wx.navigateTo({
@@ -157,9 +153,9 @@ Page({
       events: {
         getBackData: res => {
           var key = 'home_device_list' + wx.getUserInfo().userId;
-          var saveStr = wx.getStorageSync(key) ?? "[]";
+          var saveStr = wx.getStorageSync(key) || "[]";
 
-          var oldList = JSON.parse(saveStr) ?? [];
+          var oldList = JSON.parse(saveStr);
           var findElement;
           for (let index = 0; index < oldList.length; index++) {
             const element = oldList[index];

+ 0 - 32
utils/eventBus.js

@@ -1,32 +0,0 @@
-const eventBus = {
-  // 存储所有事件和对应的订阅者
-  eventList: new Map(),
-  // 订阅事件
-  on(event, callback) {
-    if (!this.eventList.has(event)) {
-      this.eventList.set(event, new Set())
-    }
-    this.eventList.get(event).add(callback)
-  },
-  // 取消订阅事件
-  off(event, callback) {
-    if (this.eventList.has(event)) {
-      const callbacks = this.eventList.get(event)
-      callbacks.delete(callback)
-      if (callbacks.size === 0) {
-        this.eventList.delete(event)
-      }
-    }
-  },
-  // 发布事件
-  emit(event, ...args) {
-    if (this.eventList.has(event)) {
-      const callbacks = this.eventList.get(event)
-      callbacks.forEach((callback) => {
-        callback.call(null, ...args)
-      })
-    }
-  }
-}
-
-module.exports = eventBus