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

src/jfw/front/wx_dataExport.go

@@ -94,6 +94,7 @@ func (w *WxDataExport) SaveData() error {
 	keyWord := w.GetString("keyWord")                      //关键词
 	buyer := w.GetString("buyer")                          //采购单位
 	winner := w.GetString("winner")                        //中标单位
+	selectType := w.GetString("selectType")                //标题 or 全文
 
 	var areaArr []string
 	var cityArr []string
@@ -149,16 +150,16 @@ func (w *WxDataExport) SaveData() error {
 			log.Println("keyWordArr", len(keyWordArr), keyWordArr)
 		}
 	}
-	log.Println("date", publishtime)
-	log.Println("area", areaArr)
-	log.Println("city", cityArr)
-	log.Println("region", regionArr)
-	log.Println("industry", industryArr)
-	log.Println("subType", subType)
-	log.Println("min", min)
-	log.Println("max", max)
-	log.Println("buyer", buyerArr)
-	log.Println("winner", winnerArr)
+	//	log.Println("date", publishtime)
+	//	log.Println("area", areaArr)
+	//	log.Println("city", cityArr)
+	//	log.Println("region", regionArr)
+	//	log.Println("industry", industryArr)
+	//	log.Println("subType", subType)
+	//	log.Println("min", min)
+	//	log.Println("max", max)
+	//	log.Println("buyer", buyerArr)
+	//	log.Println("winner", winnerArr)
 
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
@@ -174,6 +175,7 @@ func (w *WxDataExport) SaveData() error {
 		"winner":      winnerArr,
 		"comeintime":  time.Now().Unix(),
 		"comeinfrom":  "exportPage",
+		"selectType":  selectType,
 	}
 	if w.GetSession("s_m_openid") != nil {
 		saveData["s_openid"] = w.GetSession("s_m_openid").(string)

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

@@ -88,6 +88,7 @@ func (w *WxDataExport) SaveData() error {
 	keyWord := w.GetString("keyWord")                      //关键词
 	buyer := w.GetString("buyer")                          //采购单位
 	winner := w.GetString("winner")                        //中标单位
+	selectType := w.GetString("selectType")                //标题 or 全文
 
 	var areaArr []string
 	var cityArr []string
@@ -143,16 +144,16 @@ func (w *WxDataExport) SaveData() error {
 			log.Println("keyWordArr", len(keyWordArr), keyWordArr)
 		}
 	}
-	log.Println("date", publishtime)
-	log.Println("area", areaArr)
-	log.Println("city", cityArr)
-	log.Println("region", regionArr)
-	log.Println("industry", industryArr)
-	log.Println("subType", subType)
-	log.Println("min", min)
-	log.Println("max", max)
-	log.Println("buyer", buyerArr)
-	log.Println("winner", winnerArr)
+	//	log.Println("date", publishtime)
+	//	log.Println("area", areaArr)
+	//	log.Println("city", cityArr)
+	//	log.Println("region", regionArr)
+	//	log.Println("industry", industryArr)
+	//	log.Println("subType", subType)
+	//	log.Println("min", min)
+	//	log.Println("max", max)
+	//	log.Println("buyer", buyerArr)
+	//	log.Println("winner", winnerArr)
 
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
@@ -166,6 +167,7 @@ func (w *WxDataExport) SaveData() error {
 		"subtype":     subType,
 		"buyer":       buyerArr,
 		"winner":      winnerArr,
+		"selectType":  selectType,
 		"comeintime":  time.Now().Unix(),
 		"comeinfrom":  "exportPage",
 	}

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

@@ -106,121 +106,124 @@ $(function(){
             for(var i in keys){
                 var append = keys[i].appended;
                 var exclude = keys[i].exclude;
-                keys[i].keyWord = keyWord;
-                // if(keys[i].keyWord === keyWord){
-                keyWordArr.push(keys[i]);
-                localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                //
-                if(append !== undefined && exclude === undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
+                // keys[i].keyWord = keyWord;
+                if(keys[i].keyWord === turn){
+                    if(keyWord !== turn){
+                        keys[i].keyWord = keyWord
+                    }
+                    keyWordArr.push(keys[i]);
+                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                    //
+                    if(append !== undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append === undefined && exclude !== undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append !== undefined && exclude !== undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                    </li>`;
+                    }else if(append === undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append === undefined && exclude === undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
+                    </li>`;
+                    }else if(append !== undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }else if(append === undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }
+                    keyWordHtml = keyWordHtml.replace(/,/g, " ");
+                    //
+                    $('.showKeyWord > ul').prepend(keyWordHtml);
+                    // 隐藏
+                    $(".enter.addkeyWord").hide();
+                    $(".showKeyWord").show();
+                    $(".addKeyWord").show();
+                    $('.enter.addkeyWord > input').val('');
+                    var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true);
+                    return
                 }
-                keyWordHtml = keyWordHtml.replace(/,/g, " ");
-                //
-                $('.showKeyWord > ul').prepend(keyWordHtml);
-                // 隐藏
-                $(".enter.addkeyWord").hide();
-                $(".showKeyWord").show();
-                $(".addKeyWord").show();
-                $('.enter.addkeyWord > input').val('');
-                var buttonDOM = $('.enter.addkeyWord .btn button')[0];
-                buttonDOM.style.opacity = .5;
-                buttonDOM.setAttribute("disabled", true);
-                return
-                // }
             }
         }
         var Obj = {"keyWord": keyWord};

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

@@ -466,7 +466,6 @@
             $("#endtime").mobiscroll('show');
         });
 		var onceDetail = {{.T.orderDetail}}
