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

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -56,8 +56,6 @@ type VipSimpleMsg struct {
 	//Id         string                  `json:"_id"`        //mgo id
 	Area               *map[string]interface{} `json:"area"`               //地区
 	Industry           []string                `json:"industry"`           //行业
-	Addarea            *map[string]interface{} `json:"addarea"`            //新增订阅地区
-	Addindustry        []string                `json:"addindustry"`        //新增订阅行业
 	Addareacount       *map[string]interface{} `json:"addareacount"`       //新增购买区域数量
 	Addbuyerclasscount int                     `json:"addbuyerclasscount"` //新增行业数量
 	Cyclecount         int                     `json:"cyclecount"`         //日期数量

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

@@ -192,8 +192,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				area,
 				industry,
 				nil,
-				nil,
-				nil,
 				0,
 				date_count,
 				date_unit,
@@ -203,8 +201,6 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 			filter = entity.VipSimpleMsg{
 				allBuyArea,
 				allIndustry,
-				area,
-				industry,
 				vipBuyCount,
 				industryCount,
 				date_count,

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

@@ -87,8 +87,6 @@ func (this *SubVipPayOrder) CreateOrder() {
 			area,
 			industry,
 			nil,
-			nil,
-			nil,
 			0,
 			date_count,
 			date_unit,

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

@@ -285,8 +285,6 @@ func (this *TrialOrder) TrialPay() {
 			area,
 			industry,
 			nil,
-			nil,
-			nil,
 			0,
 			date_count,
 			date_unit,

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

@@ -1222,8 +1222,9 @@
             	vipCount = JSON.stringify(JSON.parse(sessionStorage.vipAddCount));
             }
             let vipIndustry = 0
-            if(industrysArr!==null){
-            	if(industrysArr.length==1&&industrysArr[0]=="全部行业"){
+            if(sessionStorage.vipSubSelectIndustryAdd!==undefined&&sessionStorage.vipSubSelectIndustryAdd!==""){
+            	let industrysArr = JSON.parse(sessionStorage.vipSubSelectIndustryAdd)
+				if(industrysArr.length==1&&industrysArr[0]=="全部行业"){
 	                vipIndustry = -1;
 	            }else{
 	            	vipIndustry = industrysArr.length;