Browse Source

fix:合并冲突

Signed-off-by: tsz <2417024719@qq.com>
tsz 1 year ago
parent
commit
8e41777e67
1 changed files with 0 additions and 4 deletions
  1. 0 4
      src/web/staticres/js/ent-search-index-pc.js

+ 0 - 4
src/web/staticres/js/ent-search-index-pc.js

@@ -942,16 +942,12 @@ var vm = new Vue({
             // 去超级订阅画像
             // 去超级订阅画像
             var svipLink = '/swordfish/page_big_pc/svip/ent_ser_portrait/' + id + BIPage
             var svipLink = '/swordfish/page_big_pc/svip/ent_ser_portrait/' + id + BIPage
             // 大会员画像
             // 大会员画像
-<<<<<<< HEAD
             var memberLink = '/swordfish/page_big_pc/ent_portrait/' + id + BIPage
             var memberLink = '/swordfish/page_big_pc/ent_portrait/' + id + BIPage
-=======
-            var memberLink = '/swordfish/page_big_pc/ent_portrait/' + id
             // 是渠道合作页面需要登录后重定向
             // 是渠道合作页面需要登录后重定向
             if(cooperateCode) {
             if(cooperateCode) {
               openLoginDig(null, svipLink)
               openLoginDig(null, svipLink)
               return
               return
             }
             }
->>>>>>> master
             try {
             try {
                 item.visited = true
                 item.visited = true
                 visitedPath.pathVisiting(
                 visitedPath.pathVisiting(