Merge remote-tracking branch 'origin/hotfix/v4.10.29.1' into hotfix/v4.10.29.1

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -900,7 +900,11 @@
                         </ul>
                     </div>
                 </div>
-                <div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取。如有误差，请联系客服进行处理。</div>
+      {{if .T.obj.isCandidate }}
+			        <div class="explain" style="display:none;">*该信息为<span style="color: #FF3A20">候选人公示</span>，具体<span style="color: #FF3A20">中标信息未确认</span>，请以实际中标通知为准！如有误差，请联系客服处理。</div>
+			{{else}}
+            <div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取。如有误差，请联系客服进行处理。</div>
+      {{end}}
                 <div class="lead-btn" style="height: 1.2rem;background: #F5F6F7;border-radius: 8px; color:#2cb7ca;margin: 16px 0;display:none; align-items: center;padding: 0 .32rem;" onclick="adv_statistics(this)">
                     <a class="adv_dataexprt" style="width: .48rem; height: .48rem;margin-right: .24rem;display: flex;"></a>
                     <a class="adv_center" style="display: flex;flex-direction: column;flex: 1;">
@@ -1200,6 +1204,10 @@
     var isVIP={{.T.isVip}};
     var hsn = {{.T.obj.hasSession}};
     var id = {{.T.obj._id}}; // 招标信息id
+    var hasWaitWinnerState = {{.T.obj.isCandidate}}
+    var fixWinnerLabel = hasWaitWinnerState ? '中标候选人' : '中标单位'
+    var fixWinnerMoneyLabel = hasWaitWinnerState ? '投标金额(元)' : '中标金额(元)'
+//
     var title = {{.T.obj.title}};
     var s_words = {{.T.keywords}};
     var url = {{.T.obj.href}};
@@ -2985,7 +2993,7 @@
           }
 
           if(count>=5){
-            	var bidInfohtml='<li><p class="name">中标单位</p><div style="flex: 1;">'
+            	var bidInfohtml='<li><p class="name">'+fixWinnerLabel+'</p><div style="flex: 1;">'
               var indexN =0;
               var winnerArr =[];
                 $("#bidInfoTitle").show();
@@ -3001,7 +3009,7 @@
                     }
                 }
               }
