显示

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

@@ -153,7 +153,20 @@
 			var typ=0;
 			var deleteIndex=0;
 			
-			
+			//格式化数字
+			function toThousands(num) {
+				//TODO if 截取
+				console.log(num)
+				var num = (num || 0).toString(), result = '';
+				while (num.length > 3) {
+					result = ',' + num.slice(-3) + result;
+					num = num.slice(0, num.length - 3);
+				}
+				if (num) { 
+					result = num + result;
+				}
+				return result;
+			}
 			
 			function appendList(listhtml){
 				listhtml.children(".card-content").on("click", function(event){
@@ -242,6 +255,7 @@
 											                        createTime=createTime.replace(/-/g,".")
 											                        //选择时间
 											                        var publishTime = obj.filter_publishtime;
+											                        publishTime= publishTime.replace(/\./g,"/")
 											                        if(!publishTime){
 											                            publishTime = "全部";
 											                        }
@@ -256,7 +270,7 @@
 											                        //+'<span class="status notpay">'+orderStatus+'</span>'
 											                        var orderStatus = obj.order_status;
 											                        if(orderStatus==0){
-											                        	orderStatus="待支付"
+											                        	orderStatus="待付款"
 											                        	orderHtml=""
 											                        	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
 											                        	iconHtml=""
@@ -279,6 +293,15 @@
 											                        var data_count=obj.data_count;
 											                        //订单金额
 											                        var orderMoney = obj.order_money;
+									       	                        //金额格式化 小数点前 1,000
+											                        orderMoney=orderMoney+"";
+										           	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
+																	orderMoney_2=orderMoney.split(".")[1];
+										           	             	if(orderMoney_2){
+										           	             		orderMoney=orderMoney_1+"."+orderMoney_2;
+										           	             	}else{
+										           	             		orderMoney=orderMoney_1;
+										           	             	}                 
 											                        //
 											                        var token = obj.token;
 											                        //关键词
@@ -582,6 +605,7 @@
                     	createTime=createTime.replace(/-/g,".")
                         //选择时间
                         var publishTime = obj.filter_publishtime;
+                        publishTime= publishTime.replace(/\./g,"/")
                         if(!publishTime){
                             publishTime = "全部";
                         }
@@ -596,7 +620,7 @@
                         //+'<span class="status notpay">'+orderStatus+'</span>'
                         var orderStatus = obj.order_status;
                         if(orderStatus==0){
-                        	orderStatus="待支付"
+                        	orderStatus="待付款"
                         	orderHtml=""
                         	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
                         	iconHtml=""
@@ -618,6 +642,15 @@
                         var data_count=obj.data_count;
                         //订单金额
                         var orderMoney = obj.order_money;
+                        //金额格式化 小数点前 1,000
+                        orderMoney=orderMoney+"";
+       	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
+						orderMoney_2=orderMoney.split(".")[1];
+       	             	if(orderMoney_2){
+       	             		orderMoney=orderMoney_1+"."+orderMoney_2;
+       	             	}else{
+       	             		orderMoney=orderMoney_1;
+       	             	}
                         //
                         var token = obj.token;
                         //关键词
@@ -783,7 +816,7 @@
 						var res = data.res[0]
 						var oneMHtml = '<div class="card"><div class="card-header">'
 										+'<span class="time" style="color:#888888">'+res.create_time+'</span>'
-										+'<span class="status notpay">待支付</span></div>'
+										+'<span class="status notpay">待付款</span></div>'
 										+'<div class="card-content"><a eid="'+res.order_code+'" class="media">'
 										+'<div class="media-img"><img src="/jyapp/images/myorder/historical_data.png"></div>'
 										+'<div class="media-info">'

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

@@ -458,7 +458,7 @@
 								finishEmailVerity=false;
 								//发送成功
 								sendemailTimer(60*5);
-								$(".verity_input").removeAttr("readonly");;
+								$(".verity_input").removeAttr("readonly");
 								$(".sendCode").attr("disabled","disabled");
 								$(".email_input").attr("readonly",true);
 							}

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

@@ -244,7 +244,7 @@
 						var res = data.res[0]
 						var oneMHtml = '<div class="card"><div class="card-header">'
 										+'<span class="time" style="color:#888888">'+res.create_time+'</span>'
-										+'<span class="status notpay">待支付</span></div>'
+										+'<span class="status notpay">待付款</span></div>'
 										+'<div class="card-content"><a eid="'+res.order_code+'" class="media">'
 										+'<div class="media-img"><img src="/dataExport/image/historical_data.png"></div>'
 										+'<div class="media-info">'
@@ -297,6 +297,22 @@
 			var deleteIndex=0;
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 			
+			
+			//格式化数字
+			function toThousands(num) {
+				//TODO if 截取
+				console.log(num)
+				var num = (num || 0).toString(), result = '';
+				while (num.length > 3) {
+					result = ',' + num.slice(-3) + result;
+					num = num.slice(0, num.length - 3);
+				}
+				if (num) { 
+					result = num + result;
+				}
+				return result;
+			}
+			
 			function appendList(listhtml){
 				listhtml.children(".card-content").on("click", function(event){
 					var eid = $(this).find(".media").attr("eid");
@@ -382,6 +398,7 @@
 											                        createTime=createTime.replace(/-/g,".")
 											                        //选择时间
 											                        var publishTime = obj.filter_publishtime;
+											                        publishTime= publishTime.replace(/\./g,"/")
 											                        if(!publishTime){
 											                            publishTime = "全部";
 											                        }
@@ -395,7 +412,7 @@
 											                        //订单状态 0待支付 1已完成 -1删除
 											                        var orderStatus = obj.order_status;
 											                        if(orderStatus==0){
-											                        	orderStatus="待支付"
+											                        	orderStatus="待付款"
 											                        	orderHtml=""
 											                        	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
 											                        	iconHtml=""
@@ -418,6 +435,15 @@
 											                        var data_count=obj.data_count;
 											                        //订单金额
 											                        var orderMoney = obj.order_money;
+				                        	                        //金额格式化 小数点前 1,000
+											                        orderMoney=orderMoney+"";
+										           	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
+																	orderMoney_2=orderMoney.split(".")[1];
+										           	             	if(orderMoney_2){
+										           	             		orderMoney=orderMoney_1+"."+orderMoney_2;
+										           	             	}else{
+										           	             		orderMoney=orderMoney_1;
+										           	             	}
 											                        //
 											                        var token = obj.token;
 											                        //关键词
@@ -729,6 +755,7 @@
 	                        createTime =createTime.replace(/-/g,".")
 	                        //选择时间
 	                        var publishTime = obj.filter_publishtime;
+	                        publishTime= publishTime.replace(/\./g,"/")
 	                        if(!publishTime){
 	                            publishTime = "全部";
 	                        }
@@ -743,6 +770,15 @@
 	                        var data_count=obj.data_count;
 	                        //订单金额
 	                        var orderMoney = obj.order_money;
+	                        //金额格式化 小数点前 1,000
+	                        orderMoney=orderMoney+"";
+           	             	orderMoney_1=toThousands(orderMoney.split(".")[0]);
+							orderMoney_2=orderMoney.split(".")[1];
+           	             	if(orderMoney_2){
+           	             		orderMoney=orderMoney_1+"."+orderMoney_2;
+           	             	}else{
+           	             		orderMoney=orderMoney_1;
+           	             	}
 	                        //
 	                        var token = obj.token;
 	                        //订单状态 0待支付 1已完成 -1删除
@@ -753,7 +789,7 @@
 								sessionStorage.removeItem("paySuccess_"+obj.order_code);
 							}
 	                        if(orderStatus==0){
-	                        	orderStatus="待支付"
+	                        	orderStatus="待付款"
 	                        	orderHtml=""
 	                        	orderHtml+='<span class="status notpay">'+orderStatus+'</span>'
 	                        	iconHtml=""