Acasă Explorează Ajutor
Autentificare
qmx
/
jy
14
0
Bifurcare 0
Fisiere Probleme 2 Trageți solicitările 0 Wiki
Răsfoiți Sursa

Merge branch 'dev/v4.9.9_cyl' of qmx/jy into feature/v4.9.9

cuiyalong 1 an în urmă
părinte
d26e2cd047 d2e4741c1f
comite
d469d157d3
8 a modificat fișierele cu 32 adăugiri și 32 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 3 3
      src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
  2. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  3. 8 8
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  4. 5 5
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
  5. 3 3
      src/web/templates/weixin/dataExport/dataExport.html
  6. 1 1
      src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
  7. 7 7
      src/web/templates/weixin/dataExport/dataExport_winnerEdit.html
  8. 4 4
      src/web/templates/weixin/dataExport/dataExport_winnerInput.html

+ 3 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html
Vizualizați fișierul 

@@ -336,7 +336,7 @@
 
                                 <i class="iconfont icon-arrow"></i>
 
                             </a></li>
 
                         <li><a href="JavaScript:;" onclick="goChoosedetail('/jyapp/front/dataExport/winnerEdit')">
 
-                                <strong>中标单位</strong>
 
+                                <strong>中标企业</strong>
 
                                 <span id="winner"></span>
 
                                 <i class="iconfont icon-arrow"></i>
 
                             </a>
 
@@ -845,7 +845,7 @@
 
             } else {
 
                 localStorage.buyer = "";
 
             }
 
-            //中标单位
 
+            //中标企业
 
             if (filter["winner"] != null && filter["winner"].length > 0) {
 
                 localStorage.winner = filter["winner"].join(",");
 
             } else {
 
@@ -1007,7 +1007,7 @@
 
             $(".confirm").hide();
 
             $(".resetOne").css('display', 'flex');
 
         }
 
-        //中标单位
 
