Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

wangshan 6 years ago
parent
e80247a2e2 c4aca58663
commit
5caceedd26
17 changed files with 449 additions and 130 deletions
Split View Show Diff Stats
  1. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExPort.html
  2. 37 21
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
  3. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
  4. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html
  5. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html
  6. 18 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html
  7. 38 21
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
  8. 18 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
  9. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html
  10. 19 2
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html
  11. 16 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
  12. 16 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
  13. 18 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html
  14. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  15. 17 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
  16. 146 82
      src/jfw/pay/aliPay.go
  17. 4 1
      src/web/staticres/js/biddingSearch.js

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExPort.html
View File 

@@ -9,6 +9,7 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
 
+    <link rel="stylesheet" type="text/css" href="/jyapp/css/font.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" href="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
 
@@ -127,10 +128,22 @@
 
         top: 0;
 
         color: #444444;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 
 </style>
 
 <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         数据导出
 
     </div>
 
     <div class="page" style="margin-top:60px">
 
@@ -632,6 +645,10 @@
 
             n = n.toString();
 
             return n[1] ? n : '0' + n
 
         }
 
+        //
 
+        $(".app-back").on("click", function () {
 
+            history.back();
 
+        });
 
     })
 
 </script>

+ 37 - 21
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 
     <script src="/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>
 
     .app-layout-header{
 
@@ -33,9 +35,21 @@
 
     .keyWord .enter .btn .save {
 
         float: right;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 </style>
 
 <body>
 
 <div class="app-layout-header">
 
+    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
     附加词
 
 </div>
 
 <div class="keyWord" style="margin-top: 50px">
 
@@ -105,30 +119,29 @@
 
             window.onload = function(){
 
                 backListen();
 
             };
 
-        }
 
-        //
 
-        // 监听浏览器回退事件
 
-        function backListen () {
 
-            if (window.history && window.history.pushState) {
 
-                $(window).on('popstate', function () { // 点击后退会触发popstate事件
 
-                    var hashLocation = location.hash; // 获取点击后的页面的hash值
 
-                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
 
-                    var hashName = hashSplit[1]; // 取数组的第一个
 
+            // 监听浏览器回退事件
 
+            function backListen () {
 
+                if (window.history && window.history.pushState) {
 
+                    $(window).on('popstate', function () { // 点击后退会触发popstate事件
 
+                        var hashLocation = location.hash; // 获取点击后的页面的hash值
 
+                        var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
 
+                        var hashName = hashSplit[1]; // 取数组的第一个
 
 
-                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
 
-                    if (hashName !== '') {
 
-                        var hash = window.location.hash;
 
-                        if (hash === '') { // 如果当前页面没有哈希值
 
+                        // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
 
+                        if (hashName !== '') {
 
+                            var hash = window.location.hash;
 
+                            if (hash === '') { // 如果当前页面没有哈希值
 
 
-                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
 
+                                sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
 
 
-                            // 强行回退一步，就不用多点一次了😎
 
-                            history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
 
+                                // 强行回退一步，就不用多点一次了😎
 
+                                history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
 
+                            }
 
                         }
 
-                    }
 
-                });
 
-                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
 
-                window.history.pushState('forward', null, '#');
 
+                    });
 
+                    // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
 
+                    window.history.pushState('forward', null, '#');
 
+                }
 
             }
 
         }
 
         //
 
@@ -253,7 +266,7 @@
 
             });
 
 
             // 添加 按钮的点击事件
 
-            $('.addkeyWord .btn button').on('click', function(){
 
+            $('.addkeyWord .btn .save').on('click', function(){
 
                 var appended = $('.addkeyWord input.enterOne').val();
 
                 if(appendedArr===undefined){
 
                     appendedArr = [];
 
@@ -377,6 +390,9 @@
 
             $('.addkeyWord .btn .close').on('click', function () {
 
                 window.history.back();
 
             });
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
+            });
 
         })
 
 
     </script>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"2>
 
     <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>
 
         .app-layout-header{
 
@@ -33,9 +35,21 @@
 
         .keyWord .enter .btn .save {
 
             float: right;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
     <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         附加词
 
     </div>
 
     <div class="keyWord" style="margin-top: 50px;">
 
@@ -198,6 +212,9 @@
 
             $('.addkeyWord .btn .close').on('click', function () {
 
                 window.history.back();
 
             });
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
+            });
 
         })
 
 
     </script>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html
