fix: 企业情报页面广告位问题&其他样式修改

src/components/common/ContentLayout.vue

@@ -11,7 +11,7 @@
             class="ad-item-container"
             v-for="(item, index) in adList"
             :key="index">
-            <a :href="item.s_link" target="_blank">
+            <a :href="item.s_link" target="_blank" :id="routerName + '-' + index">
               <img :src="item.s_pic" />
             </a>
           </div>
@@ -24,6 +24,7 @@
 
 <script>
 import { getAdList } from '@/api/modules/'
+import { getRandomString } from '@/utils/'
 export default {
   name: 'content-layout',
   props: {
@@ -52,12 +53,13 @@ export default {
   },
   data () {
     return {
+      routerName: '',
       adCodeMap: {
         projectInfo: 'jy-pc-bigmember-project-content-right', // 项目详情页右侧广告位code
-        entportrait: 'jy-pc-bigmember-entportrait-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'
+        month: 'jy-pc-bigmember-month-content-right',  // 数据月报右侧
+        week: 'jy-pc-bigmember-week-content-right' // 数据周报右侧
       },
       adList: [
         // {
@@ -68,22 +70,24 @@ export default {
     }
   },
   created () {
+    this.routerName = this.$route.name
     if (this.needAd) {
       this.getAdvertisementList()
     }
   },
   methods: {
+    getRandomString,
     async getAdvertisementList () {
       const params = {
         code: this.adCode
       }
 
-      if (!params.code) {
-        const routeName = this.$route.name
+      if (!params.code) { // 先从props中取出参数，如果没取到，就从map中取
+        const routeName = this.routerName
         params.code = this.adCodeMap[routeName]
       }
 
-      if (!params.code) return
+      if (!params.code) return console.warn('请传入adCode参数')
 
       const { data } = await getAdList(params)
 

src/components/push-list/ProjectList.vue

@@ -141,7 +141,7 @@ export default {
         })
       }
 
-      // this.listState.loading = true
+      this.listState.loading = true
       this.listState.loaded = false
       // 判断是否无筛选条件
       this.isAllFirst = false
@@ -149,7 +149,7 @@ export default {
         this.isAllFirst = true
       }
       const res = await getFollowProjectList(query)
-      // this.listState.loading = false
+      this.listState.loading = false
       this.listState.loaded = true
 
       if (res.error_code === 0) {
@@ -174,7 +174,7 @@ export default {
     sortItemInfo (item) {
       return {
         ...item,
-        type: item.status, // 类型
+        type: item.status // 类型
       }
     },
     onPageChange (p) {

src/components/selector/BusinessScopeSelectorContent.vue

@@ -13,7 +13,8 @@
         :key="index"
         class="j-button-item bgc"
         :class="{
-          active: item.selected
+          active: item.selected,
+          all: item.name === '全部'
         }"
         @click="buttonClick(item)"
       >{{ item.name }}</div>

src/components/selector/BuyerclassSelectorContent.vue

@@ -34,9 +34,6 @@
       v-for="(item, key) in cateListMap"
       :key="key"
       class="select-group-container"
-      :class="{
-        global: key === '#'
-      }"
     >
       <!-- <div class="index-anchor" :id="key" :data-index="key" v-if="key !== '#'">{{ key }}</div> -->
       <div class="select-group">
@@ -44,7 +41,8 @@
           class="j-button-item bgc"
           :class="{
             active: cate.selected,
-            [cate.id]: true
+            [cate.id]: true,
+            all: cate.name === '全部'
           }"
           @click="changeCateState($event,cate)">{{ cate.name }}</button>
       </div>

src/components/selector/IndustrySelectorContent.vue

@@ -42,6 +42,9 @@
       v-for="(item, index) in industryListMap"
       :key="index"
       class="select-group-container"
+      :class="{
+        'right-line': showMore
+      }"
     >
       <div class="select-group-header">
         <button
@@ -50,7 +53,9 @@
             active: item.selected,
             [item.id]: true,
             'button-level-0': item.level === 0,
-            'bgc': item.level === 1,
+            'button-level-1': item.level === 1,
+            'all': item.level === 0,
+            'bgc': item.level === 1
           }"
           @click="changeIndustryState(item)"
         >{{ item.name }}</button>
@@ -58,7 +63,7 @@
       <div class="select-group-main" v-show="showMore">
         <button
           v-for="(iitem, iindex) in item.children" :key="999-iindex"
-          class="j-button-item bgc-opacity"
+          class="j-button-item bgc-opacity button-level-2"
           :class="{
             active: iitem.selected,
             [iitem.id]: true
@@ -358,6 +363,9 @@ export default {
   }
 
   .s-line {
+    .button-level-1 {
+      color: $color-text--highlight;
+    }
     .selector-content {
       display: flex;
       flex-wrap: wrap;
@@ -366,24 +374,21 @@ export default {
         height: 38px;
         overflow: hidden;
       }
-      .button-level-0 {
-        font-weight: 700;
-        border-color: transparent;
-      }
     }
     .select-group-container {
       position: relative;
       display: flex;
       flex-wrap: wrap;
-      &:not(:last-of-type)::after {
+      &.right-line::after {
         content: '';
         position: absolute;
-        right: -6px;
+        right: -1px;
         top: 50%;
         width: 1px;
         height: 16px;
         background-color: #E3E4E6;
         margin-top: -8px;
+        // transform: translate(0, -50%);
       }
       .select-group-main {
         display: flex;

src/components/selector/SelectorCard.vue

@@ -69,7 +69,7 @@ export default {
           background-color: #fff;
           border: 1px solid rgba(0,0,0,.05);
           cursor: pointer;
-          &.global {
+          &.global { // s-card中的全部按钮使用
             padding: 6px 8px;
             height: 24px;
             line-height: 24px;
@@ -77,6 +77,10 @@ export default {
             color: inherit;
             border-color: rgba(0,0,0,.05);
           }
+          &.all { // s-line中的全部按钮使用
+            font-weight: 700;
+            border-color: transparent;
+          }
           &.hover:hover {
             color: #2abed1;
           }

src/views/portrayal/EntPortrayal.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ent-portrayal">
+  <Layout class="ent-portrayal">
     <div class="ent-header">
       <div class="name">{{entName}}</div>
       <div class="ent_follow" @click="setFollow()">
@@ -28,12 +28,13 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-  </div>
+  </Layout>
 </template>
 <script>
 import EntChart from './components/EntChart'
 import EntForm from './components/EntForm'
 import EntHistoryForm from './components/EntHistoryForm'
+import Layout from '@/components/common/ContentLayout.vue'
 import ProActive from './components/ProActive'
 import { Tabs, TabPane } from 'element-ui'
 import { moneyUnit, dateFormatter } from '@/utils'
@@ -46,6 +47,7 @@ export default {
     EntChart,
     EntForm,
     EntHistoryForm,
+    Layout,
     ProActive
   },
   data () {
@@ -158,7 +160,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .ent-portrayal{
-  width: 920px;
   margin: 32px auto;
   .ent-header{
     display: flex;

src/views/project/ProjectInfo.vue

@@ -183,7 +183,6 @@ export default {
     toForecast () {
       const { sid, fid } = this
       this.$router.push(`/bidforlimit/${fid}/${sid}`)
-      
     },
     toPolicy () {
       const { sid, fid } = this