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

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

zhangxinlei1996 5 years ago
parent
f1a042a0c3 ccb602ffdd
commit
305554eef7
14 changed files with 14 additions and 14 deletions
Split View Show Diff Stats
  1. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  2. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  3. 1 1
      src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html
  4. 1 1
      src/jfw/modules/app/src/web/templates/entniche/pay_success.html
  5. 1 1
      src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
  6. 1 1
      src/jfw/modules/app/src/web/templates/invoice/check_invoice.html
  7. 1 1
      src/jfw/modules/app/src/web/templates/invoice/invoicing.html
  8. 1 1
      src/jfw/modules/app/src/web/templates/me/account.html
  9. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation.html
  10. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation_result.html
  11. 1 1
      src/jfw/modules/app/src/web/templates/me/logoff/cancellation_two.html
  12. 1 1
      src/jfw/modules/app/src/web/templates/me/mine.html
  13. 1 1
      src/jfw/modules/app/src/web/templates/me/setting.html
  14. 1 1
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

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

@@ -423,7 +423,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div class="j-container" id="order_list">
 
-		<div class="j-header">
 
+		<div class="j-header jy-app-header">
 
 			<span class="header-left iconfont icon-fanhui"></span>
 
 			<span class="header-title">我的订单</span>
 
 			<span class=""></span>

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

@@ -533,7 +533,7 @@
 
 		    <p><span></span></p>
 
 		</div>
 
 		<div class="j-container" id="order_detail">
 
-			<div class="j-header">
 
+			<div class="j-header jy-app-header">
 
 				<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 				<span class="header-title"></span>
 
 				<span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html
View File 

@@ -254,7 +254,7 @@ body .loading_ p span {
 
 	<div class="loading_">
 
 	    <p><span></span></p>
 
 	</div>
 
-	<div class="j-header">
 
+	<div class="j-header jy-app-header">
 
 		<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 		<span class="header-title"></span>
 
 		<span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/entniche/pay_success.html
View File 

@@ -74,7 +74,7 @@
 
 
 <body>
 
     <div class="j-container">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">订单详情</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html
View File 

@@ -24,7 +24,7 @@
 
 
 <body>
 
     <div class="j-container" id="check_invoice">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">查看发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/check_invoice.html
View File 

@@ -19,7 +19,7 @@
 
 
 <body>
 
     <div class="j-container" id="check_invoice">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">查看发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/invoice/invoicing.html
View File 

@@ -19,7 +19,7 @@
 
 
 <body>
 
     <div class="j-container" id="invoicing">
 
-        <div class="j-header" id="app-show">
 
+        <div class="j-header jy-app-header" id="app-show">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">开发票</span>
 
             <span class="header-right check-rules">开票规则</span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/account.html
View File 

@@ -80,7 +80,7 @@
 
 
 <body>
 
     <div class="j-container">
 
-        <div class="j-header">
 
+        <div class="j-header jy-app-header">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">账户与安全</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation.html
View File 

@@ -18,7 +18,7 @@
 
 

 <body>

     <div class="j-container cancellation">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation_result.html
View File 

@@ -34,7 +34,7 @@
 
 

 <body>

     <div class="j-container">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left_ iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/logoff/cancellation_two.html
View File 

@@ -26,7 +26,7 @@
 
 

 <body>

     <div class="j-container">

-        <div class="j-header" style="z-index: 999;">

+        <div class="j-header jy-app-header" style="z-index: 999;">

             <span class="header-left iconfont icon-fanhui"></span>

             <span class="header-title">注销账户</span>

             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/mine.html
View File 

@@ -118,7 +118,7 @@ color:#1d1d1d;
 
 </style>
 
 <body>
 
     <div class="j-container mine">
 
-        <div class="j-header" style="padding: 31px 0.24rem 6px">
 
+        <div class="j-header jy-app-header" style="padding: 31px 0.24rem 6px">
 
             <span></span>
 
             <span class="header-title"></span>
 
             <div class="header-right">

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/setting.html
View File 

@@ -32,7 +32,7 @@
 
 		推送消息设置
 
 	</div>
 
     <div class="j-container">
 
-        <div class="j-header" style="z-index: 999;">
 
+        <div class="j-header jy-app-header" style="z-index: 999;">
 
             <span class="header-left iconfont icon-fanhui"></span>
 
             <span class="header-title">设置</span>
 
             <span class="header-right"></span>

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html
View File 

@@ -226,7 +226,7 @@
 
 			该订单记录已删除
 
 		</div>
 
     </div>
 
-		<div class="j-header">
 
+		<div class="j-header jy-app-header">
 
 			<span class="header-left iconfont icon-fanhui"><em class="left-title">订单详情</em></span>
 
 			<span class="header-title"></span>
 
 			<span class="header-right"></span>