xuzhiheng 5 vuotta sitten
vanhempi
commit
8283437fdd
21 muutettua tiedostoa jossa 33 lisäystä ja 3 poistoa
  1. 3 1
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js
  2. 2 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js
  3. 2 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
  4. 1 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
  5. 1 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html
  6. 2 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
  7. 1 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
  8. 1 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
  9. 2 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  10. 1 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
  11. 2 0
      src/web/staticres/wx_dataExport/js/additionWord.js
  12. 3 1
      src/web/staticres/wx_dataExport/js/keyWord.js
  13. 2 0
      src/web/templates/weixin/dataExport/dataExport_appended.html
  14. 1 0
      src/web/templates/weixin/dataExport/dataExport_appendedInput.html
  15. 1 0
      src/web/templates/weixin/dataExport/dataExport_buyerInput.html
  16. 2 0
      src/web/templates/weixin/dataExport/dataExport_exclude.html
  17. 1 0
      src/web/templates/weixin/dataExport/dataExport_excludeInput.html
  18. 1 1
      src/web/templates/weixin/dataExport/dataExport_keyWord.html
  19. 1 0
      src/web/templates/weixin/dataExport/dataExport_keyWordInput.html
  20. 2 0
      src/web/templates/weixin/dataExport/dataExport_winnerEdit.html
  21. 1 0
      src/web/templates/weixin/dataExport/dataExport_winnerInput.html

+ 3 - 1
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -41,7 +41,8 @@ $(function(){
     
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save-btn').on('click', function(){
-        var keyWord = $('.addkeyWord input.enterOne').val()
+        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);
@@ -109,6 +110,7 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('span').text();
         var buyer = $(this).parent().prev().find('.key').text();
+        keyWord = keyWord.replace(/\s/g,"");
         if (keyWord.length < 1) {
 
             weui.toast('采购单位不能为空', {

+ 2 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -63,6 +63,7 @@ $(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)
@@ -302,6 +303,7 @@ $(function(){
         var $this = $(this);
         var keyWord = $(this).siblings('span').text();
         var keyWords = $(this).parent().prev().find('.key').text();
+        keyWord = keyWord.replace(/\s/g,"");
         if ($(this).parent().find("span").html().length < 1) {
 
             weui.toast('关键词不能为空', {

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

@@ -251,6 +251,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var appended = $('.addkeyWord input.enterOne').val();
+                appended = appended.replace(/\s/g,"");
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
@@ -357,6 +358,7 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var appended = $(this).siblings('span').text();
                 var appendeds = $(this).parent().prev().find('.key').text();
+                appended = appended.replace(/\s/g,"");
                 if (appended.length < 1) {
 
                     weui.toast('附加词不能为空', {

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

@@ -156,6 +156,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var appended = $('.addkeyWord input.enterOne').val();
+                appended = appended.replace(/\s/g,"");
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }

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

@@ -111,6 +111,7 @@
         // 添加 按钮的点击事件
         $('.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);

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

@@ -252,6 +252,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
+                exclude = exclude.replace(/\s/g,"");
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
@@ -358,6 +359,7 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var exclude = $(this).siblings('span').text();
                 var excludes = $(this).parent().prev().find('.key').text();
+                exclude = exclude.replace(/\s/g,"");
                 if (exclude.length < 1) {
 
                     weui.toast('排除词不能为空', {

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

@@ -164,6 +164,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
+                exclude = exclude.replace(/\s/g,"");
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }

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

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

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

@@ -163,6 +163,7 @@
 			// 添加 按钮的点击事件
 			$('.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);
@@ -230,6 +231,7 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('span').text();
 				var winner = $(this).parent().prev().find('.key').text();
+				keyWord = keyWord.replace(/\s/g,"");
 				if (keyWord.length < 1) {
 
 					weui.toast('中标单位不能为空', {

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

@@ -113,6 +113,7 @@
         // 添加 按钮的点击事件
         $('.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);

+ 2 - 0
src/web/staticres/wx_dataExport/js/additionWord.js

@@ -42,6 +42,7 @@ $(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);
@@ -109,6 +110,7 @@ $(function(){
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
         var keyWord = $(this).siblings('span').text();
         var buyer = $(this).parent().prev().find('.key').text();
+        keyWord = keyWord.replace(/\s/g,"");
         if (keyWord.length < 1) {
 
             weui.toast('采购单位不能为空', {

+ 3 - 1
src/web/staticres/wx_dataExport/js/keyWord.js

@@ -52,6 +52,7 @@ $(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);
@@ -59,7 +60,7 @@ $(function(){
             weui.toast('关键词不能超过20字', {
                 duration: 2000,
                 className: 'text-overflow100',
-                callback: function(){ console.log('close') }
+                callback: function(){}
             });
         }
         var keyWordHtml = "";
@@ -290,6 +291,7 @@ $(function(){
         var $this = $(this);
         var keyWord = $(this).siblings('span').text();
         var keyWords = $(this).parent().prev().find('.key').text();
+        keyWord = keyWord.replace(/\s/g,"");
         if ($(this).parent().find("span").html().length < 1) {
 
             weui.toast('关键词不能为空', {

+ 2 - 0
src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -224,6 +224,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var appended = $('.addkeyWord input.enterOne').val();
+                appended = appended.replace(/\s/g,"");
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }
@@ -330,6 +331,7 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var appended = $(this).siblings('span').text();
                 var appendeds = $(this).parent().prev().find('.key').text();
+                appended = appended.replace(/\s/g,"");
                 if (appended.length < 1) {
 
                     weui.toast('附加词不能为空', {

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

@@ -126,6 +126,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var appended = $('.addkeyWord input.enterOne').val();
+                appended = appended.replace(/\s/g,"");
                 if(appendedArr===undefined){
                     appendedArr = [];
                 }

+ 1 - 0
src/web/templates/weixin/dataExport/dataExport_buyerInput.html

@@ -84,6 +84,7 @@
         // 添加 按钮的点击事件
         $('.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);

+ 2 - 0
src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -223,6 +223,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
+                exclude = exclude.replace(/\s/g,"");
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }
@@ -329,6 +330,7 @@
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var exclude = $(this).siblings('span').text();
                 var excludes = $(this).parent().prev().find('.key').text();
+                exclude = exclude.replace(/\s/g,"");
                 if (exclude.length < 1) {
 
                     weui.toast('排除词不能为空', {

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

@@ -137,6 +137,7 @@
             // 添加 按钮的点击事件
             $('.addkeyWord .btn .save').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
+                exclude = exclude.replace(/\s/g,"");
                 if(excludeArr===undefined){
                     excludeArr = [];
                 }

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

@@ -112,7 +112,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"}}49"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}52"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(window).bind("pageshow", function(event){

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

@@ -114,6 +114,7 @@
         // 添加 按钮的点击事件
         $('.addkeyWord .btn .save').on('click', function () {
             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);

+ 2 - 0
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -134,6 +134,7 @@
 			// 添加 按钮的点击事件
 			$('.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);
@@ -201,6 +202,7 @@
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('span').text();
 				var winner = $(this).parent().prev().find('.key').text();
+				keyWord = keyWord.replace(/\s/g,"");
 				if (keyWord.length < 1) {
 
 					weui.toast('中标单位不能为空', {

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

@@ -86,6 +86,7 @@
             // 添加 按钮的点击事件
             $('.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);