字数校验

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/choose_area.css

@@ -329,6 +329,7 @@
   font-size: .3rem;
   padding: .2rem .5rem;
   border-bottom: 0.5px solid #e0e0e0;
+  box-sizing: border-box;
 }
 
 #choose_area .select-area-box .tab .province {

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

@@ -43,9 +43,9 @@ $(function(){
     $('.addkeyWord .btn .save-btn').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
         keyWord = keyWord.replace(/\s/g,"");
-        if (keyWord.length >= 50) {
-            var s = keyWord.slice(0,49);
-            $('.addkeyWord input.enterOne').val(s);
+        if (keyWord.length > 50) {
+            // var s = keyWord.slice(0,49);
+            // $('.addkeyWord input.enterOne').val(s);
 
             weui.toast('采购单位不能超过50字', {
                 duration: 2000,
@@ -121,9 +121,9 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length >= 50){
-            var s = $(this).parent().find("span").text().slice(0,49);
-            $(this).parent().find("span").text(s);
+        }else if($(this).parent().find("span").text().length > 50){
+            // var s = $(this).parent().find("span").text().slice(0,49);
+            // $(this).parent().find("span").text(s);
             weui.toast('采购单位不能超过50字', {
                 duration: 2000,
                 className: 'text-overflow100',

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

@@ -64,9 +64,9 @@ $(function(){
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
         keyWord = keyWord.replace(/\s/g,"");
-        if (keyWord.length >= 20) {
-            var s = keyWord.slice(0,19);
-            $('.addkeyWord input.enterOne').val(s)
+        if (keyWord.length > 20) {
+            // var s = keyWord.slice(0,19);
+            // $('.addkeyWord input.enterOne').val(s)
 
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
@@ -315,9 +315,9 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length >= 20){
-            var s = $(this).parent().find("span").text().slice(0,19);
-            $(this).parent().find("span").text(s);
+        }else if($(this).parent().find("span").text().length > 20){
+            // var s = $(this).parent().find("span").text().slice(0,19);
+            // $(this).parent().find("span").text(s);
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
                 className: 'text-overflow100',

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

@@ -255,9 +255,9 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
-                if (appended.length >= 20) {
-                    var s = appended.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (appended.length > 20) {
+                    // var s = appended.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,
@@ -369,9 +369,9 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length >= 20){
-                    var s = $(this).parent().find("span").text().slice(0,19);
-                    $(this).parent().find("span").text(s);
+                }else if($(this).parent().find("span").text().length > 20){
+                    // var s = $(this).parent().find("span").text().slice(0,19);
+                    // $(this).parent().find("span").text(s);
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -160,9 +160,9 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
-                if (appended.length >= 20) {
-                    var s = appended.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (appended.length > 20) {
+                    // var s = appended.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,

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

@@ -112,9 +112,9 @@
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
             keyWord = keyWord.replace(/\s/g,"");
-            if (keyWord.length >= 50) {
-                var s = keyWord.slice(0,49);
-                $('.addkeyWord input.enterOne').val(s);
+            if (keyWord.length > 50) {
+                // var s = keyWord.slice(0,49);
+                // $('.addkeyWord input.enterOne').val(s);
 
                 weui.toast('采购单位不能超过50字', {
                     duration: 2000,

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

@@ -256,9 +256,9 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
-                if (exclude.length >= 20) {
-                    var s = exclude.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (exclude.length > 20) {
+                    // var s = exclude.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,
@@ -370,9 +370,9 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length >= 20){
-                    var s = $(this).parent().find("span").text().slice(0,19);
-                    $(this).parent().find("span").text(s);
+                }else if($(this).parent().find("span").text().length > 20){
+                    // var s = $(this).parent().find("span").text().slice(0,19);
+                    // $(this).parent().find("span").text(s);
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -168,9 +168,9 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
-                if (exclude.length >= 20) {
-                    var s = exclude.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (exclude.length > 20) {
+                    // var s = exclude.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,

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

@@ -139,7 +139,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"}}39"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}40"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){

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

@@ -143,9 +143,9 @@
             keyWord = keyWord.replace(/\s/g,"");
             var Obj = {"keyWord": keyWord};
             //
-            if (keyWord.length >= 20) {
-                var s = keyWord.slice(0,19);
-                $('.addkeyWord input.enterOne').val(s);
+            if (keyWord.length > 20) {
+                // var s = keyWord.slice(0,19);
+                // $('.addkeyWord input.enterOne').val(s);
 
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,

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

@@ -164,9 +164,9 @@
 			$('.addkeyWord .btn .save-btn').on('click', function(){
 				var keyWord = $('.addkeyWord input.enterOne').val();
 				keyWord = keyWord.replace(/\s/g,"");
-				if (keyWord.length >= 50) {
-					var s = keyWord.slice(0,49);
-					$('.addkeyWord input.enterOne').val(s);
+				if (keyWord.length > 50) {
+					// var s = keyWord.slice(0,49);
+					// $('.addkeyWord input.enterOne').val(s);
 
 					weui.toast('中标单位不能超过50字', {
 						duration: 2000,
@@ -242,9 +242,9 @@
 						}
 					});
 					return
-				}else if($(this).parent().find("span").text().length >= 50){
-					var s = $(this).parent().find("span").text().slice(0,49);
-					$(this).parent().find("span").text(s);
+				}else if($(this).parent().find("span").text().length > 50){
+					// var s = $(this).parent().find("span").text().slice(0,49);
+					// $(this).parent().find("span").text(s);
 					weui.toast('中标单位不能超过50字', {
 						duration: 2000,
 						className: 'text-overflow100',

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

@@ -114,9 +114,9 @@
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
             keyWord = keyWord.replace(/\s/g,"");
-            if (keyWord.length >= 50) {
-                var s = keyWord.slice(0,49);
-                $('.addkeyWord input.enterOne').val(s);
+            if (keyWord.length > 50) {
+                // var s = keyWord.slice(0,49);
+                // $('.addkeyWord input.enterOne').val(s);
 
                 weui.toast('中标单位不能超过50字', {
                     duration: 2000,
@@ -145,22 +145,6 @@
             return this.replace(/(^\s*)|(\s*$)/g, ' ');
         };
 
-        //附加词个数
-        $('.modify span').keydown(function(){
-            var olength = $(this).text().replace(/\s+/g,'').length;
-            // console.log(olength)
-            if(olength >= 50){
-                $('.fontLength').show();
-                var s = $(this).text().slice(0,49);
-                $(this).text(s);
-                weui.toast('中标单位不能超过50字', {
-                    duration: 2000,
-                    className: 'text-overflow100',
-                    callback: function(){ console.log('close') }
-                });
-            }
-        });
-
         $(".close").on('click', function () {
             history.back();
         });

src/web/staticres/wx_dataExport/css/choose_area.css

@@ -329,6 +329,7 @@
   font-size: .3rem;
   padding: .2rem .5rem;
   border-bottom: 0.5px solid #e0e0e0;
+  box-sizing: border-box;
 }
 
 #choose_area .select-area-box .tab .province {

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

@@ -43,9 +43,9 @@ $(function(){
     $('.addkeyWord .btn .save-btn').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val()
         keyWord = keyWord.replace(/\s/g,"");
-        if (keyWord.length >= 50) {
-            var s = keyWord.slice(0,49);
-            $('.addkeyWord input.enterOne').val(s);
+        if (keyWord.length > 50) {
+            // var s = keyWord.slice(0,49);
+            // $('.addkeyWord input.enterOne').val(s);
 
             weui.toast('采购单位不能超过50字', {
                 duration: 2000,
@@ -121,9 +121,9 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length >= 50){
-            var s = $(this).parent().find("span").text().slice(0,49);
-            $(this).parent().find("span").text(s);
+        }else if($(this).parent().find("span").text().length > 50){
+            // var s = $(this).parent().find("span").text().slice(0,49);
+            // $(this).parent().find("span").text(s);
             weui.toast('采购单位不能超过50字', {
                 duration: 2000,
                 className: 'text-overflow100',
@@ -148,22 +148,6 @@ $(function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
     }
 
-    //附加词个数
-    $('.modify span').keydown(function(){
-        var olength = $(this).text().replace(/\s+/g,'').length;
-        // console.log(olength)
-        if(olength >= 50){
-            $('.fontLength').show();
-            var s = $(this).text().slice(0,49)
-            $(this).text(s)
-            weui.toast('采购单位不能超过50字', {
-                duration: 2000,
-                className: 'text-overflow100',
-                callback: function(){ console.log('close') }
-            });
-        }
-    });
-
     $(".close").on("click", function () {
         history.back();
     })

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

@@ -53,9 +53,9 @@ $(function(){
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
         keyWord = keyWord.replace(/\s/g,"");
-        if (keyWord.length >= 20) {
-            var s = keyWord.slice(0,19);
-            $('.addkeyWord input.enterOne').val(s);
+        if (keyWord.length > 20) {
+            // var s = keyWord.slice(0,19);
+            // $('.addkeyWord input.enterOne').val(s);
 
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
@@ -303,9 +303,9 @@ $(function(){
                 }
             });
             return
-        }else if($(this).parent().find("span").text().length >= 20){
-            var s = $(this).parent().find("span").text().slice(0,19);
-            $(this).parent().find("span").text(s);
+        }else if($(this).parent().find("span").text().length > 20){
+            // var s = $(this).parent().find("span").text().slice(0,19);
+            // $(this).parent().find("span").text(s);
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
                 className: 'text-overflow100',

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

@@ -228,9 +228,9 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
-                if (appended.length >= 20) {
-                    var s = appended.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (appended.length > 20) {
+                    // var s = appended.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,
@@ -342,9 +342,9 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length >= 20){
-                    var s = $(this).parent().find("span").text().slice(0,19);
-                    $(this).parent().find("span").text(s);
+                }else if($(this).parent().find("span").text().length > 20){
+                    // var s = $(this).parent().find("span").text().slice(0,19);
+                    // $(this).parent().find("span").text(s);
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -130,9 +130,9 @@
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
-                if (appended.length >= 20) {
-                    var s = appended.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (appended.length > 20) {
+                    // var s = appended.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,

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

@@ -85,9 +85,9 @@
         $('.addkeyWord .btn .save-btn').on('click', function(){
             var keyWord = $('.addkeyWord input.enterOne').val();
             keyWord = keyWord.replace(/\s/g,"");
-            if (keyWord.length >= 50) {
-                var s = keyWord.slice(0,49);
-                $('.addkeyWord input.enterOne').val(s);
+            if (keyWord.length > 50) {
+                // var s = keyWord.slice(0,49);
+                // $('.addkeyWord input.enterOne').val(s);
 
                 weui.toast('采购单位不能超过50字', {
                     duration: 2000,

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

@@ -227,9 +227,9 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
-                if (exclude.length >= 20) {
-                    var s = exclude.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (exclude.length > 20) {
+                    // var s = exclude.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,
@@ -341,9 +341,9 @@
                         }
                     });
                     return
-                }else if($(this).parent().find("span").text().length >= 20){
-                    var s = $(this).parent().find("span").text().slice(0,19);
-                    $(this).parent().find("span").text(s);
+                }else if($(this).parent().find("span").text().length > 20){
+                    // var s = $(this).parent().find("span").text().slice(0,19);
+                    // $(this).parent().find("span").text(s);
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -141,9 +141,9 @@
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
-                if (exclude.length >= 20) {
-                    var s = exclude.slice(0,19);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (exclude.length > 20) {
+                    // var s = exclude.slice(0,19);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('排除词不能超过20字', {
                         duration: 2000,

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

@@ -116,9 +116,9 @@
             var keyWord = $('.addkeyWord input.enterOne').val();
             keyWord = keyWord.replace(/\s/g,"");
             var Obj = {"keyWord": keyWord};
-            if (keyWord.length >= 20) {
-                var s = keyWord.slice(0, 19);
-                $('.addkeyWord input.enterOne').val(s);
+            if (keyWord.length > 20) {
+                // var s = keyWord.slice(0, 19);
+                // $('.addkeyWord input.enterOne').val(s);
 
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,

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

@@ -135,9 +135,9 @@
 			$('.addkeyWord .btn .save-btn').on('click', function(){
 				var keyWord = $('.addkeyWord input.enterOne').val();
 				keyWord = keyWord.replace(/\s/g,"");
-				if (keyWord.length >= 50) {
-					var s = keyWord.slice(0,49);
-					$('.addkeyWord input.enterOne').val(s);
+				if (keyWord.length > 50) {
+					// var s = keyWord.slice(0,49);
+					// $('.addkeyWord input.enterOne').val(s);
 
 					weui.toast('中标单位不能超过50字', {
 						duration: 2000,
@@ -213,9 +213,9 @@
 						}
 					});
 					return
-				}else if($(this).parent().find("span").text().length >= 50){
-					var s = $(this).parent().find("span").text().slice(0,49);
-					$(this).parent().find("span").text(s);
+				}else if($(this).parent().find("span").text().length > 50){
+					// var s = $(this).parent().find("span").text().slice(0,49);
+					// $(this).parent().find("span").text(s);
 					weui.toast('中标单位不能超过50字', {
 						duration: 2000,
 						className: 'text-overflow100',

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

@@ -87,9 +87,9 @@
             $('.addkeyWord .btn .save-btn').on('click', function(){
                 var keyWord = $('.addkeyWord input.enterOne').val();
                 keyWord = keyWord.replace(/\s/g,"");
-                if (keyWord.length >= 50) {
-                    var s = keyWord.slice(0,49);
-                    $('.addkeyWord input.enterOne').val(s);
+                if (keyWord.length > 50) {
+                    // var s = keyWord.slice(0,49);
+                    // $('.addkeyWord input.enterOne').val(s);
 
                     weui.toast('中标单位不能超过50字', {
                         duration: 2000,