+        //中标企业
 
         if (localStorage.winner !== undefined && localStorage.winner !== "") {
 
             var winner = localStorage.winner;
 
             var winners = winner.replace(/,/g, " ");

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
Vizualizați fișierul 

@@ -584,7 +584,7 @@
 
 										</span>
 
                         </p>
 
                         <p class="item-list l-item">
 
-                            <span class="label">中标单位：</span>
 
+                            <span class="label">中标企业：</span>
 
                             <span class="item-list-parents winner value">
 
 										</span>
 
                         </p>

+ 8 - 8
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
Vizualizați fișierul 

@@ -3,7 +3,7 @@
 
 
 <head>
 
   {{include "/common/meta.html"}}
 
-  <title>中标单位</title>
 
+  <title>中标企业</title>
 
   <link rel="stylesheet" type="text/css"
 
     href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
 
   <link rel="stylesheet" type="text/css"
 
@@ -76,13 +76,13 @@
 
   <div class="page">
 
     <div class="app-layout-header jy-app-header">
 
       <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
-      中标单位
 
+      中标企业
 
       <span></span></div>
 
     <div class="app-layout-content-b">
 
       <div class="keyWord">
 
         <section class="content">
 
           <div class="enter addkeyWord">
 
-            <input type="text" class="enterOne" placeholder="中标单位名称" />
 
+            <input type="text" class="enterOne" placeholder="中标企业名称" />
 
             <div class="btn fixed-bottom">
 
               <button class="save-btn" disabled>确认</button>
 
               <button class="close">取消</button>
 
@@ -101,7 +101,7 @@
 
             </ul>
 
           </div>
 
         </section>
 
-        <div class="ent-more-tips">最多可添加{{Export.exportLimit.winnerLimit}}个中标单位，目前已达上限，如需添加更多您可<a href="javascript:;" onclick="goPerfect()">申请数据定制导出＞</a></div>
 
+        <div class="ent-more-tips">最多可添加{{Export.exportLimit.winnerLimit}}个中标企业，目前已达上限，如需添加更多您可<a href="javascript:;" onclick="goPerfect()">申请数据定制导出＞</a></div>
 
       </div>
 
     </div>
 
     <div class="addKeyBtn" id="add-ent-word">
 
@@ -224,7 +224,7 @@
 
             // var s = keyWord.slice(0,49);
 
             // $('.addkeyWord input.enterOne').val(s);
 
 
-            weui.toast('中标单位不能超过50字', {
 
+            weui.toast('中标企业不能超过50字', {
 
               duration: 2000,
 
               className: 'text-overflow100',
 
               callback: function () {}
 
@@ -290,7 +290,7 @@
 
           keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 
           if (keyWord.replace(/\s+/g, "").length < 1) {
 
 
-            weui.toast('中标单位不能为空', {
 
+            weui.toast('中标企业不能为空', {
 
               duration: 2000,
 
               className: 'text-overflow100',
 
               callback: function () {
 
@@ -301,7 +301,7 @@
 
           } else if ($(this).parent().find("textarea").val().length > 50) {
 
             // var s = $(this).parent().find("span").text().slice(0,49);
 
             // $(this).parent().find("span").text(s);
 
-            weui.toast('中标单位不能超过50字', {
 
+            weui.toast('中标企业不能超过50字', {
 
               duration: 2000,
 
               className: 'text-overflow100',
 
               callback: function () {}
 
@@ -311,7 +311,7 @@
 
             for (var i in winnerArr) {
 
               if (keyWord !== winner) {
 
                 if (winnerArr[i] === keyWord) {
 
-                  weui.toast('中标单位重复了', {
 
+                  weui.toast('中标企业重复了', {
 
                     duration: 2000,
 
                     className: 'text-overflow100',
 
                     callback: function () {}

+ 5 - 5
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
Vizualizați fișierul 

@@ -3,7 +3,7 @@
 
 
 <head>
 
     {{include "/common/meta.html"}}
 
-	<title>中标单位</title>
 
+	<title>中标企业</title>
 
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css">
 
@@ -39,13 +39,13 @@
 
     	<div class="page">
 
 		    <div class="app-layout-header jy-app-header">
 
 		        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
-		        中标单位
 
+		        中标企业
 
 		    <span></span></div>
 
 			<div class="app-layout-content-b">
 
 	    		<div class="keyWord">
 
         <section class="content">
 
         <div class="enter addkeyWord">
 
-        <input type="text" class="enterOne" placeholder="中标单位名称" />
 
+        <input type="text" class="enterOne" placeholder="中标企业名称" />
 
         <div class="btn fixed-bottom">
 
         <button class="save-btn" disabled>确认</button>
 
         <button class="close">取消</button>
 
@@ -105,7 +105,7 @@
 
                 // var s = keyWord.slice(0,49);
 
                 // $('.addkeyWord input.enterOne').val(s);
 
 
-                weui.toast('中标单位不能超过50字', {
 
+                weui.toast('中标企业不能超过50字', {
 
                     duration: 2000,
 
                     className: 'text-overflow100',
 
                     callback: function(){}
 
@@ -114,7 +114,7 @@
 
             }
 
             for (var a in winnerArr){
 
                 if (keyWord === winnerArr[a]){
 
-                    weui.toast('中标单位重复了', {
 
+                    weui.toast('中标企业重复了', {
 
                         duration: 2000,
 
                         className: 'text-overflow100',
 
                         callback: function(){}

+ 3 - 3
src/web/templates/weixin/dataExport/dataExport.html
Vizualizați fișierul 

@@ -361,7 +361,7 @@
 
                            <i class="iconfont icon-arrow"></i>
 
                         </a></li>
 
                         <li class="list-item"><a href="JavaScript:;" onclick="goChoosedetail('/front/wx_dataExport/winnerEdit')">
 
-                            <strong class="label">中标单位</strong>
 
+                            <strong class="label">中标企业</strong>
 
                            <span id="winner" class="content"></span>
 
                            <i class="iconfont icon-arrow"></i>
 
                           </a>
 
@@ -871,7 +871,7 @@
 
 	        }else{
 
 				localStorage.buyer = "";
 
 			}
 
-	        //中标单位
 
+	        //中标企业
 
 	        if(filter["winner"]!=null&&filter["winner"].length>0){
 
 				localStorage.winner = filter["winner"].join(",");
 
 	        }else{
 
@@ -1030,7 +1030,7 @@
 
             $(".confirm").hide();
 
             $(".resetOne").css('display','flex');
 
         }
 
-        //中标单位
 
+        //中标企业
 
         if(localStorage.winner!==undefined && localStorage.winner!==""){
 
             var winner = localStorage.winner;
 
             var winners = winner.replace(/,/g," ");

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
Vizualizați fișierul 

@@ -440,7 +440,7 @@
 
 									</span>
 
                         </p>
 
                         <p class="item-list l-item">
 
-                            <span class="label">中标单位：</span>
 
+                            <span class="label">中标企业：</span>
 
                             <span class="item-list-parents winner value">
 
 									</span>
 
                         </p>

+ 7 - 7
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html
Vizualizați fișierul 

@@ -5,7 +5,7 @@
 
 	<meta charset="UTF-8">
 
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 
-	<title>中标单位</title>
 
+	<title>中标企业</title>
 
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 
 	<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"}}">
 
@@ -62,7 +62,7 @@
 
 	<div class="keyWord">
 
     <section class="content">
 
       <div class="enter addkeyWord">
 
-        <input type="text" class="enterOne" placeholder="中标单位名称" />
 
+        <input type="text" class="enterOne" placeholder="中标企业名称" />
 
         <div class="btn fixed-bottom">
 
           <button class="save-btn" disabled>确认</button>
 
           <button class="close">取消</button>
 
@@ -80,7 +80,7 @@
 
         </ul>
 
       </div>
 
     </section>
 
-    <div class="ent-more-tips">最多可添加{{Export.exportLimit.winnerLimit}}个中标单位，目前已达上限，如需添加更多您可<a href="/weixin/frontPage/bigmember/free/perfect_info?source=wx_Dataself_entmore_customization" onclick="goPerfect()">申请数据定制导出＞</a></div>
 
+    <div class="ent-more-tips">最多可添加{{Export.exportLimit.winnerLimit}}个中标企业，目前已达上限，如需添加更多您可<a href="/weixin/frontPage/bigmember/free/perfect_info?source=wx_Dataself_entmore_customization" onclick="goPerfect()">申请数据定制导出＞</a></div>
 
 	</div>
 
 	<div class="addKeyBtn">
 
 		<i class="iconfont icon-tianjia"></i>
 
@@ -216,7 +216,7 @@
 
 					// var s = keyWord.slice(0,49);
 
 					// $('.addkeyWord input.enterOne').val(s);
 
 
-					weui.toast('中标单位不能超过50字', {
 
+					weui.toast('中标企业不能超过50字', {
 
 						duration: 2000,
 
 						className: 'text-overflow100',
 
 						callback: function(){}
 
@@ -280,7 +280,7 @@
 
 				keyWord = keyWord.replace(/(^\s*)|(\s*$)/g, "");
 
 				if (keyWord.replace(/\s+/g,"").length < 1) {
 
 
-					weui.toast('中标单位不能为空', {
 
+					weui.toast('中标企业不能为空', {
 
 						duration: 2000,
 
 						className: 'text-overflow100',
 
 						callback: function(){
 
@@ -291,7 +291,7 @@
 
 				}else if($(this).parent().find("textarea").val().length > 50){
 
 					// var s = $(this).parent().find("span").text().slice(0,49);
 
 					// $(this).parent().find("span").text(s);
 
-					weui.toast('中标单位不能超过50字', {
 
+					weui.toast('中标企业不能超过50字', {
 
 						duration: 2000,
 
 						className: 'text-overflow100',
 
 						callback: function(){}
 
@@ -301,7 +301,7 @@
 
 					for(var i in winnerArr){
 
 						if(winner !== keyWord){
 
 							if(winnerArr[i] === keyWord){
 
-								weui.toast('中标单位重复了', {
 
+								weui.toast('中标企业重复了', {
 
 									duration: 2000,
 
 									className: 'text-overflow100',
 
 									callback: function(){}

+ 4 - 4
src/web/templates/weixin/dataExport/dataExport_winnerInput.html
Vizualizați fișierul 

@@ -5,7 +5,7 @@
 
     <meta charset="UTF-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
-    <title>中标单位</title>
 
+    <title>中标企业</title>
 
     <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"}}">
 
@@ -35,7 +35,7 @@
 
 
     <div class="keyWord">
 
         <div class="enter addkeyWord">
 
-        <input type="text" class="enterOne" placeholder="中标单位名称" />
 
+        <input type="text" class="enterOne" placeholder="中标企业名称" />
 
         <div class="btn fixed-bottom">
 
         <button class="save-btn" disabled>确认</button>
 
         <button class="close">取消</button>
 
@@ -97,7 +97,7 @@
 
                     // var s = keyWord.slice(0,49);
 
                     // $('.addkeyWord input.enterOne').val(s);
 
 
-                    weui.toast('中标单位不能超过50字', {
 
+                    weui.toast('中标企业不能超过50字', {
 
                         duration: 2000,
 
                         className: 'text-overflow100',
 
                         callback: function(){}
 
@@ -106,7 +106,7 @@
 
                 }
 
                 for (var a in winnerArr){
 
                     if (keyWord === winnerArr[a]){
 
-                        weui.toast('中标单位重复了', {
 
+                        weui.toast('中标企业重复了', {
 
                             duration: 2000,
 
                             className: 'text-overflow100',
 
                             callback: function(){}