Merge branch 'dev/v1.5.53_yf' of jianyu/page_bigmember_pc into feature/v1.5.53

src/router/router-interceptors.js

@@ -70,9 +70,9 @@ router.beforeEach(async (to, from, next) => {
     const hasEntPortPower = info.memberStatus > 0 && (power.includes(4) || power.includes(13))
     if (hasEntPortPower) {
       // 大会员有画像权限用户，访问超级订阅画像，则重定向到大会员画像
-      if (to.name === 'ent_ser_portrait' || to.path.indexOf('ent_ser_portrait') > -1) {
+      if (to.name === 'ent_ser_portrait') {
         next({
-          path: `/ent_portrait/${encodeURIComponent(to.params.eId)}`,
+          path: `/ent_portrait/${to.params.eId}`,
           replace: true,
           query: {
             // ?ismedical=1
@@ -83,10 +83,10 @@ router.beforeEach(async (to, from, next) => {
         next()
       }
     } else {
-      if (to.name === 'ent_portrait' || to.path.indexOf('ent_portrait') > -1) {
+      if (to.name === 'ent_portrait') {
         // 其他无画像权限用户，访问大会员画像，则重定向到超级订阅画像
         next({
-          path: `/svip/ent_ser_portrait/${encodeURIComponent(to.params.eId)}`,
+          path: `/svip/ent_ser_portrait/${to.params.eId}`,
           replace: true
         })
       } else {

src/views/portrayal/EntPortrayal.vue

@@ -57,7 +57,7 @@
             <div id="project-information" :style="{ margin: !isConf4 ? '40px 40px 0' : '64px 0 0' }"
               v-show="showConf13 && !emptyShow">
               <Dynamic-list :key="dynamicKey" :filters="ScreenParams"
-                :config="{ baseParam: { entId: decodeURIComponent(this.$route.params.eId) }, isWinner: true, hasPower: showConf13 }"
+                :config="{ baseParam: { entId: this.$route.params.eId }, isWinner: true, hasPower: showConf13 }"
                 style="width: 856px"></Dynamic-list>
             </div>
             <ent-chart @showEmpty="showEmpty" v-show="!emptyShow" @loadingChart="loadingChart" :params="bidInfoParams"

src/views/portrayal/EntSearchPortrayal.vue

@@ -60,7 +60,7 @@
               <div class="pro_info_tip">数据统计范围：{{ dateRange.start }}-{{ dateRange.end }}</div>
             </div>
             <Dynamic-list :key="dynamicKey" :filters="ScreenParams"
-              :config="{ baseParam: { entId: decodeURIComponent($route.params.eId) }, isWinner: true, hasPower: pagePowerInfo.visited || pagePowerInfo.balance > 0 }"
+              :config="{ baseParam: { entId: $route.params.eId }, isWinner: true, hasPower: pagePowerInfo.visited || pagePowerInfo.balance > 0 }"
               style="width: 856px"></Dynamic-list>
             <ent-chart @showEmpty="showEmpty" @loadingChart="loadingChart" :params="bidInfoParams" :active="activeName"
               v-on:entInfo="getEntInfo"></ent-chart>

src/views/portrayal/Loading.vue

@@ -25,7 +25,7 @@ export default {
   },
   created () {
     this.type = this.$route.params.type // ent企业画像 buyer采购单位画像
-    this.params = decodeURIComponent(this.$route.params.params) // 企业画像id 或 采购单位名称
+    this.params = this.$route.params.params // 企业画像id 或 采购单位名称
     this.position = this.$route.query?.position // 定位到画像哪个模块
   },
   mounted () {