View File 

@@ -13,6 +13,8 @@
 
 		<link rel="stylesheet" href="/jyapp/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" href="/jyapp/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}">
 
 		<script src="/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>
 
 			#choose_area .main .select-area-box .tab .province .checkbox:checked {
 
@@ -40,9 +42,21 @@
 
 				top: 0;
 
 				color: #444444;
 
 			}
 
+			.app-layout-header>.app-back{
 
+				position: absolute;
 
+				font-size: 19px;
 
+				padding-top: 20px;
 
+				padding-left: 11px;
 
+				padding-right: 40px;
 
+				padding-bottom: 7px;
 
+				left: 0px;
 
+				top: 18px;
 
+				color: #444444;
 
+			}
 
 		</style>
 
 	<body>
 
 		<div class="app-layout-header">
 
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 			区域
 
 		</div>
 
 		<div id="choose_area">
 
@@ -561,6 +575,9 @@
 
 					 $(this).parent().prev().find(".checkbox").prop("checked", true);
 
 				 });
 
 				 //
 
+				 $(".app-back").on("click", function () {
 
+					 history.back();
 
+				 });
 
 
 			})
 
 		</script>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html
View File 

@@ -11,6 +11,8 @@
 
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css">
 
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css">
 
 	<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></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>
 
 	.keyWord .addKeyWord {
 
@@ -39,10 +41,22 @@
 
 	.keyWord .enter .btn .save-btn {
 
 		float: right;
 
 	}
 
+	.app-layout-header>.app-back{
 
+		position: absolute;
 
+		font-size: 19px;
 
+		padding-top: 20px;
 
+		padding-left: 11px;
 
+		padding-right: 40px;
 
+		padding-bottom: 7px;
 
+		left: 0px;
 
+		top: 18px;
 
+		color: #444444;
 
+	}
 
 </style>
 
 
 <body>
 
 <div class="app-layout-header">
 
+	<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 	采购单位
 
 </div>
 
 <div class="keyWord" style="margin-top:70px">
 
@@ -96,6 +110,9 @@
 
 		}
 
 		$('.showKeyWord > ul').prepend(html);
 
 	}
 
+	$(".app-back").on("click", function () {
 
+		history.back();
 
+	});
 
 
 </script>

+ 18 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
 
     <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></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>
 
         .keyWord .addKeyWord {
 
@@ -39,10 +41,22 @@
 
         .keyWord .enter .btn .save-btn {
 
             float: right;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
 
     <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         采购单位
 
     </div>
 
     <div class="keyWord" style="margin-top: 40px;">
 
@@ -136,7 +150,10 @@
 
 
         $(".close").on("click", function () {
 
             history.back();
 
-        })
 
+        });
 
+        $(".app-back").on("click", function () {
 
+            history.back();
 
+        });
 
 
     </script>

+ 38 - 21
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <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"></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>
 
     .app-layout-header{
 
@@ -33,9 +35,21 @@
 
     .keyWord .enter .btn .save {
 
         float: right;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 </style>
 
 <body>
 
 <div class="app-layout-header">
 
+    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
     排除词
 
 </div>
 
 <div class="keyWord" style="margin-top: 50px">
 
@@ -105,29 +119,29 @@
 
             window.onload = function(){
 
                 backListen();
 
             };
 
-        }
 
-        // 监听浏览器回退事件
 
-        function backListen () {
 
-            if (window.history && window.history.pushState) {
 
-                $(window).on('popstate', function () { // 点击后退会触发popstate事件
 
-                    var hashLocation = location.hash; // 获取点击后的页面的hash值
 
-                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
 
-                    var hashName = hashSplit[1]; // 取数组的第一个
 
+            // 监听浏览器回退事件
 
+            function backListen () {
 
+                if (window.history && window.history.pushState) {
 
+                    $(window).on('popstate', function () { // 点击后退会触发popstate事件
 
+                        var hashLocation = location.hash; // 获取点击后的页面的hash值
 
+                        var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
 
+                        var hashName = hashSplit[1]; // 取数组的第一个
 
 
-                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
 
-                    if (hashName !== '') {
 
-                        var hash = window.location.hash;
 
-                        if (hash === '') { // 如果当前页面没有哈希值
 
+                        // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
 
+                        if (hashName !== '') {
 
+                            var hash = window.location.hash;
 
+                            if (hash === '') { // 如果当前页面没有哈希值
 
 
-                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
 
+                                sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
 
 
-                            // 强行回退一步，就不用多点一次了😎
 
-                            history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
 
+                                // 强行回退一步，就不用多点一次了😎
 
+                                history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
 
+                            }
 
                         }
 
-                    }
 
-                });
 
-                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
 
-                window.history.pushState('forward', null, '#');
 
+                    });
 
+                    // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
 
+                    window.history.pushState('forward', null, '#');
 
+                }
 
             }
 
         }
 
         //
 
@@ -252,7 +266,7 @@
 
             });
 
 
             // 添加 按钮的点击事件
 
-            $('.addkeyWord .btn button').on('click', function(){
 
+            $('.addkeyWord .btn .save').on('click', function(){
 
                 var exclude = $('.addkeyWord input.enterOne').val();
 
                 if(excludeArr===undefined){
 
                     excludeArr = [];
 
@@ -374,7 +388,10 @@
 
             });
 
 
             $('.addkeyWord .btn .close').on('click', function () {
 
-                window.history.back();
 
+                history.back();
 
+            });
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
             });
 
         })

