修改缺陷

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -62,9 +62,9 @@ var SuperSearch = {
 		}catch(e){}
         $("body").css("background-color","#fff");
 		if(SuperSearch.dyDiv){   //首次进来是否显示订阅
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false);
 		}else{
-			$("#supersearchPage .resbm").removeClass("hidden");
+			SuperSearch.showToOrder(true);
 		}
 		SuperSearch.canSearch();
 		if(isReload){
@@ -177,7 +177,7 @@ var SuperSearch = {
 		//是否开通超级搜索服务
 		//关闭搜索后订阅================================================================
 		$("#supersearchPage .dy_close").on("tap",function(){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false);
 			SuperSearch.dyDiv=true;
 		});
 		
@@ -864,7 +864,7 @@ var SuperSearch = {
 		$("#supersearchPage #table").addClass("hidden");
 		$("#supersearchPage #list").addClass("hidden");
 		if(SuperSearch.showNull){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false);
 		}
 		$("#supersearchPage .nullcontent").addClass("hidden");
 		$("#supersearchPage .selLable").removeClass("hidden");
@@ -1126,27 +1126,27 @@ var SuperSearch = {
 			//拟建项目
 			if(SuperSearch.subtype_proposed==SuperSearch.reqParam.subtype){
 				var projectinfo = list[i].projectinfo;
-				if(projectinfo){
+				//if(projectinfo){
 					var approvecode = "";
-					if(projectinfo.approvecode){
+					if(projectinfo&&projectinfo.approvecode){
 					   approvecode = projectinfo.approvecode;
 					}
 					var approvecontent = "";
-					if(projectinfo.approvecontent){
+					if(projectinfo&&projectinfo.approvecontent){
 					   approvecontent = projectinfo.approvecontent;
 					}
 					var approvestatus = "";
-					if(projectinfo.approvestatus){
+					if(projectinfo&&projectinfo.approvestatus){
 					   approvestatus = projectinfo.approvestatus;
 					}
 					var approvetime = "";
 					var diff = "";
-					if(projectinfo.approvetime){
+					if(projectinfo&&projectinfo.approvetime){
 					   	approvetime = projectinfo.approvetime.replace(/-/g,"/");
 					   	diff = timeDiff(new Date(approvetime));
 					}
 					var industry = "";
-					if(projectinfo.industry){
+					if(projectinfo&&projectinfo.industry){
 						industry = projectinfo.industry;
 					}
 					TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'" i="'+industry+'">'+
@@ -1158,7 +1158,7 @@ var SuperSearch = {
 					   '<td><div style="width: 75px;text-align: center;">'+approvetime+'</div></td>'+
 					   '<td><div style="width: 75px;text-align: center;">'+diff+'</div></td>'+
 					   '</tr>';
-				}
+				//}
 			}else{
 				TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'" i="'+(list[i].industry?list[i].industry:"")+'">'+
 							'<td><div>'+index+'</div></td>'+
@@ -1190,9 +1190,9 @@ var SuperSearch = {
 		$("#supersearchPage .nullcontent").addClass("hidden");
 		$("#supersearchPage #wrapper").removeClass("hidden");
 		if(SuperSearch.dyDiv){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false);
 		}else{
-			$("#supersearchPage .resbm").removeClass("hidden");
+			SuperSearch.showToOrder(true);
 		}
 	},
 	appendListHtml: function (html){  //下拉时展示信息
@@ -1556,13 +1556,13 @@ var SuperSearch = {
 				if(sessionStorage.superSearch_dyDiv == "false"){
 					SuperSearch.dyDiv = false;
 					$("#supersearchPage .resbm").css("position","absolute");
-					$("#supersearchPage .resbm").removeClass("hidden");
+					SuperSearch.showToOrder(true);
 					setTimeout(function(){
 						$("#supersearchPage .resbm").css("position","fixed");
 					},200);
 				}else{
 					SuperSearch.dyDiv = true;
-					$("#supersearchPage .resbm").addClass("hidden");
+					SuperSearch.showToOrder(false);
 				}
 				SuperSearch.noMoreCache = sessionStorage.superSearch_noMoreCache;
 				SuperSearch.showNull = false;
@@ -1969,5 +1969,14 @@ var SuperSearch = {
 		$("#supersearchPage input[name=super_searchinput]").blur();
 		$("#supersearchPage .maxMrice").blur();
 	    $("#supersearchPage .minMrice").blur();
+	},
+	showToOrder:function(flag){
+		if(flag){
+			$("#wrapper").css("margin-bottom","91px");
+			$("#supersearchPage .resbm").removeClass("hidden");
+		}else{
+			$("#wrapper").css("margin-bottom","52px");
+			$("#supersearchPage .resbm").addClass("hidden");
+		}
 	}
 };

src/jfw/pay/aliPay.go

@@ -216,6 +216,7 @@ func (a *AliPayAction) PayCallback() {
 
 	//支付完成插入
 	now := time.Now()
+	log.Printf("支付宝支付完成-回调  订单号%s\n", out_trade_no)
 	orderdata := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
 		"out_trade_no": out_trade_no,
 		"order_money":  total_amount * 100,

src/web/staticres/js/biddingSearch.js

@@ -367,14 +367,18 @@ $(function() {
 						$("#labModal").modal("show");
 					}
 				}
-				//隐藏翻页
-				$(".pagination.clearfix.w").css("display","none");			
+				//隐藏翻页(仅超级搜索页面、拟建项目不隐藏)
+				if(window.location.href.indexOf("supsearch/index.html")>-1){
+					$(".pagination.clearfix.w").css("display","none");			
+				}
 			}else if($(this).attr("id")=="right-list"){
 				$(this).addClass("active").siblings().removeClass("active");
 				$controlDiv.eq($(this).index()).show().siblings().hide();
 				$controlDiv_2.eq($(this).index()).show().siblings().hide();
 				//显示翻页
-				$(".pagination.clearfix.w").css("display","");
+				if(window.location.href.indexOf("supsearch/index.html")>-1){
+					$(".pagination.clearfix.w").css("display","");
+				}
 			}else if($(this).attr("id")=="right-export"){
 				//数据导出
 				if(!loginflag){

src/web/staticres/js/wxSupersearch.js

@@ -45,9 +45,9 @@ var SuperSearch = {
 		$("#supersearchPage").removeClass("hidden");
         $("body").css("background-color","#fff");
 		if(SuperSearch.dyDiv){   //首次进来是否显示订阅
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false)
 		}else{
-			$("#supersearchPage .resbm").removeClass("hidden");
+			SuperSearch.showToOrder(true)
 		}
 		SuperSearch.canSearch();
 		if(isReload){
@@ -163,7 +163,7 @@ var SuperSearch = {
 		//是否开通超级搜索服务
 		//关闭搜索后订阅================================================================
 		$("#supersearchPage .dy_close").on("tap",function(){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false)
 			SuperSearch.dyDiv=true;
 		});
 		
@@ -845,7 +845,7 @@ var SuperSearch = {
 		$("#supersearchPage #table").addClass("hidden");
 		$("#supersearchPage #list").addClass("hidden");
 		if(SuperSearch.showNull){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false)
 		}
 		$("#supersearchPage .nullcontent").addClass("hidden");
 		$("#supersearchPage .selLable").removeClass("hidden");
@@ -1076,27 +1076,27 @@ var SuperSearch = {
 			//拟建项目
 			if(SuperSearch.subtype_proposed==SuperSearch.reqParam.subtype){
 				var projectinfo = list[i].projectinfo;
-				if(projectinfo){
+				//if(projectinfo){
 					var approvecode = "";
-					if(projectinfo.approvecode){
+					if(projectinfo&&projectinfo.approvecode){
 					   approvecode = projectinfo.approvecode;
 					}
 					var approvecontent = "";
-					if(projectinfo.approvecontent){
+					if(projectinfo&&projectinfo.approvecontent){
 					   approvecontent = projectinfo.approvecontent;
 					}
 					var approvestatus = "";
-					if(projectinfo.approvestatus){
+					if(projectinfo&&projectinfo.approvestatus){
 					   approvestatus = projectinfo.approvestatus;
 					}
 					var approvetime = "";
 					var diff = "";
-					if(projectinfo.approvetime){
+					if(projectinfo&&projectinfo.approvetime){
 					   	approvetime = projectinfo.approvetime.replace(/-/g,"/");
 					   	diff = timeDiff(new Date(approvetime));
 					}
 					var industry = "";
-					if(projectinfo.industry){
+					if(projectinfo&&projectinfo.industry){
 						industry = projectinfo.industry;
 					}
 					TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'" i="'+industry+'">'+
@@ -1108,7 +1108,7 @@ var SuperSearch = {
 					   '<td><div style="width: 75px;text-align: center;">'+approvetime+'</div></td>'+
 					   '<td><div style="width: 75px;text-align: center;">'+diff+'</div></td>'+
 					   '</tr>';
-				}
+				//}
 			}else{
 				TableHtml +='<tr s="'+href+'"  sid="'+list[i]._id+'" i="'+(list[i].industry?list[i].industry:"")+'">'+
 							'<td><div>'+index+'</div></td>'+
@@ -1140,9 +1140,9 @@ var SuperSearch = {
 		$("#supersearchPage .nullcontent").addClass("hidden");
 		$("#supersearchPage #wrapper").removeClass("hidden");
 		if(SuperSearch.dyDiv){
-			$("#supersearchPage .resbm").addClass("hidden");
+			SuperSearch.showToOrder(false)
 		}else{
-			$("#supersearchPage .resbm").removeClass("hidden");
+			SuperSearch.showToOrder(true)
 		}
 	},
 	appendListHtml: function (html){  //下拉时展示信息
@@ -1875,5 +1875,14 @@ var SuperSearch = {
 		$("#supersearchPage input[name=super_searchinput]").blur();
 		$("#supersearchPage .maxMrice").blur();
 	    $("#supersearchPage .minMrice").blur();
+	},
+	showToOrder:function(flag){
+		if(flag){
+			$("#wrapper").css("margin-bottom","91px");
+			$("#supersearchPage .resbm").removeClass("hidden");
+		}else{
+			$("#wrapper").css("margin-bottom","52px");
+			$("#supersearchPage .resbm").addClass("hidden");
+		}
 	}
 };

src/web/templates/pc/supsearch.html

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

src/web/templates/weixin/search/mainSearch.html

@@ -338,13 +338,13 @@
           查看更多
         </div>
       </div>
-			<!--<div class="resbm hidden">
+			<div class="resbm hidden">
 				<div class="rests">如果您对以上结果满意可</div>
 				<div class="resdy" id="zjdy">直接订阅<img src="{{Msg "seo" "cdn"}}/images/wx/jydyyou.png"></div>
 				<div class="dy_close"><img src="{{Msg "seo" "cdn"}}/images/search/dy_close.png"/></div>
 				<div style="clear:both"></div>
 			</div>
-			<div onclick="window.location.href='/supportJy'" style="font-size:15px;background-color: #FFB900;line-height: 50px;z-index: 2000;color: #fff;bottom: 0px;right: 0px;left:0px;position: fixed;"><img src="{{Msg "seo" "cdn"}}/images/search/laba.png" style="width: 23px;margin:0px 10px;">好几天没有推送消息了，真相是......</div>-->
+			<!--<div onclick="window.location.href='/supportJy'" style="font-size:15px;background-color: #FFB900;line-height: 50px;z-index: 2000;color: #fff;bottom: 0px;right: 0px;left:0px;position: fixed;"><img src="{{Msg "seo" "cdn"}}/images/search/laba.png" style="width: 23px;margin:0px 10px;">好几天没有推送消息了，真相是......</div>-->
 		</div>
 	</div>
 	<div id="working" class="hidden" style="text-align: center;position: absolute;top: 50%;left: 50%;margin-left: -81px;margin-top: -50px;"><img style="width:163px;" src="/images/wx/working.gif"><div style="font-size:16px;">剑鱼标讯正在努力工作中···</div></div>