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

src/jfw/front/dataExport.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"jfw/config"
+	"jfw/pay"
 	"jfw/public"
 	"log"
 	"qfw/util"
@@ -264,14 +265,23 @@ func (d *DataExport) CancelOrder() error {
 */
 func (d *DataExport) DeleteOrder() error {
 	if userId := d.GetSession("userId"); userId != nil {
-		//	if openid := d.GetSession("s_m_openid"); openid != nil {
 		queryMap := map[string]interface{}{
 			"id":      d.GetString("id"),
 			"user_id": userId.(string),
 		}
-		boo := public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
-		//撤销订单
-		d.ServeJson(map[string]interface{}{"success": boo})
+		flag := false
+		order := public.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time,order_status", "")
+		if order != nil {
+			if util.IntAll((*order)["order_status"]) == 0 { //未支付状态下 删除订单需要先关闭订单
+				flag = pay.CloseDataExportOrder(util.ObjToString((*order)["pay_way"]), util.ObjToString((*order)["out_trade_no"]), util.ObjToString((*order)["prepay_time"]))
+			} else {
+				flag = true
+			}
+		}
+		if flag {
+			flag = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
+		}
+		d.ServeJson(map[string]interface{}{"success": flag})
 	}
 	return nil
 }

src/jfw/front/supsearch.go

@@ -247,7 +247,7 @@ func (p *Pcsearch) PcSearchIndex() error {
 			listSize = len(*list)
 		}
 		//所有的再次分词查询 只查标题
-		if len([]rune(s_word)) > 3 && int(count) < pc_pageSize && selectType == "title" {
+		if len([]rune(s_word)) > 3 && int(count) < pc_pageSize {
 			secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 			findfields := `"title"`
 			qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(area, publishtime, subtype))

src/jfw/front/swordfish.go

@@ -492,7 +492,7 @@ func (m *Front) PcAjaxReq() {
 				if list != nil {
 					listSize = len(*list)
 				}
-				if len([]rune(s_word)) > 3 && int(count) < pc_pageSize && start == 0 && selectType == "title" {
+				if len([]rune(s_word)) > 3 && int(count) < pc_pageSize && start == 0 {
 					secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 					findfields := `"title"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(area, publishtime, subtype))
@@ -859,7 +859,7 @@ func (m *Front) WxsearchlistPaging() {
 				if list != nil {
 					listSize = len(*list)
 				}
-				if len([]rune(s_word)) > 3 && listSize < pc_pageSize && pageNum == 1 && selectType == "title" {
+				if len([]rune(s_word)) > 3 && listSize < pc_pageSize && pageNum == 1 {
 					secondKWS = jy.HttpEs(s_word, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 					findfields := `"title"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))

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

@@ -468,7 +468,7 @@ func (m *Front) WxsearchlistPaging() {
 				if list != nil {
 					listSize = len(*list)
 				}
-				if len([]rune(s_word)) > 3 && listSize < wx_pageSize && pageNum == 1 && selectType == "title" {
+				if len([]rune(s_word)) > 3 && listSize < wx_pageSize && pageNum == 1 {
 					secondKWS = jy.HttpEs(searchvalue, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 					findfields := `"title"`
 					qstr := getSearchQuery(secondKWS, industry, minprice, maxprice, findfields, getBidSearchQuery(scope, publishtime, subtype))

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -59,7 +59,7 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save-btn').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length > 50) {
             // var s = keyWord.slice(0,49);
             // $('.addkeyWord input.enterOne').val(s);
@@ -125,7 +125,7 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('textarea').val();
         var buyer = $(this).parent().prev().find('.key').text();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length < 1) {
 
             weui.toast('采购单位不能为空', {

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -69,7 +69,7 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length > 20) {
             // var s = keyWord.slice(0,19);
             // $('.addkeyWord input.enterOne').val(s)
@@ -320,7 +320,7 @@ $(function(){
         // var keyWord = $(this).siblings('span').text();
         var keyWord = $(this).siblings('textarea').val();
         var keyWords = $(this).parent().prev().find('.key').text();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if ($(this).parent().find("textarea").val().length < 1) {
 
             weui.toast('关键词不能为空', {

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

@@ -111,7 +111,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
-            keyWord = keyWord.replace(/\s/g,"");
+            keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
             if (keyWord.length > 50) {
                 // var s = keyWord.slice(0,49);
                 // $('.addkeyWord input.enterOne').val(s);

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

@@ -53,6 +53,7 @@
     关键词
 </div>
 <div class="keyWord" style="padding-top: 50px;">
+	<section class="content">
     <p class="title">示例：软件系统(关键词);  开发(附加词);  运维(排除词)</p>
     <!-- 添加关键词 -->
     <div class="enter addkeyWord">
@@ -70,6 +71,7 @@
     <div class="problem">
         疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    </section>
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
@@ -140,7 +142,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
-            keyWord = keyWord.replace(/\s/g,"");
+            keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
             var Obj = {"keyWord": keyWord};
             //
             if (keyWord.length > 20) {
@@ -201,7 +203,7 @@
 
         //去空格方法
         String.prototype.trim = function(){
-            return this.replace(/(^\s*)|(\s*$)/g, ' ');
+            return this.replace(/(^\s*)|(\s*$)/g, '');
         }
     });
 

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

@@ -177,7 +177,7 @@
 			// 添加 按钮的点击事件
 			$('.addkeyWord .btn .save-btn').on('click', function(){
 				var keyWord = $('.addkeyWord input.enterOne').val();
-				keyWord = keyWord.replace(/\s/g,"");
+				keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 				if (keyWord.length > 50) {
 					// var s = keyWord.slice(0,49);
 					// $('.addkeyWord input.enterOne').val(s);
@@ -243,7 +243,7 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('textarea').val();
 				var winner = $(this).parent().prev().find('.key').text();
-				keyWord = keyWord.replace(/\s/g,"");
+				keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 				if (keyWord.length < 1) {
 
 					weui.toast('中标单位不能为空', {

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

@@ -111,7 +111,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
-            keyWord = keyWord.replace(/\s/g,"");
+            keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
             if (keyWord.length > 50) {
                 // var s = keyWord.slice(0,49);
                 // $('.addkeyWord input.enterOne').val(s);

src/jfw/pay/dataExportPay.go

@@ -737,9 +737,11 @@ func CloseDataExportOrder(payWay, tradeno, prepayTime string) (status bool) {
 	log.Printf("%s取消订单，订单号%s\n", payWay, tradeno)
 	if payWay == "ali_pc" {
 		status = Alipay.CloseOrder(tradeno)
-	}
-	if payWay == "wx_pc" || payWay == "wx_js" {
+	} else if payWay == "wx_pc" || payWay == "wx_js" {
 		status = public.WxStruct.CloseOrder(config.Sysconfig["weixinrpc"].(string), tradeno)
+	} else {
+		//非扫码支付 暂不处理
+		status = true
 	}
 	if !status {
 		log.Printf("%s订单关闭失败：%s\n", payWay, tradeno)

src/jfw/public/search.go

@@ -272,7 +272,7 @@ func GetDataExportSearchCountUseId(_id string) (count int) {
 	count = int(elastic.Count(INDEX, TYPE, qstr))
 	//超级搜索一致的检索（防止数据导出和超级搜索数据量不一致）
 	//if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
-	if len(scd.Keyword) != 0 && scd.SelectType == "title" {
+	if len(scd.Keyword) != 0 {
 		searchTextSize := 0
 		if len(scd.Keyword) > 0 {
 			searchTextSize = len([]rune(scd.Keyword[0].Keyword))
@@ -357,7 +357,7 @@ func GetDataExportSearchResultUseId(_id, dataType string, count int) *[]map[stri
 			if len(scd.Keyword) > 0 {
 				searchTextSize = len([]rune(scd.Keyword[0].Keyword))
 			}
-			if searchTextSize > 3 && count < 50 && scd.SelectType == "title" {
+			if searchTextSize > 3 && count < 50 {
 				var res *[]map[string]interface{}
 				if count > 0 {
 					res = doSearch(qstr, 0, count, "")
@@ -409,7 +409,7 @@ func GetDataExportSearchResultUseId(_id, dataType string, count int) *[]map[stri
 			if len(scd.Keyword) > 0 {
 				searchTextSize = len([]rune(scd.Keyword[0].Keyword))
 			}
-			if searchTextSize > 3 && num < 50 && scd.SelectType == "title" {
+			if searchTextSize > 3 && num < 50 {
 				secondKWS := jy.HttpEs(scd.Keyword[0].Keyword, "ik_smart", config.Sysconfig["elasticsearch"].(string))
 				scd.Keyword[0].Keyword = secondKWS
 				qstr = getDataExportSql(scd)

src/web/staticres/dataExport/js/conditions_order.js

@@ -301,7 +301,7 @@ function addDelInput(t,type) {
   }
   $(d).html(text)
   text = $(d).text()
-  text = text.replace(/\s/g,"")
+  text = text.replace(/(^\s*)|(\s*$)/g, "");
   // console.log('--text--', text)
   var box = 'inputDel_' + type
   var template = null
@@ -353,7 +353,7 @@ function addDelInputB(t,type) {
     }
     $(d).html(text);
     text = $(d).text();
-    text = text.replace(/\s/g,"")
+    text = text.replace(/(^\s*)|(\s*$)/g, "")
     var box = 'inputDel_' + type;
     var arr = box;
     switch (type) {

src/web/staticres/wx_dataExport/js/additionWord.js

@@ -59,7 +59,7 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save-btn').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val()
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length > 50) {
             // var s = keyWord.slice(0,49);
             // $('.addkeyWord input.enterOne').val(s);
@@ -125,7 +125,7 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('textarea').val();
         var buyer = $(this).parent().prev().find('.key').text();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length < 1) {
 
             weui.toast('采购单位不能为空', {

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -61,7 +61,7 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if (keyWord.length > 20) {
             // var s = keyWord.slice(0,19);
             // $('.addkeyWord input.enterOne').val(s)
@@ -321,7 +321,7 @@ $(function(){
         // var keyWord = $(this).siblings('span').text();
         var keyWord = $(this).siblings('textarea').val();
         var keyWords = $(this).parent().prev().find('.key').text();
-        keyWord = keyWord.replace(/\s/g,"");
+        keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
         if ($(this).parent().find("textarea").val().length < 1) {
 
             weui.toast('关键词不能为空', {

src/web/templates/pc/dataExport_sieve.html

@@ -1404,6 +1404,7 @@
         $("#keyInput").next().hide();
         $(".add-input-w > div > input").remove();
         $(".add-input-w").hide();
+        window["inputDel_0"] = [];
         //price
         $("#minprice").val("");
         $("#maxprice").val("");

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

@@ -857,6 +857,7 @@
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
             sessionStorage.removeItem("keyWord");
+            sessionStorage.removeItem("IOSsession");
             //
             $("#area").text("");
             $("#industry").text("");

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

@@ -84,7 +84,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
-            keyWord = keyWord.replace(/\s/g,"");
+            keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
             if (keyWord.length > 50) {
                 // var s = keyWord.slice(0,49);
                 // $('.addkeyWord input.enterOne').val(s);

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

@@ -126,7 +126,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
-            keyWord = keyWord.replace(/\s/g,"");
+            keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
             var Obj = {"keyWord": keyWord};
             if (keyWord.length > 20) {
                 // var s = keyWord.slice(0, 19);

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

@@ -185,7 +185,6 @@
 					}
 					if(r.res.data){
 						var res = r.res.data;
-						console.log(res)
 						var aHtml = bz;
 						if(t==2){
 							$(".tabs").css("min-width","4020px");
@@ -197,7 +196,6 @@
 									for(var m in keys){
 										var re =new RegExp(keys[m], "g");
 										var index = res[i]["title"].search(re);
-										console.log(index)
 										if(index !== -1){
 											a++;
 											aHtml+='<tr><td>'+a+'</td>'
@@ -310,7 +308,7 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										// break
+										break
 									}
 								}else{
 									aHtml+='<tr><td>'+(Number(i)+Number(1))+'</td>'
@@ -351,7 +349,7 @@
 													+'<td>'+res[i]["subtype"]+'</td>'
 													+'</tr>'
 										}
-										// break
+										break
 									}
 								}
 							}

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

@@ -151,7 +151,7 @@
 			// 添加 按钮的点击事件
 			$('.addkeyWord .btn .save-btn').on('click', function(){
 				var keyWord = $('.addkeyWord input.enterOne').val();
-				keyWord = keyWord.replace(/\s/g,"");
+				keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 				if (keyWord.length > 50) {
 					// var s = keyWord.slice(0,49);
 					// $('.addkeyWord input.enterOne').val(s);
@@ -217,7 +217,7 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('textarea').val();
 				var winner = $(this).parent().prev().find('.key').text();
-				keyWord = keyWord.replace(/\s/g,"");
+				keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 				if (keyWord.length < 1) {
 
 					weui.toast('中标单位不能为空', {

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

@@ -86,7 +86,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save-btn').on('click', function(){
                 var keyWord = $('.addkeyWord input.enterOne').val();
-                keyWord = keyWord.replace(/\s/g,"");
+                keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
                 if (keyWord.length > 50) {
                     // var s = keyWord.slice(0,49);
                     // $('.addkeyWord input.enterOne').val(s);