+ 18 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
 
     <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></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>
 
         .app-layout-header{
 
@@ -33,9 +35,21 @@
 
         .keyWord .enter .btn .save {
 
             float: right;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
     <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         排除词
 
     </div>
 
     <div class="keyWord" style="margin-top: 50px;">
 
@@ -154,7 +168,7 @@
 
             });
 
 
             // 添加 按钮的点击事件
 
-            $('.addkeyWord .btn button').on('click', function(){
 
+            $('.addkeyWord .btn .save').on('click', function(){
 
                 var exclude = $('.addkeyWord input.enterOne').val();
 
                 if(excludeArr===undefined){
 
                     excludeArr = [];
 
@@ -210,6 +224,9 @@
 
             $('.addkeyWord .btn .close').on('click', function () {
 
                 window.history.back();
 
             });
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
+            });
 
         })
 
 
     </script>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html
View File 

@@ -9,6 +9,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/industry.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>
 
         .active{
 
@@ -40,9 +42,21 @@
 
             top: 0;
 
             color: #444444;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
 <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         行业
 
     </div>
 
     <div class="industry" style="margin-top:65px">
 
@@ -317,6 +331,9 @@
 
                 }
 
             }
 
             //
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
+            });
 
 
 
     </script>

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

@@ -12,6 +12,8 @@
 
     <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>
 
     .keyWord .addKeyWord {
 
@@ -41,9 +43,21 @@
 
     .keyWord .enter .btn .save {
 
         float: right;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 </style>
 
 <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         关键词
 
     </div>
 
     <div class="keyWord" style="margin-top:53px">
 
@@ -260,9 +274,12 @@
 
         });
 
 
         $('.addkeyWord .btn .close').on('click', function () {
 
-            window.history.back();
 
+            history.back();
 
+        });
 
+        //
 
+        $(".app-back").on("click", function () {
 
+            history.back();
 
         });
 
-
 
 
     </script>
 
 </body>

+ 16 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
View File 

@@ -12,6 +12,7 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
 
     <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>
 
     .app-layout-header{
 
@@ -34,9 +35,21 @@
 
     .keyWord .enter .btn .save {
 
         float: right;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 </style>
 
 <body>
 
 <div class="app-layout-header">
 
+    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
     关键词
 
 </div>
 
 <div class="keyWord" style="margin-top: 50px;">
 
@@ -196,6 +209,9 @@
 
         sessionStorage.keyWord = JSON.stringify(obj);
 
         window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord+"_in";
 
     });
 
+    $(".app-back").on("click", function () {
 
+        history.back();
 
+    });
 
 
 </script>
 
 </body>

+ 16 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html
View File 

@@ -10,6 +10,7 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/money.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>
 
     .active{
 
@@ -30,9 +31,21 @@
 
         top: 0;
 
         color: #444444;
 
     }
 
+    .app-layout-header>.app-back{
 
+        position: absolute;
 
+        font-size: 19px;
 
+        padding-top: 20px;
 
+        padding-left: 11px;
 
+        padding-right: 40px;
 
+        padding-bottom: 7px;
 
+        left: 0px;
 
+        top: 18px;
 
+        color: #444444;
 
+    }
 
 </style>
 
 <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         金额
 
     </div>
 
     <div class="industry" style="margin-top:65px">
 
