Sākums Izpētīt Palīdzība
Pierakstīties
qmx
/
jy
14
0
Atdalīts 0
Faili Problēmas 2 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

tj

wangkaiyue 6 gadi atpakaļ
vecāks
ed27a17243
revīzija
6b934cc7ff
5 mainītis faili ar 25 papildinājumiem un 55 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 0
      src/jfw/public/dataexport.go
  2. 1 1
      src/web/staticres/dataExport/css/drder_details.css
  3. 13 10
      src/web/staticres/dataExport/js/pageination.ie.js
  4. 10 43
      src/web/templates/pc/myOrder.html
  5. 0 1
      src/web/templates/pc/orderDetail.html

+ 1 - 0
src/jfw/public/dataexport.go
Parādīt failu 

@@ -126,6 +126,7 @@ func (w *WeixinStruct) GetPrepayId(weixinrpc string, param map[string]string) (r
 
 	}, func(e interface{}) {})
 
 	return
 
 }
 
+
 
 func init() {
 
 	util.ReadConfig("./dataexport.json", &ExConf)
 
 }

+ 1 - 1
src/web/staticres/dataExport/css/drder_details.css
Parādīt failu 

@@ -255,6 +255,6 @@
 
 .modal .nav .close{
 
     position: fixed;
 
     left: 50%;
 
-    bottom: 15%;
 
+    margin-top: 25px;
 
     margin-left: -20px;
 
 }

+ 13 - 10
src/web/staticres/dataExport/js/pageination.ie.js
Parādīt failu 

@@ -212,35 +212,38 @@ var Page =
 
             return n - step;
 
           }; // min
 
 
-          if (n <= size - this.min) {
 
-            mapF = function mapF(v, i) {
 
-              return _this3.min + 1 + i;
 
-            };
 
 
-            show[0] = false;
 
-          } // max
 
-
 
-          if (this.max - size < n) {
 
+		  if (this.max - size < n) {
 
             mapF = function mapF(v, i) {
 
               return _this3.max - size + i;
 
             };
 
 
             show[1] = false;
 
           }
 
+        
+          if(n+(size-1)/2<this.max-1){
 
+        	show[1] = true;
 
+          }	
+        
+          if (n <= size - this.min) {
 
+            mapF = function mapF(v, i) {
 
+              return _this3.min + 1 + i;
 
+            };
 
 
+            show[0] = false;
 
+          } // max
 
           if (this.max - this.min <= this.show) {
 
             show = [false, false];
 
           }
 
-
 
           this.contentArr = arr.map(mapF).filter(function(v) {
 
             return v > _this3.min && v < _this3.max;
 
           });
 
           show.forEach(function(v, i) {
 
             _this3.otherDom[i + 1].style.display = v ? "inline-block" : "none";
 
+            _this3.otherDom[i + 1].style.pointerEvents = "none";
 
           });
 
         }
 
       }
 
     ]);
 
-
 
     return Page;
 
   })();

+ 10 - 43
src/web/templates/pc/myOrder.html
Parādīt failu 

@@ -1,4 +1,3 @@
 
-<!doctype html>
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="UTF-8">
 
@@ -200,7 +199,8 @@
 
 						<p class="scan_text" id="paywaytip">使用手机微信扫描二维码支付</p>
 
 					</div>
 
 					<div class="footer">
 
-						<div class="tips">二维码过期倒计时：<span class="times">00:00:00 </span> | 如过期，请刷新页面重试</div>
 
+						<div class="tips" id="timein">二维码过期倒计时：<span class="times">00:00:00 </span> | 如过期，请刷新页面重试</div>
 
+            <div class="tips" id="timeout" style="display:none">二维码已过期，请刷新页面重试</div>
 
 					</div>
 
 				</div>
 
 				<div class="close">
 
@@ -261,46 +261,12 @@
 
 					$list.eq($Index).show().siblings().hide();
 
 					pageNum = 1;
 
 					pageFlag = true;
 
+          p.click = null;
 
 					p = null;
 
 					$("#previousPage").addClass("disabled");
 
 					$("#nextPage").removeClass("disabled");
 
 					queryOrder($Index, $list, pageNum);
 
 				});
 
-				/*
 
-		//点击上下页
 
-		$("#previousPage").on("click",function () {
 
-			if($(this).hasClass("disabled")){
 
-				return;
 
-			}
 
-			var $Index = $(".tab-bar .tab li.active").index();
 
-			var $list = $(".list .item");
 
-			pageNum--;
 
-			if (pageNum<=0){
 
-				pageNum=1;
 
-			}
 
-			if(pageNum==1){
 
-				$("#previousPage").addClass("disabled");
 
-			}
 
-			$("#nextPage").removeClass("disabled");
 
-            queryOrder($Index,$list,pageNum);
 
-        });
 
-		
-		$("#nextPage").on("click",function () {
 
-			if($(this).hasClass("disabled")){
 
-				return;
 
-			}
 
-			var $Index = $(".tab-bar .tab li.active").index();
 
-			var $list = $(".list .item");
 
-			pageNum++;
 
-			if(pageNum>=totalPage){
 
-				pageNum=totalPage;
 
-				$("#nextPage").addClass("disabled");
 
-			}
 
-			$("#previousPage").removeClass("disabled");
 
-            queryOrder($Index,$list,pageNum);
 
-        });
 
-		*/
 
-
 
 			})
 
 
 			var noDataHtml =
 
@@ -604,20 +570,21 @@
 
 						"' style='width: 300px;height:280px;border:none;padding-left: 34px;padding-top: 11px;'></iframe>");
 
 					$("#paywaytip").text("使用手机支付宝扫描二维码支付");
 
 				}
 
+        $("#timeout").css("display","none");
 
+        $("#timein").css("display","");
 
 				interval = setInterval(function() {
 
 					var h = Math.floor(interval_t / 60 / 60 % 24);
 
 					var m = Math.floor(interval_t / 60 % 60);
 
 					var s = Math.floor(interval_t % 60);
 
 					var text = "";
 
-					if (h > 0) {
 
-						text += PrefixInteger(h, 2) + ":";
 
-					}
 
-					if (m > 0) {
 
-						text += PrefixInteger(m, 2) + ":";
 
-					}
 
+					
+					text += PrefixInteger(h, 2) + ":";
 
+					text += PrefixInteger(m, 2) + ":";
 
 					text += PrefixInteger(s, 2);
 
 					$("#myModal .times").text(text);
 
 					if (interval_t <= 0) {
 
+            $("#timeout").css("display","");
 
+            $("#timein").css("display","none");
 
 						clearInterval(interval);
 
 					}
 
 					interval_t--;

+ 0 - 1
src/web/templates/pc/orderDetail.html
Parādīt failu 

@@ -1,4 +1,3 @@
 
-<!doctype html>
 
 <html lang="en">
 
 <head>
 
     <meta charset="UTF-8">