首頁 探索 說明
登入
qmx
/
jy
14
0
複刻 0
Files 問題管理 2 合併請求 0 Wiki
瀏覽代碼

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

wangshan 6 年之前
父節點
f6194f1b9c d82eaff0e9
當前提交
3d93b2911c
共有 4 個文件被更改，包括 81 次插入 和 1 次删除
分割檢視 顯示文件統計
  1. 14 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
  2. 37 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html
  3. 16 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
  4. 14 0
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

+ 14 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html
查看文件 

@@ -14,6 +14,8 @@
 
         <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}" />
 
         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/invoice.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" href="//at.alicdn.com/t/font_624651_pkolpjt0k5a.css">
 
+		{{include "/common/js.html"}}
 
+		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 
     </head>
 
     <body>
 
     	<style>
 
@@ -31,6 +33,17 @@
 
 			    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;
 
+			}
 
     		.disno{
 
 				display:none;
 
 			}
 
@@ -95,6 +108,7 @@
 
 			}
 
     	</style>		
 		<div class="app-layout-header">
 
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 			开发票
 
 		</div>
 
         <form class="invoice" id="invoice"  role="form"  method="post">

+ 37 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_invoiceSuccess.html
查看文件 

@@ -11,8 +11,44 @@
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/base.css?v={{Msg "seo" "version"}}" />
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}" />
 
         <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/submit_success.css?v={{Msg "seo" "version"}}">
 
+		{{include "/common/js.html"}}
 
+		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 
     </head>
 
+	<style>
 
+		.app-layout-header{
 
+			line-height: 44px;
 
+		    background-color: #FFFFFF;
 
+		    text-align: center;
 
+		    border-bottom: 1px solid #E6E6E6;
 
+		    font-size: 17px;
 
+		    position: fixed;
 
+		    padding-top: 20px;
 
+		    z-index: 99999;
 
+		    left: 0;
 
+		    right: 0;
 
+		    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;
 
+		}
 
+		.submit_success{
 
+			padding-top:64px;
 
+		}
 
+	</style>
 
     <body>
 
+	<div class="app-layout-header">
 
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
+			提交成功
 
+		</div>
 
         <div class="submit_success">
 
             <div class="success">
 
                 <i class="icon iconfont">&#xe612;</i>
 
@@ -20,7 +56,7 @@
 
             </div>
 
             <a href="javascript:history.go(-1)" class="go_back"></a>
 
         </div>
 
-        <script>
 
+    	 <script>
 
         	var i=5;
 
 			$(function(){
 
 			 setTimeout(function(){

+ 16 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html
查看文件 

@@ -13,6 +13,8 @@
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/order_list.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/dropload.css?v={{Msg "seo" "version"}}">
 
 		<link href="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.css" rel="stylesheet">
 
+		{{include "/common/js.html"}}
 
+		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 
    	    <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
 
 	</head>
 
 	<body>
 
@@ -31,6 +33,17 @@
 
 			    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;
 
+			}
 
 			#order_list{
 
 				padding-top:64px;
 
 			}
 
@@ -104,6 +117,7 @@
 
 			}
 
 		</style>
 
 		<div class="app-layout-header">
 
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 			我的订单
 
 		</div>
 
 		<!-- 加载数据-->
 
@@ -138,6 +152,8 @@
 
 			var typ=0;
 
 			var deleteIndex=0;
 
 			
+			
+			
 			function appendList(listhtml){
 
 				listhtml.children(".card-content").on("click", function(event){
 
 					var eid = $(this).find(".media").attr("eid");

+ 14 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
查看文件 

@@ -11,6 +11,8 @@
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/base.css?v={{Msg "seo" "version"}}" />
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}" />
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/css/myorder/order_detail.css?v={{Msg "seo" "version"}}">
 
+		{{include "/common/js.html"}}
 
+		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 
 	</head>
 
 	<body>
 
 	<style>
 
@@ -28,6 +30,17 @@
 
 			    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;
 
+			}
 
 		#order_detail{
 
 			padding-top:64px;
 
 		}
 
@@ -186,6 +199,7 @@
 
 	        }
 
 		</script>		
 		<div class="app-layout-header">
 
+			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
 			订单详情
 
 		</div>
 
 		<div id="order_detail">