@@ -111,7 +124,9 @@
 
                 $(".all span").removeClass("active");
 
             }
 
         }
 
-
 
+        $(".app-back").on("click", function () {
 
+            history.back();
 
+        });
 
     })
 
 </script>
 
 </body>

+ 18 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_subType.html
View File 

@@ -9,6 +9,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/messageType.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>
 
         .active{
 
@@ -40,9 +42,21 @@
 
             top: 0;
 
             color: #444444;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
 <body>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         信息类型
 
     </div>
 
     <div class="industry" style="margin-top:60px">
 
@@ -237,6 +251,10 @@
 
                     $(_this).parent().find('dt').addClass('active');
 
                 }
 
             }
 
+            //
 
+            $(".app-back").on("click", function () {
 
+                history.back();
 
+            });
 
 
     </script>
 
 </body>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
View File 

@@ -11,6 +11,8 @@
 
 	<link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
 	<link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 
 	<script src="/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>
 
 		.keyWord .addKeyWord {
 
@@ -39,9 +41,21 @@
 
 		.keyWord .enter .btn .save-btn {
 
 			float: right;
 
 		}
 
+		.app-layout-header>.app-back{
 
+			position: absolute;
 
+			font-size: 19px;
 
+			padding-top: 20px;
 
+			padding-left: 11px;
 
+			padding-right: 40px;
 
+			padding-bottom: 7px;
 
+			left: 0px;
 
+			top: 18px;
 
+			color: #444444;
 
+		}
 
 	</style>
 
 	<body>
 
 	<div class="app-layout-header">
 
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 		中标单位
 
 	</div>
 
 	<div class="keyWord" style="margin-top:70px;">
 
@@ -235,6 +249,9 @@
 
 			$(".close").on('click', function () {
 
 				history.back();
 
 			});
 
+			$(".app-back").on("click", function () {
 
+				history.back();
 
+			});
 
 		})
 
 
 	</script>

+ 17 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html
View File 

@@ -11,6 +11,8 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
 
     <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>
 
         .keyWord .addKeyWord {
 
@@ -39,6 +41,17 @@
 
         .keyWord .enter .btn .save-btn {
 
             float: right;
 
         }
 
+        .app-layout-header>.app-back{
 
+            position: absolute;
 
+            font-size: 19px;
 
+            padding-top: 20px;
 
+            padding-left: 11px;
 
+            padding-right: 40px;
 
+            padding-bottom: 7px;
 
+            left: 0px;
 
+            top: 18px;
 
+            color: #444444;
 
+        }
 
     </style>
 
     <body>
 
 
@@ -51,6 +64,7 @@
 
     </div>
 
     </div>
 
     <div class="app-layout-header">
 
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
         中标单位
 
     </div>
 
     <!-- 添加附加词显示列表 -->
 
@@ -139,6 +153,9 @@
 
         $(".close").on('click', function () {
 
             history.back();
 
         });
 
+        $(".app-back").on("click", function () {
 
+            history.back();
 
+        });
 
     })
 
 
     </script>

+ 146 - 82
src/jfw/pay/aliPay.go
View File 

@@ -29,15 +29,17 @@ type AliPayStruct struct {
 
 	Appid        string
 
 	PrivateKey   *rsa.PrivateKey //请求接口秘钥
 
 	AliPublicKey *rsa.PublicKey  //支付完成回调，校验使用(取支付宝后台)
 
-	Qr_width     int             //二维码宽度
 
-	CallBackUrl  string          //支付完成回调地址
 
-	ReturnUrl    string          //支付完成页面跳转地址
 
 	Requseturl   string          //接口请求地址
 
 	Subject      string          //支付小标题
 
+
 
+	PC_Qr_width    int    //PC扫码二维码宽度
 
+	PC_CallBackUrl string //pc扫码支付完成回调地址
 
+
 
+	APP_CallBackUrl string //app支付完成回调地址
 
 }
 
 
-//支付订单生成请求参数(扫码支付)
 
