Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

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

@@ -31,61 +31,58 @@ type RenewUpgrade struct {
 //获取购买订阅相关信息
 func (this *RenewUpgrade) GetBuyMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
-	data, ok := util.MQFW.FindById("user", userId, nil)
-	if ok && len(*data) > 0 && *data != nil {
-		vipjy := (*data)["o_vipjy"].(map[string]interface{})
-		area := vipjy["o_area"]
-		buyerclass := vipjy["a_buyerclass"]
-		//		cycleunit := vipjy["i_cycleunit"]   // 1-年，2-月
-		//		cyclecount := vipjy["i_cyclecount"] //数量
-		starttime := qutil.Int64All((*data)["l_vip_starttime"])
-		start := time.Unix(starttime, 0).Format("2006-01-02")
-		endtime := qutil.Int64All((*data)["l_vip_endtime"])
-		end := time.Unix(endtime, 0).Format("2006-01-02")
-		now := time.Unix(time.Now().Unix(), 0).Format("2006-01-02")
-		vipStatus := (*data)["i_vip_status"]
-		buyset := vipjy["o_buyset"]
-
-		orderdata := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
-			"user_id":      userId,
-			"order_status": 1,
-			"product_type": "VIP订阅",
-		}, "filter,order_code", "create_time desc")
-		vmsg := entity.VipSimpleMsg{}
-		allArea := &map[string]interface{}{}
-		allIndustry := []string{}
-		if len(*orderdata) > 0 && *orderdata != nil {
-			filterStr := qutil.ObjToString((*orderdata)["filter"])
-			if err := json.Unmarshal([]byte(filterStr), &vmsg); err != nil {
-				log.Printf("%s vipSubscribeStruct PayCallBack Unmarshal 出错 [%s]\n", filterStr)
-				return
-			}
-			allArea = vmsg.Area
-			allIndustry = vmsg.Industry
+	r := func() *entity.FuncResult {
+		if userId == "" {
+			return &entity.FuncResult{false, errors.New("未登录"), nil}
 		}
-		dataArr := map[string]interface{}{
-			"area":        area,
-			"buyerclass":  buyerclass,
-			"starttime":   starttime,
-			"endtime":     endtime,
-			"start":       start,
-			"end":         end,
-			"now":         now,
-			"vipStatus":   vipStatus,
-			"buyset":      buyset,
-			"allarea":     allArea,
-			"allindustry": allIndustry,
-			"orderCode":   (*orderdata)["order_code"],
+		data, ok := util.MQFW.FindById("user", userId, nil)
+		if ok && len(*data) > 0 && *data != nil {
+			vipjy := (*data)["o_vipjy"].(map[string]interface{})
+			area := vipjy["o_area"]
+			buyerclass := vipjy["a_buyerclass"]
+			starttime := qutil.Int64All((*data)["l_vip_starttime"])
+			start := time.Unix(starttime, 0).Format("2006-01-02")
+			endtime := qutil.Int64All((*data)["l_vip_endtime"])
+			end := time.Unix(endtime, 0).Format("2006-01-02")
+			now := time.Unix(time.Now().Unix(), 0).Format("2006-01-02")
+			vipStatus := (*data)["i_vip_status"]
+			buyset := vipjy["o_buyset"]
+			//
+			var orderCode interface{}
+			orderdata := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
+				"user_id":      userId,
+				"order_status": 1,
+				"product_type": "VIP订阅",
+			}, "order_code", "create_time desc")
+			if len(*orderdata) > 0 && *orderdata != nil {
+				orderCode = (*orderdata)["order_code"]
+			}
+			dataArr := map[string]interface{}{
+				"area":       area,
+				"buyerclass": buyerclass,
+				"starttime":  starttime,
+				"endtime":    endtime,
+				"start":      start,
+				"end":        end,
+				"now":        now,
+				"vipStatus":  vipStatus,
+				"buyset":     buyset,
+				"orderCode":  orderCode,
+			}
+			return &entity.FuncResult{true, nil, dataArr}
+		} else {
+			return &entity.FuncResult{false, errors.New("非法请求"), nil}
 		}
-		this.ServeJson(dataArr)
+	}()
+	if r.Err != nil {
+		log.Printf("%s CreateOrder err:%v\n", userId, r.Err.Error())
 	}
+	this.ServeJson(r.Format())
 }
 
 //升级续费
 //创建订单返回支付串
 func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
-	area := qutil.ObjToMap(this.GetString("area"))                   //新增订阅区域
-	industry := strings.Split(this.GetString("industry"), ",")       //新增行业
 	allBuyArea := qutil.ObjToMap(this.GetString("allBuyArea"))       //已购+新增区域
 	allIndustry := strings.Split(this.GetString("allIndustry"), ",") //已购+新增行业
 	date := this.GetString("time")                                   //不延长时为空，正常为 年或月
