Merge branch 'dev/v4.8.87_cyl' of qmx/jy into release/v4.8.87

src/web/staticres/common-module/exhibition/css/index.css

@@ -9,7 +9,7 @@
   #vm_exhibition .head {
     width: 100%;
     height: 360px;
-    background: url('/common-module/exhibition/img/bannerBG.png') center center no-repeat;
+    background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;
     background-size: cover;
 
   }
@@ -275,7 +275,7 @@
   #vm_exhibition .head {
     width: 100%;
     height: 3.2rem;
-    background: url('/common-module/exhibition/img/mobile_head.png') center center no-repeat;
+    background: url('/common-module/exhibition/img/mobile_head.png?v=1') center center no-repeat;
     background-size: cover;
 
   }

src/web/staticres/common-module/exhibition/css/index_pc.css

@@ -11,7 +11,7 @@
   #vm_exhibition .head {
     width: 100%;
     height: 360px;
-    background: url('/common-module/exhibition/img/bannerBG.png') center center no-repeat;
+    background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;
     background-size: cover;
 
   }

src/web/staticres/frontRouter/pc/user/js/set_favorite.js

@@ -359,11 +359,7 @@ var favorite = new Vue({
             if (window.opener && window.opener !== window) {
                 window.close()
             }
-            if (goTemplateData.inIframe) {
-                window.parent.location.href = '/?from=set_favorite'
-            } else {
-                location.href = '/?from=set_favorite'
-            }
+            window.top.location.href = '/?from=set_favorite'
         },
         // 变更微信提醒按钮
         changeWxSwitch (val, key) {

src/web/staticres/js/login.js

@@ -29,6 +29,10 @@ var unseatzbqyflag = false;//未登录情况下，用户点击中标企业等开
 var sendMsgInterval = null;
 var entjumpflag = false;
 var isBindPage = false; // 是否是绑定手机号页面功能
+var _reconnectedConf = {
+  count: 0, // ws重连了几次
+  max: 10, // ws最大重连次数，重连max次后不再重连
+}
 //轮询查询
 var LoginPolling = {
 	isPostLoginPolling: true,//是否发起轮询请求
@@ -184,11 +188,18 @@ function reconnect() {
 	if(webSocketHeartCheck.lockReconnect || loginflag){
 		return;
 	}
+  // 达到最大重连次数后，不再重连
+  if (_reconnectedConf.count >= _reconnectedConf.max) {
+    console.log('ws重连达到最大次数，不再重连')
+    return
+  }
 	LoginPolling.isPostLoginPolling = true;
     webSocketHeartCheck.lockReconnect = true;
 	LoginPolling.init();
     //没连接上会一直重连，设置延迟避免请求过多
     setTimeout(function () {
+        _reconnectedConf.count++;
+        console.log('ws第' + _reconnectedConf.count + '次重连')
         createWebSocket();
 		webSocketHeartCheck.lockReconnect = false;
     }, 2000);

src/web/staticres/pccss/index_pc.css

@@ -1057,7 +1057,11 @@
 }
 
 .ent-service-module .service-desc-card {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
     width: 288px;
+    height: 314px;
 }
 .ent-service-module .service-desc-header {
     padding: 0 20px;
@@ -1065,21 +1069,22 @@
 }
 .ent-service-module .service-desc-main {
     padding: 0 20px;
+    flex: 1;
 }
 .ent-service-module .service-desc-text {
-    margin-bottom: 26px;
+    margin-bottom: 12px;
     color: #686868;
     font-size: 12px;
     line-height: 22px;
 }
 .ent-service-module .service-desc-list li:not(:first-of-type) {
-    margin-top: 12px;
+    margin-top: 10px;
 }
 .ent-service-module .service-desc-list li {
     width: 100%;
 }
 .ent-service-module .service-desc-footer {
-    margin-top: 24px;
+    /* margin-top: 24px; */
 }
 
 /* data-service-module */

src/web/staticres/public-pc/css/sub-page.css

@@ -246,7 +246,7 @@ body.in-iframe {
   width: calc(100% - 48px) !important ;
   height: calc(20.3vw - 48px) !important;
   margin: auto;
-  background: url('/common-module/exhibition/img/work_bg.png') center center no-repeat;
+  background: url('/common-module/exhibition/img/work_bg.png?v=1') center center no-repeat;
   background-size: cover;
   border-radius: 8px;
 }

src/web/staticres/public-pc/js/header-nav-mini.js

@@ -1,4 +1,5 @@
 var headerNavMini = {
+  inIframe: window.parent !== window,
   headerNavContainer: $('#header-nav-container'),
   headerNav: $('#public-nav'),
   headerNavPlaceholder: $('#header-nav-mini-placeholder'),
@@ -11,7 +12,12 @@ var headerNavMini = {
     this.initEvents()
   },
   initStyle: function () {
-    this.headerNav.show()
+    if (this.inIframe) {
+      this.headerNav.hide()
+      this.headerNavContainer.hide()
+    } else {
+      this.headerNav.show()
+    }
   },
   headerFixed: function (f) {
     if (f) {
@@ -30,6 +36,7 @@ var headerNavMini = {
   },
   // 登陆前不展示。登陆后工作台外的页面顶部统一展示(除了首页)
   secondHeaderShow: function (login) {
+    if (this.inIframe) return
     if (!login) return
     // exclude中的页面不会显示第二个头部
     var pathname = location.pathname

src/web/templates/pc/biddetail_rec.html

@@ -1598,11 +1598,11 @@
                         <div class="com-status">
                             {{if $v.area}}<span class="com-area"><a href="/list/area/{{$v.areaadd}}.html">{{$v.area}}</a></span>{{end}}
                             {{if or (eq  $v.type "拟建") ( eq  $v.type "采购意向")}}
-                            <span class="com-type"><a href="javascript:volid(0);">{{$v.type}}</a></span>
+                            <span class="com-type"><a target="_top" href="javascript:volid(0);">{{$v.type}}</a></span>
                             {{else}}
-                            <span class="com-type"><a href="/list/stype/{{$v.stypeadd}}.html">{{$v.type}}</a></span>
+                            <span class="com-type"><a target="_top" href="/list/stype/{{$v.stypeadd}}.html">{{$v.type}}</a></span>
                             {{end}}
-                            {{if $v.industry}}<span class="com-industry"><a href="/list/industry/{{$v.indadd}}.html">{{$v.industry}}</a></span>{{end}}
+                            {{if $v.industry}}<span class="com-industry"><a target="_top" href="/list/industry/{{$v.indadd}}.html">{{$v.industry}}</a></span>{{end}}
                             {{if $v.publishtime}}<span class="com-time" data-value="{{$v.pbtime}}"><i class="glyphicon bofangjilu"></i>{{$v.publishtime}}</span>{{end}}
                         </div>
                     </li>