Merge branch 'dev/v1.0.70_tsz' of jianyu/web into feature/v1.0.70

apps/bigmember_pc/src/views/customer/Search.vue

@@ -320,6 +320,7 @@ export default {
 .ent-search {
   &-iframe {
     padding: 24px;
+    background-color: unset;
   }
   width: 100%;
   background-color: #fff;
@@ -469,7 +470,8 @@ export default {
         height: 0;
       }
       .el-tabs__nav-scroll {
-        border: 1px solid #ebebeb;
+        border-top: 1px solid #ebebeb;
+        border-bottom: 1px solid #ebebeb;
       }
       .el-tabs__item {
         padding: 0 16px !important;

apps/bigmember_pc/src/views/ent-intel/EntIntel.vue

@@ -73,7 +73,7 @@ export default {
   },
   created() {
     // listData
-    this.getMyFollowList()
+    this.ajaxGetEntFollowList()
   },
   mounted() {
     this.$store.commit('forcast/setType', 0)
@@ -81,9 +81,6 @@ export default {
   methods: {
     // 我关注的企业列表
     getMyFollowList(p = 0, match = '', group = '', pageSize = 10) {
-      this.$nextTick(() => {
-        scrollTargetView('.listData_ul')
-      })
       if (this.$refs.myList) {
         this.myDataObj.list = []
       }
@@ -94,6 +91,12 @@ export default {
           this.$refs.myList.listState.pageNum = 1
         })
       }
+      this.ajaxGetEntFollowList(p, match, group, pageSize)
+      this.$nextTick(() => {
+        scrollTargetView('.listData_ul')
+      })
+    },
+    ajaxGetEntFollowList (p = 0, match = '', group = '', pageSize = 10) {
       getEntFollowList({
         pageNum: p,
         pageSize: pageSize,