xuzhiheng 6 سال پیش
والد
کامیت
a6800106b0
25فایلهای تغییر یافته به همراه277 افزوده شده و 58 حذف شده
  1. 16 4
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js
  2. 16 4
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js
  3. 19 7
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
  4. 12 2
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
  5. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html
  6. 10 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html
  7. 16 4
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
  8. 10 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
  9. 2 2
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html
  10. 10 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
  11. 18 6
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  12. 10 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
  13. 0 1
      src/web/staticres/wx_dataExport/css/keyWord.css
  14. 16 4
      src/web/staticres/wx_dataExport/js/additionWord.js
  15. 16 4
      src/web/staticres/wx_dataExport/js/keyWord.js
  16. 16 4
      src/web/templates/weixin/dataExport/dataExport_appended.html
  17. 10 0
      src/web/templates/weixin/dataExport/dataExport_appendedInput.html
  18. 1 1
      src/web/templates/weixin/dataExport/dataExport_buyerEdit.html
  19. 12 2
      src/web/templates/weixin/dataExport/dataExport_buyerInput.html
  20. 16 4
      src/web/templates/weixin/dataExport/dataExport_exclude.html
  21. 10 0
      src/web/templates/weixin/dataExport/dataExport_excludeInput.html
  22. 2 2
      src/web/templates/weixin/dataExport/dataExport_keyWord.html
  23. 11 1
      src/web/templates/weixin/dataExport/dataExport_keyWordInput.html
  24. 17 5
      src/web/templates/weixin/dataExport/dataExport_winnerEdit.html
  25. 10 0
      src/web/templates/weixin/dataExport/dataExport_winnerInput.html

+ 16 - 4
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -10,11 +10,13 @@ $(function(){
     function hasWords () {
         var showKeyWordLength = $(".showKeyWord ul").find('li').length;
         if(showKeyWordLength === 0){
-            $(".addkeyWord").show();
+            $(".enter.addkeyWord").show();
+            $(".addKeyWord").hide();
             $(".showKeyWord").hide();
         } else {
-            $(".addkeyWord").hide();
+            $(".enter.addkeyWord").hide();
             $(".showKeyWord").show();
+            $(".addKeyWord").show();
         }
     }
     hasWords();
@@ -73,8 +75,9 @@ $(function(){
         $('.showKeyWord > ul').prepend(html)
         
         // 隐藏
-        $(".addkeyWord").hide();
-        $('.showKeyWord').show();
+        $(".enter.addkeyWord").hide();
+        $(".showKeyWord").show();
+        $(".addKeyWord").show();
         $('.enter.addkeyWord > input').val('')
         var buttonDOM = $('.enter.addkeyWord .btn button')[0]
         buttonDOM.style.opacity = .5
@@ -115,6 +118,15 @@ $(function(){
                 }
             });
             return
+        }else if($(this).parent().find("span").text().length >= 100){
+            var s = $(this).parent().find("span").text().slice(0,99);
+            $(this).parent().find("span").text(s);
+            weui.toast('采购单位不能超过100字', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){}
+            });
+            return
         }else{
             for(var i in buyerArr){
                 if(buyerArr[i] === buyer){

+ 16 - 4
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -13,11 +13,13 @@ $(function(){
     function hasWords () {
         var showKeyWordLength = $(".showKeyWord ul").find('li').length;
         if(showKeyWordLength === 0){
-            $(".addkeyWord").show();
+            $(".enter.addkeyWord").show();
+            $(".addKeyWord").hide();
             $(".showKeyWord").hide();
         } else {
-            $(".addkeyWord").hide();
+            $(".enter.addkeyWord").hide();
             $(".showKeyWord").show();
+            $(".addKeyWord").show();
         }
     }
     hasWords();
@@ -96,8 +98,9 @@ $(function(){
         $('.showKeyWord > ul').prepend(html);
 
         // 隐藏
-        $(".addkeyWord").hide();
-        $('.showKeyWord').show();
+        $(".enter.addkeyWord").hide();
+        $(".showKeyWord").show();
+        $(".addKeyWord").show();
         $('.enter.addkeyWord > input').val('')
         var buttonDOM = $('.enter.addkeyWord .btn button')[0]
         buttonDOM.style.opacity = .5
@@ -181,6 +184,15 @@ $(function(){
                 }
             });
             return
+        }else if($(this).parent().find("span").text().length >= 100){
+            var s = $(this).parent().find("span").text().slice(0,99);
+            $(this).parent().find("span").text(s);
+            weui.toast('关键词不能超过100字', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){}
+            });
+            return
         }else{
             for(var i in keyWordArr){
                 if(keyWordArr[i].keyWord === keyWords){

+ 19 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
+    <link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
     <script src="/jyapp/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"}}" />
@@ -135,7 +135,7 @@
                                 sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
 
                                 // 强行回退一步,就不用多点一次了😎
-                                history.go(-2); // 直接跳过没有哈希值的页面,就不会出现要点两次才能回到真正的上一页了
+                                history.go(-1); // 直接跳过没有哈希值的页面,就不会出现要点两次才能回到真正的上一页了
                             }
                         }
                     });