-		console.log(onceDetail)
 		if(onceDetail!=""){
 			var filter = onceDetail["filter"];
 	        //金额
@@ -521,13 +520,13 @@
 			}
 			//采购单位
 	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
-				localStorage.buyer = JSON.stringify(filter["buyer"])
+				localStorage.buyer = filter["buyer"].join(",");
 	        }else{
 				localStorage.buyer = "";
 			}
 	        //中标单位
 	        if(filter["winner"]!=null&&filter["winner"].length>0){
-				localStorage.winner = JSON.stringify(filter["winner"])
+				localStorage.winner = filter["winner"].join(",");
 	        }else{
 				localStorage.winner = "";
 			}
@@ -563,6 +562,11 @@
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
 			}
+	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
+				localStorage.selectType = filter["selectType"];
+	        }else{
+				localStorage.selectType = "";
+			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
         //回显
@@ -734,12 +738,14 @@
             var subType = "";
             var buyer = "";
             var winner = "";
+            var selectType = "";
             date = getDate();
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
             if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
-                area = localStorage.areaHtml;
+                var areaHtml = localStorage.areaHtml;
+                area = areaHtml.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;
@@ -767,6 +773,9 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
+            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
+                selectType = localStorage.selectType;
+            }
             $.ajax({
                 type: 'post',
                 url: '/jyapp/front/dataExport/saveData',
@@ -782,6 +791,7 @@
                     "subType":subType,
                     "buyer":buyer,
                     "winner":winner,
+                    "selectType":selectType,
                 },
                 dataType: 'json',
                 success: function(data){
@@ -796,8 +806,8 @@
             localStorage.removeItem("date");
             localStorage.removeItem("province");
             localStorage.removeItem("city");
-            localStorage.removeItem("area");
             localStorage.removeItem("areaHtml");
+            localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
             localStorage.removeItem("price");

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

@@ -137,7 +137,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}47"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}48"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){
@@ -257,7 +257,7 @@
         }
         //
         if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-            var turn = $('.addkeyWord input.enterOne').val();
