xuzhiheng před 5 roky
rodič
revize
0e0127ead9

+ 64 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -1595,6 +1595,7 @@
 									var orderMoney = obj.order_money;
 									var courseId = filterObj.courseMgoId;
 									var lastHtml = "";
+									var helpHtml = "";
 									
 									if(payWay !== "transferAccounts"){
 										if(orderStatus === 0){
@@ -1633,19 +1634,79 @@
 										}
 									}else{
 										//公对公
-										
+										if(orderStatus === 0){
+											if(courseStatus === 1){
+												orderStatusHtml = "待付款";
+												orderStatusHtmls = "notpay";
+												lastHtml = `<div class="card-footer">
+																<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
+																<a href="/jyapp/course/optionPay?code=${orderCode}" class="btn pay">去支付</a>
+															</div>`;
+											}else if(courseStatus === 2){
+												orderStatusHtml = "转账审核中";
+												orderUrl = "/jyapp/course/transferVerify?code="+ orderCode;
+											}else if(courseStatus === 3){
+												orderStatusHtml = "未收到转账";
+												lastHtml = `<div class="card-footer">
+																<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
+																<a href="/jyapp/course/optionPay?code=${orderCode}" class="btn pay">再次支付</a>
+															</div>`;
+												helpHtml = `<span class="doubt iconfont icon-bangzhu"></span>`
+											}
+										}else if(orderStatus === 1){
+											if(courseStatus === 5){
+												orderStatusHtml = "退款审核中";
+												orderStatusHtmls = "refund";
+												lastHtml = `<div class="card-footer">
+																<a href="/jyapp/course/detail/${courseId}" class="btn cancle">再次购买</a>
+															</div>`;
+												orderUrl = "/jyapp/course/refundVerify?code="+ orderCode;
+											}else if(courseStatus === 6){
+												orderStatusHtml = "已退款";
+												orderStatusHtmls = "refund";
+												lastHtml = `<div class="card-footer">
+																<a href="/jyapp/course/detail/${courseId}" class="btn cancle">再次购买</a>
+															</div>`;
+											}else{
+												orderStatusHtml = "已完成";
+												lastHtml = `<div class="card-footer refundable tooltip">
+																<i class="show-more" onclick="show_more(this)"></i>
+																<a href="/jyapp/course/refund?code=${orderCode}" class="tooltip-text hide" data-id="订单id" style="display: none;">退款</a>
+																<a href="/jyapp/course/detail/${courseId}" class="btn cancle">再次购买</a>
+															</div>`
+												var endTime = "";
+												if(courseType === "招标管理课程"){
+													var endTimes = filterObj.discount.peopleNum.tenderingDiscount.reduce.EndTime;
+													endTime = new Date(endTimes).getTime();
+												}else if(courseType === "投标实务课程"){
+													var endTimes = filterObj.discount.peopleNum.biddingDiscount.reduce.EndTime;
+													endTime = new Date(endTimes).getTime();
+												}
+												var nowTime = new Date().getTime();
+												if(nowTime >= endTime){
+													lastHtml = `<div class="card-footer">
+																	<a href="/jyapp/course/detail/${courseId}" class="btn cancle">再次购买</a>
+																</div>`
+												}
+											}
+										}else{
+											orderStatusHtml = "已取消";
+											lastHtml = `<div class="card-footer">
+															<a href="/jyapp/course/detail/${courseId}" class="btn cancle">再次购买</a>
+														</div>`
+										}
 									}
 									listhtml += `<div class="card">
 													<div class="card-header">
 														<span class="time">${createTime}</span>
 														<span class="status ${orderStatusHtmls}">
-															<!-- <span class="doubt iconfont icon-bangzhu"></span> -->
+															${helpHtml}
 															<span class="status-text">${orderStatusHtml}</span>
 															<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(${id},this)"></a>
 														</span>
 													</div>
 													<div class="card-content">
-														<a href="./order_detail.html" class="media">
+														<a href="${orderUrl}" class="media">
 															<div class="media-img">
 																<span class="img-container">
 																	<span class="img-book"></span>

+ 3 - 1
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -1471,6 +1471,7 @@
 							var courseId = filterObj.courseMgoId;
 							var lastHtml = "";
 							var orderUrl = "/swordfish/course/orderDetail?code="+ orderCode;
+							var helpHtml = "";
 
 							if(payWay !== "transferAccounts"){
 								if(orderStatus === 0){
@@ -1541,6 +1542,7 @@
 														<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
 														<a href="/weixin/pay/optionPay?code=${orderCode}" class="btn pay">再次支付</a>
 													</div>`;
+										helpHtml = `<span class="doubt iconfont icon-bangzhu"></span>`
 									}
 								}else if(orderStatus === 1){
 									if(courseStatus === 5){
@@ -1589,7 +1591,7 @@
 											<div class="card-header">
 												<span class="time">${createTime}</span>
 												<span class="status ${orderStatusHtmls}">
-													<!-- <span class="doubt iconfont icon-bangzhu"></span> -->
+													${helpHtml}
 													<span class="status-text">${orderStatusHtml}</span>
 													<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(${id},this)"></a>
 												</span>