@@ -225,11 +225,13 @@
             function hasWords () {
                 var showKeyWordLength = $(".showKeyWord ul").find('li').length;
                 if(showKeyWordLength === 0){
-                    $(".addkeyWord").show();
+                    $(".enter.addkeyWord").show();
+                    $(".addKeyWord").hide();
                     $(".showKeyWord").hide();
                 } else {
-                    $(".addkeyWord").hide();
+                    $(".enter.addkeyWord").hide();
                     $(".showKeyWord").show();
+                    $(".addKeyWord").show();
                 }
             }
             hasWords();
@@ -313,14 +315,14 @@
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
-                $(".addkeyWord").hide();
-                $('.showKeyWord').show();
+                $(".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)
             });
-
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
                 $('.modify span').each(function(item){
@@ -360,6 +362,16 @@
                         }
                     });
                     return
+                }else if(appended.length >= 100){
+                    var s = $(this).siblings('span').text().slice(0,99);
+                    $(this).siblings('span').text(s);
+
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                    return
                 }else{
                     for(var i in appendedArr){
                         if(appendedArr[i] === appendeds){

+ 12 - 2
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}6">
     <script src="{{Msg "seo" "cdn"}}/jyapp/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"}}" />
@@ -161,6 +161,16 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
+                for (var a in appendedArr){
+                    if (appended === appendedArr[a]){
+                        weui.toast('附加词重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
+                }
                 appendedArr.push(appended);
                 for(var i in keyWordArr){
                     if(keyWordArr[i].keyWord === token){
@@ -199,7 +209,7 @@
                 // console.log(olength)
                 if(olength >= 100){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100);
+                    var s = $(this).text().slice(0,99);
                     $(this).text(s);
                     weui.toast('附加词不能超过100字', {
                         duration: 2000,

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -82,7 +82,7 @@
 </div>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js"></script>
 <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}27"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}31"></script>
 <script>
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){

+ 10 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html

@@ -122,6 +122,16 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
+            for (var a in buyerArr){
+                if (keyWord === buyerArr[a]){
+                    weui.toast('采购单位重复了', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
+                }
+            }
             buyerArr.push(keyWord);
             localStorage.setItem("buyer", buyerArr);
             history.back();

+ 16 - 4
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -225,11 +225,13 @@
             function hasWords () {
                 var showKeyWordLength = $(".showKeyWord ul").find('li').length;
                 if(showKeyWordLength === 0){
-                    $(".addkeyWord").show();
+                    $(".enter.addkeyWord").show();
+                    $(".addKeyWord").hide();
                     $(".showKeyWord").hide();
                 } else {
-                    $(".addkeyWord").hide();
+                    $(".enter.addkeyWord").hide();
                     $(".showKeyWord").show();
+                    $(".addKeyWord").show();
                 }
             }
             hasWords();
@@ -313,8 +315,9 @@
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
-                $(".addkeyWord").hide();
-                $('.showKeyWord').show();
+                $(".enter.addkeyWord").hide();
+                $(".showKeyWord").show();
+                $(".addKeyWord").show();
                 $('.enter.addkeyWord > input').val('');
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
@@ -360,6 +363,15 @@
                         }
                     });
                     return
+                }else if($(this).parent().find("span").text().length >= 100){
+                    var s = $(this).parent().find("span").text().slice(0,99);
+                    $(this).parent().find("span").text(s);
+                    weui.toast('排除词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
                 }else{
                     for(var i in excludeArr){
                         if(excludeArr[i] === excludes){

+ 10 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -173,6 +173,16 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
+                for (var a in excludeArr){
+                    if (exclude === excludeArr[a]){
+                        weui.toast('采购单位重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
+                }
                 excludeArr.push(exclude);
                 for(var i in keyWordArr){
                     if(keyWordArr[i].keyWord === token){

+ 2 - 2
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}9">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}13">
     <script src="{{Msg "seo" "cdn"}}/jyapp/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"}}" />
@@ -127,7 +127,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"}}24"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}33"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){

+ 10 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -150,6 +150,16 @@
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
             var Obj = {"keyWord": keyWord};
+            for (var a in keyWordArr){
+                if (keyWord === keyWordArr[a].keyWord){
+                    weui.toast('关键词重复了', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
+                }
+            }
             keyWordArr.push(Obj);
             localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
             window.history.back();

+ 18 - 6
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -80,8 +80,8 @@
 			</div>
 
 			</div>
-			<script src="/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-	<script src="/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+			<script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+	<script src="/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 	<script>
 		var winnerArr = [];
 		if(localStorage.winner !== "" && localStorage.winner !== undefined){
@@ -120,11 +120,13 @@
 			function hasWords () {
 				var showKeyWordLength = $(".showKeyWord ul").find('li').length;
 				if(showKeyWordLength === 0){
-					$(".addkeyWord").show();
+					$(".enter.addkeyWord").show();
+					$(".addKeyWord").hide();
 					$(".showKeyWord").hide();
 				} else {
-					$(".addkeyWord").hide();
+					$(".enter.addkeyWord").hide();
 					$(".showKeyWord").show();
+					$(".addKeyWord").show();
 				}
 			}
 			hasWords();
@@ -183,8 +185,9 @@
 				$('.showKeyWord > ul').prepend(html);
 
 				// 隐藏
-				$(".addkeyWord").hide();
-				$('.showKeyWord').show();
+				$(".enter.addkeyWord").hide();
+				$(".showKeyWord").show();
+				$(".addKeyWord").show();
 				$('.enter.addkeyWord > input').val('');
 				var buttonDOM = $('.enter.addkeyWord .btn button')[0];
 				buttonDOM.style.opacity = .5;
@@ -225,6 +228,15 @@
 						}
 					});
 					return
+				}else if($(this).parent().find("span").text().length >= 100){
+					var s = $(this).parent().find("span").text().slice(0,99);
+					$(this).parent().find("span").text(s);
+					weui.toast('中标单位不能超过100字', {
+						duration: 2000,
+						className: 'text-overflow100',
+						callback: function(){}
+					});
+					return
 				}else{
 					for(var i in winnerArr){
 						if(winnerArr[i] === winner){

+ 10 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -124,6 +124,16 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
+            for (var a in winnerArr){
+                if (keyWord === winnerArr[a]){
+                    weui.toast('中标单位重复了', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
+                }
+            }
             winnerArr.push(keyWord);
             localStorage.setItem("winner", winnerArr);
             history.back();

+ 0 - 1
src/web/staticres/wx_dataExport/css/keyWord.css

@@ -1,5 +1,4 @@
 .keyWord .title {
-  height: .48rem;
   font-size: .26rem;
   color: #888;
   padding: .2rem;

+ 16 - 4
src/web/staticres/wx_dataExport/js/additionWord.js

@@ -10,11 +10,13 @@ $(function(){
     function hasWords () {
         var showKeyWordLength = $(".showKeyWord ul").find('li').length;
         if(showKeyWordLength === 0){
-            $(".addkeyWord").show();
+            $(".enter.addkeyWord").show();
+            $(".addKeyWord").hide();
             $(".showKeyWord").hide();
         } else {
-            $(".addkeyWord").hide();
+            $(".enter.addkeyWord").hide();
             $(".showKeyWord").show();
+            $(".addKeyWord").show();
         }
     }
     hasWords();
@@ -73,8 +75,9 @@ $(function(){
         $('.showKeyWord > ul').prepend(html)
         
         // 隐藏
-        $(".addkeyWord").hide();
-        $('.showKeyWord').show();
+        $(".enter.addkeyWord").hide();
+        $(".showKeyWord").show();
+        $(".addKeyWord").show();
         $('.enter.addkeyWord > input').val('')
         var buttonDOM = $('.enter.addkeyWord .btn button')[0]
         buttonDOM.style.opacity = .5
@@ -115,6 +118,15 @@ $(function(){
                 }
             });
             return
+        }else if($(this).parent().find("span").text().length >= 100){
+            var s = $(this).parent().find("span").text().slice(0,99);
+            $(this).parent().find("span").text(s);
+            weui.toast('采购单位不能超过100字', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){}
+            });
+            return
         }else{
             for(var i in buyerArr){
                 if(buyerArr[i] === buyer){

+ 16 - 4
src/web/staticres/wx_dataExport/js/keyWord.js

@@ -13,11 +13,13 @@ $(function(){
     function hasWords () {
         var showKeyWordLength = $(".showKeyWord ul").find('li').length;
         if(showKeyWordLength === 0){
-            $(".addkeyWord").show();
+            $(".enter.addkeyWord").show();
+            $(".addKeyWord").hide();
             $(".showKeyWord").hide();
         } else {
-            $(".addkeyWord").hide();
+            $(".enter.addkeyWord").hide();
             $(".showKeyWord").show();
+            $(".addKeyWord").show();
         }
     }
     hasWords();
@@ -95,8 +97,9 @@ $(function(){
         $('.showKeyWord > ul').prepend(html);
         
         // 隐藏
-        $(".addkeyWord").hide();
-        $('.showKeyWord').show();
+        $(".enter.addkeyWord").hide();
+        $(".showKeyWord").show();
+        $(".addKeyWord").show();
         $('.enter.addkeyWord > input').val('')
         var buttonDOM = $('.enter.addkeyWord .btn button')[0]
         buttonDOM.style.opacity = .5
@@ -181,6 +184,15 @@ $(function(){
                 }
             });
             return
+        }else if($(this).parent().find("span").text().length >= 100){
+            var s = $(this).parent().find("span").text().slice(0,99);
+            $(this).parent().find("span").text(s);
+            weui.toast('关键词不能超过100字', {
+                duration: 2000,
+                className: 'text-overflow100',
+                callback: function(){}
+            });
+            return
         }else{
             for(var i in keyWordArr){
                 if(keyWordArr[i].keyWord === keyWords){

+ 16 - 4
src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -197,11 +197,13 @@
             function hasWords () {
                 var showKeyWordLength = $(".showKeyWord ul").find('li').length;
                 if(showKeyWordLength === 0){
-                    $(".addkeyWord").show();
+                    $(".enter.addkeyWord").show();
+                    $(".addKeyWord").hide();
                     $(".showKeyWord").hide();
                 } else {
-                    $(".addkeyWord").hide();
+                    $(".enter.addkeyWord").hide();
                     $(".showKeyWord").show();
+                    $(".addKeyWord").show();
                 }
             }
             hasWords();
@@ -285,8 +287,9 @@
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
-                $(".addkeyWord").hide();
-                $('.showKeyWord').show();
+                $(".enter.addkeyWord").hide();
+                $(".showKeyWord").show();
+                $(".addKeyWord").show();
                 $('.enter.addkeyWord > input').val('');
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
@@ -332,6 +335,15 @@
                         }
                     });
                     return
+                }else if($(this).parent().find("span").text().length >= 100){
+                    var s = $(this).parent().find("span").text().slice(0,99);
+                    $(this).parent().find("span").text(s);
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
                 }else{
                     for(var i in appendedArr){
                         if(appendedArr[i] === appendeds){

+ 10 - 0
src/web/templates/weixin/dataExport/dataExport_appendedInput.html

@@ -131,6 +131,16 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
+                for (var a in appendedArr){
+                    if (appended === appendedArr[a]){
+                        weui.toast('附加词重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
+                }
                 appendedArr.push(appended);
                 for(var i in keyWordArr){
                     if(keyWordArr[i].keyWord === token){

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

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

+ 12 - 2
src/web/templates/weixin/dataExport/dataExport_buyerInput.html

@@ -95,6 +95,16 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
+            for (var a in buyerArr){
+                if (keyWord === buyerArr[a]){
+                    weui.toast('采购单位重复了', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
+                }
+            }
             buyerArr.push(keyWord);
             localStorage.setItem("buyer", buyerArr);
             history.back();
@@ -111,9 +121,9 @@
             // console.log(olength)
             if(olength >= 100){
                 $('.fontLength').show();
-                var s = $(this).text().slice(0,100);
+                var s = $(this).text().slice(0,99);
                 $(this).text(s);
-                weui.toast('附加词不能超过100字', {
+                weui.toast('采购单位不能超过100字', {
                     duration: 2000,
                     className: 'text-overflow100',
                     callback: function(){ console.log('close') }

+ 16 - 4
src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -198,11 +198,13 @@
             function hasWords () {
                 var showKeyWordLength = $(".showKeyWord ul").find('li').length;
                 if(showKeyWordLength === 0){
-                    $(".addkeyWord").show();
+                    $(".enter.addkeyWord").show();
+                    $(".addKeyWord").hide();
                     $(".showKeyWord").hide();
                 } else {
-                    $(".addkeyWord").hide();
+                    $(".enter.addkeyWord").hide();
                     $(".showKeyWord").show();
+                    $(".addKeyWord").show();
                 }
             }
             hasWords();
@@ -286,8 +288,9 @@
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
-                $(".addkeyWord").hide();
-                $('.showKeyWord').show();
+                $(".enter.addkeyWord").hide();
+                $(".showKeyWord").show();
+                $(".addKeyWord").show();
                 $('.enter.addkeyWord > input').val('');
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
@@ -333,6 +336,15 @@
                         }
                     });
                     return
+                }else if($(this).parent().find("span").text().length >= 100){
+                    var s = $(this).parent().find("span").text().slice(0,99);
+                    $(this).parent().find("span").text(s);
+                    weui.toast('排除词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
                 }else{
                     for(var i in excludeArr){
                         if(excludeArr[i] === excludes){

+ 10 - 0
src/web/templates/weixin/dataExport/dataExport_excludeInput.html

@@ -146,6 +146,16 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
+                for (var a in excludeArr){
+                    if (exclude === excludeArr[a]){
+                        weui.toast('排除词重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
+                }
                 excludeArr.push(exclude);
                 for(var i in keyWordArr){
                     if(keyWordArr[i].keyWord === token){

+ 2 - 2
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}116">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}117">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="/js/jquery.js"></script>
     {{include "/common/weixin.html"}}
@@ -100,7 +100,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"}}32"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}36"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];

+ 11 - 1
src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

@@ -92,7 +92,7 @@
         // 添加keyWords检查输入框内是否有文字,如果有才能点击添加按钮
         $('.addkeyWord input.enterOne').on('input', function () {
             if ($(this).val().length >= 100) {
-                var s = $(this).val().slice(0, 100)
+                var s = $(this).val().slice(0, 99)
                 $(this).val(s)
 
                 weui.toast('关键词不能超过100字', {
@@ -125,6 +125,16 @@
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
             var Obj = {"keyWord": keyWord};
+            for (var a in keyWordArr){
+                if (keyWord === keyWordArr[a].keyWord){
+                    weui.toast('关键词重复了', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){}
+                    });
+                    return
+                }
+            }
             keyWordArr.push(Obj);
             localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
             window.history.back();

+ 17 - 5
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/weixin.html"}}
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -93,11 +93,13 @@
 			function hasWords () {
 				var showKeyWordLength = $(".showKeyWord ul").find('li').length;
 				if(showKeyWordLength === 0){
-					$(".addkeyWord").show();
+					$(".enter.addkeyWord").show();
+					$(".addKeyWord").hide();
 					$(".showKeyWord").hide();
 				} else {
-					$(".addkeyWord").hide();
+					$(".enter.addkeyWord").hide();
 					$(".showKeyWord").show();
+					$(".addKeyWord").show();
 				}
 			}
 			hasWords();
@@ -156,8 +158,9 @@
 				$('.showKeyWord > ul').prepend(html);
 
 				// 隐藏
-				$(".addkeyWord").hide();
-				$('.showKeyWord').show();
+				$(".enter.addkeyWord").hide();
+				$(".showKeyWord").show();
+				$(".addKeyWord").show();
 				$('.enter.addkeyWord > input').val('');
 				var buttonDOM = $('.enter.addkeyWord .btn button')[0];
 				buttonDOM.style.opacity = .5;
@@ -198,6 +201,15 @@
 						}
 					});
 					return
+				}else if($(this).parent().find("span").text().length >= 100){
+					var s = $(this).parent().find("span").text().slice(0,99);
+					$(this).parent().find("span").text(s);
+					weui.toast('中标单位不能超过100字', {
+						duration: 2000,
+						className: 'text-overflow100',
+						callback: function(){}
+					});
+					return
 				}else{
 					for(var i in winnerArr){
 						if(winnerArr[i] === winner){

+ 10 - 0
src/web/templates/weixin/dataExport/dataExport_winnerInput.html

@@ -97,6 +97,16 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save-btn').on('click', function(){
                 var keyWord = $('.addkeyWord input.enterOne').val();
+                for (var a in winnerArr){
+                    if (keyWord === winnerArr[a]){
+                        weui.toast('中标单位重复了', {
+                            duration: 2000,
+                            className: 'text-overflow100',
+                            callback: function(){}
+                        });
+                        return
+                    }
+                }
                 winnerArr.push(keyWord);
                 localStorage.setItem("winner", winnerArr);
                 history.back();