Merge branch 'dev' of http://192.168.3.207:10080/jianyu/page_bigmember_pc into dev

src/api/modules/potential.js

@@ -1,5 +1,5 @@
 import request from '@/api'
-import qs from "qs";
+import qs from 'qs'
 
 // 潜在客户/竞争对手接口
 export function getCorList (data) {

src/assets/style/reset-ele.scss

@@ -36,8 +36,8 @@
 
   .el-button--main {
     font-family: Microsoft YaHei, Microsoft YaHei-Regular;
-    border-color: #2cb7ca;
-    background: #2cb7ca;
+    border-color: $color-text--highlight;
+    background: $color-text--highlight;
     border-radius: 6px;
     padding: 8px 16px;
     box-sizing: border-box;
@@ -46,8 +46,8 @@
     color: #fff;
     line-height: 24px;
     &:hover, &:focus {
-      border-color: #2cb7ca;
-      background: #2cb7ca;
+      border-color: $color-text--highlight;
+      background: $color-text--highlight;
       color: #fff;
     }
   }

src/components/common/ContentLayout.vue

@@ -56,10 +56,10 @@ export default {
       routerName: '',
       adCodeMap: {
         projectInfo: 'jy-pc-bigmember-project-content-right', // 项目详情页右侧广告位code
-        entportrayal: 'jy-pc-bigmember-entportrayal-content-right', // 企业情报详情页右侧广告位code
-        unitportrayal: 'jy-pc-bigmember-unitportrayal-content-right', // 采购单位全景分析详情页右侧广告位code
-        month: 'jy-pc-bigmember-month-content-right',  // 数据月报右侧
-        week: 'jy-pc-bigmember-week-content-right' // 数据周报右侧
+        'ent_portrait': 'jy-pc-bigmember-entportrayal-content-right', // 企业情报详情页右侧广告位code
+        'unit_portrayal': 'jy-pc-bigmember-unitportrayal-content-right', // 采购单位全景分析详情页右侧广告位code
+        'bigvip_subreport_month': 'jy-pc-bigmember-month-content-right', // 数据月报右侧
+        'bigvip_subreport_week': 'jy-pc-bigmember-week-content-right' // 数据周报右侧
       },
       adList: [
         // {

src/views/PotentialList.vue

@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="content-list-box">
-          <potential-list :key="filters.listKey" @goDetail="goDetail"
+          <potential-list @goDetail="goDetail"
                           @follow="changeFollow"
                           @remove="changeRemove"
                           @delete="changeDelete"
@@ -114,6 +114,7 @@ export default {
     },
     changeSubmitInfo (type) {
       if (type) {
+        this.filters.searchbool = 1
         this.$refs.pushList.doQuery(this.filters)
       } else {
         this.filters = Object.assign({}, this.$options.data.bind(this)().filters)
@@ -122,8 +123,13 @@ export default {
         this.$refs.buyerclassSelector.setCateState()
         this.$refs.businessScopeSelector.setState()
         this.changeBusiness([])
+        this.recoverCreate()
       }
     },
+    recoverCreate () {
+      this.filters.searchbool = 0
+      this.$refs.pushList.doQuery(this.filters)
+    },
     goDetail (item) {
       let routeUrl = {}
       if (this.filters.pcor === 'C') {
@@ -185,6 +191,9 @@ export default {
       })
     }
   },
+  mounted () {
+    this.recoverCreate()
+  },
   async created () {
     if (!this.scope.length) {
       await this.$store.dispatch('user/getKeywordsList')

src/views/subscribe/components/key/KeyConfig.vue

@@ -257,6 +257,7 @@ export default {
     },
     removeEmptyInput (arr) {
       for (let i = 0; i < arr.length; i++) {
+        // eslint-disable-next-line
         if (arr[i] === '' || arr[i] === null || typeof (arr[i]) === undefined) {
           arr.splice(i, 1)
           i = i - 1

src/views/subscribe/components/key/KeyList.vue

@@ -322,6 +322,7 @@ export default {
     },
     removeEmptyInput (arr) {
       for (let i = 0; i < arr.length; i++) {
+        // eslint-disable-next-line
         if (arr[i] === '' || arr[i] === null || typeof (arr[i]) === undefined) {
           arr.splice(i, 1)
           i = i - 1

src/views/subscribe/components/scope/Add.vue

@@ -82,6 +82,7 @@ export default {
     // 输入框为空移除
     removeEmptyInput (arr) {
       for (let i = 0; i < arr.length; i++) {
+        // eslint-disable-next-line
         if (arr[i] === '' || arr[i] === null || typeof (arr[i]) === undefined) {
           arr.splice(i, 1)
           i = i - 1

src/views/subscribe/components/scope/List.vue

@@ -204,6 +204,7 @@ export default {
     // 输入框为空移除
     removeEmptyInput (arr) {
       for (let i = 0; i < arr.length; i++) {
+        // eslint-disable-next-line
         if (arr[i] === '' || arr[i] === null || typeof (arr[i]) === undefined) {
           arr.splice(i, 1)
           i = i - 1