-              bidInfohtml +='<li class="bbm0 needLogin"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p></li>'
+              bidInfohtml +='<li class="bbm0 needLogin"><p class="name">'+fixWinnerMoneyLabel+'</p><p class="textcontent">'+rerbidamount+'</p></li>'
               if(winnertel!=""){
                   bidInfohtml +='<li class="bbm0 winnertel bigwinnertel needLogin" style="position: relative; margin-bottom: 10px;border-bottom: 0px !important"><p class="name">联系方式</p>'
                   if ((isVIP!=null&&isVIP)||(isEntniche!=null&&isEntniche)){

src/web/templates/areaPack/pc/page_order.html

@@ -276,7 +276,7 @@
                     $('.filter_data .replace_text[name="type"]').text(formatAreaTextBefore(filterObj.ordertype))
                     $('.filter_data .replace_text[name="area"]').text(formatAreaText(filterObj.num, filterObj.OldNum))
                     $('.filter_data .replace_text[name="cycle"]').text(filterObj.ordertype === 2 ? '不延期' : formatCycleText(filterObj.cycleunit))
-                    $('.filter_data .replace_text[name="time"]').text(formatTimeText(r.data.order.vip_endtime) + '到期')
+                    $('.filter_data .replace_text[name="time"]').text(formatTimeText(r.data.order.vip_endtime || r.data.order.service_endtime) + '到期')
                     if (r.data.order.order_status == 1) {
                         $(".realTimeText").show()
                     }

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1345,7 +1345,11 @@ body .loading_ p span {
 					</ul>
 				</div>
 			</div>
+      {{if .T.obj.isCandidate }}
+			  <div class="explain" style="display:none;">*该信息为<span style="color: #FF3A20">候选人公示</span>，具体<span style="color: #FF3A20">中标信息未确认</span>，请以实际中标通知为准！如有误差，请联系客服处理。</div>
+			{{else}}
 			  <div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取。如有误差，请联系客服进行处理。</div>
+      {{end}}
 			<div class="lead-btn" style="height: 1.2rem;background: #F5F6F7;border-radius: 8px; color:#2cb7ca;margin: 16px 0;display:none; align-items: center;padding: 0 .32rem;" onclick="adv_statistics(this)">
 				<a class="adv_dataexprt" style="width: .48rem; height: .48rem;margin-right: .24rem;display: flex;"></a>
 				<a class="adv_center" style="display: flex;flex-direction: column;flex: 1;">
@@ -1600,6 +1604,9 @@ var reg =""
 var winner_con = "";
 var title = {{.T.obj.title}};
 var id = {{.T.obj._id}};
+var hasWaitWinnerState = {{.T.obj.isCandidate}}
+var fixWinnerLabel = hasWaitWinnerState ? '中标候选人' : '中标单位'
+var fixWinnerMoneyLabel = hasWaitWinnerState ? '投标金额(元)' : '中标金额(元)'
 //
 var s_words = {{.T.keywords}};
 s_words=decodeURIComponent(getParameter("keywords"));
@@ -3036,7 +3043,7 @@ $(function(){
     }
     if(count>=5){
 		$("#bidInfoTitle").show();
-    	var bidInfohtml='<li><p class="name">中标单位</p><div style="flex: 1;">'
+    	var bidInfohtml='<li><p class="name">'+fixWinnerLabel+'</p><div style="flex: 1;">'
       var indexN =0;
       console.log(rerwinner)
       var winnerArr =[];
@@ -3052,7 +3059,7 @@ $(function(){
       }
       bidInfohtml+='</div><a dataName="中标单位" dataCont="'+x+'" dataCode="winner" onClick="recoveryAction(this)">纠错</a></li>'
 
-  		bidInfohtml +='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
+  		bidInfohtml +='<li class="bbm0"><p class="name">'+fixWinnerMoneyLabel+'</p><p class="textcontent">'+rerbidamount+'</p><a dataName="中标金额(元)" dataCont="'+rerbidamount+'" dataCode="bidamount" onClick="recoveryAction(this)">纠错</a></li>'
       if(winnertel!=""){
         bidInfohtml +='<li class="bbm0 winnertel"><p class="name">联系方式</p>';
         bidInfohtml +='<div class="tel-group"><div class="tel-item"><p>'+winnertel+'</p><a href="tel:'+winnertel+'" class="border-tel" style="display:block;position: static;"><div class="tel"></div></a></div><div class="tel-source">'+tel_source+'</div></div>'
@@ -3108,8 +3115,8 @@ $(function(){
 					pkchtml+='<li><p class="name">拟定单一来源采购供应商</p><p class="textcontent">'+pckwinner+'</p><a dataName="拟定单一来源采购供应商" dataCont="'+pckwinner+'"  dataCode="'+n+'-winner" onClick="recoveryAction(this)">纠错</a></li>'
 					pkchtml+='<li class="bbm0"><p class="name">项目预算(元)</p><p class="textcontent">'+pckbidamount+'</p><a dataName="项目预算(元)" dataCont="'+pckbidamount+'"  dataCode="'+n+'-bidamount" onClick="recoveryAction(this)">纠错</a></li>'
 				}else{
-					pkchtml+='<li><p class="name">中标单位</p><p class="textcontent">'+pckwinner+'</p><a dataName="中标单位" dataCont="'+pckwinner+'"  dataCode="'+n+'-winner" onClick="recoveryAction(this)">纠错</a></li>'
-					pkchtml+='<li class="bbm0"><p class="name">中标金额(元)</p><p class="textcontent">'+pckbidamount+'</p><a dataName="中标金额(元)" dataCont="'+pckbidamount+'"  dataCode="'+n+'-bidamount" onClick="recoveryAction(this)">纠错</a></li>'
+					pkchtml+='<li><p class="name">'+fixWinnerLabel+'</p><p class="textcontent">'+pckwinner+'</p><a dataName="中标单位" dataCont="'+pckwinner+'"  dataCode="'+n+'-winner" onClick="recoveryAction(this)">纠错</a></li>'
+					pkchtml+='<li class="bbm0"><p class="name">'+fixWinnerMoneyLabel+'</p><p class="textcontent">'+pckbidamount+'</p><a dataName="中标金额(元)" dataCont="'+pckbidamount+'"  dataCode="'+n+'-bidamount" onClick="recoveryAction(this)">纠错</a></li>'
 				}
 			}