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

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

@@ -1399,8 +1399,15 @@
 										}else if(year === 0&& month !==0){
 											effectiveduration_vip=month+"个月";
 										}
-										if(cycleunit_vip==3){
-											effectiveduration_vip=cyclecount_vip+"天";	 
+										//试用用户生成订单 周期
+										if (effectiveduration_vip==""){
+											if(cycleunit_vip==1){
+					                        	effectiveduration_vip=cyclecount_vip+"年";
+					                        }else if(cycleunit_vip==2){
+					                        	effectiveduration_vip=cyclecount_vip+"个月"
+					                        }else if(cycleunit_vip==3){
+					                        	effectiveduration_vip=cyclecount_vip+"天";	                    
+					                        }
 										}
 									}else{
 										if(cycleunit_vip==1){

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

@@ -531,9 +531,13 @@
        	    	}else if(year === 0&& month !==0){
        	    		$(".cyclecount").text(month+"个月");
        	    	}
-       			if(filterObj.cycleunit==3){
-       	    		$(".cyclecount").text(filterObj.cyclecount+"天")
-       	    	}
+       			if(filterObj.cycleunit==1){
+			        $(".cyclecount").text(filterObj.cyclecount+"年")
+			    }else if(filterObj.cycleunit==2){
+			       $(".cyclecount").text(filterObj.cyclecount+"个月")
+			    }else if(filterObj.cycleunit==3){
+			       $(".cyclecount").text(filterObj.cyclecount+"天")
+			    }
             }else{
 				//未支付
 				if(filterObj.cycleunit==1){

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

@@ -1159,6 +1159,16 @@
 			                        	effectiveduration_vip=cyclecount_vip+"天";	                    
 			                        }
 							    }
+								//试用用户生成订单 周期
+								if (effectiveduration_vip==""){
+									if(cycleunit_vip==1){
+			                        	effectiveduration_vip=cyclecount_vip+"年";
+			                        }else if(cycleunit_vip==2){
+			                        	effectiveduration_vip=cyclecount_vip+"个月"
+			                        }else if(cycleunit_vip==3){
+			                        	effectiveduration_vip=cyclecount_vip+"天";	                    
+			                        }
+								}
 	                       }else if(vip_type==2){
 								//新增全部行业:-1  新增部分行业:123   		无新增:0
 								//新增全国{"province":0,"city":0}  无新增:{}

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -438,9 +438,13 @@ try{
 	    	}else if(year === 0&& month !==0){
 	    		$(".cyclecount").text(month+"个月");
 	    	}
-			if(filterObj.cycleunit==3){
-	    		$(".cyclecount").text(filterObj.cyclecount+"天")
-	    	}
+			if(filterObj.cycleunit==1){
+		        $(".cyclecount").text(filterObj.cyclecount+"年")
+		    }else if(filterObj.cycleunit==2){
+		       $(".cyclecount").text(filterObj.cyclecount+"个月")
+		    }else if(filterObj.cycleunit==3){
+		       $(".cyclecount").text(filterObj.cyclecount+"天")
+		    }
        }else{
        		//未支付
 	      if(filterObj.cycleunit==1){