-type BizContent struct {
 
+//扫码支付订单生成请求参数
 
+type BizPcContent struct {
 
 	Subject      string  `json:"subject"`
 
 	OutTradeNo   string  `json:"out_trade_no"`
 
 	TotalAmount  float64 `json:"total_amount"`
 
@@ -47,14 +49,18 @@ type BizContent struct {
 
 	Time_expire  string  `json:"time_expire"` //支付超时时间yyyy-MM-dd HH:mm:ss
 
 }
 
 
-//支付订单关闭请求参数
 
+//App支付订单生成请求参数
 
+type BizAppContent struct {
 
+	Subject     string  `json:"subject"`
 
+	OutTradeNo  string  `json:"out_trade_no"`
 
+	TotalAmount float64 `json:"total_amount"`
 
+	ProductCode string  `json:"product_code"`
 
+}
 
+
 
+//扫码支付订单关闭结构体
 
 type CloseContent struct {
 
 	OutTradeNo string `json:"out_trade_no"`
 
 }
 
-type AliPayAction struct {
 
-	*xweb.Action
 
-	payCallback xweb.Mapper `xweb:"/alipay/pay/callback"` //微信支付回调
 
-}
 
 
 var Alipay *AliPayStruct
 
 var alipayConf map[string]interface{}
 
@@ -75,43 +81,49 @@ func init() {
 
 		Appid:        util.ObjToString(alipayConf["appid"]),
 
 		PrivateKey:   privateKey,
 
 		AliPublicKey: aliPublicKey,
 
-		CallBackUrl:  util.ObjToString(config.Sysconfig["webdomain"]) + "/alipay/pay/callback",
 
-		Qr_width:     250,
 
-		ReturnUrl:    "", //不配置
 
 		Requseturl:   util.ObjToString(alipayConf["reqUrl"]),
 
 		Subject:      util.ObjToString(alipayConf["Subject"]),
 
+		//pc扫码参数
 
+		PC_CallBackUrl: util.ObjToString(config.Sysconfig["webdomain"]) + "/alipay/pay/callback",
 
+		PC_Qr_width:    250,
 
+		//app支付参数
 
+		APP_CallBackUrl: util.ObjToString(config.Sysconfig["webdomain"]) + "/app/alipay/pay/callback",
 
+	}
 
+
 
+	//注册路由
 
+	if alipayConf["isApp"] == "T" {
 
+		xweb.AddAction(&AliAppPayAction{})
 
+	} else {
 
+		xweb.AddAction(&AliPcPayAction{})
 
 	}
 
-	xweb.AddAction(&AliPayAction{})
 
+
 
 }
 
 
 func (w *AliPayStruct) GetTradeno() string {
 
 	return fmt.Sprintf("%s_%d%s%s", "z", time.Now().UnixNano(), util.GetRandom(5), util.GetLetterRandom(6))
 
 }
 
 
-//获取支付连接
 
+//pc扫码获取支付二维码地址
 
 func (a *AliPayStruct) GetPayUrl(order_money float64, time_expire string) (string, string, error) {
 
 	tradeno := a.GetTradeno()
 
-	bizContent := BizContent{
 
+	bizPcContent := BizPcContent{
 
 		Subject:      a.Subject,
 
 		OutTradeNo:   tradeno,
 
 		TotalAmount:  order_money / 100,
 
 		ProductCode:  "FAST_INSTANT_TRADE_PAY",
 
 		Qr_pay_mode:  "4",
 
-		Qrcode_width: a.Qr_width,
 
+		Qrcode_width: a.PC_Qr_width,
 
 		Time_expire:  time_expire,
 
 	}
 
-	bizbyte, err := json.Marshal(bizContent)
 
+	bizbyte, err := json.Marshal(bizPcContent)
 
 	if err != nil {
 
 		return "", "", err
 
 	}
 
 	var data = url.Values{}
 
 	data.Add("app_id", Alipay.Appid)
 
 	data.Add("method", "alipay.trade.page.pay")
 
-	if a.CallBackUrl != "" {
 
-		data.Add("notify_url", a.CallBackUrl) //支付完成回调地址
 
-	}
 
-	if a.ReturnUrl != "" {
 
-		data.Add("return_url", a.ReturnUrl)
 
+	if a.PC_CallBackUrl != "" {
 
+		data.Add("notify_url", a.PC_CallBackUrl) //支付完成回调地址
 
 	}
 
 	data.Add("format", "json")
 
 	data.Add("charset", "UTF-8")
 
@@ -129,6 +141,41 @@ func (a *AliPayStruct) GetPayUrl(order_money float64, time_expire string) (strin
 
 	return a.Requseturl + "?" + data.Encode(), tradeno, nil
 
 }
 
 
+//app支付获取支付token
 
+func (a *AliPayStruct) GetAliPayToken(order_money float64) (string, string, error) {
 
+	tradeno := a.GetTradeno()
 
+	bizAppContent := BizAppContent{
 
+		Subject:     a.Subject,
 
+		OutTradeNo:  tradeno,
 
+		TotalAmount: order_money / 100,
 
+		ProductCode: "QUICK_MSECURITY_PAY",
 
+	}
 
+	bizbyte, err := json.Marshal(bizAppContent)
 
+	if err != nil {
 
+		return "", "", err
 
+	}
 
+	var data = url.Values{}
 
+	data.Add("app_id", Alipay.Appid)
 
+	data.Add("method", "alipay.trade.app.pay")
 
+	if a.APP_CallBackUrl != "" {
 
+		data.Add("notify_url", a.APP_CallBackUrl) //支付完成回调地址
 
+	}
 
+	data.Add("format", "json")
 
+	data.Add("charset", "UTF-8")
 
+	data.Add("sign_type", "RSA2")
 
+	data.Add("timestamp", time.Now().Format("2006-01-02 15:04:05"))
 
+	data.Add("version", "1.0")
 
+	data.Add("biz_content", string(bizbyte))
 
+
 
+	signContentBytes, _ := url.QueryUnescape(data.Encode())
 
+	signature, err := a.getSign([]byte(signContentBytes))
 
+	if err != nil {
 
+		return "", "", err
 
+	}
 
+	data.Add("sign", signature)
 
+	return data.Encode(), tradeno, nil
 
+}
 
+
 
 //加载秘钥
 
 func parsePrivateKey(key string) (*rsa.PrivateKey, error) {
 
 	block, _ := pem.Decode([]byte(key))
 
@@ -200,9 +247,82 @@ func (a *AliPayStruct) checkCallBackSign(param, sign string) bool {
 
 	return true
 
 }
 
 
-//支付宝支付回调
 
-func (a *AliPayAction) PayCallback() {
 
-	checkSign := a.GetForm()
 
+//支付宝关闭订单(生成的订单二维码，未扫码无法关闭订单)
 
+func (a *AliPayStruct) CloseOrder(tradeno string) bool {
 
+	toClose := CloseContent{
 
+		OutTradeNo: tradeno,
 
+	}
 
+	bizbyte, err := json.Marshal(toClose)
 
+	if err != nil {
 
+		log.Println()
 
+		return false
 
+	}
 
+	var data = url.Values{}
 
+	data.Add("app_id", Alipay.Appid)
 
+	data.Add("method", "alipay.trade.close")
 
+	data.Add("format", "json")
 
+	data.Add("charset", "UTF-8")
 
+	data.Add("sign_type", "RSA2")
 
+	data.Add("timestamp", time.Now().Format("2006-01-02 15:04:05"))
 
+	data.Add("version", "1.0")
 
+	data.Add("biz_content", string(bizbyte))
 
+	signContentBytes, _ := url.QueryUnescape(data.Encode())
 
+	log.Println(signContentBytes)
 
+	signature, err := a.getSign([]byte(signContentBytes))
 
+	if err != nil {
 
+		log.Println(tradeno, "获取签名出错", err)
 
+		return false
 
+	}
 
+	data.Add("sign", signature)
 
+
 
+	url := a.Requseturl + "?" + data.Encode()
 
+	//clien 优化
 
+	client := http.Client{Jar: nil}
 
+	req, _ := http.NewRequest("POST", url, nil)
 
+	res, err := client.Do(req)
 
+	if err != nil {
 
+		log.Printf("%s支付宝关闭订单  请求出错%v\n", tradeno, err)
 
+		return false
 
+	}
 
+	bArr, err := ioutil.ReadAll(res.Body)
 
+	if err != nil {
 
+		log.Printf("%s支付宝关闭订单  读取相应出错%v\n", tradeno, err)
 
+		return false
 
+	}
 
+	m := map[string]interface{}{}
 
+	err = json.Unmarshal(bArr, &m)
 
+	if err != nil {
 
+		log.Println(string(bArr))
 
+		log.Println("%s支付宝关闭订单   解析相应参数出错%v\n", tradeno, err)
 
+	}
 
+	msg := (*util.ObjToMap(m["alipay_trade_close_response"]))["sub_msg"]
 
+	log.Printf("%s msg:%s 订单关闭相应参数  %+v", tradeno, msg, m)
 
+	if msg == "交易状态不合法" || msg == "REASON_ILLEGAL_STATUS" { //已支付
 
+		return false
 
+	}
 
+	return true
 
+}
 
+
 
+//pc支付回调地址
 
+type AliPcPayAction struct {
 
+	*xweb.Action
 
+	payCallback xweb.Mapper `xweb:"/alipay/pay/callback"`
 
+}
 
+
 
+//app支付回调地址
 
+type AliAppPayAction struct {
 
+	*xweb.Action
 
+	payCallback xweb.Mapper `xweb:"/app/alipay/pay/callback"`
 
+}
 
+
 
+func (a *AliPcPayAction) PayCallback() {
 
+	PayCallbackDetail(a.Request)
 
+}
 
+func (a *AliAppPayAction) PayCallback() {
 
+	PayCallbackDetail(a.Request)
 
+}
 
+func PayCallbackDetail(a *http.Request) {
 
+	checkSign := a.Form
 
 	sign := checkSign.Get("sign") //待验证签名
 
 	checkSign.Del("sign")
 
 	checkSign.Del("sign_type")
 
@@ -275,59 +395,3 @@ func (a *AliPayAction) PayCallback() {
 
 		log.Println("insertAliPay", insertAliPay)
 
 	}
 
 }
 
-
 
-//支付宝关闭订单(生成的订单二维码，未扫码无法关闭订单)
 
-func (a *AliPayStruct) CloseOrder(tradeno string) bool {
 
-	toClose := CloseContent{
 
-		OutTradeNo: tradeno,
 
-	}
 
-	bizbyte, err := json.Marshal(toClose)
 
-	if err != nil {
 
-		log.Println()
 
-		return false
 
-	}
 
-	var data = url.Values{}
 
-	data.Add("app_id", Alipay.Appid)
 
-	data.Add("method", "alipay.trade.close")
 
-	data.Add("format", "json")
 
-	data.Add("charset", "UTF-8")
 
-	data.Add("sign_type", "RSA2")
 
-	data.Add("timestamp", time.Now().Format("2006-01-02 15:04:05"))
 
-	data.Add("version", "1.0")
 
-	data.Add("biz_content", string(bizbyte))
 
-	signContentBytes, _ := url.QueryUnescape(data.Encode())
 
-	log.Println(signContentBytes)
 
-	signature, err := a.getSign([]byte(signContentBytes))
 
-	if err != nil {
 
-		log.Println(tradeno, "获取签名出错", err)
 
-		return false
 
-	}
 
-	data.Add("sign", signature)
 
-
 
-	url := a.Requseturl + "?" + data.Encode()
 
-	//clien 优化
 
-	client := http.Client{Jar: nil}
 
-	req, _ := http.NewRequest("POST", url, nil)
 
-	res, err := client.Do(req)
 
-	if err != nil {
 
-		log.Printf("%s支付宝关闭订单  请求出错%v\n", tradeno, err)
 
-		return false
 
-	}
 
-	bArr, err := ioutil.ReadAll(res.Body)
 
-	if err != nil {
 
-		log.Printf("%s支付宝关闭订单  读取相应出错%v\n", tradeno, err)
 
-		return false
 
-	}
 
-	m := map[string]interface{}{}
 
-	err = json.Unmarshal(bArr, &m)
 
-	if err != nil {
 
-		log.Println(string(bArr))
 
-		log.Println("%s支付宝关闭订单   解析相应参数出错%v\n", tradeno, err)
 
-	}
 
-	msg := (*util.ObjToMap(m["alipay_trade_close_response"]))["sub_msg"]
 
-	log.Printf("%s msg:%s 订单关闭相应参数  %+v", tradeno, msg, m)
 
-	if msg == "交易状态不合法" || msg == "REASON_ILLEGAL_STATUS" { //已支付
 
-		return false
 
-	}
 
-	return true
 
-}

+ 4 - 1
src/web/staticres/js/biddingSearch.js
View File 

@@ -369,7 +369,10 @@ $(function() {
 
 				}

 				//隐藏翻页(仅超级搜索页面、拟建项目不隐藏)

 				if(window.location.href.indexOf("supsearch/index.html")>-1){

-					$(".pagination.clearfix.w").css("display","none");			

+					//未登录情况 仍显示

+					if(loginflag){

+						$(".pagination.clearfix.w").css("display","none");

+					}			

 				}

 			}else if($(this).attr("id")=="right-list"){

 				$(this).addClass("active").siblings().removeClass("active");