lhd

ipop-web/app/front/entry/main.ejs

@@ -189,7 +189,7 @@
 		  <el-row  style="border-bottom:none;padding: 0px;min-width: 1244px;">
 		  <el-row  style="border-bottom:none;padding: 0px;min-width: 1244px;">
 				<el-col :span="2" style="min-width:150px;text-align: center;">
 				<el-col :span="2" style="min-width:150px;text-align: center;">
 					<!-- <el-button type="text" style="font-size:24px;font-size: 0.24rem;" @click="navRoute('首页')">知识产权运营平台</el-button> -->
 					<!-- <el-button type="text" style="font-size:24px;font-size: 0.24rem;" @click="navRoute('首页')">知识产权运营平台</el-button> -->
-					<img v-if="typeHome" style="margin-top: 14px;margin-left: 32px;cursor: pointer;" @click="NavIndexRoute('首页')" src="/imgs/home/logoimg1.png" alt="">
+					<img v-if="typeHome" style="margin-top: 14px;margin-left: 32px;cursor: pointer;" @click="NavIndexRoute('首页')" src="/imgs/home/logoimg.png" alt="">
 					<img v-if="!typeHome" style="margin-top: 14px;cursor: pointer;" src="/imgs/home/logos.png" @click="NavIndexRoute('首页')" alt="">
 					<img v-if="!typeHome" style="margin-top: 14px;cursor: pointer;" src="/imgs/home/logos.png" @click="NavIndexRoute('首页')" alt="">
 				</el-col>
 				</el-col>
 			  <!-- <el-col :span="17" class="spechorizotal">
 			  <!-- <el-col :span="17" class="spechorizotal">

ipop-web/app/front/entry/public/js/index.js

@@ -403,10 +403,7 @@ axios.get("/vue/comp/base").then(function(res){
            
            
           }else if(v== "创新人才发现"){
           }else if(v== "创新人才发现"){
             this.typeHome = false;
             this.typeHome = false;
-<<<<<<< HEAD
-=======
             // window.open("https://gct.aminer.cn/");
             // window.open("https://gct.aminer.cn/");
->>>>>>> df9a4b0324cd0c8eb5fbab653ded5482ba856b9b
             this.loadingHome = true;
             this.loadingHome = true;
             var url = encodeURIComponent("https://gct.aminer.cn/");
             var url = encodeURIComponent("https://gct.aminer.cn/");
             this.pushx({name:"/iframehtml",title:"创新人才发现",params:{url:url}});
             this.pushx({name:"/iframehtml",title:"创新人才发现",params:{url:url}});
@@ -414,12 +411,6 @@ axios.get("/vue/comp/base").then(function(res){
               this.loadingHome = false;
               this.loadingHome = false;
             },1500);
             },1500);
           }else if(v== "知识产权运营"){
           }else if(v== "知识产权运营"){
-<<<<<<< HEAD
-            this.typeHome = false;
-            this.loadingHome = true;
-            var url = encodeURIComponent("https://www.cnuip.com/");
-            this.pushx({name:"/iframehtml",title:"知识产权运营",params:{url:url}});
-=======
             // window.open("https://www.cnuip.com/");
             // window.open("https://www.cnuip.com/");
             this.typeHome = false;
             this.typeHome = false;
             this.loadingHome = true;
             this.loadingHome = true;
@@ -434,15 +425,11 @@ axios.get("/vue/comp/base").then(function(res){
             this.loadingHome = true;
             this.loadingHome = true;
             var url = encodeURIComponent("http://125.34.170.146/");
             var url = encodeURIComponent("http://125.34.170.146/");
             this.pushx({name:"/iframehtml",title:"智能分类",params:{url:url}});
             this.pushx({name:"/iframehtml",title:"智能分类",params:{url:url}});
->>>>>>> df9a4b0324cd0c8eb5fbab653ded5482ba856b9b
             setTimeout(()=>{
             setTimeout(()=>{
               this.loadingHome = false;
               this.loadingHome = false;
             },1500);
             },1500);
           }else if(v== "智能采集"){
           }else if(v== "智能采集"){
-<<<<<<< HEAD
-=======
             // window.open("http://47.104.94.221:8001/wiki");
             // window.open("http://47.104.94.221:8001/wiki");
->>>>>>> df9a4b0324cd0c8eb5fbab653ded5482ba856b9b
             this.typeHome = false;
             this.typeHome = false;
             this.loadingHome = true;
             this.loadingHome = true;
             var url = encodeURIComponent("http://47.104.94.221:8001/wiki");
             var url = encodeURIComponent("http://47.104.94.221:8001/wiki");
@@ -450,8 +437,6 @@ axios.get("/vue/comp/base").then(function(res){
             setTimeout(()=>{
             setTimeout(()=>{
               this.loadingHome = false;
               this.loadingHome = false;
             },1500);
             },1500);
-<<<<<<< HEAD
-=======
           }else if(v== "智能翻译"){
           }else if(v== "智能翻译"){
             // window.open("http://47.104.94.221:8001/wiki");
             // window.open("http://47.104.94.221:8001/wiki");
             this.typeHome = false;
             this.typeHome = false;
@@ -461,7 +446,6 @@ axios.get("/vue/comp/base").then(function(res){
             setTimeout(()=>{
             setTimeout(()=>{
               this.loadingHome = false;
               this.loadingHome = false;
             },1500);
             },1500);
->>>>>>> df9a4b0324cd0c8eb5fbab653ded5482ba856b9b
           }else if(v== "创新资源共享"){
           }else if(v== "创新资源共享"){
             this.typeHome = false;
             this.typeHome = false;
             this.loadingHome = true;
             this.loadingHome = true;