瀏覽代碼

修改find方法返回数据方式

yangc 7 年之前
父節點
當前提交
2de8a96245
共有 2 個文件被更改,包括 23 次插入5 次删除
  1. 7 1
      components/default/Header.vue
  2. 16 4
      components/main/Search.vue

+ 7 - 1
components/default/Header.vue

@@ -79,7 +79,13 @@
       enterprise () {
         let ens = this.user.data.enterprises
         if (ens && ens.length) {
-          return ens.find(item => item.current) || {enName: '个人账户'}
+          for (let i = 0; i < ens.length; i++) {
+            if (ens[i].current) {
+              return ens[i]
+            }
+            return {enName: '个人账户'}
+          }
+//          return ens.find(item => item.current) || {enName: '个人账户'}
         } else {
           return {enName: '个人账户'}
         }

+ 16 - 4
components/main/Search.vue

@@ -84,16 +84,28 @@
       hotSearchData () {
         let list = this.$store.state.floor.list_v3.data
         let obj = {}
-        if (list && list.length > 0) {
-          obj = list.find(item => item.floorNumber === 2) || {}
+        if (list && list.length) {
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].floorNumber === 2) {
+              obj = list[i]
+            }
+          }
+//          obj = list.find(item => item.floorNumber === 2) || {}
         }
         return obj
       },
       ifFloorsHotSearchInValid () {
         let obj = this.hotSearchData
+        let tmp = false
         if (obj.items && obj.items.length) {
-          let result = obj.items.find(item => !item.body || item.body === '') || true
-          return result !== true
+          for (let i = 0; i < obj.items.length; i++) {
+            if (!obj.items[i].body || obj.items[i].body === '') {
+              tmp = obj.items[i]
+              break
+            }
+          }
+//          let result = obj.items.find(item => !item.body || item.body === '') || true
+          return tmp || true
         }
         return true
       }