+            turn = $('.addkeyWord input.enterOne').val();
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var a in keys){
                 if (keys[a].keyWord === turn){

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

@@ -157,23 +157,26 @@
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for (var i in keys) {
-                    keys[i].keyWord = keyWord;
-                    // if (keys[i].keyWord === keyWord) {
-                    for (var a in keyWordArr){
-                        if (keyWord === keyWordArr[a].keyWord){
-                            weui.toast('关键词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                    // keys[i].keyWord = keyWord;
+                    if (keys[i].keyWord === turn) {
+                        if(keyWord !== turn){
+                            keys[i].keyWord = keyWord
                         }
+                        for (var a in keyWordArr){
+                            if (keyWord === keyWordArr[a].keyWord){
+                                weui.toast('关键词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
+                        }
+                        keyWordArr.push(keys[i]);
+                        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                        window.history.back();
+                        return
                     }
-                    keyWordArr.push(keys[i]);
-                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                    window.history.back();
-                    return
-                    // }
                 }
             }
             //
@@ -203,7 +206,7 @@
     });
 
     if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-        var turn = $('.addkeyWord input.enterOne').val();
+        turn = $('.addkeyWord input.enterOne').val();
         var keys = JSON.parse(sessionStorage.keyWord);
         for(var a in keys){
             if (keys[a].keyWord === turn){

src/jfw/modules/app/src/web/templates/staticpage/dataExport_serviceterms.html

@@ -5,6 +5,8 @@
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<link href="{{Msg "seo" "cdn"}}/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<link href="/jyapp/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+	<script src="/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
     <title>剑鱼标讯线上购买与服务条款</title>
 	<style type="text/css">
 	.public-nav{
@@ -102,10 +104,47 @@
 		display: inline-block;
 		margin-left: 10px;
 	}
+	.app-layout-header {
+	    line-height: 44px;
+	    background-color: #FFFFFF;
+	    text-align: center;
+	    border-bottom: 1px solid #E6E6E6;
+	    font-size: 17px;
+	    position: fixed;
+	    padding-top: 20px;
+	    z-index: 99999;
+	    left: 0;
+	    right: 0;
+	    top: 0;
+	    color: #444444;
+	}
+	.app-layout-header>.app-back_ {
+	    position: absolute;
+	    font-size: 19px;
+	    padding-top: 20px;
+	    padding-left: 11px;
+	    padding-right: 40px;
+	    padding-bottom: 7px;
+	    left: 0px;
+	    top: 18px;
+	    color: #444444;
+	}
 	</style>
+	<script>
+	$(function(){
+        //
+        $(".app-back_").on("click", function () {
+            history.go(-1);
+        });
+	})
+	</script>
 </head>
 <body>
 <section style="margin: auto;padding: 2rem 1rem" class="main">
+	<div class="app-layout-header">
+		<span class="app-back_ jyapp-icon jyapp-icon-zuojiantou"></span>
+		剑鱼标讯线上购买与服务条款
+	</div>
     <p>
 	<div class="MsoNormal" align="center" style="font-size:10.5pt;text-align:center;margin-bottom:20px;">
 		<b><span style="font-size: 1.5rem;line-height: 2rem;">剑鱼标讯产品与服务线上购买服务条款<span></span></span></b>

src/jfw/public/search.go

@@ -192,7 +192,7 @@ func getDataExportSql(scd *SieveCondition) string {
 		}
 		multi_match = fmt.Sprintf(multi_match, "%s", "\""+scd.SelectType+"\"")
 
-		if scd.Comeinfrom == "supersearchPage" {
+		if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 
 			keywordArr := strings.Split(scd.Keyword[0].Keyword, "+")
 			if len(keywordArr) > 1 {
@@ -271,7 +271,7 @@ func GetDataExportSearchCountUseId(_id string) (count int) {
 	}
 	count = int(elastic.Count(INDEX, TYPE, qstr))
 	//超级搜索一致的检索（防止数据导出和超级搜索数据量不一致）
-	if scd.Comeinfrom == "supersearchPage" {
+	if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 		if len(scd.Keyword) != 0 || len(scd.Industry) != 0 {
 
 			searchTextSize := 0
@@ -353,7 +353,7 @@ func GetDataExportSearchResultUseId(_id, dataType string, count int) *[]map[stri
 				}
 			}
 			return &res
-		} else if scd.Comeinfrom == "supersearchPage" {
+		} else if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 			//超级搜索非空查询
 			count = int(elastic.Count(INDEX, TYPE, qstr))
 			searchTextSize := 0

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

@@ -98,121 +98,124 @@ $(function(){
             for(var i in keys){
                 var append = keys[i].appended;
                 var exclude = keys[i].exclude;
-                keys[i].keyWord = keyWord;
-                // if(keys[i].keyWord === keyWord){
-                keyWordArr.push(keys[i]);
-                localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                //
-                if(append !== undefined && exclude === undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
+                // keys[i].keyWord = keyWord;
+                if(keys[i].keyWord === turn){
+                    if(keyWord !== turn){
+                        keys[i].keyWord = keyWord
+                    }
+                    keyWordArr.push(keys[i]);
+                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                    //
+                    if(append !== undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append === undefined && exclude !== undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append !== undefined && exclude !== undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                    </li>`;
+                    }else if(append === undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
-                }else if(append === undefined && exclude === undefined){
-                    keyWordHtml += `
-                <li>
-                    <div class="one">
-                        <div>
-                            <span>
-                                <strong> 关键词：</strong>
-                                <p class="key">${ keys[i].keyWord }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <button class="addAdjunctWord">编辑 附加词</button>
-                        <button class="addExclusion">添加 排除词</button>
-                        <button class="deleteKey">删除</button>
-                        <button class="ascertainKey">确定</button>
-                    </div>
-                </li>`;
+                    </li>`;
+                    }else if(append !== undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }else if(append === undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }
+                    keyWordHtml = keyWordHtml.replace(/,/g, " ");
+                    //
+                    $('.showKeyWord > ul').prepend(keyWordHtml);
+                    // 隐藏
+                    $(".enter.addkeyWord").hide();
+                    $(".showKeyWord").show();
+                    $(".addKeyWord").show();
+                    $('.enter.addkeyWord > input').val('');
+                    var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true);
+                    return
                 }
-                keyWordHtml = keyWordHtml.replace(/,/g, " ");
-                //
-                $('.showKeyWord > ul').prepend(keyWordHtml);
-                // 隐藏
-                $(".enter.addkeyWord").hide();
-                $(".showKeyWord").show();
-                $(".addKeyWord").show();
-                $('.enter.addkeyWord > input').val('');
-                var buttonDOM = $('.enter.addkeyWord .btn button')[0];
-                buttonDOM.style.opacity = .5;
-                buttonDOM.setAttribute("disabled", true);
-                return
-                // }
             }
         }
         var Obj = {"keyWord": keyWord};

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

@@ -473,13 +473,13 @@
 			}
 			//采购单位
 	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
-				localStorage.buyer = JSON.stringify(filter["buyer"])
+				localStorage.buyer = filter["buyer"].join(",");
 	        }else{
 				localStorage.buyer = "";
 			}
 	        //中标单位
 	        if(filter["winner"]!=null&&filter["winner"].length>0){
-				localStorage.winner = JSON.stringify(filter["winner"])
+				localStorage.winner = filter["winner"].join(",");
 	        }else{
 				localStorage.winner = "";
 			}
@@ -515,6 +515,11 @@
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
 			}
+	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
+				localStorage.selectType = filter["selectType"];
+	        }else{
+				localStorage.selectType = "";
+			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
         //回显
@@ -683,12 +688,14 @@
             var subType = "";
             var buyer = "";
             var winner = "";
+            var selectType = "";
             var date = getDate();
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
             if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
-                area = localStorage.areaHtml;
+                var areaHtml = localStorage.areaHtml;
+                area = areaHtml.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;
@@ -716,6 +723,9 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
+            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
+                selectType = localStorage.selectType;
+            }
             $.ajax({
                 type: 'post',
                 url: '/front/wx_dataExport/saveData',
@@ -731,6 +741,7 @@
                     "subType":subType,
                     "buyer":buyer,
                     "winner":winner,
+                    "selectType":selectType,
                 },
                 dataType: 'json',
                 success: function(data){
@@ -745,8 +756,8 @@
             localStorage.removeItem("date");
             localStorage.removeItem("province");
             localStorage.removeItem("city");
-            localStorage.removeItem("area");
             localStorage.removeItem("areaHtml");
+            localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
             localStorage.removeItem("price");

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

@@ -627,7 +627,7 @@
 					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500);
 					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
-
+					 console.log(document.body.scrollTop)
 				 });
 				 //
 				 $('.province .checkbox:not(.other)').on('change',function(){
@@ -635,8 +635,8 @@
 					// console.log(isCheckded);
 					if(isCheckded){
 						$(this).parents('.tab').siblings('.tab_content').find('.city').addClass('active')
-						isAllSelected()
-						getResult()
+						isAllSelected();
+						getResult();
 					}else{
 						$(this).parents('.tab').siblings('.tab_content').find('.city').removeClass('active')
 						isAllSelected()

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

@@ -110,7 +110,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}78"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}82"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(function(){
@@ -238,7 +238,7 @@
         //
         function IOSsession() {
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-                var turn = $('.addkeyWord input.enterOne').val();
+                turn = $('.addkeyWord input.enterOne').val();
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for(var a in keys){
                     if (keys[a].keyWord === turn){

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

@@ -144,23 +144,26 @@
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for (var i in keys) {
-                    keys[i].keyWord = keyWord;
-                    // if (keys[i].keyWord === keyWord) {
-                    for (var a in keyWordArr){
-                        if (keyWord === keyWordArr[a].keyWord){
-                            weui.toast('关键词重复了', {
-                                duration: 2000,
-                                className: 'text-overflow100',
-                                callback: function(){}
-                            });
-                            return
+                    // keys[i].keyWord = keyWord;
+                    if (keys[i].keyWord === turn) {
+                        if(keyWord !== turn){
+                            keys[i].keyWord = keyWord
                         }
+                        for (var a in keyWordArr){
+                            if (keyWord === keyWordArr[a].keyWord){
+                                weui.toast('关键词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
+                        }
+                        keyWordArr.push(keys[i]);
+                        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                        window.history.back();
+                        return
                     }
-                    keyWordArr.push(keys[i]);
-                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                    window.history.back();
-                    return
-                    // }
                 }
             }
             //
@@ -192,7 +195,7 @@
 
     function IOSsession() {
         if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-            var turn = $('.addkeyWord input.enterOne').val();
+            turn = $('.addkeyWord input.enterOne').val();
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var a in keys){
                 if (keys[a].keyWord === turn){

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

@@ -147,13 +147,12 @@
 		$(".loading_").show();
 		SuperSearch.setSessionStorage();
 		//判断 是标题搜索还是全文搜索
-			var em_selectType=$(".options").children(".search-title").children("em").html();
-			console.log(em_selectType)
-			if(em_selectType=="全文搜索"){
-				SuperSearch.reqParam.selectType="all";
-			}else if(em_selectType=="标题搜索"){
-				SuperSearch.reqParam.selectType="title";
-			}
+		var em_selectType=$(".options").children(".search-title").children("em").html();
+		if(em_selectType=="全文搜索"){
+			SuperSearch.reqParam.selectType="all";
+		}else if(em_selectType=="标题搜索"){
+			SuperSearch.reqParam.selectType="title";
+		}
 		$.ajax({
 			type: "post",
 			url: "/front/wx_dataExport/searchExport",
@@ -161,6 +160,7 @@
 			dataType: "json",
 			success: function(data){
 				if(data._id!=""){
+					$(".loading_").hide();
 					window.location.href="/weixin/pay/dataexport?id="+data._id+"&source=d"
 					//window.location.href="/front/pay/redirect?id="+data._id+"&source=d"
 				}