Merge branch 'dev' into feature-yf

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

@@ -55,11 +55,11 @@ export default {
     return {
       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' // 数据周报右侧
+        pro_follow_detail: 'jy-pc-bigmember-project-content-right', // 项目详情页右侧广告位code
+        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/components/forecast/ForLayout.vue

@@ -91,7 +91,7 @@ export default {
             if (data.events === 'select') {
               // 联想跳转
               if (this.bidnum !== 0) {
-                const result = [data.data]
+                const result = data.data.list
                 this.$store.commit('forcast/setHistoryList', result)
                 this.$router.push({
                   path: '/ai_add',
@@ -119,7 +119,7 @@ export default {
             // } else
             if (data.events === 'select') {
               // 联想跳转
-              const result = [data.data]
+              const result = data.data.list
               this.$store.commit('forcast/setHistoryPolicyList', result)
               this.$router.push(`/analysis_result/${data.data.s_id}/${data.data.sourceinfoid}`)
             } else {

src/components/forecast/ForeCast.vue

@@ -176,7 +176,7 @@
 </template>
 
 <script>
-import { Pagination, Progress } from 'element-ui'
+import { Pagination, Progress, Message } from 'element-ui'
 import { mapState } from 'vuex'
 // import { getPushList } from '@/api/modules/'
 import Empty from '@/components/common/Empty.vue'
@@ -188,6 +188,7 @@ export default {
   components: {
     [Pagination.name]: Pagination,
     [Progress.name]: Progress,
+    [Message.name]: Message,
     Empty
   },
   data () {
@@ -419,14 +420,18 @@ export default {
       this.$router.push(`/ent_portrait/${id}`)
     },
     goEntPor (id) {
-      const routeUrl = this.$router.resolve({
-        path: `/ent_portrait/${id}`
-      })
-      return window.open(routeUrl.href, '_blank')
+      if (id && id !== '' && id !== undefined && id !== 'undefined') {
+        const routeUrl = this.$router.resolve({
+          path: `/ent_portrait/${id}`
+        })
+        return window.open(routeUrl.href, '_blank')
+      } else {
+        this.$message('暂无数据')
+      }
     },
     goViewDetail (id) {
       this.$router.push({
-        path: '/project/info?sid=' + id
+        path: '/pro_follow_detail?sid=' + id
       })
     },
     goPotenSimiLar (id, results) {
@@ -447,7 +452,7 @@ export default {
     },
     // 设置关键词
     setKey () {
-      this.$router.push('/subscribe/config')
+      this.$router.push('/set_subscribe/config')
     },
     // 数组对象去重
     unique (arr) {

src/components/push-list/ProjectList.vue

@@ -163,7 +163,7 @@ export default {
     toDetail (item) {
       const { sid, fid } = item
       const link = this.$router.resolve({
-        path: '/project/info',
+        path: '/pro_follow_detail',
         query: {
           sid,
           fid

src/components/push-list/PushList.vue

@@ -2,7 +2,7 @@
   <el-card class="info-list-card">
     <div slot="header" class="clearfix">
       <span class="card-title">订阅推送</span>
-      <el-button v-if="subManager" @click="goManage" class="sub-manager" type="plain" icon="el-icon-jy-edit">订阅管理</el-button>
+      <el-button v-if="canSubmanager" @click="goManage" class="sub-manager" type="plain" icon="el-icon-jy-edit">订阅管理</el-button>
     </div>
     <div class="info-list" v-loading="listState.loading">
       <article-item
@@ -13,9 +13,9 @@
         @onClick="toDetail(item)"
       />
       <empty v-show="showEmpty">
-        <div v-if="isAllFirst">
+        <div v-if="isAllFirst && canSubmanager">
           <span>订阅关键词，接收最新招投标信息</span>
-          <div class="add-key-button" @click="$router.push('/subscribe/config')">
+          <div class="add-key-button" @click="$router.push('/set_subscribe/config')">
             <span class="icon-chahao"></span>
             <span class="button-text">订阅关键词</span>
           </div>
@@ -103,7 +103,7 @@ export default {
   },
   methods: {
     goManage () {
-      this.$router.push('/subscribe/config')
+      this.$router.push('/set_subscribe/config')
     },
     // 恢复数据至第一次请求的状态(页码等)
     resetListState () {

src/router/router-interceptors.js

@@ -2,13 +2,14 @@ import router from '@/router/router'
 import store from '@/store/'
 import { powerCheck } from '@/utils/bigmember/'
 
-// 权限控制白名单-组件名
+// 权限控制白名单-路由名
 const powerCheckWhiteList = ['404']
 
 router.beforeEach(async (to, from, next) => {
-  const { power, info } = store.state.user
+  let { power, info } = store.state.user
   if (!Object.keys(info).length) {
-    await store.dispatch('user/getUserPower')
+    info = await store.dispatch('user/getUserPower')
+    power = info.power ? info.power : []
   }
   if (powerCheckWhiteList.includes(to.name)) {
     next()

src/router/routers.js

@@ -64,7 +64,7 @@ export default [
     component: () => import('@/views/potential-for/PotenSimilar.vue')
   },
   {
-    path: '/subscribe/config',
+    path: '/set_subscribe/config',
     name: 'config',
     component: () => import('@/views/subscribe/Config.vue')
   },
@@ -82,8 +82,8 @@ export default [
   },
   // 项目信息
   {
-    path: '/project/info',
-    name: 'projectInfo',
+    path: '/pro_follow_detail',
+    name: 'pro_follow_detail',
     component: () => import('@/views/project/ProjectInfo.vue')
   },
   // 投标决策分析结果页
@@ -94,7 +94,7 @@ export default [
   },
   // 业务范围
   {
-    path: '/subscribe/scope',
+    path: '/set_scope',
     name: 'scope',
     component: () => import('@/views/subscribe/Scope.vue')
   }

src/views/Home.vue

@@ -196,7 +196,7 @@ export default {
             }
           }))
           nowObj.list = nowList.slice(0, nowObj.maxLength)
-          if (nowList.length < nowObj.maxLength) {
+          if (nowList.length !== 0 && nowList.length < nowObj.maxLength) {
             const nowParams = config.checkFn(config)
             if (nowParams) {
               return this.getWeeksOrMonths(Object.assign({}, config, { params: nowParams }))

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') {
@@ -138,7 +144,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     goManage () {
-      this.$router.push('/subscribe/scope')
+      this.$router.push('/set_scope')
     },
     changeArea (item) {
       this.filters.area = item
@@ -185,6 +191,9 @@ export default {
       })
     }
   },
+  mounted () {
+    this.recoverCreate()
+  },
   async created () {
     if (!this.scope.length) {
       await this.$store.dispatch('user/getKeywordsList')

src/views/bid-forecast/BidForecastLimit.vue

@@ -218,7 +218,7 @@ export default {
     setSure () {
       this.iscomplete = false
       const routeUrl = this.$router.resolve({
-        path: '/project/info',
+        path: '/pro_follow_detail',
         query: {
           sid: this.baseInfo.infoid,
           fid: this.baseInfo.id

src/views/bid-policy/components/PolicyLimit.vue

@@ -177,7 +177,7 @@ export default {
     setPurContent (title) {
       console.log(title)
       this.$router.push({
-        path: '/subscribe/scope',
+        path: '/set_scope',
         query: {
           title: title
         }

src/views/potential-for/PotenSimilar.vue

@@ -22,7 +22,7 @@
               </div>
               <div class="poten_unit poten_margin">
                 <span class="unit_label poten_label">预测线索：</span>
-                <router-link :to="dataInfo.jyhref" class="unit_name poten_name">{{dataInfo.title}}</router-link>
+                <a v-if="dataInfo && dataInfo.jyhref" :href="dataInfo.jyhref" class="unit_name poten_name">{{dataInfo.title}}</a>
               </div>
             </div>
             <div class="poten_tips">预测说明：潜在项目预测基于对历史招标信息统计分析，仅供参考</div>

src/views/reportData/pageWeek.vue

@@ -11,7 +11,7 @@
                 <div class="reoprt_time">
                   <span class="week_text">周</span>
                   <span class="week_days">{{dateFormatter(item.startdate * 1000, 'MM月dd日')}}-{{dateFormatter(item.enddate * 1000, 'MM月dd日')}}</span>
-                  <span class="red_point" v-show="item.unread !== 0" ref="weekitempoint"></span>
+                  <span class="red_point" v-show="item.unread !== 1" ref="weekitempoint"></span>
                 </div>
                 <div class="repot_gettime">{{item.pushtime}}</div>
               </div>

src/views/subscribe/Config.vue

@@ -48,8 +48,15 @@ export default {
       scope: []
     }
   },
-  computed: {},
+  computed: {
+    canSubmanager () {
+      return !this.$store.state.user.info?.isSubCount
+    }
+  },
   created () {
+    if (!this.canSubmanager) {
+      history.back()
+    }
     this.getBigInfo()
   },
   methods: {