优化

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

@@ -105,14 +105,26 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('span').text();
         var buyer = $(this).parent().prev().find('.key').text();
-        for(var i in buyerArr){
-            if(buyerArr[i] === buyer){
-                buyerArr[i] = keyWord;
+        if (keyWord.length < 1) {
+
+            weui.toast('采购单位不能为空', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){
+
+                }
+            });
+            return
+        }else{
+            for(var i in buyerArr){
+                if(buyerArr[i] === buyer){
+                    buyerArr[i] = keyWord;
+                }
             }
+            localStorage.buyer = buyerArr.toString();
+            $(this).parent().siblings().find('.key').text(keyWord)
+            $(this).parent().hide().siblings().show()
         }
-        localStorage.buyer = buyerArr.toString();
-        $(this).parent().siblings().find('.key').text(keyWord)
-        $(this).parent().hide().siblings().show()
     })
 
     //去空格方法

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

@@ -76,25 +76,25 @@ $(function(){
         keyWordArr.push(Obj);
         localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
         var html = `<li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <strong> 关键词：</strong>
-                                    <p class="key">${ keyWord }</p>
-                                </span>
-                            </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    <div class="one">
+                        <div>
+                            <span>
+                                <strong> 关键词：</strong>
+                                <p class="key">${ keyWord }</p>
+                            </span>
                         </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ keyWord }</span>
-                            <button class="addAdjunctWord">编辑 附加词</button>
-                            <button class="addExclusion">添加 排除词</button>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`
+                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    </div>
+                    <div class="modify">
+                        <span contentEditable="true">${ keyWord }</span>
+                        <button class="addAdjunctWord">编辑 附加词</button>
+                        <button class="addExclusion">添加 排除词</button>
+                        <button class="deleteKey">删除</button>
+                        <button class="ascertainKey">确定</button>
+                    </div>
+                </li>`
         $('.showKeyWord > ul').prepend(html);
-        
+
         // 隐藏
         $(".addkeyWord").hide();
         $('.showKeyWord').show();
@@ -102,7 +102,6 @@ $(function(){
         var buttonDOM = $('.enter.addkeyWord .btn button')[0]
         buttonDOM.style.opacity = .5
         buttonDOM.setAttribute("disabled", true)
-
     })
 
     // 编辑
@@ -144,33 +143,26 @@ $(function(){
         var $this = $(this);
         var keyWord = $(this).siblings('span').text();
         var keyWords = $(this).parent().prev().find('.key').text();
-        for(var i in keyWordArr){
-            if(keyWordArr[i].keyWord === keyWords){
-                keyWordArr[i].keyWord = keyWord;
+        if ($('.addkeyWord input.enterOne').val().length < 1) {
+
+            weui.toast('关键词不能为空', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){
+
+                }
+            });
+            return
+        }else{
+            for(var i in keyWordArr){
+                if(keyWordArr[i].keyWord === keyWords){
+                    keyWordArr[i].keyWord = keyWord;
+                }
             }
+            localStorage.keyWord = JSON.stringify(keyWordArr);
+            $this.parent().siblings().find('.key').text(keyWord)
+            $this.parent().hide().siblings().show()
         }
-        localStorage.keyWord = JSON.stringify(keyWordArr);
-        // weui.confirm('保存关键词？', {
-        //     buttons: [{
-        //         label: '我再想想',
-        //         type: 'default',
-        //         onClick: function(){
-        //             $this.parent().hide().siblings().show()
-        //             console.log('我再想想')
-        //         }
-        //     }, {
-        //         label: '确定保存',
-        //         type: 'primary',
-        //         onClick: function(){
-        //             $this.parent().siblings().find('.key').text(keyWord)
-        //             $this.parent().hide().siblings().show()
-        //             console.log(keyWord)
-        //         }
-        //     }]
-        // });
-        $this.parent().siblings().find('.key').text(keyWord)
-        $this.parent().hide().siblings().show()
-        // console.log(keyWord)
     })
 
     //去空格方法

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

@@ -253,7 +253,7 @@
             //
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
-            $(".dateMake").css({"color":"rgb(0, 0, 0)"});
+            $(".dateMake").css({"color":"#888"});
             $("#starttime").val("");
             $("#endtime").val("");
         });

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

@@ -46,6 +46,9 @@
         top: 18px;
         color: #444444;
     }
+    .text-overflow100 .weui-toast {
+        font-size: .1rem;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -350,20 +353,32 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var appended = $(this).siblings('span').text();
                 var appendeds = $(this).parent().prev().find('.key').text();
-                for(var i in appendedArr){
-                    if(appendedArr[i] === appendeds){
-                        appendedArr[i] = appended;
+                if (appended.length < 1) {
+
+                    weui.toast('附加词不能为空', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){
+
+                        }
+                    });
+                    return
+                }else{
+                    for(var i in appendedArr){
+                        if(appendedArr[i] === appendeds){
+                            appendedArr[i] = appended;
+                        }
                     }
-                }
-                for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === tokens){
-                        keyWordArr[m].appended = appendedArr
+                    for(var m in keyWordArr){
+                        if(keyWordArr[m].keyWord === tokens){
+                            keyWordArr[m].appended = appendedArr
+                        }
                     }
+                    sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    $(this).parent().siblings().find('.key').text(appended);
+                    $(this).parent().hide().siblings().show()
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
-                $(this).parent().siblings().find('.key').text(appended);
-                $(this).parent().hide().siblings().show()
             });
 
             //去空格方法

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

@@ -46,6 +46,9 @@
             top: 18px;
             color: #444444;
         }
+        .text-overflow100 .weui-toast {
+            font-size: .1rem;
+        }
     </style>
     <body>
     <div class="app-layout-header">

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

@@ -15,12 +15,6 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
-	.keyWord .addKeyWord {
-		width: 100%;
-		position: fixed;
-		top: 100%;
-		text-align: center;
-	}
 	.app-layout-header{
 		line-height: 44px;
 		background-color: #FFFFFF;
@@ -52,6 +46,15 @@
 		top: 18px;
 		color: #444444;
 	}
+	.keyWord .addKeyWord {
+		width: 100%;
+		position: fixed;
+		top: 100%;
+		text-align: center;
+	}
+	.text-overflow100 .weui-toast {
+		font-size: .1rem;
+	}
 </style>
 
 <body>
@@ -82,7 +85,7 @@
 </div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}25"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}26"></script>
 <script>
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){

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

@@ -15,12 +15,6 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .keyWord .addKeyWord {
-            width: 100%;
-            position: fixed;
-            top: 100%;
-            text-align: center;
-        }
         .app-layout-header{
             line-height: 44px;
             background-color: #FFFFFF;
@@ -52,6 +46,15 @@
             top: 18px;
             color: #444444;
         }
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
+        .text-overflow100 .weui-toast {
+            font-size: .1rem;
+        }
     </style>
 
     <body>

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

@@ -46,6 +46,9 @@
         top: 18px;
         color: #444444;
     }
+    .text-overflow100 .weui-toast {
+        font-size: .1rem;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -350,20 +353,33 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var exclude = $(this).siblings('span').text();
                 var excludes = $(this).parent().prev().find('.key').text();
-                for(var i in excludeArr){
-                    if(excludeArr[i] === excludes){
-                        excludeArr[i] = exclude;
+                if (exclude.length < 1) {
+
+                    weui.toast('排除词不能为空', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){
+
+                        }
+                    });
+                    return
+                }else{
+                    for(var i in excludeArr){
+                        if(excludeArr[i] === excludes){
+                            excludeArr[i] = exclude;
+                        }
                     }
-                }
-                for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === tokens){
-                        keyWordArr[m].exclude = excludeArr
+                    for(var m in keyWordArr){
+                        if(keyWordArr[m].keyWord === tokens){
+                            keyWordArr[m].exclude = excludeArr
+                        }
                     }
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                    $(this).parent().siblings().find('.key').text(exclude);
+                    $(this).parent().hide().siblings().show()
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                $(this).parent().siblings().find('.key').text(exclude);
-                $(this).parent().hide().siblings().show()
+
             });
 
             //去空格方法

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

@@ -46,6 +46,9 @@
             top: 18px;
             color: #444444;
         }
+        .text-overflow100 .weui-toast {
+            font-size: .1rem;
+        }
     </style>
     <body>
     <div class="app-layout-header">

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

@@ -12,7 +12,6 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
     <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
-
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 <style>
@@ -54,6 +53,9 @@
         top: 18px;
         color: #444444;
     }
+    .text-overflow100 .weui-toast {
+        font-size: .1rem;
+    }
 </style>
 <body>
     <div class="app-layout-header">
@@ -66,8 +68,8 @@
         <div class="enter addkeyWord">
             <input type="text" class="enterOne" placeholder="请输入关键词" />
             <div class="btnChoose" style="display:none;">
-                <button class="addAdjunctWord" disabled>添加 附加词</button>
-                <button class="addExclusion" disabled>添加 排除词</button>
+                <button class="addAdjunctWord appended" disabled>添加 附加词</button>
+                <button class="addExclusion exclude" disabled>添加 排除词</button>
             </div>
             <div class="btn">
                 <button class="save" disabled>确认</button>
@@ -126,7 +128,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}13"></script>
+    <script src="/jyapp/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}21"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){

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

@@ -46,6 +46,9 @@
         top: 18px;
         color: #444444;
     }
+    .text-overflow100 .weui-toast {
+        font-size: .1rem;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -115,37 +118,6 @@
         $(".problem").on('click', function () {
             $(".problemPop").css("display", 'flex');
         });
-        // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
-        $('.addkeyWord input.enterOne').on('input', function () {
-            if ($(this).val().length >= 100) {
-                var s = $(this).val().slice(0, 100)
-                $(this).val(s)
-
-                weui.toast('关键词不能超过100字', {
-                    duration: 2000,
-                    className: 'text-overflow100',
-                    callback: function () {
-                        console.log('close')
-                    }
-                });
-                return
-            }
-
-            var buttonDOM = $(this).siblings()[1].children[0];
-            if ($(this).val().length >= 1) {
-                buttonDOM.style.opacity = 1;
-                buttonDOM.removeAttribute("disabled");
-                //
-                $(this).next().find(".appended").prop("disabled", false);
-                $(this).next().find(".exclude").prop("disabled", false);
-            } else {
-                buttonDOM.style.opacity = .5;
-                buttonDOM.setAttribute("disabled", true);
-                //
-                $(this).next().find(".appended").prop("disabled", true);
-                $(this).next().find(".exclude").prop("disabled", true);
-            }
-        });
 
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save').on('click', function () {

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

@@ -72,12 +72,12 @@
     </div>
 <script>
     $(function () {
-        $("input").on('click', function () {
+        $("input").on('change', function () {
             $(".industry .all span").removeClass("active");
         });
 
         $(".industry .all span").on('click', function () {
-            $(this).addClass("active")
+            $(this).addClass("active");
             $(".connectMain").css("background", "#f5f4f9");
         });
 
@@ -96,6 +96,12 @@
             }
             history.back();
         });
+        $(".reset").on('click', function () {
+            $(".connectMain").css("background", "rgb(245, 244, 249)");
+            $(".all span").addClass("active");
+            $("#min").val("");
+            $("#max").val("");
+        });
         //
         if(localStorage.price !== ""&&localStorage.price!=undefined){
             var price = localStorage.price.replace("-","").split("万元");

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

@@ -15,12 +15,6 @@
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 	</head>
 	<style>
-		.keyWord .addKeyWord {
-			width: 100%;
-			position: fixed;
-			top: 100%;
-			text-align: center;
-		}
 		.app-layout-header{
 			line-height: 44px;
 			background-color: #FFFFFF;
@@ -52,6 +46,15 @@
 			top: 18px;
 			color: #444444;
 		}
+		.keyWord .addKeyWord {
+			width: 100%;
+			position: fixed;
+			top: 100%;
+			text-align: center;
+		}
+		.text-overflow100 .weui-toast {
+			font-size: .1rem;
+		}
 	</style>
 	<body>
 	<div class="app-layout-header">
@@ -215,14 +218,27 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('span').text();
 				var winner = $(this).parent().prev().find('.key').text();
-				for(var i in winnerArr){
-					if(winnerArr[i] === winner){
-						winnerArr[i] = keyWord;
+				if (keyWord.length < 1) {
+
+					weui.toast('中标单位不能为空', {
+						duration: 2000,
+						className: 'text-overflow100',
+						callback: function(){
+
+						}
+					});
+					return
+				}else{
+					for(var i in winnerArr){
+						if(winnerArr[i] === winner){
+							winnerArr[i] = keyWord;
+						}
 					}
+					localStorage.winner = winnerArr.toString();
+					$(this).parent().siblings().find('.key').text(keyWord);
+					$(this).parent().hide().siblings().show()
 				}
-				localStorage.winner = winnerArr.toString();
-				$(this).parent().siblings().find('.key').text(keyWord);
-				$(this).parent().hide().siblings().show()
+
 			});
 
 			//去空格方法

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

@@ -15,12 +15,6 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     </head>
     <style>
-        .keyWord .addKeyWord {
-            width: 100%;
-            position: fixed;
-            top: 100%;
-            text-align: center;
-        }
         .app-layout-header{
             line-height: 44px;
             background-color: #FFFFFF;
@@ -52,6 +46,15 @@
             top: 18px;
             color: #444444;
         }
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
+        .text-overflow100 .weui-toast {
+            font-size: .1rem;
+        }
     </style>
     <body>
 

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

@@ -105,14 +105,27 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('span').text();
         var buyer = $(this).parent().prev().find('.key').text();
-        for(var i in buyerArr){
-            if(buyerArr[i] === buyer){
-                buyerArr[i] = keyWord;
+        if (keyWord.length < 1) {
+
+            weui.toast('采购单位不能为空', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){
+
+                }
+            });
+            return
+        }else{
+            for(var i in buyerArr){
+                if(buyerArr[i] === buyer){
+                    buyerArr[i] = keyWord;
+                }
             }
+            localStorage.buyer = buyerArr.toString();
+            $(this).parent().siblings().find('.key').text(keyWord)
+            $(this).parent().hide().siblings().show()
         }
-        localStorage.buyer = buyerArr.toString();
-        $(this).parent().siblings().find('.key').text(keyWord)
-        $(this).parent().hide().siblings().show()
+
     })
 
     //去空格方法

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

@@ -144,33 +144,26 @@ $(function(){
         var $this = $(this);
         var keyWord = $(this).siblings('span').text();
         var keyWords = $(this).parent().prev().find('.key').text();
-        for(var i in keyWordArr){
-            if(keyWordArr[i].keyWord === keyWords){
-                keyWordArr[i].keyWord = keyWord;
+        if ($('.addkeyWord input.enterOne').val().length < 1) {
+
+            weui.toast('关键词不能为空', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){
+
+                }
+            });
+            return
+        }else{
+            for(var i in keyWordArr){
+                if(keyWordArr[i].keyWord === keyWords){
+                    keyWordArr[i].keyWord = keyWord;
+                }
             }
+            localStorage.keyWord = JSON.stringify(keyWordArr);
+            $this.parent().siblings().find('.key').text(keyWord)
+            $this.parent().hide().siblings().show()
         }
-        localStorage.keyWord = JSON.stringify(keyWordArr);
-        // weui.confirm('保存关键词？', {
-        //     buttons: [{
-        //         label: '我再想想',
-        //         type: 'default',
-        //         onClick: function(){
-        //             $this.parent().hide().siblings().show()
-        //             console.log('我再想想')
-        //         }
-        //     }, {
-        //         label: '确定保存',
-        //         type: 'primary',
-        //         onClick: function(){
-        //             $this.parent().siblings().find('.key').text(keyWord)
-        //             $this.parent().hide().siblings().show()
-        //             console.log(keyWord)
-        //         }
-        //     }]
-        // });
-        $this.parent().siblings().find('.key').text(keyWord)
-        $this.parent().hide().siblings().show()
-        // console.log(keyWord)
     })
 
     //去空格方法

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

@@ -200,7 +200,7 @@
             //
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
-            $(".dateMake").css({"color":"rgb(0, 0, 0)"});
+            $(".dateMake").css({"color":"#888"});
             $("#starttime").val("");
             $("#endtime").val("");
         });

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

@@ -316,20 +316,33 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var appended = $(this).siblings('span').text();
                 var appendeds = $(this).parent().prev().find('.key').text();
-                for(var i in appendedArr){
-                    if(appendedArr[i] === appendeds){
-                        appendedArr[i] = appended;
+                if (appended.length < 1) {
+
+                    weui.toast('附加词不能为空', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){
+
+                        }
+                    });
+                    return
+                }else{
+                    for(var i in appendedArr){
+                        if(appendedArr[i] === appendeds){
+                            appendedArr[i] = appended;
+                        }
                     }
-                }
-                for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === tokens){
-                        keyWordArr[m].appended = appendedArr
+                    for(var m in keyWordArr){
+                        if(keyWordArr[m].keyWord === tokens){
+                            keyWordArr[m].appended = appendedArr
+                        }
                     }
+                    sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    $(this).parent().siblings().find('.key').text(appended);
+                    $(this).parent().hide().siblings().show()
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
-                $(this).parent().siblings().find('.key').text(appended);
-                $(this).parent().hide().siblings().show()
+
             });
 
             //去空格方法

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

@@ -48,7 +48,7 @@
 </div>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}27"></script>
+<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}29"></script>
 <script>
 	initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 	var buyerArr = [];

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

@@ -15,12 +15,12 @@
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>
-    .keyWord .addKeyWord {
-        width: 100%;
-        position: fixed;
-        top: 100%;
-        text-align: center;
-    }
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
     </style>
 
     <body>

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

@@ -315,20 +315,33 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var exclude = $(this).siblings('span').text();
                 var excludes = $(this).parent().prev().find('.key').text();
-                for(var i in excludeArr){
-                    if(excludeArr[i] === excludes){
-                        excludeArr[i] = exclude;
+                if (exclude.length < 1) {
+
+                    weui.toast('排除词不能为空', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){
+
+                        }
+                    });
+                    return
+                }else{
+                    for(var i in excludeArr){
+                        if(excludeArr[i] === excludes){
+                            excludeArr[i] = exclude;
+                        }
                     }
-                }
-                for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === tokens){
-                        keyWordArr[m].exclude = excludeArr
+                    for(var m in keyWordArr){
+                        if(keyWordArr[m].keyWord === tokens){
+                            keyWordArr[m].exclude = excludeArr
+                        }
                     }
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                    $(this).parent().siblings().find('.key').text(exclude);
+                    $(this).parent().hide().siblings().show()
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                $(this).parent().siblings().find('.key').text(exclude);
-                $(this).parent().hide().siblings().show()
+
             });
 
             //去空格方法

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

@@ -92,7 +92,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"}}20"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}21"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];

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

@@ -46,7 +46,7 @@
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function () {
-        $("input").on('click', function () {
+        $("input").on('change', function () {
             $(".industry .all span").removeClass("active");
         });
 
@@ -70,8 +70,14 @@
             }
             history.back();
         });
+        $(".reset").on('click', function () {
+            $(".connectMain").css("background", "rgb(245, 244, 249)");
+            $(".all span").addClass("active");
+            $("#min").val("");
+            $("#max").val("");
+        });
         //
-        if(localStorage.price !== ""&&localStorage.price!=undefined){
+        if(localStorage.price !== ""&&localStorage.price!==undefined){
             var price = localStorage.price.replace("-","").split("万元");
             //只有一个金额
 			if(price[0]!=""){

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

@@ -182,14 +182,26 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('span').text();
 				var winner = $(this).parent().prev().find('.key').text();
-				for(var i in winnerArr){
-					if(winnerArr[i] === winner){
-						winnerArr[i] = keyWord;
+				if (keyWord.length < 1) {
+
+					weui.toast('中标单位不能为空', {
+						duration: 2000,
+						className: 'text-overflow100',
+						callback: function(){
+
+						}
+					});
+					return
+				}else{
+					for(var i in winnerArr){
+						if(winnerArr[i] === winner){
+							winnerArr[i] = keyWord;
+						}
 					}
+					localStorage.winner = winnerArr.toString();
+					$(this).parent().siblings().find('.key').text(keyWord);
+					$(this).parent().hide().siblings().show()
 				}
-				localStorage.winner = winnerArr.toString();
-				$(this).parent().siblings().find('.key').text(keyWord);
-				$(this).parent().hide().siblings().show()
 			});
 
 			//去空格方法

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

@@ -15,12 +15,12 @@
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>
-    .keyWord .addKeyWord {
-        width: 100%;
-        position: fixed;
-        top: 100%;
-        text-align: center;
-    }
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
     </style>
     <body>