修改缺陷

src/jfw/front/swordfish.go

@@ -499,6 +499,9 @@ func (m *Front) PcAjaxReq() {
 					findfields := `"`
 					findfields += m.GetString("selectType")
 					findfields += `"`
+					if findfields == `"all"` {
+						findfields = `"title","detail"`
+					}
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(area, publishtime, subtype))
 					secondLimit := 2*pc_pageSize - int(count)
 					secRel := elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, 0, secondLimit, 0, false)

src/jfw/modules/app/src/app/front/swordfish.go

@@ -459,7 +459,6 @@ func (m *Front) WxsearchlistPaging() {
 				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
-						log.Println("11111")
 						list, b_word, a_word, s_word = getWxsearchlistData_new(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, pageNum, public.Lst.TotalPage*wx_pageSize, selectType, feld)
 					}
 				} else {
@@ -476,6 +475,9 @@ func (m *Front) WxsearchlistPaging() {
 					findfields := `"`
 					findfields += m.GetString("selectType")
 					findfields += `"`
+					if findfields == `"all"` {
+						findfields = `"title","detail"`
+					}
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 					secondLimit := 2*wx_pageSize - listSize
 					secRel = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, feld, 0, secondLimit, 0, false)
@@ -554,7 +556,6 @@ func (m *Front) WxsearchlistPaging() {
 				m.T["msgset"] = keys
 			}
 		}
-		log.Println("list:", list)
 		m.ServeJson(map[string]interface{}{
 			"limitFlag":     limitFlag,
 			"status":        isLimit,
@@ -587,12 +588,9 @@ func getWxsearchlistData_new(keywords, scope, publishtime, subtype, industry, mi
 	}
 	qstr := getSearchQuery(s_word, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))
 	if selectType == "all" { //全文搜索
-		log.Println("全文")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, true)
 	} else { //标题搜索
-		log.Println("标题")
 		list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, field, (pageNum-1)*pageSize, pageSize, 100, false)
-		log.Println("end")
 	}
 
 	if list != nil {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -313,10 +313,6 @@
 				window.location.href="/jyapp/front/staticPage/dataExport_serviceterms.html";
 			}
 			$(function() {     
-				//进入其他页面 验证码显示 
-				if(sessionStorage.email_sign=="1"){
-					$(".verification").show();
-				}
 				//返回键
 				$(".app-layout-header .app-back_").unbind("tap").on("tap",function(){
 						setTimeout(function(){

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -812,7 +812,7 @@
 									if (r.success) {
 										//更改缓存内容
 										$(".loading_").show();
-										changeCache(this_e);
+										//changeCache(this_e);
 										setTimeout(function(){
 											//存缓存
 											$(".loading_").hide();

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -555,12 +555,14 @@
 							<p class="text ellipsis">支付时间：{{.T.o.pay_time}}</p>
 							<p class="text ellipsis">产品类型：{{.T.o.product_type}}</p>
 							{{if ne .T.o.order_status -2}}
+							{{if .T.o.pay_time}}
 							{{if eq .T.o.pay_way "wx_js"}}        
 								<p class="text ellipsis">微信支付单号：{{.T.o.transaction_id}}</p>
 					        {{end}}
 					        {{if eq .T.o.pay_way "ali_app"}}        
 								<p class="text ellipsis">支付宝单号：{{.T.o.transaction_id}}</p>
 					        {{end}}
+							{{end}}
 					        {{end}}
 							<p class="text ellipsis">数据类型：{{.T.o.data_spec}}</p>
 							<p class="text ellipsis">数据量：{{.T.o.data_count}}条</p>

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -306,10 +306,6 @@
 			}
 			//
             $(function() {			
-            	//进入其他页面 验证码显示 
-				if(sessionStorage.email_sign=="1"){
-					$(".form-control").show();
-				}
             	if(sessionStorage.index=="1"){
             		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
             		dataType=2;

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -280,7 +280,7 @@
 							setTimeout(function(){
 								setSessionStorage();
 								window.location.href="/front/wx_dataExport/paySuccessPage?email="+res["user_mail"]+"&orderCode="+res["order_code"]+"&payTime="+res["timestamp"];
-							},1000)
+							},500)
 						}else if(r.err_msg == "get_brand_wcpay_request:cancel"){
 							//取消支付 可以再次支付
 							canpay=true;