Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev2.10.5.2' of http://192.168.3.207:10080/qmx/jy into dev2.10.5.2

zhangyuhan 5 years ago
parent
8474dcf0e9 305554eef7
commit
ceb0862eb7
16 changed files with 77 additions and 20 deletions
Split View Show Diff Stats
  1. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  2. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  3. 1 1
      src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html
  4. 1 1
      src/jfw/modules/app/src/web/templates/entniche/pay_success.html
  5. 1 1
      src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
  6. 1 1
      src/jfw/modules/app/src/web/templates/invoice/check_invoice.html
  7. 1 1
      src/jfw/modules/app/src/web/templates/invoice/invoicing.html
  8. 1 1
      src/jfw/modules/app/src/web/templates/me/account.html
  9. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation.html
  10. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation_result.html
  11. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation_two.html
  12. 1 1
      src/jfw/modules/app/src/web/templates/me/mine.html
  13. 1 1
      src/jfw/modules/app/src/web/templates/me/setting.html
  14. 1 1
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html
  15. 32 4
      src/web/templates/pc/biddetail_rec.html
  16. 31 2
      src/web/templates/weixin/wxinfocontent_rec.html

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
View File 

@@ -423,7 +423,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div class="j-container" id="order_list">
 
-		<div class="j-header">
 
+		<div class="j-header jy-app-header">
 
 			<span class="header-left iconfont icon-fanhui"></span>
 
 			<span class="header-title">我的订单</span>
 
 			<span class=""></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
View File 

@@ -533,7 +533,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div class="j-container" id="order_detail">
 
-			<div class="j-header">
 
+			<div class="j-header jy-app-header">
 
 				<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 				<span class="header-title"></span>
 
 				<span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html
View File 

