weixianghui пре 5 година
родитељ
комит
89096b2210

+ 5 - 5
core/src/web/staticres/css/issue.css

@@ -64,9 +64,9 @@
 }
 .issue .mork {
   position: fixed;
-  top: 120px;
+  top: 0px;
   bottom: 0;
-  left: 247px;
+  left: 0px;
   right: 0;
 }
 .issue .mork .hint {
@@ -124,7 +124,7 @@
   transform: translate(-50%, -50%);
   box-sizing: border-box;
   width: 800px;
-  max-height: 600px;
+  max-height: 80%;
   padding: 24px 30px;
   background: #FFFFFF;
   box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.2);
@@ -139,7 +139,7 @@
   display: flex;
   flex-direction: column;
   margin-top: 24px;
-  max-height: 440px;
+  max-height: 350px;
   overflow-y: auto;
   /*滚动条样式*/
 }
@@ -152,7 +152,7 @@
   background: #ECECEC;
 }
 .issue .mork .choose-course ul li {
-  height: 40px;
+  /* height: 40px;*/
   display: flex;
   align-items: center;
 }

+ 140 - 55
core/src/web/templates/manage/course/order_detail.html

@@ -9,7 +9,10 @@
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/dataexport/dataExport.css"/>
 	</head>
 	<style>
