课程页面提交

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -746,6 +746,7 @@
 												var isEntOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isent");
 												var courseOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("courseOrder");
 												var courseId = $(obj).parent(".card-footer").prev(".card-content").find("a").attr("eid");
+                        var courseOnlineOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("courseOnlineOrder");
 												//vip订单取消了没有再次购买
 												if (isVipOrder!="true"){
 													if(courseOrder !== "true"){
@@ -753,7 +754,10 @@
 															self.text("已取消");
 															/*$(obj).parent(".card-footer").html('<a  onclick="renewalOrBuyAgain_ent(1,this)" class="btn cancle">再次购买</a>')*/
 															$(obj).parent(".card-footer").html("");
-														}else{
+														}else if(courseOnlineOrder=="true"){
+                              self.text("已取消");
+                              $(obj).parent(".card-footer").remove();
+                            }else{
 															self.text("已取消");
 															$(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
 														}
@@ -2031,6 +2035,81 @@
 												</div>
 												${lastHtml}
 											</div>`
+							}else if (obj.product_type=="线上课程"){
+								count++;
+								var id = obj.id;
+								//订单编号
+								var orderCode = obj.order_code;
+								//创建时间
+								var createTime=obj.create_time;
+								createTime =createTime.replace(/-/g,".")
+								var payWay = obj.pay_way
+								var filterObj = JSON.parse(obj.filter);
+								var courseName = filterObj.s_name;
+								var courseLength = filterObj.s_courseDate;
+								var courseEndTimeStamp = filterObj.l_endtime;
+								var courseId = filterObj._id;
+								var orderStatus = obj.order_status;
+								var orderStatusHtml = "";
+								var orderStatusHtmls = "";
+                var orderMoney = obj.order_money;
+                var applybillStatus= obj.applybill_status;
+                
+                var courseEndTime = new Date(courseEndTimeStamp*1000)
+                
+								var lastHtml = "";
+								var orderUrl = "/jyxsapp/orderMsg?code="+ orderCode;
+							
+								if(orderStatus === 0){
+									orderStatusHtml = "待付款";
+									orderStatusHtmls = "notpay";
+									lastHtml = `<div class="card-footer">
+													<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
+													<a onclick="setSessionStorage()" href="/jyxsapp/confirmPay?code=${orderCode}&price=${orderMoney}" class="btn pay">去支付</a>
+												</div>`;
+								}else if(orderStatus === 1){
+									orderStatusHtml = "已完成";
+                  orderStatusHtmls ="finish";
+                  if(applybillStatus==1){
+                		lastHtml = `<div class="card-footer">
+											<a onclick="setSessionStorage()" href="/jyxsapp/invoiceDetail?code=${id}" class="btn cancle">查看发票</a>
+										</div>`
+                  }else{
+                		lastHtml = `<div class="card-footer">
+											<a onclick="setSessionStorage()" href="/jyxsapp/invoice?code=${id}" class="btn cancle">开发票</a>
+										</div>`
+                  }
+								}else{
+									orderStatusHtml = "已取消";
+                  orderStatusHtmls = "status-text";
+								}
+
+								listhtml += `<div class="card">
+												<div class="card-header">
+													<span class="time">${createTime}</span>
+													<span class="status ${orderStatusHtmls}">${orderStatusHtml}</span>
+													<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(${id},this)"></a>
+													
+												</div>
+												<div class="card-content">
+													<a onclick="setSessionStorage()" href="${orderUrl}" eid="${courseId}" vid="${orderCode}" class="media" courseOnlineOrder="true">
+														<div class="media-img">
+															<span class="img-container">
+															</span>
+														</div>
+														<div class="media-info">
+															<p class="item-ifo ellipsis-2">${courseName}</p>
+															<p class="item-ifo ellipsis">课程类型：线上课程</p>
+															<p class="item-ifo ellipsis">课程时长：${courseLength}</p>
+															<p class="item-ifo ellipsis">有效日期：${courseEndTime.getFullYear()}/${courseEndTime.getMonth()+1}/${courseEndTime.getDate()} 到期</p>
+														</div>
+													</a>
+													<div class="price">
+														<strong class="current">￥${formatMoney(orderMoney)}</strong>
+													</div>
+												</div>
+												${lastHtml}
+											</div>`
 							}else if (obj.product_type=="企业商机管理"){
 								if(typ==1 || $(".tab-link.active").index() === 1){	//待付款订单列表页
 									if(obj.order_status==-2){

src/web/templates/pc/myOrder.html

@@ -347,11 +347,11 @@
 													+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +
 										',this,\''+obj.filter_id+'\',0)">取消订单</a></p>'
 									}else if (orderStatus == 1) {//已完成
-										m_status_html +='<p class="finish_status">已完成</p>'
-										if(obj.applybill_status==1){
-											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-										}else{
-											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
+										m_status_html +='<p class="finish_status">已完成</p>'
+										if(obj.applybill_status==1){
+											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+										}else{
+											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
 										}
 											m_handle_html +='<p><a  orderCode="' + orderCode + '" href="/front/dataExport/toSieve">再次购买</a></p>'
 									}else if (orderStatus == -2) {//已取消
@@ -419,6 +419,34 @@
 
 									}
 									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',2);">查看详情</a></p>'
+								}else if (obj.product_type=="线上课程"){
+									var filter_ = JSON.parse(obj.filter)
+									var courseEndTimeStamp = filter_.l_endtime;
+									var courseEndTime = new Date(courseEndTimeStamp*1000)
+
+									shop_img_html += '<img src="/course/image/bid_course.png" alt="">'
+									shop_main_html +='<p>课程名称：'+filter_.s_name+'</p>'
+											+'<p>课程类型：线上课程</p>'
+											+'<p>课程时长：'+filter_.s_courseDate+'</p>'
+											+'<p>有效日期：'+courseEndTime.getFullYear()+'/'+(courseEndTime.getMonth()+1)+'/'+courseEndTime.getDate()+' 到期</p>'
+									if (orderStatus == 0) {//0：待付款；
+										//1:对公转账未上传凭证；2：对公转账审核中；3：对公转账审核未通过
+										orderStatusClassOne="blueColor"
+										orderStatusClassTwo="blueBg"
+										m_status_html +='<p class="finish_status">待付款</p>'
+										m_handle_html +='<p><a href="/jyxspc/buy-courser?id='+filter_._id+'" class="go_pay">去支付</a></p>'
+												+'<p><a  orderCode="' + orderCode + '" onclick="toCancel(' + id +',this,\''+obj.filter_id+'\',3)">取消订单</a></p>'
+									}else if (orderStatus == 1) {//已完成
+										m_status_html +='<p class="finish_status">已完成</p>'
+										if(obj.applybill_status){
+											m_handle_html +='<p><a href="/jyxspc/checkInvoice?ids='+id+'&code='+orderCode+'">发票信息</a></p>'
+										}else{
+											m_handle_html +='<p><a href="/jyxspc/invoice?ids='+id+'&code='+orderCode+'">开发票</a></p>'
+										}
+									}else if (orderStatus == -2) {//已取消
+										m_status_html +='<p class="finish_status">已取消</p>'
+									}
+									m_status_html +='<p><a href="/jyxspc/orderDetail?orderId='+orderCode+'">查看详情</a></p>'
 								}else if(obj.product_type=="VIP订阅"){
 									var filter_ = JSON.parse(obj.filter)
 									var region_vip="";
@@ -493,7 +521,7 @@
 									}
 									if(filter_.cycleunit==0&&filter_.cyclecount==0){
 										cycleT="不延期";
-									}
+									}
 									
 									if(obj.vip_endtime!=""&&obj.vip_starttime!=""){
 										obj.vip_starttime = formatTime(obj.vip_starttime) +" - "+formatTime(obj.vip_endtime)
@@ -527,29 +555,29 @@
 
 									}
 									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',3);">查看详情</a></p>'
-								}else if (obj.product_type=="企业商机管理"){
-									var filter_ = JSON.parse(obj.filter)
-									shop_img_html += '<img src="/electronic_invoice/image/enterprise.png" alt="">'
-									shop_main_html +='<p style="line-height: 33px;">企业名称：'+filter_.entname+'</p>'
-													+'<p style="line-height: 33px;">团队人数：'+filter_.personnum+' 人</p>'
-													+'<p style="line-height: 33px;">使用周期：'+filter_.cycle+' 年</p>'
-									
-									if (orderStatus == 0) {//0：待付款；
-										orderStatusClassOne="blueColor"
-										orderStatusClassTwo="blueBg"
-										
-										m_status_html +='待付款'
-										m_handle_html +='-'
-									}else if (orderStatus == 1) {//已完成
-										m_status_html +='<p class="finish_status">已完成</p>'
-										if(obj.applybill_status==1){
-											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
-										}else{
-											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
-										}
-									}else if (orderStatus == -2) {//已取消
-										m_status_html +='<p class="finish_status">已取消</p>'
-									}
+								}else if (obj.product_type=="企业商机管理"){
+									var filter_ = JSON.parse(obj.filter)
+									shop_img_html += '<img src="/electronic_invoice/image/enterprise.png" alt="">'
+									shop_main_html +='<p style="line-height: 33px;">企业名称：'+filter_.entname+'</p>'
+													+'<p style="line-height: 33px;">团队人数：'+filter_.personnum+' 人</p>'
+													+'<p style="line-height: 33px;">使用周期：'+filter_.cycle+' 年</p>'
+									
+									if (orderStatus == 0) {//0：待付款；
+										orderStatusClassOne="blueColor"
+										orderStatusClassTwo="blueBg"
+										
+										m_status_html +='待付款'
+										m_handle_html +='-'
+									}else if (orderStatus == 1) {//已完成
+										m_status_html +='<p class="finish_status">已完成</p>'
+										if(obj.applybill_status==1){
+											m_handle_html +='<p><a href="/front/order/check_invoice/'+orderCode+'">发票信息</a></p>'
+										}else{
+											m_handle_html +='<p><a onclick="check_over(\''+orderCode+'\')">开发票</a></p>';
+										}
+									}else if (orderStatus == -2) {//已取消
+										m_status_html +='<p class="finish_status">已取消</p>'
+									}
 									m_status_html +='<p><a onclick="toDetail(\''+orderCode+'\',4);">查看详情</a></p>'
 								}
 								temp += '<div class="order_list '+orderStatusClassOne+'">'
@@ -589,7 +617,7 @@
 							$(".pagination-box").hide();
 						}
 						$(".c_tbody").html(temp);
-						//objD.eq(ind).html(temp);
+						//objD.eq(ind).html(temp);
 						$(".backTop").click();
 						initHover();
 					},
@@ -599,14 +627,14 @@
 				});
 			}
 			//
-			function formatTime(t){
-				try{
-					return t.substring(0,10).replace(/\-/g,".")
-				}catch(e){
-					if(t === null){
-						t = "";
-					}
-					return t
+			function formatTime(t){
+				try{
+					return t.substring(0,10).replace(/\-/g,".")
+				}catch(e){
+					if(t === null){
+						t = "";
+					}
+					return t
 				}
 			}
 			//
@@ -696,8 +724,8 @@
 					window.open("/front/course/orderDetail?orderId=" + orderCode);
 				}else if (n==3){
 					window.open("/front/vipOrder/vipOrderDetail?order_code="+orderCode)
-				}else if(n==4){
-					window.open("/front/entniche/entnicheOrderDetail?order_code="+orderCode)
+				}else if(n==4){
+					window.open("/front/entniche/entnicheOrderDetail?order_code="+orderCode)
 				}
 			}
 			//取消订单
@@ -720,7 +748,10 @@
 									dataType: 'json',
 									success: function(data) {
 										if (data && data["success"]) {
-											var mbuyhtml = '<p><a  href="/front/dataExport/toSieve">再次购买</a></p>'
+											var mbuyhtml =''
+											if (n!=3){
+												mbuyhtml = '<p><a  href="/front/dataExport/toSieve">再次购买</a></p>'
+											}
 											if(n==2){
 												if(fid!=""){
 												mbuyhtml = '<p><a  href="/front/course/detail?aboutFlag=true&_id='+fid+'">再次购买</a></p>'
@@ -729,9 +760,9 @@
 												}
 											}
 											var self = $(obj).parents(".m_handle").prev(".m_status");
-											if($(".tab_item.active").index() === 1){
-												$(obj).parents(".order_list").remove();
-											}
+											if($(".tab_item.active").index() === 1){
+												$(obj).parents(".order_list").remove();
+											}
 											var chtml = '<p class="finish_status">已取消</p><p><a onclick="toDetail(\''+orderCode+'\',\''+n+'\');">查看详情</a></p>'
 											self.find(".stateBox").html(chtml)
 											$(obj).parents(".handleBox").html(mbuyhtml)
@@ -782,16 +813,16 @@
 		        M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '.';
 		        D = date.getDate();
 		        return Y+M+D;
-		    }
-			
-			function check_over(order_code){
-				$.post("/subscribepay/orderListDetails/isOver",{"order_code":order_code},function(r){
-					if(r.status!=1){
-						window.open("/front/order/invoicetimeOut",'_self');
-					}else{
-						window.open("/front/order/invoice/"+order_code,'_self');
-					}
-				})
+		    }
+			
+			function check_over(order_code){
+				$.post("/subscribepay/orderListDetails/isOver",{"order_code":order_code},function(r){
+					if(r.status!=1){
+						window.open("/front/order/invoicetimeOut",'_self');
+					}else{
+						window.open("/front/order/invoice/"+order_code,'_self');
+					}
+				})
 			}
 		</script>
 	</body>

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -771,7 +771,7 @@
 												if(courseOrder !== "true"){
 													if(courseOnlineOrder=="true"){
 														self.text("已取消");
-														$(obj).parent(".card-footer").html('')
+														$(obj).parent(".card-footer").remove();
 													}else{
 														self.text("已取消");
 														$(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
@@ -1861,59 +1861,59 @@
 			var courseEndTime = new Date(courseEndTimeStamp*1000)
 
 			var lastHtml = "";
-			var orderUrl = "/jyapp/course/orderDetail?code="+ orderCode;
+			var orderUrl = "/jyxsapp/orderMsg?code="+ id;
 			var helpHtml = "";
 
 			if(orderStatus === 0){
 				orderStatusHtml = "待付款";
 				orderStatusHtmls = "notpay";
 				lastHtml = `<div class="card-footer">
-													<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
-													<a onclick="setSessionStorage()" href="/jyxsapp/confirmPay?code=${orderCode}&price=${orderMoney}" class="btn pay">去支付</a>
-												</div>`;
+								<a  class="btn cancle" onclick="cancelOrder(${id},this)">取消订单</a>
+								<a onclick="setSessionStorage()" href="/jyxsapp/confirmPay?code=${orderCode}&price=${orderMoney}" class="btn pay">去支付</a>
+							</div>`;
 			}else if(orderStatus === 1){
 				orderStatusHtml = "已完成";
 				if(applybillStatus==1){
 					lastHtml = `<div class="card-footer">
-											<a onclick="setSessionStorage()" href="/jyxsapp/invoiceDetail?code=${orderCode}" class="btn cancle">查看发票</a>
-										</div>`
+									<a onclick="setSessionStorage()" href="/jyxsapp/invoiceDetail?code=${orderCode}" class="btn cancle">查看发票</a>
+								</div>`
 				}else{
 					lastHtml = `<div class="card-footer">
-											<a onclick="setSessionStorage()" href="/jyxsapp/invoice?code=${orderCode}" class="btn cancle">开发票</a>
-										</div>`
+									<a onclick="setSessionStorage()" href="/jyxsapp/invoice?code=${orderCode}" class="btn cancle">开发票</a>
+								</div>`
 				}
 			}else{
 				orderStatusHtml = "已取消";
 			}
 
 			listhtml += `<div class="card">
-												<div class="card-header">
-													<span class="time">${createTime}</span>
-													<span class="status ${orderStatusHtmls}">
-														${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 onclick="setSessionStorage()" href="${orderUrl}" eid="${courseId}" vid="${orderCode}" class="media" courseOnlineOrder="true">
-														<div class="media-img">
-															<span class="img-container">
-															</span>
-														</div>
-														<div class="media-info">
-															<p class="item-ifo ellipsis-2">${courseName}</p>
-															<p class="item-ifo ellipsis">课程类型：线上课程</p>
-															<p class="item-ifo ellipsis">课程时长：${courseLength}</p>
-															<p class="item-ifo ellipsis">有效日期：${courseEndTime.getFullYear()}/${courseEndTime.getMonth()+1}/${courseEndTime.getDate()} 到期</p>
-														</div>
-													</a>
-													<div class="price">
-														<strong class="current">￥${formatMoney(orderMoney)}</strong>
-													</div>
-												</div>
-												${lastHtml}
-											</div>`
+							<div class="card-header">
+								<span class="time">${createTime}</span>
+								<span class="status ${orderStatusHtmls}">
+									${helpHtml}
+									<span class="status-text">${orderStatusHtml}</span>
+									<a class="delete_icon" title="删除订单" onclick="deleteOrder(${id},this)"></a>
+								</span>
+							</div>
+							<div class="card-content">
+								<a onclick="setSessionStorage()" href="${orderUrl}" eid="${courseId}" vid="${orderCode}" class="media" courseOnlineOrder="true">
+									<div class="media-img">
+										<span class="img-container">
+										</span>
+									</div>
+									<div class="media-info">
+										<p class="item-ifo ellipsis-2">${courseName}</p>
+										<p class="item-ifo ellipsis">课程类型：线上课程</p>
+										<p class="item-ifo ellipsis">课程时长：${courseLength}</p>
+										<p class="item-ifo ellipsis">有效日期：${courseEndTime.getFullYear()}/${courseEndTime.getMonth()+1}/${courseEndTime.getDate()} 到期</p>
+									</div>
+								</a>
+								<div class="price">
+									<strong class="current">￥${formatMoney(orderMoney)}</strong>
+								</div>
+							</div>
+							${lastHtml}
+						</div>`
 		}
 	}
 	appendList($(listhtml));