@@ -254,7 +254,7 @@ body .loading_ p span {
 
 	<div class="loading_">
 
 	    <p><span></span></p>
 
 	</div>
 
-	<div class="j-header">
 
+	<div class="j-header jy-app-header">
 
 		<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 		<span class="header-title"></span>
 
 		<span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/entniche/pay_success.html
View File 

@@ -74,7 +74,7 @@
 
 
 <body>
 
     <div class="j-container">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">订单详情</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
View File 

@@ -24,7 +24,7 @@
 
 
 <body>
 
     <div class="j-container" id="check_invoice">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">查看发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/check_invoice.html
View File 

@@ -19,7 +19,7 @@
 
 
 <body>
 
     <div class="j-container" id="check_invoice">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">查看发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/invoicing.html
View File 

@@ -19,7 +19,7 @@
 
 
 <body>
 
     <div class="j-container" id="invoicing">
 
-        <div class="j-header" id="app-show">
 
+        <div class="j-header jy-app-header" id="app-show">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">开发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/account.html
View File 

@@ -80,7 +80,7 @@
 
 
 <body>
 
     <div class="j-container">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">账户与安全</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation.html
View File 

@@ -18,7 +18,7 @@
 
 

 <body>

     <div class="j-container cancellation">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation_result.html
View File 

@@ -34,7 +34,7 @@
 
 

 <body>

     <div class="j-container">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left_ iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation_two.html
View File 

@@ -26,7 +26,7 @@
 
 

 <body>

     <div class="j-container">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/mine.html
View File 

@@ -118,7 +118,7 @@ color:#1d1d1d;
 
 </style>
 
 <body>
 
     <div class="j-container mine">
 
-        <div class="j-header" style="padding: 31px 0.24rem 6px">
 
+        <div class="j-header jy-app-header" style="padding: 31px 0.24rem 6px">
 
             <span></span>
 
             <span class="header-title"></span>
 
             <div class="header-right">

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/setting.html
View File 

@@ -32,7 +32,7 @@
 
 		推送消息设置
 
 	<span></span></div>
 
     <div class="j-container">
 
-        <div class="j-header" style="z-index: 999;">
 
+        <div class="j-header jy-app-header" style="z-index: 999;">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">设置</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html
View File 

@@ -226,7 +226,7 @@
 
 			该订单记录已删除
 
 		</div>
 
     </div>
 
-		<div class="j-header">
 
+		<div class="j-header jy-app-header">
 
 			<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 			<span class="header-title"></span>
 
 			<span class="header-right"></span>

+ 32 - 4
src/web/templates/pc/biddetail_rec.html
View File 

@@ -349,7 +349,7 @@ function isWechat() {
 
 				</table>
 
 			</div>
 
 		</div>
 
-    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)" adv_name="PC三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
+    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
     {{if .T.obj.detail}}
 
 		<div class="recoveryfat" style="display:none;">
 
 			<div class="recoveryhead">
 
@@ -449,7 +449,7 @@ function isWechat() {
 
 				</div>
 
 			</div>
 
 			<div class="explain" style="display:none;">*以上摘要信息由剑鱼标讯智能提取。</div>
 
-      <div class="lead-btn" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)" adv_name="PC三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
+      <div class="lead-btn" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
 			<div id="tab1">
 
 				<div class="com-detail">
 
 					{{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}
 
@@ -847,7 +847,8 @@ if (adv[x]==any_adv[0]){
 
   btn_text="立即查看";
 
 }
 
 $(".adv_tosieve-btn").text(btn_text)
 
-$(".join > a").attr("dataHref","/front/dataExport/toSieve?adv_from="+getinfotype(subtype));
 
+$(".join").attr("adv_name",fromwhere(adv[x]));
 
+$(".join > a").attr("dataHref","/front/dataExport/toSieve?adv_from="+fromwhere(adv[x]));
 
 
 function getinfotype(subtype){
 
   var infotype=""
 
@@ -867,7 +868,34 @@ function getinfotype(subtype){
 
 	}
 
   return infotype
 
 }
 
-
 
+function fromwhere(text){
 
+  var ad="pc_articel_";
 
+  if (getinfotype(subtype)=="拟建项目"){
 
+    ad+="nj"
 
+  }
 
+  if (getinfotype(subtype)=="招标公告"){
 
+    ad+="zb"
 
+  }
 
+  if (getinfotype(subtype)=="中标公告"){
 
+    ad+="win"
 
+  }
 
+  if (getinfotype(subtype)=="其他"){
 
+    ad+="qt"
 
+  }
 
+  if (jQuery.inArray(text,zb_adv)!=-1){
 
+    ad+="_zb_"+(jQuery.inArray(text,zb_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,win_adv)!=-1){
 
+    ad+="_win_"+(jQuery.inArray(text,win_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,any_adv)!=-1){
 
+    ad+="_sj_"+(jQuery.inArray(text,any_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,nj_adv)!=-1){
 
+    ad+="_nj_"+(jQuery.inArray(text,nj_adv)+1);
 
+  }
 
+  return ad
 
+}
 
 //
 
 $(window).scroll(function(event){
 
 	if(cHeight <= 0){

+ 31 - 2
src/web/templates/weixin/wxinfocontent_rec.html
View File 

@@ -684,7 +684,7 @@ pre {
 
 				{{end}}
 
 			</ul>
 
 		</div>
 
-    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)" adv_name="微信三级页引导按钮"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
+    <div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;margin-top:20px;"><div class="adv_tosieve" style="font-size:.25rem;"></div><div class="join" onclick="adv_statistics(this)"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
 
     <div class="tab-ct">
 
 			<div id="tab1" style="display:none;">
 
 				<div class="publicTitle">
 
@@ -938,7 +938,8 @@ if (adv[x]==any_adv[0]){
 
   btn_text="立即查看";
 
 }
 
 $(".adv_tosieve-btn").text(btn_text)
 
-$(".join > a").attr("dataHref","/front/wx_dataExport/toSieve?adv_from="+getinfotype(subtype));
 
+$(".join").attr("adv_name",fromwhere(adv[x]));
 
+$(".join > a").attr("dataHref","/front/wx_dataExport/toSieve?adv_from="+fromwhere(adv[x]));
 
 
 function getinfotype(subtype){
 
   var infotype=""
 
@@ -958,6 +959,34 @@ function getinfotype(subtype){
 
 	}
 
   return infotype
 
 }
 
+function fromwhere(text){
 
+  var ad="wx_articel_";
 
+  if (getinfotype(subtype)=="拟建项目"){
 
+    ad+="nj"
 
+  }
 
+  if (getinfotype(subtype)=="招标公告"){
 
+    ad+="zb"
 
+  }
 
+  if (getinfotype(subtype)=="中标公告"){
 
+    ad+="win"
 
+  }
 
+  if (getinfotype(subtype)=="其他"){
 
+    ad+="qt"
 
+  }
 
+  if (jQuery.inArray(text,zb_adv)!=-1){
 
+    ad+="_zb_"+(jQuery.inArray(text,zb_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,win_adv)!=-1){
 
+    ad+="_win_"+(jQuery.inArray(text,win_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,any_adv)!=-1){
 
+    ad+="_sj_"+(jQuery.inArray(text,any_adv)+1);
 
+  }
 
+  if (jQuery.inArray(text,nj_adv)!=-1){
 
+    ad+="_nj_"+(jQuery.inArray(text,nj_adv)+1);
 
+  }
 
+  return ad
 
+}
 
 if({{.T.obj.subtype}}=="中标"||{{.T.obj.subtype}}=="成交"||{{.T.obj.subtype}}=="合同"){
 
     var winner_ = {{.T.obj.winner}};
 
     var bidamount_ = {{.T.obj.bidamount}};