@@ -104,11 +101,11 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	openId := qutil.ObjToString(this.GetSession("s_m_openid"))
 	r := func() *entity.FuncResult {
+		if userId == "" {
+			return &entity.FuncResult{false, errors.New("未登录"), nil}
+		}
 		now := time.Now()
 		//数据校验
-		if len(industry) == 1 && industry[0] == "" { //去掉[""]
-			industry = []string{}
-		}
 		if len(allIndustry) == 1 && allIndustry[0] == "" { //去掉[""]
 			allIndustry = []string{}
 		}
@@ -157,9 +154,11 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		}
 		filter := entity.VipSimpleMsg{}
 		if pay_source == "Renew" {
+			areaMap := qutil.ObjToMap(vipjy["o_area"])
+			industryMap := qutil.ObjArrToStringArr(vipjy["a_buyerclass"].([]interface{}))
 			filter = entity.VipSimpleMsg{
-				area,
-				industry,
+				areaMap,
+				industryMap,
 				nil,
 				0,
 				&oldBuyset,
@@ -220,20 +219,16 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				if newICount < iCount {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
-			} else {
-				if iCount > 0 && iCount < 4 {
-					return &entity.FuncResult{false, errors.New("非法请求"), nil}
-				}
 			}
 			if newPCount != -1 {
 				if newPCount < pCount {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
-			}
-			for a, b := range *newCityArr {
-				if (*cityArr)[a] != nil {
-					if qutil.IntAll((*cityArr)[a]) < qutil.IntAll(b) {
-						return &entity.FuncResult{false, errors.New("非法请求"), nil}
+				for a, b := range *newCityArr {
+					if (*cityArr)[a] != nil {
+						if qutil.IntAll((*cityArr)[a]) < qutil.IntAll(b) {
+							return &entity.FuncResult{false, errors.New("非法请求"), nil}
+						}
 					}
 				}
 			}

src/web/staticres/vipsubscribe/js/updateArea.js

@@ -748,10 +748,10 @@ $(function () {
 
     // ----------------------- 以下数据交互 ------------------
     $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-    	if(data){
+    	if(data.success){
         	areaData["data"] = {
-        		"area" : data.area,
-        		"buyset" : data.buyset, 
+        		"area" : data.data.area,
+        		"buyset" : data.data.buyset, 
         	}
         	init();
     	}

src/web/templates/weixin/search/mainSearch.html

@@ -274,7 +274,7 @@
 	}
 	</style>
 </head>
-<body>
+<body  style="min-height:100vh;">
 
 <!--主题内容-->
 <section id="searchIndex" class="hidden" style="transform: none;">

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

@@ -1,881 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>区域选择</title>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
-	{{include "/common/weixin.html"}}
-	<!--<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>-->
-	<script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
-</head>
-<style type="text/css">
-	body,html {
-		height: 100%;
-	}
-</style>
-<body>
-	<script type="text/javascript">
-		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
-	</script>
-    <div id="choose_area" >
-        <div class="result">
-            <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
-            <p class="result_text line_two"> 已新增：<span class="result_name"></span>
-                <a href="javascript:;" class="detail">详情</a>
-            </p>
-            <a href="javascript:;" class="packup" style="display: none;">收起</a>
-        </div>
-        <div class="form">
-            <div class="select-area-box">
-                <ul class="area-list">
-                    <li>
-                        <div class="tab whole">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox other">全国
-                            </div>
-                        </div>
-                    </li>
-                    <li class="index" id="A">A</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">安徽
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">澳门
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="B">B</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">北京
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="C">C</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">重庆
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="F">F</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">福建
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="G">G</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">广西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">贵州
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">甘肃
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="H">H</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖北
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">黑龙江
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">海南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">河南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">湖南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <p class="index" id="J">J</p>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">吉林
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江苏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">江西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="L">L</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">辽宁
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="N">N</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">内蒙古
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">宁夏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Q">Q</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">青海
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="S">S</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">陕西
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">上海
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">山东
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">四川
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="T">T</li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">天津
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">台湾
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="X">X</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">西藏
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">新疆
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li>
-                        <div class="tab municipality">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">香港
-                            </div>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Y">Y</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">云南
-                            </div>
-                            <span><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                    <li class="index" id="Z">Z</li>
-                    <li>
-                        <div class="tab">
-                            <div class="province">
-                                <input type="checkbox" class="checkbox">浙江
-                            </div>
-                            <span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-                        </div>
-                        <div class="tab_content clearfix"></div>
-                    </li>
-                </ul>
-                
-            </div>
-        </div>
-        <div class="tips_btn">
-            <div class="tips_discount">
-                <!--<div class="tips_d_money" style="display: block">&yen;38</div>-->
-                <div class="tips_d_text citys">已选择4个市，建议购买“全省”。</div>
-                <div class="tips_d_text all">已选择10个省，建议购买“全国”。</div>
-            </div>
-            <div class="btns">
-                <button class="reset-btn">重置</button>
-                <button class="save-btn">确认</button>
-            </div>
-        </div>
-        <div class="slide">
-            <a href="javascript:;">#</a>
-            <a href="javascript:;">A</a>
-            <a href="javascript:;">B</a>
-            <a href="javascript:;">C</a>
-            <a href="javascript:;">F</a>
-            <a href="javascript:;">G</a>
-            <a href="javascript:;">H</a>
-            <a href="javascript:;">J</a>
-            <a href="javascript:;">L</a>
-            <a href="javascript:;">N</a>
-            <a href="javascript:;">Q</a>
-            <a href="javascript:;">S</a>
-            <a href="javascript:;">T</a>
-            <a href="javascript:;">X</a>
-            <a href="javascript:;">Y</a>
-            <a href="javascript:;">Z</a>
-        </div>
-    </div>
-    <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
-    <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-    <script>
-    	//已购买
-    	var buystr = "";
-    	var areaData = {};
-        $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-        	if(data){
-            	buystr = data.area;
-            	areaData["data"] = {
-            		"area" : data.area,
-            		"buyset" : data.buyset, 
-            	}
-            	console.log(areaData)
-        	}
-        }, false);
-//      console.log(buystr)
-      var AreaChoose={
-        selectObj:{},//已选择，未购买城市;
-        buyObj:{},//已购买
-        selectedIndustryArr:["一个行业"],//计算价格临时变量
-        timeSelect:[1,2],//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-        vipSubisTrial:false,
-        inintData:function(){
-          //已选择
-          try{
-            let select =sessionStorage.getItem("vipSubSelectAreaUpgrade");
-            if(select){
-              this.selectObj=JSON.parse(select);
-            }
-            if(sessionStorage.getItem("vipSubSelectIndustryUpgrade")){
-              this.selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustryUpgrade"));
-            }
-            if(sessionStorage.getItem("vipSubSelectTime")){
-              this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
-            }
-            //
-            this.buyObj = buystr;
-            if(checkObj(buystr)){
-            	this.buyObj = {"全国":[]}
-            }
-//          console.log(this.buyObj)
-            //是否试用界面
-            if(sessionStorage.getItem("vipSubisTrial")) this.vipSubisTrial=true;
-          }catch(e){
-            console.log(e);
-            this.selectObj={};
-          }
-        },
-        inintPage:function(){//初始化省份城市选项   
-          $(".select-area-box ul li:not('.index')").each(function () {
-              var text = $(this).find(".province").text().trim()
-              var data = null
-              chinaMapJSON.some(function (v) {
-                  data = v
-                  return v.name.indexOf(text) !== -1
-              })
-              var box = $(this).find('div.tab_content')
-              var html = AreaChoose.createMoreCity(data.city)
-              box.html(html)
-          })
-        },
-        createMoreCity:function(arr){
-          var tempHtml = arr.map(function (v) {
-                return '<button class="city">' + v.name + '</button>'
-            }).join('')
-            return tempHtml
-        },
-        showSelected:function(canClick){ //回显已选择
-        	var ran = "";
-            if(canClick){
-            	ran = this.selectObj;
-            }else{
-            	ran = this.buyObj;
-            }    
-            for(var province in ran) {
-      			let citys=ran[province]
-	            if(citys.length>0){//地市
-	                this.selectCity(citys,canClick)
-	            }else{//省份
-	                this.selectProvince(province,canClick)
-	            }
-	        }
-        },
-        selectProvince:function(province,canClick){ //设置选中省份 province 省份
-          $($('.tab .province')).each(function (index, dom) {
-            if (province == $.trim($(dom).text())) {
-              $(".checkbox.other").attr("checked", false); //取消全国选中
-              $(dom).children('.checkbox').attr({"checked": true,"disabled":!canClick});//选中此省份
-              if(canClick){
-              	$(dom).parents().siblings('.tab_content').find(".city").addClass("active").attr({"disabled":!canClick});
-              }else{
-              	$(dom).parents().siblings('.tab_content').find(".city").attr({"disabled":!canClick});
-              }
-            }
-            if(!canClick){
-            	if(province === "全国"){
-	            	$('.tab .province').each(function(){
-	            		$(this).children('.checkbox').attr({"checked": true,"disabled":!canClick});//选中此省份
-	            	});
-	            	$('.tab_content .city').each(function(){
-	            		$(this).attr("disabled",!canClick);
-	            	});
-	            }
-            }
-          })
-        },
-        selectCity:function(citys,canClick){ //设置选中城市
-          citys.forEach(v => {
-            $($('.tab_content .city')).each(function (index, dom) {
-                if (v == $(dom).text()) {
-                    $(".checkbox.other").attr("checked", false); //取消全国选中
-                    if(canClick){
-                    	$(dom).addClass('active').attr('disabled', !canClick).parents().siblings('.tab')
-                        .addClass('selected').children('.province').children('.checkbox').attr({
-                            "checked": true
-                        })
-                    }else{
-                    	$(dom).attr('disabled', !canClick).parents().siblings('.tab')
-                        .addClass('selected').children('.province').children('.checkbox').attr({
-                            "checked": true,
-                            "disabled": "disabled"
-                        })
-                        $(dom).parents().slideDown(500);
-                    }
-                }
-            })
-          })
-        },
-        getResult:function(){   /* 选中结果 */
-          //如果选中所有，则转为全国
-          if($(".city").length==$(".city.active").length){
-            $(".checkbox.other").trigger("click");
-            return
-          }
-          this.selectObj = {};
-          $('.result_name').empty()
-          var data = []; //定义一个总数组
-          var cityArr =[]; //定义一个选中城市数组
-          var provincesArr = [];
-          var val = $('.other').parents('.province').text().trim();
-          if ($('.other').is(':checked')) {
-            // data.push(val)
-            data =[{name:val,children:[]}] //全国
-          }
-          $(".tab_content").find(".city.active:not('[disabled]')").each(function () {
-              var length = $(this).parent('.tab_content').find('.city').length; //省份下城市的length
-              var activeLeng = $(this).parent('.tab_content').find('.city.active').length; //省份下选中城市的length
-              let arr =[];
-              // 判断省份下的城市是否等于选中的城市长度,相等就是全部选中
-              if (length == activeLeng) {
-                  $('.tips_btn .tips_d_text.citys').hide();
-                  // data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim())
-                  let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
-                  data.push({
-                      name:province,
-                      children:[]
-                  });
-                  provincesArr.push(province);
-              } else { 
-                  let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
-                  let city = $(this).html()
-                  arr.push({name:city,parent:province})
-                  for(let i =0;i<arr.length;i++){
-                      let obj ={};
-                      obj.name = arr[i].name;
-                      obj.parent = arr[i].parent;
-                      cityArr.push(obj)
-                  }
-                  data.push({
-                      name:province,
-                      children:cityArr
-                  })
-              }
-              if(activeLeng > 0){
-              	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-              	$(".tips_btn .btns .save-btn").removeAttr("disabled");
-              }
-          })
-          //数组对象去重
-          let obj = {};
-          data = data.reduce((cur,next) =>{
-              obj[next.name] ? "" : obj[next.name] = true && cur.push(next);
-              return cur
-          },[]);
-          
-          // 数组筛选
-          let result = data.map(v =>{
-              let filterArr = v.children.filter(s =>{
-                 return s.parent === v.name
-              })
-              return {
-                  name:v.name,
-                  children:filterArr
-              }
-          })
-          var html = '';
-          for (var i = 0; i < result.length; i++) {
-              let children = result[i].children;
-              if( children.length >0){
-                  // 判断每个省份下选中的城市长度，当大于等于4的时候 弹出"选择全省更划算的弹窗"
-                  let childrenArr=[];
-                  if (children.length >= 3 && !this.vipSubisTrial) {
-                      $('.tips_btn .tips_d_text.citys').text("已选择"+children.length+"个市，建议购买“全省”");
-                      $('.tips_btn .tips_d_text.citys').show();
-                  }else{
-                  		$('.tips_btn .tips_d_text.citys').hide();
-                  }
-                  html += `${result[i].name}(`
-                  for(var j = 0;j < children.length;j++){
-                      childrenArr.push(children[j].name)
-                      if (j != children.length - 1) {
-                          html += `${children[j].name}、`
-                      } else {
-                          html += `${children[j].name}`
-                      }
-                  }
-                  if(i !=result.length -1){
-                      html += `)、`
-                  }else{
-                      html += `)`
-                  }
-                  this.selectObj[result[i].name]=childrenArr;//
-              }else{
-                  if(i !=result.length -1){
-                      html += `${result[i].name}、`
-                  }else{
-                      html += `${result[i].name}`
-                  }
-                  this.selectObj[result[i].name]=[];//
-              }
-          }
-          	for (var x = 0; x < provincesArr.length; x++) {
-	            for (var j =x+1; j <provincesArr.length; ) {
-	                if (provincesArr[x] === provincesArr[j]){
-	                    provincesArr.splice(j, 1);
-	                }
-	                else j++;
-	            }
-	        }
-          	if(provincesArr.length > 9){
-          		$('.tips_d_text.all').text("已选择"+provincesArr.length+"个省，建议购买“全国”");
-          		$('.tips_d_text.all').show();
-          		$('.tips_d_text.citys').hide();
-          	}else{
-          		$('.tips_d_text.all').hide();
-          	}
-//        console.log("this.selectObj:",this.selectObj)
-          $('.result_name').append(html)
-          AreaChoose.isOpen()
-        },
-        submitArea:function(){
-          let addCity = $('.result_name').text(); //新增的城市
-          sessionStorage.setItem("vipSubSelectAreaUpgrade",JSON.stringify(AreaChoose.selectObj));
-          history.go(-1);
-        },
-        isAllSelected:function(){
-          var _f = true
-          $($('.tab_content .city')).each(function (index, dom) {
-              if ($(dom).hasClass('active')) {
-                  _f = false
-                  $('.other').prop('checked', false);
-              }
-          })
-          // 如果循环结束仍为true说明 没有全部都被选中
-          if (_f) {
-//            $('.other').prop('checked', true);
-				$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-        		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-          }
-        },
-        isOpen:function(){
-          let pHeight = $('.result_text').height()
-          let minHeight = $('.result_text').css('min-height')
-          let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
-          $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
-//        console.log("高度："+ pHeight,"最小高度"+ minHeight,"行数：" + rows)
-          if(rows == 1){
-              if(length >= 50){
-                  $('.detail').show()
-                  $('.packup').hide()
-              }else{
-                  $('.detail').hide()
-                  $('.packup').hide()
-              }
-          }else if(rows == 2){
-//            console.log($('.result_name').html().trim().length)
-              let length = $('.result_name').html().trim().length;
-              if(length >= 50){
-                  $('.detail').show()
-                  $('.packup').hide()
-              }else{
-                  $('.detail').hide()
-                  $('.packup').hide()
-              }
-              
-          } else{
-              $('.packup').show()
-              $('.detail').hide()
-          }
-        },
-        inintClick:function(){
-//      	$('.tab_content').each(function(){
-//        		AreaChoose.showSelected(false);
-//      	})
-          $('.detail').click(function () {  
-                $('.result_text').removeClass('line_two')
-                $(".result").css("padding-bottom","0.3rem")
-                $(this).hide();
-                $('.packup').show()
-                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
-            })
-            $('.packup').click(function () { 
-                $(".result").css("padding-bottom","0.2rem")
-                $('.result_text').addClass('line_two')
-                $(this).hide();
-                $('.detail').show()
-                $(".select-area-box .area-list").css("margin-top",$('.result_text').height()+20);
-            })
-            $("body").on('click','.slide a',function(){
-                var s = $(this).html()
-                if(s == '#'){
-                    return;
-                }
-                document.querySelector('#' + s).scrollIntoView({block:'center'});
-            })
-          $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
-                if($(this).next('.tab_content:not(:animated)').css("display") == "block"){
-                    $(this).children().children('i').css({
-                        "display":"inline-block",
-                        "transform":"rotate(0)"
-                    })
-                }else{
-                    $(this).children().children('i').css({
-                        "display":"inline-block",
-                        "transform":"rotate(-180deg)"
-                    })
-                }
-                $(this).toggleClass('selected').next('.tab_content:not(:animated)').stop(true, true).slideToggle()
-                $(this).parent().siblings().children('.tab').removeClass('selected');
-                
-            })
-            $('.checkbox').click(function (e) {  
-                e.stopPropagation();
-            })
-            $('.province .checkbox:not(.other)').on('change', function () {
-                var isCheckded = $(this).is(':checked')
-                if (isCheckded) {
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').addClass('active')
-                    $(this).parents('.tab').siblings('.tab_content').find('.city[disabled]').removeClass('active')
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                    AreaChoose.showSelected(false);
-                } else {
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').removeClass(
-                        'active')
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').attr('disabled',false);    
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                    AreaChoose.showSelected(false);
-                }
-            })
-
-            //执行已购买城市函操作dom函数
-            $('.tab_content').on('click', '.city', function () {
-            	AreaChoose.showSelected(false);
-                $(this).toggleClass('active')
-                var isActive = $(this).parent().find('.city.active').length
-                if (isActive) {
-                    var input = $(this).parents('li').find('input.checkbox')
-                    window.input = input
-                    input.prop('checked', true)
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                } else {
-                    $(this).parent('div').siblings('.tab').children().children('.checkbox').prop(
-                        'checked', false)
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                }
-            })
-
-            $('.other').on('change', function () { //选择全国
-              	AreaChoose.reset();
-            })
-
-            $('.save-btn').click(function () {  // 提交
-                AreaChoose.submitArea();              
-            })
-            $('.reset-btn').click(function () {  //重置
-//            if(!$(".other").is(':checked')){
-//              $(".other").trigger("click");
-//            }
-				$('.tab:not(.whole):not(.tab[disabled])').removeClass('selected').children('.province').find(
-                    'input').prop({
-                    'checked': false,
-                    "disabled": false
-                });
-                $('.tab_content').find('.city:not(.city[disabled])').removeClass('active').attr({
-                    "disabled": false,
-                    "checked": false
-                })
-				AreaChoose.showSelected(false);
-				AreaChoose.getResult();
-				sessionStorage.removeItem("vipSubSelectAreaUpgrade");
-            })
-            //
-            if(sessionStorage.vipSubSelectAreaUpgrade!==undefined&&sessionStorage.vipSubSelectAreaUpgrade!==""){
-            	let areas = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade);
-            	for(var province in areas){
-            		if(province === "全国"){
-              			$(".other").prop("checked",true);
-              			AreaChoose.reset();
-            		}
-            	}
-            }
-        },
-        reset:function(){
-           var checked = $(".other").is(':checked');
-            if (checked) {
-                $('.tab_content').slideUp(500)
-                $('.tab span i').css({
-                    "display":"inline-block",
-                    "transform":"rotate(0)"
-                })
-                $('.tab:not(.whole):not(.tab[disabled])').removeClass('selected').children('.province').find(
-                    'input').prop({
-                    'checked': false,
-                    "disabled": false
-                });
-                $('.tab_content').find('.city:not(.city[disabled])').removeClass('active').attr({
-                    "disabled": false,
-                    "checked": false
-                })
-                AreaChoose.getResult();
-                $(".tips_btn .btns .reset-btn").removeAttr("disabled");
-            	$(".tips_btn .btns .save-btn").removeAttr("disabled");
-            }else{
-            	AreaChoose.showSelected(false);
-                AreaChoose.getResult();
-                $(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-            	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-            }
-        }
-      }
-      
-      $(function () {
-            AreaChoose.isOpen()
-            AreaChoose.inintData(); //初始化 已选择和已购买数据
-            AreaChoose.inintPage(); //初始化城市数据
-            AreaChoose.showSelected(false);
-            AreaChoose.showSelected(true);//回显已选择
-            /* 判断已购买的城市 在不在 全部城市里面，在，将按钮置灰，不可点击 */
-
-            AreaChoose.getResult();
-            AreaChoose.inintClick();
-        })
-      //
-        //
-	    function checkObj(obj) {
-		    //检验数组
-		    if (Array.prototype.isPrototypeOf(obj) && obj.length === 0) {
-		        return true;
-		    }
-		    //检验对象
-		    if (Object.prototype.isPrototypeOf(obj) && Object.keys(obj).length === 0) {
-		        return true;
-		    }
-		    return false;
-		}
-	    //
-	    if($(".result_name").text()===""){
-	    	$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-        	$(".tips_btn .btns .save-btn").attr("disabled","disabled");
-	    }
-	    
-	    if(sessionStorage.vipSubSelectAreaUpgrade!==undefined && sessionStorage.vipSubSelectAreaUpgrade!==""){
-	    	$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-            $(".tips_btn .btns .save-btn").removeAttr("disabled");
-	    }
-
-    </script>
-</body>
-
-</html>

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

@@ -474,11 +474,11 @@
                 }
                 //已购买行业
                 $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-                	if(data){
-		            	buyIndustry = data.buyerclass;
+                	if(data.success){
+		            	buyIndustry = data.data.buyerclass;
 		            	buyLen = buyIndustry.length
 		            	buyIndustryLen = buyIndustry.length;
-		            	buyset = Number(data.buyset.buyerclasscount);
+		            	buyset = Number(data.data.buyset.buyerclasscount);
 		            	if(sessionStorage.buyIndustry !== undefined){
 							$(".buyset").text(sessionStorage.buyIndustry);
 						}else{

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

@@ -138,7 +138,7 @@
                     <strong class="weui-dialog__title">快速导入</strong>
                 </div>
                 <div class="weui-dialog__bd">
-                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“<span class="fastICName">未分类</span>"关键词分类内,无需再次手动输入，简化您的订阅过程。
+                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“<span class="fastICName">未分类</span>”关键词分类内,无需再次手动输入，简化您的订阅过程。
 					<p style="color:#888;">注：地区与行业分类以VIP订阅设置内为准,不做导入。</p>
                 </div>
                 <div class="weui-dialog__ft">

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

@@ -153,14 +153,12 @@
 				},false);
 			}else{
 				$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-					if(data){
-						var area = data.allarea;
-					    var buyerclass = data.allindustry;
-					    var startTime = data.start;
-					    var endTime = data.end;
+					if(data.success){
+					    var startTime = data.data.start;
+					    var endTime = data.data.end;
 					    var exprie = {{.T.exprie}};
-					    var vipStatus = Number(data.vipStatus);
-					    orderCode = data.orderCode;
+					    var vipStatus = Number(data.data.vipStatus);
+					    orderCode = data.data.orderCode;
 					    //
 					    var areaHtml = "";
 					    var provinceArr = [];
@@ -169,29 +167,8 @@
 					    var buyerclassHtml = "";
 				//	    var dateName = "";
 					    var dateHtml = "";
-						var oldBuyset = data.buyset;
-				// 	    if (area !== "" && area !== undefined){
-				// 	    	for(var province in area){
-				// 	    		var citys = area[province]
-				// //	    		console.log(citys);
-				// 	    		if(citys.length===0){
-				// 	    			provinceArr.push(province);
-				// 	    		}else{
-				// 	    			for(var i in citys){
-				// 	    				var city = citys[i];
-				// 	    				cityArr.push(city);
-				// 	    			}
-				// 	    		}
-				// 	    	}
-				// 	    	var provinceLen = provinceArr.length;
-				// 	 		var cityLen = cityArr.length;
-				// 	    	areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
-					    	
-				// 			if(checkObj(area)){
-				// 				areaHtml = "全国";
-				// 			}
-				// 	    	$(".area-list").text(areaHtml);
-				// 	    }
+						var oldBuyset = data.data.buyset;
+				
 						if(oldBuyset!==""&&oldBuyset!==undefined){
 							let provinceLen = 0;
 							provinceLen = oldBuyset.areacount
@@ -207,26 +184,15 @@
 								areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 							}
 							$(".area-list").text(areaHtml);
+							let industryLen = 0;
+							industryLen = oldBuyset.buyerclasscount;
+							if(industryLen === -1){
+								buyerclassHtml = "全行业";
+							}else{
+								buyerclassHtml = industryLen+"个行业";
+							}
+							$(".industry-list").text(buyerclassHtml);
 						}
-					    if(buyerclass !== "" && buyerclass !== undefined){
-					    	for(var i in buyerclass){
-					    		var industry = buyerclass[i];
-					    		buyerclassArr.push(industry);
-					    		buyerclassHtml = buyerclassArr.length+"个行业";
-					    	}
-					    	if(checkObj(buyerclass)){
-					    		buyerclassHtml = "全行业";
-					    	}
-					    	$('.industry-list').text(buyerclassHtml);
-					    }
-				//	    if(cycleunit !== "" && cycleunit !== undefined){
-				//	    	if(cycleunit === 1){
-				//	    		dateName = cyclecount + " 年";
-				//	    	}else if(cycleunit === 2){
-				//	    		dateName = cyclecount + " 个月";
-				//	    	}
-				//	    	$(".item_cycle .label_for").text(dateName);
-				//	    }
 					    if(startTime !== "" && endTime !== ""){
 					    	var start = startTime.toString().replace(/-/g, ".");
 					    	var end = endTime.toString().replace(/-/g, ".");

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

@@ -591,17 +591,15 @@
 		var oldBuyset = "";
 	    //
 	    $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-            if (data) {
-                area = data.area;
-			    buyerclass = data.buyerclass;
-			    areas = data.allarea;
-			    industrys = data.allindustry;
-			    cyclecount = data.cyclecount;
-			    startTime = data.start;
-			    starts = data.starttime;
-			    endTime = data.end;
-			    ends = data.endtime;
-				oldBuyset = data.buyset;
+            if (data.success) {
+                area = data.data.area;
+			    buyerclass = data.data.buyerclass;
+			    cyclecount = data.data.cyclecount;
+			    startTime = data.data.start;
+			    starts = data.data.starttime;
+			    endTime = data.data.end;
+			    ends = data.data.endtime;
+				oldBuyset = data.data.buyset;
 			    monthPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 2]);
 			    yearPrice = getsubVipOrderPriceBybuyset(oldBuyset, [1, 1]);
 			    //
@@ -650,18 +648,15 @@
 						areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
 					}
 					$(".item_area .label_for").text(areaHtml);
+					let industryLen = 0;
+					industryLen = oldBuyset.buyerclasscount;
+					if(industryLen === -1){
+						buyerclassHtml = "全行业";
+					}else{
+						buyerclassHtml = industryLen+"个行业";
+					}
+					$(".item_industry .label_for").text(buyerclassHtml);
 				}
-			    if(industrys !== "" && industrys !== undefined){
-			    	for(var i in industrys){
-			    		var industry = industrys[i];
-			    		buyerclassArr.push(industry);
-			    		buyerclassHtml = buyerclassArr.length+"个行业";
-			    	}
-			    	if(checkObj(industrys)){
-			    		buyerclassHtml = "全行业";
-			    	}
-			    	$(".item_industry .label_for").text(buyerclassHtml);
-			    }
 			    if(startTime !== "" && endTime !== "" && startTime !== undefined && endTime !== undefined){
 			    	console.log(startTime)
 			    	var start = startTime.replace(/-/g, ".");
@@ -817,8 +812,8 @@
 			}
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		"area": JSON.stringify(areas),
-	    		"industry": industrys.toString(),
+	    		// "area": JSON.stringify(areas),
+	    		// "industry": industrys.toString(),
 				// "buyset": JSON.stringify(oldBuyset),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":"wx_js",

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

@@ -738,18 +738,16 @@
 	    var ends = "";
 		var oldBuyset = "";
 	 	$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-            if (data) {
-                area = data.area;
-			    buyerclass = data.buyerclass;
-			    buyArea = data.allarea;
-			    buyIndustry = data.allindustry;
-			    cycleunit = data.cycleunit;
-			    cyclecount = data.cyclecount;
-			    startTime = data.start;
-			    starts = data.starttime;
-			    endTime = data.end;
-			    ends = data.endtime;
-				oldBuyset = data.buyset;
+            if (data.success) {
+                area = data.data.area;
+			    buyerclass = data.data.buyerclass;
+			    cycleunit = data.data.cycleunit;
+			    cyclecount = data.data.cyclecount;
+			    startTime = data.data.start;
+			    starts = data.data.starttime;
+			    endTime = data.data.end;
+			    ends = data.data.endtime;
+				oldBuyset = data.data.buyset;
 			}
         },false);
 		console.log("666666666333",oldBuyset)
@@ -846,77 +844,13 @@
 						}
 					}
 				}
