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

@@ -117,7 +117,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 
 		} else { //续费时间
 			orderType = 2 //续费操作
-			//			startTime = endTime
+			startTime = endTime
 		}
 		//		if date_unit == 1 { ///延长时间
 		//			endTime = endTime.AddDate(date_count, 0, 0)
@@ -175,6 +175,7 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		if totalfee == 0 {
 			totalfee = 1
 		}
+		//		totalfee = 1
 
 		//创建订单
 		tradeno, prepayid, payStr := "", "", ""

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

@@ -375,7 +375,9 @@
 //            $("#all .industry_item").trigger("click");
 				$('.select-area-box .list button').removeClass('active');
                 showSelect(buyIndustry,false);
+                findSelectedIndustry();
                 sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
+                $('.tips_btn .btns button').removeAttr('disabled');
             })
            
             //=======================

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

@@ -738,6 +738,9 @@
 			}else{
 				$(".industry-list").text("已新增为 : 全部行业");
 			}
+			if(industryLen === 0){
+				$(".industry-list").hide();
+			}
 			$(".save_upgrade").removeAttr("disabled");
 	    }
 	    //生效时间