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

src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

@@ -128,9 +128,9 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			startTime = endTime
 		}
 		if date_unit == 1 { ///延长时间
-			endTime = startTime.AddDate(date_count, 0, 0)
+			endTime = endTime.AddDate(date_count, 0, 0)
 		} else if date_unit == 2 { //月
-			endTime = startTime.AddDate(0, date_count, 0)
+			endTime = endTime.AddDate(0, date_count, 0)
 		}
 		filter := entity.VipSimpleMsg{
 			area,

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

@@ -549,10 +549,15 @@
 			    			}
 			    		}else{
 			    			if(endDay < startDay){
+			    				year = endYear - startYear-1;
 			    				month = 12+Number(endMonth)-startMonth -1;
 			    			}else{
+			    				year = endYear - startYear-1;
 			    				month = 12+Number(endMonth)-startMonth;
 			    			}
+			    			if(year === 0){
+			    				year = "";
+			    			}
 			    		}
 			    	}else if(endYear === startYear){
 			    		if(endDay < startDay){