Merge branch 'dev/v4.8.87_cyl' of qmx/jy into release/v4.8.87

src/web/templates/areaPack/pc/page_order.html

@@ -144,7 +144,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/course/pc/applyInvoice.html

@@ -246,7 +246,6 @@
 		$(function(){
 			$("#public-nav").css("background","#fff");
 			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-			$("section[id='drder']").css("padding-top", "80px");
 			haslogin({{.T.logid}});
 			$(document).off("keydown");
 			//

src/web/templates/course/pc/orderPay.html

@@ -254,7 +254,6 @@
     $(function () {
         $("#public-nav").css("background", "#fff");
         $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-        $("section[id='drder']").css("padding-top", "80px");
         haslogin({{.T.logid}});
         $(document).off("keydown");
         reloadMore(orderCode)

src/web/templates/course/pc/refund.html

@@ -90,7 +90,6 @@
         var refund_reason = ""
         $("#public-nav").css("background","#fff");
 		$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-		$("section[id='drder']").css("padding-top", "80px");
 
         haslogin({{.T.logid}});
 		$(document).off("keydown");

src/web/templates/course/pc/viewInvoice.html

@@ -77,7 +77,6 @@
 		$(function(){
 			$("#public-nav").css("background","#fff");
 			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-			$("section[id='drder']").css("padding-top", "80px");
 			haslogin({{.T.logid}});
 
 			reloadInvoice();

src/web/templates/frontRouter/pc/dataFile/sess/orderDetail.html

@@ -116,7 +116,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
             var orderCode = getParam("order_code");
             $(".order_id").text("订单编号：" + orderCode);

src/web/templates/order/pc/bidfile/bidfileDetail.html

@@ -129,7 +129,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/order/pc/buyerPortraitPack/detail.html

@@ -116,7 +116,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = {{.T.orderId}}

src/web/templates/order/pc/datareport/detail.html

@@ -129,7 +129,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = {{.T.orderId}};

src/web/templates/order/pc/filePack/detail.html

@@ -116,7 +116,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/order/pc/integral/integralDetail.html

@@ -129,7 +129,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/order/pc/medical/detail.html

@@ -173,7 +173,6 @@
                 initAdjustTime()
                 $("#public-nav").css("background", "#fff");
                 $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-                $("section[id='drder']").css("padding-top", "80px");
                 haslogin({{.T.logid }});
 
             // var orderCode = getParam("order_code");

src/web/templates/order/pc/orderPay.html

@@ -169,7 +169,6 @@
         //nav样式
         $("#public-nav").css("background", "#fff");
         $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-        $("section[id='drder']").css("padding-top", "80px");
         //获取支付信息
         getPayCode("wx_pc");
         //支付方式切换

src/web/templates/pc/aiPack_orderDetail.html

@@ -133,7 +133,6 @@
             var orderType="aiForecastPack";
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/pc/billing_list.html

@@ -81,7 +81,6 @@
         $(function(){
             $("#public-nav").css("background","#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 			//
 			$.ajax({

src/web/templates/pc/check_invoice.html

@@ -373,7 +373,6 @@
 
 		$("#public-nav").css("background","#fff");
 		$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-		$("section[id='drder']").css("padding-top", "80px");
 		haslogin({{.T.logid}});
     </script>
 </body>

src/web/templates/pc/dataPack/packDetail.html

@@ -135,7 +135,6 @@
             initAdjustTime()
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/pc/entniche_orderDetail.html

@@ -120,7 +120,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/pc/invoice.html

@@ -245,7 +245,6 @@
 
           			  $("#public-nav").css("background","#fff");
           			  $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-          			  $("section[id='drder']").css("padding-top", "80px");
                 }
               });
             }

src/web/templates/pc/invoice_error.html

@@ -78,7 +78,6 @@
             }
       			$("#public-nav").css("background","#fff");
       			$(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-      			$("section[id='drder']").css("padding-top", "80px");
       			haslogin({{.T.logid}});
             $('#ruleModal').on('show.bs.modal', function () {
                 var $this = $(this);

src/web/templates/pc/medaratus_orderDetail.html

@@ -164,7 +164,6 @@
             initAdjustTime()
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/pc/member_orderDetail.html

@@ -136,7 +136,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
             var orderCode = getParam("order_code");
             $(".order_id").text("订单编号：" + orderCode);

src/web/templates/pc/myOrder.html

@@ -644,7 +644,7 @@
     $(document).off("keydown");
     $("body").css("line-height", "1");
     $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-    $("section[id='drder']").css({ "padding-top": "97px", "min-height": "calc(100% - 340px)" });
+    $("section[id='drder']").css({ "min-height": "calc(100% - 340px)" });
 
     $(".order_tab span.tab_item").on("click", function () {
       var $Index = $(this).index();

src/web/templates/pc/orderDetail.html

@@ -249,7 +249,6 @@
         haslogin({{.T.logid}});
         $(".public-nav").css("background-color", "#fff");
         $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-        $("section[id='order_two']").css("padding-top", "107px");
 
         /*---S-优惠券---*/
         function insetMoneyItem () {

src/web/templates/pc/subAccount_orderDetail.html

@@ -132,7 +132,6 @@
         $(function () {
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");

src/web/templates/pc/vip_orderDetail.html

@@ -165,7 +165,6 @@
             initAdjustTime()
             $("#public-nav").css("background", "#fff");
             $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
-            $("section[id='drder']").css("padding-top", "80px");
             haslogin({{.T.logid}});
 
             var orderCode = getParam("order_code");