-				if(buyArea !== ""&&buyArea !== undefined){
-					for(let province in buyArea){
-			    		let citys = buyArea[province];
-			    		if(citys.length===0){
-							allBuyArea[province] = [];
-			    		}else{
-			    			allBuyArea[province] = citys;
-			    		}
-			    	}
-					for(let province in vipArea){
-						let citys = vipArea[province];
-						if(allBuyArea[province] === undefined){
-							allBuyArea[province] = citys
-						}else{
-							if(checkObj(citys)){
-								allBuyArea[province] = [];
-							}else{
-								let cityArr = [];
-								for(let i in citys){
-									cityArr.push(citys[i]);
-								}
-								for(let i in allBuyArea[province]){
-									cityArr.push(allBuyArea[province][i]);
-								}
-								//
-								for (var x = 0; x < cityArr.length; x++) {
-									for (var j =x+1; j <cityArr.length; ) {
-										if (cityArr[x] === cityArr[j]){
-											cityArr.splice(j, 1);
-										}
-										else j++;
-									}
-								}
-								//
-								allBuyArea[province] = cityArr;
-							}
-						}
-						if(province === "全国"){
-							allBuyArea = {"全国":[]};
-						}
-					}
-				}
-				// if(sessionStorage.vipSubSelectAreaAdd!==""&&sessionStorage.vipSubSelectAreaAdd!==undefined){
-				// 	areasArr = addAreaObj();
-				// }else{
-				// 	areasArr = null;
-				// }
+				
 				if(buyCheck){
 					$(".save_upgrade").removeAttr("disabled");
 				}
 			}else{
 				areas_arr = null
 				// areasArr = null
-				if(buyArea !== ""&&buyArea !== undefined){
-					// for(let province in buyArea){
-			  //   		let citys = buyArea[province];
-			  //   		if(citys.length===0){
-					// 		allArea[province] = [];
-			  //   		}else{
-			  //   			allArea[province] = citys;
-			  //   		}
-			  //   	}
-					for(let province in buyArea){
-			    		let citys = buyArea[province];
-			    		if(citys.length===0){
-							allBuyArea[province] = [];
-			    		}else{
-			    			allBuyArea[province] = citys;
-			    		}
-			    	}
-				}
 				if(area !== ""&&area !== undefined){
 					for(let province in area){
 						let citys = area[province];
@@ -929,33 +863,6 @@
 				}
 			}
 			//
-			// if(sessionStorage.vipSubSelectIndustryAdd!==""&&sessionStorage.vipSubSelectIndustryAdd!==undefined){
-			// 	var vipIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
-			// 	for(let i in vipIndustry){
-		 //    		let industry = vipIndustry[i];
-		 //    		industrysArr.push(industry);
-		 //        }
-			// 	for(let i in vipIndustry){
-			// 		if(industry === "全部行业"){
-			// 			industrysArr = ["全部行业"];
-			// 		}
-			// 	}
-			// }
-			//
-			// if(sessionStorage.vipSubSelectIndustryAdd!==""&&sessionStorage.vipSubSelectIndustryAdd!==undefined){
-			// 	var vipIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
-			// 	for(let i in vipIndustry){
-		 //    		let industry = vipIndustry[i];
-		 //    		industrysArr.push(industry);
-		 //        }
-			// 	for(let i in vipIndustry){
-			// 		if(industry === "全部行业"){
-			// 			industrysArr = ["全部行业"];
-			// 		}
-			// 	}
-			// }else{
-			// 	industrysArr = null;
-			// }
 			
 			if(sessionStorage.vipSubSelectIndustryUpgrade!==""&&sessionStorage.vipSubSelectIndustryUpgrade!==undefined){
 				var vipIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
@@ -976,24 +883,14 @@
 					$(".save_upgrade").removeAttr("disabled");
 				}
 			}else{
-				if(buyIndustry!==""&&buyIndustry!==undefined){
-					for(let i in buyIndustry){
-			    		let industry = buyIndustry[i];
+				if(buyerclass!==""&&buyerclass!==undefined){
+					for(let i in buyerclass){
+			    		let industry = buyerclass[i];
 			    		allIndustry.push(industry);
 			    	}
 			    }
 			}
 			//
-			// if(industrysArr !== null){
-			// 	for (var x = 0; x < industrysArr.length; x++) {
-		 //            for (var j =x+1; j <industrysArr.length; ) {
-		 //                if (industrysArr[x] === industrysArr[j]){
-		 //                    industrysArr.splice(j, 1);
-		 //                }
-		 //                else j++;
-		 //            }
-		 //       	}
-			// }
 			for (var x = 0; x < allIndustry.length; x++) {
 	            for (var j =x+1; j <allIndustry.length; ) {
 	                if (allIndustry[x] === allIndustry[j]){
@@ -1077,33 +974,6 @@
 			
 			//
 			if(nowUpgradeYear >= 1){
-				// ------- 升级价格交叉计算 ---------
-				// let addAreaPriceY = 0;
-				// let addAreaPriceM = 0;
-				// let oldAreaPriceY = 0;
-				// let oldAreaPriceM = 0;
-				// let addIndustryPriceY = 0;
-				// let addIndustryPriceM = 0;
-				// if(areasArr !== null&&industrysArr !== null){
-				// 	addAreaPriceY = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgradeYear,1]);
-				// 	addAreaPriceM = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgrade,2]);
-				// }
-				// if(areasArr !== null){
-				// 	oldAreaPriceY = getsubVipOrderPrice(areasArr,buyIndustry,[nowUpgradeYear,1]);
-				// 	oldAreaPriceM = getsubVipOrderPrice(areasArr,buyIndustry,[nowUpgrade,2]);
-				// }
-				// if(industrysArr !== null){
-				// 	addIndustryPriceY = getsubVipOrderPrice(buyArea,industrysArr,[nowUpgradeYear,1]);
-				// 	addIndustryPriceM = getsubVipOrderPrice(buyArea,industrysArr,[nowUpgrade,2]);
-				// }
-				// price = addAreaPriceY + addAreaPriceM + oldAreaPriceY + oldAreaPriceM + addIndustryPriceY + addIndustryPriceM;
-				// ------- 升级价格交叉计算 ---------
-				// ------- 升级价格差价计算 ---------
-				// let buyset = getBuySet(buyArea,buyIndustry)
-				// let newPriceY = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgradeYear,1]);
-				// let newPriceM = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
-				// let yearprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgradeYear,1]);
-				// let monthprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
 				let newPriceY = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
 				let newPriceM = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
 				let yearprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
@@ -1122,22 +992,6 @@
 				console.log("monthprice",monthprice);
 				console.log(">=1",price);
 			}else{
-				// ------- 升级价格交叉计算 ---------
-				// let addAreaPriceM = 0;
-				// let oldAreaPriceM = 0;
-				// let addIndustryPriceM = 0;
-				// if(areasArr !== null&&industrysArr !== null){
-				// 	addAreaPriceM = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgrade,2]);
-				// }
-				// if(areasArr !== null){
-				// 	oldAreaPriceM = getsubVipOrderPrice(areasArr,buyIndustry,[nowUpgrade,2]);
-				// }
-				// if(industrysArr !== null){
-				// 	addIndustryPriceM = getsubVipOrderPrice(buyArea,industrysArr,[nowUpgrade,2]);
-				// }
-				// price = addAreaPriceM + oldAreaPriceM + addIndustryPriceM;
-				// // ------- 升级价格交叉计算 ---------
-				// let monthprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
 				let monthprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
 				
 				// ------- 升级价格差价计算 ---------
@@ -1218,45 +1072,7 @@
 			    return
 			}
         	$(".save_upgrade").attr("disabled","disabled");
-        	//
-        	// let areas = areasArr;
-        	// let industrys = null;
-        	// if(sessionStorage.vipSubSelectIndustryUpgrade !== undefined){
-        	// 	industrys = JSON.parse(sessionStorage.vipSubSelectIndustryUpgrade);
-        	// }
-        	// let industryArr = "";
-        	// let areaArr = "";
-        	// if(areas !== null){
-        	// 	if(areas["全国"]){
-	        //         areas={};
-	        //     }
-        	// 	areaArr = JSON.stringify(areas);
-        	// }else{
-        	// 	areaArr = "no";
-        	// }
-        	// if(industrys !== null){
-        	// 	if(industrys.length==1&&industrys[0]=="全部行业"){
-	        //         industrys=[];
-	        //     }
-        	// 	industryArr = industrys.join(",");
-        	// }else{
-        	// 	industryArr = "no";
-        	// }
-        	//
-        	// if(areas_arr !== null){
-        	// 	if(areas_arr["全国"]){
-	        //         areas_arr={};
-	        //     }
-        	// 	areas_arr = JSON.stringify(areas_arr);
-        	// }else{
-        	// 	areas_arr = "no";
-        	// }
-        	if(allBuyArea["全国"]){
-                allBuyArea={};
-            }
             //
-            let areaarr = buyArea;
-        	let industryarr = buyIndustry;
         	let allIndustryArr = allIndustry;
         	if(allArea["全国"]){
                 allArea={};
@@ -1286,12 +1102,6 @@
             }
             //
 	    	var param = {
-	    		// "area": areas_arr,
-	    		// "industry": industryArr,
-	    		// "areas": JSON.stringify(areaarr),
-	    		// "areas_arr": areaArr,
-	    		// "industryarr": industryarr.join(","),
-	    		// "allArea": JSON.stringify(allAreaArr),
 	    		"allIndustry": allIndustryArr.join(","),
 	    		"allBuyArea": JSON.stringify(allArea),
 	    		"payWay": "wx_js",
@@ -1300,7 +1110,6 @@
 	    		"addCount":vipCount,
 	    		"addIndustryCount": vipIndustry,
 				"buyset":JSON.stringify(areaObj()),
-				"oldbuyset":JSON.stringify(oldBuyset),
 	    	}
 	    	console.log(param)
 	    	$DoPost("/subscribepay/renewUpgrade/renewUpgradeCreateOrder",param,function(r){