Browse Source

fix:合并冲突

Signed-off-by: tsz <2417024719@qq.com>
tsz 1 năm trước cách đây
mục cha
commit
a6189b1fb5
1 tập tin đã thay đổi với 3 bổ sung10 xóa
  1. 3 10
      src/web/staticres/js/pur-search-index-pc.js

+ 3 - 10
src/web/staticres/js/pur-search-index-pc.js

@@ -732,20 +732,13 @@ var vm = new Vue({
             this.getList()
         },
         goTitle: function(name) {
-<<<<<<< HEAD
-          const BIPge = this.getBIParams ? '?resource=BI' : ''
-            if (this.isNewEntNiche) {
-              window.open('/entpc/unit_portrayal/' + name + BIPge)
-            } else {
-              window.open('/swordfish/page_big_pc/unit_portrayal/' + name + BIPge)
-=======
           // 是渠道合作页面需要登录后重定向
+            const BIPge = this.getBIParams ? '?resource=BI' : ''
             var url = '/swordfish/page_big_pc/unit_portrayal/' + name
             if (this.isNewEntNiche) {
-              url = '/entpc/unit_portrayal/' + name
+              url = '/entpc/unit_portrayal/' + name + BIPge
             } else {
-              url = '/swordfish/page_big_pc/unit_portrayal/' + name
->>>>>>> master
+              url = '/swordfish/page_big_pc/unit_portrayal/' + name + BIPge
             }
             if(cooperateCode) {
               openLoginDig(null, url)