-	.nofloat{float:none}
+	.nofloat{float:none;display: flex;}
+	.nofloat span:last-child {
+		flex: 1;
+	}
 	body {
 	    padding-top: 0px;
 	    font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
@@ -85,9 +88,9 @@
 					<div class="hd">退款审核</div>
 					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">申请退款时间:<span class="sqtksj"></span></li>
-							<li class="row-list nofloat">申请退款原因:<span class="sqtkyy"></span></li>
-							<li class="row-list nofloat">退款金额:<span class="sqtkje"></span></li>
+							<li class="row-list nofloat"><span>申请退款时间:</span><span class="sqtksj"></span></li>
+							<li class="row-list nofloat"><span>申请退款原因:</span><span class="sqtkyy"></span></li>
+							<li class="row-list nofloat"><span>退款金额:</span><span class="sqtkje"></span></li>
 							<li class="row-list nofloat"><button style="margin-top: 10px;" class="btn btn-success" onclick="tuikuan(this)" data-original-title="Search" id="searchtip" type="button">确认已退款</button></li>
 						</ul>
 					</div>
@@ -95,35 +98,46 @@
 				<!-- 订单信息 -->
 				<div class="order_info" id="info">
 					<div class="hd">订单信息</div>
-					<div class="bd clearfix" style="padding-right: 65px;">
+					<div class="bd clearfix NOXSKC" style="padding-right: 65px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">课程名称:<span class="kcmc"></span></li>
-							<li class="row-list nofloat">课程类型:<span class="kclx"></span></li>
-							<li class="row-list nofloat">课程地点:<span class="kcdd"></span></li>
-							<li class="row-list nofloat">参会人数:<span class="chrs"></span></li>
+							<li class="row-list nofloat"><span>课程名称:</span><span class="kcmc"></span></li>
+							<li class="row-list nofloat"><span>课程类型:</span><span class="kclx"></span></li>
+							<li class="row-list nofloat"><span>课程地点:</span><span class="kcdd"></span></li>
+							<li class="row-list nofloat"><span>参会人数:</span><span class="chrs"></span></li>
 						</ul>
 						<div class="line" style="height: 110px;"></div>
 						<ul class="row second"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">联系人单位:<span class="lxrdw"></span></li>
-							<li class="row-list nofloat">联系人姓名:<span class="lxrxm"></span></li>
-							<li class="row-list nofloat">联系人邮箱:<span class="lxryx"></span></li>
-							<li class="row-list nofloat">联系人电话:<span class="lxrdh"></span></li>
+							<li class="row-list nofloat"><span>联系人单位:</span><span class="lxrdw"></span></li>
+							<li class="row-list nofloat"><span>联系人姓名:</span><span class="lxrxm"></span></li>
+							<li class="row-list nofloat"><span>联系人邮箱:</span><span class="lxryx"></span></li>
+							<li class="row-list nofloat"><span>联系人电话:</span><span class="lxrdh"></span></li>
+						</ul>
+					</div>
+					<div class="bd clearfix YESXSKC" style="padding-right: 65px;">
+						<ul class="row first"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>课程名称:</span><span class="kcmc"></span></li>
+							<li class="row-list nofloat"><span>课程类型:</span><span class="kclx"></span></li>
+						</ul>
+						<div class="line" style="height: 50px;"></div>
+						<ul class="row second"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>课程时长:</span><span class="xskcxx_kcsc"></span></li>
+							<li class="row-list nofloat"><span>有效日期:</span><span class="xskcxx_yxrq"></span></li>
 						</ul>
 					</div>
 				</div>
 				<!-- 支付信息 -->
-				<div class="order_info" id="info">
+				<div class="order_info NOXSKC" id="info">
 					<div class="hd">支付信息</div>
 					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">订单编号:<span class="ddbh"></span></li>
-							<li class="row-list nofloat">下单时间:<span class="xdsj"></span></li>
-							<li class="row-list nofloat">支付时间:<span class="zfsj"></span></li>
+							<li class="row-list nofloat"><span>订单编号:</span><span class="ddbh"></span></li>
+							<li class="row-list nofloat"><span>下单时间:</span><span class="xdsj"></span></li>
+							<li class="row-list nofloat"><span>支付时间:</span><span class="zfsj"></span></li>
 						</ul>
 						<div class="line" style="height: 110px;"></div>
 						<ul class="row second"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">支付方式:<span class="zffs"></span></li>
-							<li class="row-list nofloat" style="display:none;">支付单号:<span class="zfdh"></span></li>
+							<li class="row-list nofloat"><span>支付方式:</span><span class="zffs"></span></li>
+							<li class="row-list nofloat" style="display:none;"><span>支付单号:</span><span class="zfdh"></span></li>
 							<li class="row-list nofloat" style="display:none;padding-top: 10px;">
 								<div>
 									转账凭证:<button style="padding: 3px;font-size: 12px;margin-top: -2px;" class="btn btn-success" id="chakanpz" type="button">查看凭证</button>
@@ -138,46 +152,89 @@
 					</div>
 					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">单价:<span class="dj"></span></li>
-							<li class="row-list nofloat">参会人数:<span class="chrs"></span></li>
-							<li class="row-list nofloat">订单总价:<span class="ddzj"></span></li>
+							<li class="row-list nofloat"><span>单价:</span><span class="dj"></span></li>
+							<li class="row-list nofloat"><span>参会人数:</span><span class="chrs"></span></li>
+							<li class="row-list nofloat"><span>订单总价:</span><span class="ddzj"></span></li>
 						</ul>
 						<div class="line" style="height: 110px;"></div>
 						<ul class="row second"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">每单立减:<span class="mdlj"></span></li>
-							<li class="row-list nofloat">多人立减:<span class="drlj"></span></li>
-							<li class="row-list nofloat">实付金额:<span class="sfje"></span></li>
+							<li class="row-list nofloat"><span>每单立减:</span><span class="mdlj"></span></li>
+							<li class="row-list nofloat"><span>多人立减:</span><span class="drlj"></span></li>
+							<li class="row-list nofloat"><span>实付金额:</span><span class="sfje"></span></li>
+						</ul>
+					</div>
+				</div>
+				<div class="order_info YESXSKC" id="info">
+					<div class="hd">支付信息</div>
+					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
+						<ul class="row first"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>订单编号:</span><span class="ddbh"></span></li>
+							<li class="row-list nofloat"><span>下单时间:</span><span class="xdsj"></span></li>
+							<li class="row-list nofloat"><span>支付时间:</span><span class="zfsj"></span></li>
+						</ul>
+						<div class="line" style="height: 80px;"></div>
+						<ul class="row second"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>支付方式:</span><span class="zffs"></span></li>
+							<li class="row-list nofloat" style="display:none;"><span>支付单号:</span><span class="zfdh"></span></li>
+						</ul>
+						<div style="clear: both;border-bottom: 1px solid #f5f5f5;width: 80%"></div>
+						<ul class="row first"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>产品类型:</span><span class="cplx"></span></li>
+						</ul>
+						<div class="line" style="height: 30px;"></div>
+						<ul class="row second"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>实付金额:</span><span class="sfje"></span></li>
 						</ul>
 					</div>
 				</div>
 				<!-- 发票信息 -->
 				<div class="order_info" id="fapiao" style="display:none;" >
-					<div class="hd">发票信息</div>
-					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
+					<div class="hd"><span></span>发票信息</div>
+					<div class="bd clearfix NOXSKC" style="padding-right: 65px;padding-bottom: 10px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">发票类型:<span class="fplx"></span></li>
-							<li class="row-list nofloat">发票抬头:<span class="fptt"></span></li>
+							<li class="row-list nofloat"><span>发票类型:</span><span class="fplx"></span></li>
+							<li class="row-list nofloat"><span>发票抬头:</span><span class="fptt"></span></li>
 						</ul>
 						<div class="line" style="height: 110px;"></div>
 						<ul class="row second"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">发票明细:<span class="fpmx"></span></li>
+							<li class="row-list nofloat"><span>发票明细:</span><span class="fpmx"></span></li>
 						</ul>
 					</div>
-					<div class="bd clearfix" style="padding-right: 65px;padding-bottom: 10px;">
+					<div class="bd clearfix NOXSKC" style="padding-right: 65px;padding-bottom: 10px;">
 						<ul class="row first"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">开票单位名称:<span class="kpdwmc"></span></li>
-							<li class="row-list nofloat">纳税人识别号:<span class="nsrsbh"></span></li>
-							<li class="row-list nofloat">注册地址:<span class="zcdz"></span></li>
-							<li class="row-list nofloat">注册电话:<span class="zcdh"></span></li>
-							<li class="row-list nofloat">开户银行:<span class="khyh"></span></li>
-							<li class="row-list nofloat">银行账号:<span class="yhzh"></span></li>
+							<li class="row-list nofloat"><span>开票单位名称:</span><span class="kpdwmc"></span></li>
+							<li class="row-list nofloat"><span>纳税人识别号:</span><span class="nsrsbh"></span></li>
+							<li class="row-list nofloat"><span>注册地址:</span><span class="zcdz"></span></li>
+							<li class="row-list nofloat"><span>注册电话:</span><span class="zcdh"></span></li>
+							<li class="row-list nofloat"><span>开户银行:</span><span class="khyh"></span></li>
+							<li class="row-list nofloat"><span>银行账号:</span><span class="yhzh"></span></li>
 						</ul>
 						<div class="line" style="height: 110px;"></div>
 						<ul class="row second"  style="margin-top:20px  !important;">
-							<li class="row-list nofloat">收件人:<span class="sjr"></span></li>
-							<li class="row-list nofloat">手机号:<span class="sjh"></span></li>
-							<li class="row-list nofloat">所在地区:<span class="szdq"></span></li>
-							<li class="row-list nofloat">详细地址:<span class="xxdz"></span></li>
+							<li class="row-list nofloat"><span>收件人:</span><span class="sjr"></span></li>
+							<li class="row-list nofloat"><span>手机号:</span><span class="sjh"></span></li>
+							<li class="row-list nofloat"><span>所在地区</span>:<span class="szdq"></span></li>
+							<li class="row-list nofloat"><span>详细地址</span>:<span class="xxdz"></span></li>
+						</ul>
+					</div>
+					<div class="bd clearfix YESXSKC" style="padding-right: 65px;padding-bottom: 10px;">
+						<ul class="row first"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>发票类型:</span><span class="fplx"></span></li>
+							<li class="row-list nofloat"><span>发票抬头:</span><span class="fptt"></span></li>
+						</ul>
+						<div class="line" style="height: 50px;"></div>
+						<ul class="row second"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>发票内容:</span><span class="fpmx"></span></li>
+						</ul>
+						<div style="clear: both;border-bottom: 1px solid #f5f5f5;width: 80%"></div>
+						<ul class="row first xskcxx_qy"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>开票单位名称:</span><span class="kpdwmc"></span></li>
+							<li class="row-list nofloat"><span>纳税人识别号:</span><span class="nsrsbh"></span></li>
+						</ul>
+						<div class="line xskcxx_qy" style="height: 50px;"></div>
+						<ul class="row second grfpxx"  style="margin-top:20px  !important;">
+							<li class="row-list nofloat"><span>手机号:</span><span class="sjh"></span></li>
+							<li class="row-list nofloat"><span>电子邮箱:</span><span class="email"></span></li>
 						</ul>
 					</div>
 				</div>
@@ -245,7 +302,17 @@
 						}else if(res["order_status"]=="-2"){
 							$(".status").text("已取消").css({"color":"#F5585"})
 						}
