Merge branch 'master' into mobile-seek

# Conflicts:
#	components/applyPurchase/ApplyInfo.vue
#	nuxt.config.js

components/applyPurchase/ApplyInfo.vue

@@ -159,7 +159,7 @@
         return str ? (str.substring(0, 3) + '****' + str.substring(7, 11)) : '-'
       },
       enterpriseFilter (str) {
-        return str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str
+        return str ? str.length > 4 ? str.substring(0, 2) + '**' + str.substring(str.length - 2, str.length) : str : '-'
       },
       userNameFilter (str) {
         return str ? (str.substring(0, 1) + '**') : '-'

components/applyPurchase/BatchPublish.vue

@@ -338,7 +338,7 @@
           str = str.substring(0, str.length - 1)
           param.spIds = str
         }
-        this.$http.post('/seek/confirmBom', param)
+        this.$http.post('/seek/confirmBom?bomId=' + Number(this.$route.params.id))
           .then(response => {
             if (response.data.success) {
 //              this.showRemindBox = true

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: '个人账户'}
         }
@@ -154,7 +160,7 @@
           if (tempEnterprise.isVendor === 313) {
             window.location.href = '/vendor#/index'
           } else {
-            window.location.href = '/register_saler'
+            window.location.href = '/register-saler'
           }
         }
       }

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
       }

components/personalMaterial/PersonalMaterial.vue

@@ -199,8 +199,6 @@
     }
     > a {
       line-height: 71px;
-      position: relative;
-      right: 105px;
     }
     .personal-material-header {
       height: 111px;