wangkaiyue %!s(int64=6) %!d(string=hai) anos
pai
achega
91afedb4ce

+ 18 - 13
src/web/staticres/js/biddingSearch.js

@@ -381,21 +381,11 @@ $(function() {
 				}
 			}else if($(this).attr("id")=="right-export"){
 				//数据导出
-				if(!loginflag){
-					unseatflag = true;
-					$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
-					$("#bidLogin").modal("show");
-				}else{
-					//已登录跳转订单支付页面
-					window.history.replaceState(null, null, "/jylab/supsearch/index.html?goback"+new Date().getTime());
-					$("#zbSeatchT").attr("action","/front/dataExport/superSearchExport");
-					$("#zbSeatchT").removeAttr("onsubmit");
-					$("#zbSeatchT").submit();
-				}
+				toPaydataExport();
 			}
 		})
 	}
-
+		
 	/*全文搜索 标题搜索 添加类名*/
 	luceneTab();
 
@@ -412,4 +402,19 @@ $(function() {
 		})
 	}
 
-})
+})
+
+//携带当前检索跳转数据导出支付页面
+function toPaydataExport(){
+	if(!loginflag){
+		unseatflag = true;
+		$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
+		$("#bidLogin").modal("show");
+	}else{
+		//已登录跳转订单支付页面
+		window.history.replaceState(null, null, "/jylab/supsearch/index.html?goback"+new Date().getTime());
+		$("#zbSeatchT").attr("action","/front/dataExport/superSearchExport");
+		$("#zbSeatchT").removeAttr("onsubmit");
+		$("#zbSeatchT").submit();
+	}
+}

+ 1 - 1
src/web/staticres/js/proproject.js

@@ -348,7 +348,7 @@ function appendDatas(datas,isNew){
 				tableHtml += '<td width="155"><div></div></td>';
 			}
 			
-			if(proinfo!=undefined && typeof(proinfo.approvetime) != "undefined" && proinfo.approvetime != null && proinfo.approvetime != ""){
+			if(proinfo!=undefined && typeof(proinfo.approvetime) != "undefined" && proinfo.approvetime != null && proinfo.approvetime != "" && proinfo.approvetime !=0 ){
 				tableHtml += '<td width="115"><div>'+proinfo.approvetime.substring(0,16)+'</div></td>';
 			}else{
 				tableHtml += '<td width="115"><div></div></td>';

+ 1 - 0
src/web/templates/pc/createOrderPage.html

@@ -241,6 +241,7 @@
 			var email=$(".email_input").val().replace(/\s*/g,"");
 			if(!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)){
 				showEmailErr("邮箱格式不正确");
+        finishEmailVerity=false;
 				return
 			}
 			$(".email_check_ok").show();

+ 2 - 2
src/web/templates/pc/supsearch.html

@@ -889,7 +889,7 @@ $(function(){
 						</tbody>
 					</table>
           <div class="shade_table" style="display:none">
-            <div class="more" onclick="window.open('/front/dataExport/toSieve')">
+            <div class="more" onclick="toPaydataExport()">
               查看更多&gt;
             </div>
           </div>
@@ -928,7 +928,7 @@ $(function(){
 						</tbody>
 					</table>
            <div class="shade_table" style="display:none">
-            <div class="more" onclick="window.open('/front/dataExport/toSieve')">
+            <div class="more" onclick="toPaydataExport()">
               查看更多&gt;
             </div>
           </div>