+						if (res["product_type"] == "线上课程"){
+							$(".NOXSKC").remove()
+						}else {
+							$(".YESXSKC").remove()
+						}
 						$(".kcmc").text(resCour["s_name"])
+						$(".xskcxx_kcsc").text(time(resCour["s_courseDate"]))
+						var yxrq = new Date(resCour["l_endtime"] * 1000);
+						var endTime = (yxrq.getFullYear()) + "-" + (yxrq.getMonth() + 1) + "-" + (yxrq.getDate()) + " " + (yxrq.getHours()) + ":" + (yxrq.getMinutes()) + ":" + (yxrq.getSeconds());
+						$(".xskcxx_yxrq").text(endTime)
+						$(".cplx").text("招投标课程")
 						$(".kclx").text(filter["courseType"])
 						$(".kcdd").text(resCour["s_address"])
 						$(".chrs").text(filter["peoleNum"])
@@ -271,22 +338,24 @@
 						}
 						$(".dj").text(parseInt(resCour["i_price"])/100)
 						$(".ddzj").text(filter["peoleNum"]*resCour["i_price"]/100)
-						for(var i=0;i<dPlan.length;i++){
-							if(dPlan[i]["title"]=="每单立减"){
-								$(".mdlj").text("-"+dPlan[i]["price"])
-							}else{
-								var zhek = 10;
-								if(filter["peoleNum"]>=8){
-									zhek = 0.2
-									var drlj = parseInt(resCour["i_price"])/100*zhek*filter["peoleNum"]
-									$(".drlj").text("-"+drlj.toFixed(2))
-								}else if(filter["peoleNum"]>=4){
-									zhek = 0.1
-									var drlj = parseInt(resCour["i_price"])/100*zhek*filter["peoleNum"]
-									$(".drlj").text("-"+drlj.toFixed(2))
+						if (res["product_type"] != "线上课程"){
+							for(var i=0;i<dPlan.length;i++){
+								if(dPlan[i]["title"]=="每单立减"){
+									$(".mdlj").text("-"+dPlan[i]["price"])
+								}else{
+									var zhek = 10;
+									if(filter["peoleNum"]>=8){
+										zhek = 0.2
+										var drlj = parseInt(resCour["i_price"])/100*zhek*filter["peoleNum"]
+										$(".drlj").text("-"+drlj.toFixed(2))
+									}else if(filter["peoleNum"]>=4){
+										zhek = 0.1
+										var drlj = parseInt(resCour["i_price"])/100*zhek*filter["peoleNum"]
+										$(".drlj").text("-"+drlj.toFixed(2))
+									}
 								}
+
 							}
-							
 						}
 						$(".sfje").text(res["order_money"]/100)
 						//发票信息
@@ -296,6 +365,10 @@
 							$(".fplx").text(resInv["invoice_type"])
 							$(".fptt").text(resInv["invoice_rise"])
 							$(".fpmx").text(resInv["invoice_content"])
+							if(!resInv["apply_company"]){
+								$(".xskcxx_qy").remove()
+								$(".grfpxx").css("padding-left","14px")
+							}
 							$(".kpdwmc").text(resInv["apply_company"])
 							$(".nsrsbh").text(resInv["apply_tinumber"])
 							$(".zcdz").text(resInv["apply_regaddress"])
@@ -306,6 +379,7 @@
 							$(".sjh").text(resInv["apply_phone"])
 							$(".szdq").text(resInv["apply_address"])
 							$(".xxdz").text(resInv["apply_addressmore"])
+							$(".email").text(resInv["email"])
 						}
 					}
                 })
@@ -339,6 +413,17 @@
 					}
 				})
 			}
+
+			function time(time) {
+				time = (time || "").split(":");
+				return (
+						time[0] +
+						":" +
+						(time[1] == undefined ? "00" : time[1]) +
+						":" +
+						(time[2] == undefined ? "00" : time[2])
+				);
+			}
 		</script>   
 	</body>
 </html>