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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/updateArea.js

@@ -107,8 +107,16 @@ $(function () {
                 let hasActiveCount = $(dom).find('button.active').length
 
                 if (hasActiveCount > buyCount) {
-                    dBuySetCityCount += buyCount
-                    dAddedCityCount += (hasActiveCount - buyCount)
+                    // dBuySetCityCount += buyCount
+                    // dAddedCityCount += (hasActiveCount - buyCount)
+
+					if (alreadySelectedCount - hasActiveCount === 0) {
+						dBuySetCityCount += buyCount
+						dBuySetProvinceCount ++
+					} else {
+						dBuySetCityCount += buyCount
+						dAddedCityCount += (hasActiveCount - buyCount)
+					}
                 } else {
                     // 操作已购买的数量
                     dBuySetCityCount += hasActiveCount
@@ -210,6 +218,7 @@ $(function () {
     }
 
     // 求需要M的数量
+	// window.getResultWithMCount = getResultWithMCount
     function getResultWithMCount() {
         let added = {
             country: 0,
@@ -234,15 +243,24 @@ $(function () {
             } else {
                 added.country = 0
                 let pName = $(dom).find('.province').text().replace(/\s+ | [\r\n]/g, '')
-                // 获取当前dom下有几个按钮有active样式
+                // 获取当前dom下有几个按钮有active样式(点亮和灰色按钮的总数)
                 let activeButtonLength = $(dom).find('button.active').length
 
                 // 判断该省是否有购买过的城市
                 if ($(dom).attr('data-buy-city-count')) {
                     let buyCityCount = $(dom).attr('data-buy-city-count') - 0
+					// 获取城市不可点击的数量(灰色按钮的数量)
+					let alreadySelectedCount = $(dom).find('button[disabled]').length
+					// 得到你需要付钱的数量(可能是负值)
                     let aCityCount = activeButtonLength - buyCityCount
+					
                     if (aCityCount > 0) {
-                        added.city[pName] = aCityCount
+						// 说明有购买的城市
+						if (activeButtonLength - alreadySelectedCount === 0) {
+							added.province ++
+						} else {
+							added.city[pName] = aCityCount
+						}
                     } else {
                         // 选不到购买的个数
                     }
@@ -496,18 +514,18 @@ $(function () {
             // 获取省的名字，并去空格.回车.换行
             let provinceName = $(dom).find('.province').text().replace(/\s+ | [\r\n]/g, '')
             for (let c in citys) {
-                let areaLeng;
-                try{
-                	areaLeng = data.area[c].length
-                	if (c === provinceName && areaLeng !== 0) {
-                	    $(dom).attr('data-buy-city-count', citys[c])
-                	}
-                }catch(e){
-                	//TODO handle the exception
-                	if (c === provinceName) {
-                	    $(dom).attr('data-buy-city-count', citys[c])
-                	}
-                }
+				// let areaLeng;
+				// try{
+				// 	areaLeng = data.area[c].length
+				// 	if (c === provinceName && areaLeng !== 0) {
+				// 	    $(dom).attr('data-buy-city-count', citys[c])
+				// 	}
+				// }catch(e){
+					//TODO handle the exception
+					if (c === provinceName) {
+					    $(dom).attr('data-buy-city-count', citys[c])
+					}
+				// }
             }
         })
         $('.add_new').hide()
@@ -574,7 +592,7 @@ $(function () {
         }else{
             $(this).prop('checked',false);
             $(this).parents('li').find('.city').removeClass('active');
-        }
+        };
         getResult();
         showOther();
     })
@@ -625,11 +643,9 @@ $(function () {
         //     province: 0,
         //     city: 0
         // }
-		//
-		sessionStorage.removeItem("vipAddCount")
-		sessionStorage.removeItem("vipSubSelectCity")
-		sessionStorage.removeItem("vipSubSelectAreaUpgrade")
-		sessionStorage.removeItem("vipSubSelectAreaAdd")
+		// sessionStorage.removeItem("vipAddCount");
+		// sessionStorage.removeItem("vipSubSelectAreaAdd");
+		// sessionStorage.removeItem("vipSubSelectCity");
         // 数组置0，在重新从数据中计算初始状态结果并返回
         for (let i in alreadyBuy) {
             for(let ii in alreadyBuy[i]) {
@@ -673,38 +689,57 @@ $(function () {
 	function showCityTips(dom){
 		let isAll = $(".area-list").attr("data-buy-province-count");
 		if(Number(isAll)===-1){
-			return	
+			return
 		}
 		let activeCityLength = $(dom).parent().find('.city.active').length;
 		let selectedCityLength = $(dom).parent().find('.city.active:not([disabled])').length;
 		let disabledCityLength = $(dom).parent().find('.city[disabled]').length;
 		let cityLength = $(dom).parent().find('.city').length;
-		let dataCount = $(dom).parent().parent().attr("data-buy-city-count");
-		if(dataCount === undefined){
-			dataCount = 0;
-		}else{
-			if(Number(dataCount) === disabledCityLength){
-				dataCount = 0;
+		// let dataCount = Number($(dom).parent().parent().attr("data-buy-city-count"));
+		// if(dataCount === undefined){
+		// 	dataCount = 0;
+		// }else{
+		// 	if(Number(dataCount) !== disabledCityLength){
+		// 		if(disabledCityLength === 0){
+		// 			dataCount = 0;
+		// 		}else{
+		// 			dataCount = dataCount - disabledCityLength;
+		// 		}
+		// 	}
+		// }
+		// let countShow = 0;
+		let showCounts = selectedCityLength + disabledCityLength;
+		// let showCount = selectedCityLength - dataCount;
+		if(showCounts > 2){
+			if(selectedCityLength === 0){
+				$(".tips_d_text").hide();
 			}else{
-				dataCount = dataCount - disabledCityLength;
+				$(".tips_d_text").text("已选择"+showCounts+"个市，建议购买“全省”");
+				$(".tips_d_text").show();
 			}
-		}
-		let showCount = selectedCityLength - dataCount;
-		if(showCount > 2){
-			$(".tips_d_text").text("已新增"+showCount+"个市，建议新增“全省”");
-			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();
 		}
-		if(showCount === cityLength){
+		if(showCounts === cityLength){
 			showOther();
 		}
 	}
 	
 	function showOther(){
-		let showCounts = newlyAdded.province;
+		let areaCount = areaData.data.buyset.areacount;
+		let areaSelect = $('.checkbox:checked:not([disabled])').length;
+		if(areaSelect === 0){
+			$(".tips_d_text").hide();
+			return
+		}
+		let showCounts = 0;
+		if(areaCount === -1){
+			$(".tips_d_text").hide();
+		}else{
+			showCounts = newlyAdded.province + areaCount;
+		}
 		if(showCounts > 9){
-			$(".tips_d_text").text("已新增"+showCounts+"个省，建议新增“全国”")
+			$(".tips_d_text").text("已选择"+showCounts+"个省，建议购买“全国”")
 			$(".tips_d_text").show();
 		}else{
 			$(".tips_d_text").hide();
@@ -713,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/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -805,14 +805,14 @@
 				$(".surePay").on("click", function() {
 					$(".loading_").show();
 					let isvip_order=$(".media").attr("isviporder");
+					var order_code_vip=$(".order_code_vip").html();
 					//vip支付；
-					if (isvip_order=="true"){
+					if (order_code_vip!=""){
 						var orderCode =$(".media").attr("eid");
 						if(!canpay)return  
 		            	canpay=false;
 			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode,"pay_way":pay_way},function(r){
 			            	if(r.success){
-								alert( JSON.stringify(r))
 			            		  if(pay_way=="wx_app"){
 					                  JyObj.wxPay(r.data.res);
 					                }else{
@@ -837,14 +837,15 @@
 							if (data.success){
 								try {
 					                if(pay_way=="wx_app"){
-					                  JyObj.wxPay(data.data)
+					                	alert("wx");
+					                	JyObj.wxPay(data.data);
 					                }else{
-					                  JyObj.aliPay(data.data)
+					                  JyObj.aliPay(data.data);
 					                }
-					                $('.pay_way').hide(200)
+					                $('.pay_way').hide(200);
 					                checkPaySuccess(data.order);
 								} catch (e) {
-									alert(e)
+									alert(e);
 								}
 							}
 				            $(".loading_").hide();
@@ -1066,7 +1067,7 @@
 			function choosePayWay_vip(orderMoney,orderCode,e){
 				$(".pay_way").show();
 				$(".money_pay").text("￥"+orderMoney);
-				$(".order_code_vip").text(orderCode)
+				$(".order_code_vip").text(orderCode);
 				
 				$("#wx").prop("checked",true);
 				$("#zfb").prop("checked",false);
@@ -1417,7 +1418,7 @@
 		       	             	}else{
 		       	             		orderMoney_vip=orderMoney_vip1;
 		       	             	}
-									console.log(orderMoney_vip)
+								console.log(orderMoney_vip,"===",orderMoney)
 		                        if(orderStatus_vip==0){
 		                        	orderStatus_vip="待付款"
 		                        	orderHtml=""
@@ -1426,7 +1427,7 @@
 		                        	iconHtml=""
 		                        	iconHtml+='<div class="card-footer">'
 												+'<a  class="btn cancle" onclick="cancelOrder('+id_vip+',this)">取消订单</a>'
-												+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\','+orderMoney+',&quot;'+orderMoney+'&quot;,this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
+												+'<a href="javascript:void(0)" onclick="choosePayWay_vip(\''+orderMoney_vip+'\',&quot;'+orderCode_vip+'&quot;,this)" class="gopay_btn pay" filterid="'+obj.filter_id+'" token="'+token_vip+'" id="'+id_vip+'" orderCode='+orderCode_vip+'>去支付</a>'
 											+'</div>'
 		                        }else if(orderStatus_vip==1){
 		                        	orderStatus_vip="已完成";

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

@@ -258,269 +258,272 @@
         <script src="/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 		<script>
-           // 点击导航跳转
-            $("body").on('click','.slide a',function(){
-                var s = $(this).html()
-                if(s == '#'){
-                    return;
-                }
-                document.querySelector('#' + s).scrollIntoView({block:'center'});
-            })
-            
-            function insertIndustryItem (letter, industryArr = []) {
-                if (!letter) return
-                var query = `#${letter[0].toUpperCase()} .item_industry_list`
-                var industryItemContainer = $(query)
-                var buttonArr = []
+		   //
+		   // 点击导航跳转
+			$("body").on('click','.slide a',function(){
+				var s = $(this).html()
+				if(s == '#'){
+					return;
+				}
+				document.querySelector('#' + s).scrollIntoView({block:'center'});
+			})
+			
+			function insertIndustryItem (letter, industryArr = []) {
+				if (!letter) return
+				var query = `#${letter[0].toUpperCase()} .item_industry_list`
+				var industryItemContainer = $(query)
+				var buttonArr = []
 
-                for (var i = 0; i < industryArr.length; i++) {
-                    buttonArr.push(`<button class="industry_item" ${industryArr[i].disabled ? 'disabled': ''}>${industryArr[i].name}</button>`)
-                }
-                industryItemContainer.html(buttonArr.join(''))
-            }
-            
-            function findSelectedIndustry () {
-                var buttons = $('.select-area-box .list button')
-                // 找到已选择的数组(有active类的数组)
-                var selectedArr = []
-                buttons.each(function(){
-                    if ($(this).hasClass('active')) {
-                        if($(this).attr("disabled")!="disabled"){
-                        	if($(this).text() === "全部行业"){
-                        		
-                        	}
-                          	selectedArr.push($(this).text())
-                        }
-                    }
-                })
-                if(selectedArr.length > 0){
-                	let adds = selectedArr.length+buyIndustryLen
-                	if(buyset !== "全部行业"){
-                		if(adds <= buyset){
-	                		$(".addUpgrade").hide();
-		            		buyLen = adds;
-		            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
-		            		$(".tips_btn .btns .save-btn").attr("disabled","disabled");
+				for (var i = 0; i < industryArr.length; i++) {
+					buttonArr.push(`<button class="industry_item" ${industryArr[i].disabled ? 'disabled': ''}>${industryArr[i].name}</button>`)
+				}
+				industryItemContainer.html(buttonArr.join(''))
+			}
+			
+			function findSelectedIndustry () {
+				var buttons = $('.select-area-box .list button')
+				// 找到已选择的数组(有active类的数组)
+				var selectedArr = []
+				buttons.each(function(){
+					if ($(this).hasClass('active')) {
+						if($(this).attr("disabled")!="disabled"){
+							if($(this).text() === "全部行业"){
+								
+							}
+							selectedArr.push($(this).text())
+						}
+					}
+				})
+				if(selectedArr.length > 0){
+					let adds = selectedArr.length+buyIndustryLen
+					if(buyset !== "全部行业"){
+						if(adds <= buyset){
+							$(".addUpgrade").hide();
+							buyLen = adds;
+							$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+							$(".tips_btn .btns .save-btn").attr("disabled","disabled");
 							$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-		            	}else{
-		            		let add = adds - buyset;
-		            		$(".addUpgrade").text("已新增："+add+"个行业");
-		            		$(".addUpgrade").show();
-		            		$(".tips_btn .btns .save-btn").removeAttr("disabled");
+						}else{
+							let add = adds - buyset;
+							$(".addUpgrade").text("已新增："+add+"个行业");
+							$(".addUpgrade").show();
+							$(".tips_btn .btns .save-btn").removeAttr("disabled");
 							$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-		            	}
-                	}else{
-                		if(selectedArr[0] === "全部行业"){
-                			$(".buyset").text("已购买：全部行业");
-                		}else{
-                			let adds = buyIndustry.length + selectedArr.length
-                			$(".buyset").text("已购买："+buyset);
-                		}
-                	}
-                }else{
-                	if(buyset !== "全部行业"){
-                		$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset+"个行业")
-                	}else{
-                		$(".buyset").text("已购买："+buyset)
-                	}
-                }
-                for(var i in selectedArr){
-                	if(selectedArr[i] === "全部行业"){
-                		if(buyset !== "全部行业"){
-                			$(".buyset").text("已购买："+buyIndustry.length+"/"+buyset+"个行业");
-	                		$(".addUpgrade").text("已新增：全部行业");
-	                		$(".addUpgrade").show();
-	                		$(".tips_btn .btns .save-btn").removeAttr("disabled");
+						}
+					}else{
+						if(selectedArr[0] === "全部行业"){
+							$(".buyset").text("已购买：全部行业");
+						}else{
+							let adds = buyIndustry.length + selectedArr.length
+							$(".buyset").text("已购买："+buyset);
+						}
+					}
+					// 显示隐藏优惠tips
+					let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
+					let showCount = buyset - disabledCount;
+					let showCounts = selectedArr.length - showCount;
+					let countShow = showCounts + buyset
+					if (countShow > 3) {
+						$('.tips_btn .tips_d_text').text("已选择"+countShow+"个行业，建议购买“全部行业”");
+						$('.tips_btn .tips_d_text').slideDown();
+					} else {
+						$('.tips_btn .tips_d_text').slideUp()
+					}
+				}else{
+					if(buyset !== "全部行业"){
+						$(".buyset").text("已购买："+buyIndustryLen+"/"+buyset+"个行业")
+					}else{
+						$(".buyset").text("已购买："+buyset)
+					}
+					$('.tips_btn .tips_d_text').slideUp()
+				}
+				for(var i in selectedArr){
+					if(selectedArr[i] === "全部行业"){
+						if(buyset !== "全部行业"){
+							$(".buyset").text("已购买："+buyIndustry.length+"/"+buyset+"个行业");
+							$(".addUpgrade").text("已新增：全部行业");
+							$(".addUpgrade").show();
+							$(".tips_btn .btns .save-btn").removeAttr("disabled");
 							$(".tips_btn .btns .reset-btn").removeAttr("disabled");
-                		}
-                	}
-                }
-                // 显示隐藏优惠tips
-                let disabledCount = $("ul.list li.list_item .item_industry_list").find(".industry_item[disabled]").length;
-                let showCount = buyset - disabledCount;
-                let showCounts = selectedArr.length - showCount;
-                if (showCounts > 3) {
-                	$('.tips_btn .tips_d_text').text("已新增"+showCounts+"个行业，建议新增“全部行业”");
-                    $('.tips_btn .tips_d_text').slideDown();
-                } else {
-                    $('.tips_btn .tips_d_text').slideUp()
-                }
-          
-                selectedIndustryArr = selectedArr
-                
-                var selectedStr = selectedArr.join('、')
-                $('.result .result_name').text(selectedStr)
+						}
+					}
+				}
+		  
+				selectedIndustryArr = selectedArr
+				
+				var selectedStr = selectedArr.join('、')
+				$('.result .result_name').text(selectedStr)
 
-                if (selectedArr.length === 0) {
+				if (selectedArr.length === 0) {
 //                  var allButton = $('#all button')
 //                  allButton.trigger('click')
 //                  $('.result .result_name').text(allButton.text())
 					$(".addUpgrade").hide();
 					$(".tips_btn .btns .save-btn").attr("disabled","disabled");
 					$(".tips_btn .btns .reset-btn").attr("disabled","disabled");
-                }
-                if (selectedArr.length === buttons.length - 1) {
-                    // 除全部行业外所有按钮都被选中了
-                    $('#all button').trigger('click');
-                }
-//              $(".select-area-box .list").css("margin-top",$(".result").height()+20);
-            }
-                      
-            function showSelect(arr,canclick){
-              if(!arr)return
-              arr.forEach(v => {
-                $($('.industry_item')).each(function (index, dom) {
-                	if(canclick){
-                		if (v!="全部行业"){
-	                      	$('#all').children().children('button').removeClass('active');
-	                      	$(".tips_btn .btns .save-btn").removeAttr("disabled","disabled");
+				}
+				if (selectedArr.length === buttons.length - 1) {
+					// 除全部行业外所有按钮都被选中了
+					$('#all button').trigger('click');
+				}
+				$(".select-area-box .list").css("margin-top",$(".result").height()+20);
+			}
+					  
+			function showSelect(arr,canclick){
+			  if(!arr)return
+			  arr.forEach(v => {
+				$($('.industry_item')).each(function (index, dom) {
+					if(canclick){
+						if (v!="全部行业"){
+							$('#all').children().children('button').removeClass('active');
+							$(".tips_btn .btns .save-btn").removeAttr("disabled","disabled");
 							$(".tips_btn .btns .reset-btn").removeAttr("disabled","disabled");
-	                    }
-                		if (v == $(dom).text()) {
-	                       $(dom).addClass("active").attr({"disabled":!canclick})
-	                    }
-                	}else{
-                		if (v == $(dom).text()) {
-	                       $(dom).attr({"disabled":!canclick});
-	                    }
-                		if(v == "全部行业"){
-                			$(".industry_item").each(function(){
-                				$(this).attr({"disabled":!canclick});
-                			});
-                			$(".tips_d_money").hide();
-                		}
-                	}
-                })
-              })
-            }
-            
-            function flushPrice(){
-              if(vipSubisTrial){
-                $('.tips_d_money').css("display","none");
-              }else{
-                var price=getsubVipOrderPrice(selectedAreaObj,selectedIndustryArr,timeSelect);
-                $('.tips_d_money').text('￥'+price);
-              }
-            }
-            
-            // 每个button的点击事件
-            $('.select-area-box .list').on('click', 'button', function (e) {
+						}
+						if (v == $(dom).text()) {
+						   $(dom).addClass("active").attr({"disabled":!canclick})
+						}
+					}else{
+						if (v == $(dom).text()) {
+						   $(dom).attr({"disabled":!canclick});
+						}
+						if(v == "全部行业"){
+							$(".industry_item").each(function(){
+								$(this).attr({"disabled":!canclick});
+							});
+							$(".tips_d_money").hide();
+						}
+					}
+				})
+			  })
+			}
+			
+			function flushPrice(){
+			  if(vipSubisTrial){
+				$('.tips_d_money').css("display","none");
+			  }else{
+				var price=getsubVipOrderPrice(selectedAreaObj,selectedIndustryArr,timeSelect);
+				$('.tips_d_money').text('￥'+price);
+			  }
+			}
+			
+			// 每个button的点击事件
+			$('.select-area-box .list').on('click', 'button', function (e) {
 
-                $(this).toggleClass('active')
-                // 如果点击全部行业，则其他所有按钮都取消active
-                if ($(this).parents('li')[0].id === 'all') {
-                    $('.select-area-box .list button').removeClass('active')
-                    $('#all button').addClass('active')
-                } else {
-                    $('#all button').removeClass('active')
-                }
-                
-                findSelectedIndustry()
-                flushPrice()
-            })
-            // 重置按钮事件
-            $('.reset-btn').on('click', function () {
+				$(this).toggleClass('active')
+				// 如果点击全部行业，则其他所有按钮都取消active
+				if ($(this).parents('li')[0].id === 'all') {
+					$('.select-area-box .list button').removeClass('active')
+					$('#all button').addClass('active')
+				} else {
+					$('#all button').removeClass('active')
+				}
+				
+				findSelectedIndustry()
+				flushPrice()
+			})
+			// 重置按钮事件
+			$('.reset-btn').on('click', function () {
 //            $("#all .industry_item").trigger("click");
 				$('.select-area-box .list button').removeClass('active');
-                showSelect(buyIndustry,false);
-                findSelectedIndustry();
-                sessionStorage.removeItem("vipSubSelectIndustryAdd");
-                sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
-                $('.tips_btn .btns button').removeAttr('disabled');
-            })
-           
-            //=======================
-             
+				showSelect(buyIndustry,false);
+				findSelectedIndustry();
+				//sessionStorage.removeItem("vipSubSelectIndustryAdd");
+				//sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
+				$('.tips_btn .btns button').removeAttr('disabled');
+			})
+		   
+			//=======================
+			 
 
-             // 确认按钮事件
-            $('.save-btn').on('click', function () {
-            	var selectedIndustrysArr = ["全部行业"];
-        		if(selectedIndustryArr[0] !== "全部行业"){
-        			let reduce = buyset - buyIndustry.length
-        			if(reduce > 0){
-        				selectedIndustrysArr = selectedIndustryArr.slice(0, -reduce);
-        			}else{
-        				selectedIndustrysArr = selectedIndustryArr;
-        			}
-        		}
-        		sessionStorage.buyIndustry = $(".buyset").html();
-        		sessionStorage.addIndustry = $(".addUpgrade").html();
-        		sessionStorage.setItem("vipSubSelectIndustryAdd",JSON.stringify(selectedIndustrysArr));
-                sessionStorage.setItem("vipSubSelectIndustryUpgrade",JSON.stringify(selectedIndustryArr));
-                history.go(-1);
-            })
-                       
-            var selectedIndustryArr //已选择行业
-            var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
-            var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
-            var vipSubisTrial = false;
-            var buyIndustry = "";//已购买
-            var buyIndustryLen = 0;
-            var buyset = "";
-            var buyLen = 0;
-            $(function(){
-              try{
-                if(sessionStorage.getItem("vipSubSelectIndustryUpgrade")){
-                  selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustryUpgrade"));
-                }else{
-                  selectedIndustryArr=[];
-                }
-                if(sessionStorage.getItem("vipSubSelectAreaUpgrade")){
-                  selectedAreaObj=JSON.parse(sessionStorage.getItem("vipSubSelectAreaUpgrade"));
-                }
-                if(sessionStorage.getItem("vipSubSelectTime")){
-                  this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
-                }
-                //已购买行业
-                $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
-                	if(data){
-		            	buyIndustry = data.buyerclass;
-		            	buyLen = buyIndustry.length
-		            	buyIndustryLen = buyIndustry.length;
-		            	buyset = Number(data.buyset.buyerclasscount);
-		            	if(sessionStorage.buyIndustry !== undefined){
+			 // 确认按钮事件
+			$('.save-btn').on('click', function () {
+				var selectedIndustrysArr = ["全部行业"];
+				if(selectedIndustryArr[0] !== "全部行业"){
+					let reduce = buyset - buyIndustry.length
+					if(reduce > 0){
+						selectedIndustrysArr = selectedIndustryArr.slice(0, -reduce);
+					}else{
+						selectedIndustrysArr = selectedIndustryArr;
+					}
+				}
+				sessionStorage.buyIndustry = $(".buyset").html();
+				sessionStorage.addIndustry = $(".addUpgrade").html();
+				sessionStorage.setItem("vipSubSelectIndustryAdd",JSON.stringify(selectedIndustrysArr));
+				sessionStorage.setItem("vipSubSelectIndustryUpgrade",JSON.stringify(selectedIndustryArr));
+				history.go(-1);
+			})
+					   
+			var selectedIndustryArr //已选择行业
+			var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
+			var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+			var vipSubisTrial = false;
+			var buyIndustry = "";//已购买
+			var buyIndustryLen = 0;
+			var buyset = "";
+			var buyLen = 0;
+			$(function(){
+			  try{
+				if(sessionStorage.getItem("vipSubSelectIndustryUpgrade")){
+				  selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustryUpgrade"));
+				}else{
+				  selectedIndustryArr=[];
+				}
+				if(sessionStorage.getItem("vipSubSelectAreaUpgrade")){
+				  selectedAreaObj=JSON.parse(sessionStorage.getItem("vipSubSelectAreaUpgrade"));
+				}
+				if(sessionStorage.getItem("vipSubSelectTime")){
+				  this.timeSelect=JSON.parse(sessionStorage.getItem("vipSubSelectTime"));
+				}
+				//已购买行业
+				$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
+					if(data.success){
+						buyIndustry = data.data.buyerclass;
+						buyLen = buyIndustry.length
+						buyIndustryLen = buyIndustry.length;
+						buyset = Number(data.data.buyset.buyerclasscount);
+						if(sessionStorage.buyIndustry !== undefined){
 							$(".buyset").text(sessionStorage.buyIndustry);
 						}else{
 							if(buyset === -1){
-			            		buyset = "全部行业";
-			            		$(".buyset").text("已购买：/"+buyset);
-			            	}else{
-			            		$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
-			            	}
+								buyset = "全部行业";
+								$(".buyset").text("已购买：/"+buyset);
+							}else{
+								$(".buyset").text("已购买："+buyLen+"/"+buyset+"个行业");
+							}
 						}
 						if(sessionStorage.addIndustry !== undefined){
 							$(".addUpgrade").text(sessionStorage.addIndustry);
 						}
-                	}
-                },false);
-                if(checkObj(buyIndustry)){
-                	buyIndustry = ["全部行业"]
-                }
-                //是否试用界面
-                if(sessionStorage.getItem("vipSubisTrial")) vipSubisTrial=true;
-              }catch(e){
-                console.log(e)
-              }
-              //已选择
-              showSelect(selectedIndustryArr,true);
-              showSelect(buyIndustry,false);
-              findSelectedIndustry();
-              flushPrice();
-            })
-            
-            //
-		    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;
+					}
+				},false);
+				if(checkObj(buyIndustry)){
+					buyIndustry = ["全部行业"]
+				}
+				//是否试用界面
+				if(sessionStorage.getItem("vipSubisTrial")) vipSubisTrial=true;
+			  }catch(e){
+				console.log(e)
+			  }
+			  //已选择
+			  showSelect(selectedIndustryArr,true);
+			  showSelect(buyIndustry,false);
+			  findSelectedIndustry();
+			  flushPrice();
+			})
+			
+			//
+			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;
 			}
 		
-        </script>
+		</script>
     </body>
 </html>

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

@@ -70,9 +70,6 @@
 			var starts = {{.T.startTime}};
 			var ends = {{.T.endTime}};
 			var orderCode = "";
-//			console.log("orderId",orderId)
-//			console.log("starts",starts)
-//			console.log("ends",ends)
 			var nowTime = new Date().getTime();
 			if(orderId !== "" && orderId !== undefined){
 				$DoPost("/subscribepay/renewUpgrade/getExprie", {"orderId":orderId}, function (r) {
@@ -84,143 +81,126 @@
 						orderCode = r.orderCode;
 						//
 						var areaHtml = "";
-					    var provinceArr = [];
-					    var cityArr = [];
-					    var buyerclassArr = [];
-					    var buyerclassHtml = "";
-					    var endstime = new Date(ends).getTime();
+						var provinceArr = [];
+						var cityArr = [];
+						var buyerclassArr = [];
+						var buyerclassHtml = "";
+						var endstime = new Date(ends).getTime();
 						if (area !== "" && area !== undefined){
-					    	for(var province in area){
-					    		var citys = area[province]
+							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(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);
-					    }
-					    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(starts !== "" && ends !== ""){
-					    	let start = starts.toString().replace(/-/g, ".");
-					    	let end = ends.toString().replace(/-/g, ".");
-					    	let dateHtml = start + " - " + end;
-					    	$(".date-span").text(dateHtml);
-					    }
-					    if(vipStatus === 2&&nowTime>endstime){
+							$(".area-list").text(areaHtml);
+						}
+						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(starts !== "" && ends !== ""){
+							let start = starts.toString().replace(/-/g, ".");
+							let end = ends.toString().replace(/-/g, ".");
+							let dateHtml = start + " - " + end;
+							$(".date-span").text(dateHtml);
+						}
+						if(vipStatus === 2&&nowTime>endstime){
 							return   
-					    }
-					    if(exprie === "will"){
-					    	let a = (endstime/1000) - (86400 * 3);
-					    	let b = nowTime/1000;
-					    	let c = endstime/1000;
-					    	if(a < b&&b < c){
-					    		$(".renew_service").show();
-						    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
-						    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
-					    	}
-					    }else{
+						}
+						if(exprie === "will"){
+							let a = (endstime/1000) - (86400 * 3);
+							let b = nowTime/1000;
+							let c = endstime/1000;
+							if(a < b&&b < c){
+								$(".renew_service").show();
+								$("#exprie").text("VIP订阅服务即将到期，请及时续费")
+								$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+							}
+						}else{
 //					    	$(".renew_service").show();
-					    	$(".aginBuy").show();
-					  	  	$(".free_service").show();
-					    }
+							$(".aginBuy").show();
+							$(".free_service").show();
+						}
 					}
 				},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;
-					    var exprie = {{.T.exprie}};
-					    var vipStatus = Number(data.vipStatus);
-					    orderCode = data.orderCode;
-					    //
-					    var areaHtml = "";
-					    var provinceArr = [];
-					    var cityArr = [];
-					    var buyerclassArr = [];
-					    var buyerclassHtml = "";
+					if(data.success){
+						var startTime = data.data.start;
+						var endTime = data.data.end;
+						var exprie = {{.T.exprie}};
+						var vipStatus = Number(data.data.vipStatus);
+						orderCode = data.data.orderCode;
+						//
+						var areaHtml = "";
+						var provinceArr = [];
+						var cityArr = [];
+						var buyerclassArr = [];
+						var buyerclassHtml = "";
 				//	    var dateName = "";
-					    var dateHtml = "";
-					    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)){
+						var dateHtml = "";
+						var oldBuyset = data.data.buyset;
+				
+						if(oldBuyset!==""&&oldBuyset!==undefined){
+							let provinceLen = 0;
+							provinceLen = oldBuyset.areacount
+							let citys = oldBuyset.citys
+							let cityLen = 0;
+							let areaHtml = "";
+							for(let i in citys){
+								cityLen += citys[i];
+							}
+							if(provinceLen === -1){
 								areaHtml = "全国";
+							}else{
+								areaHtml = provinceLen+"个省级区域、"+cityLen+"个市";
+							}
+							$(".area-list").text(areaHtml);
+							let industryLen = 0;
+							industryLen = oldBuyset.buyerclasscount;
+							if(industryLen === -1){
+								buyerclassHtml = "全行业";
+							}else{
+								buyerclassHtml = industryLen+"个行业";
 							}
-					    	$(".area-list").text(areaHtml);
-					    }
-					    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, ".");
-					    	dateHtml = start + " - " + end;
-					    	$(".date-span").text(dateHtml);
-					    }
-					    if(exprie === "will"){
-				    		$(".renew_service").show();
-					    	$("#exprie").text("VIP订阅服务即将到期，请及时续费")
-					    	$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
-					    }else{
+							$(".industry-list").text(buyerclassHtml);
+						}
+						if(startTime !== "" && endTime !== ""){
+							var start = startTime.toString().replace(/-/g, ".");
+							var end = endTime.toString().replace(/-/g, ".");
+							dateHtml = start + " - " + end;
+							$(".date-span").text(dateHtml);
+						}
+						if(exprie === "will"){
+							$(".renew_service").show();
+							$("#exprie").text("VIP订阅服务即将到期，请及时续费")
+							$(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+						}else{
 //					    	$(".renew_service").show();
 							$(".aginBuy").show();
-					    	$(".free_service").show();
-					    }
+							$(".free_service").show();
+						}
 					}
 				},false);	
 			}
@@ -235,17 +215,17 @@
 			$(".aginBuy").on("click",function(){
 				window.location.replace("/weixin/pay/vipsubscribe_new?orderCode="+orderCode);
 			});
-	        //
-		    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;
+			//
+			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;
 			}
 			
 		</script>

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

@@ -70,7 +70,7 @@
                             <p>
                                 <!-- 正常点击vip首页续费进入显示去升级，即将到期点击vip首页续费显示订阅修改 -->
                                 <a href="/jyapp/vipsubscribe/toUpgradePage" class="go_update renew_upgrade">去升级</a>
-                                <a href="/jyapp/vipsubscribe/vipsubscribe_willExpire" class="go_update renew_update">订阅修改</a>
+                                <a onclick="toWillExpire()" class="go_update renew_update">订阅修改</a>
                             </p>
                         </div>
                 </li>
@@ -536,127 +536,112 @@
 	    }
         
         //
-        var area = "";
-        var areas = "";
-	    var buyerclass = "";
-	    var industrys = "";
-	    var cycleunit = "";
-	    var cyclecount = "";
-	    var startTime = "";
-	    var starts = "";
-	    var endTime = "";
-	    var ends = "";
-	    var monthPrice = "";
-	    var yearPrice = "";
-	    //
-	    $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;
-			    monthPrice = getsubVipOrderPrice(areas, industrys, [1, 2]);
-			    yearPrice = getsubVipOrderPrice(areas, industrys, [1, 1]);
-			    //
-			    var areaHtml = "";
-			    var provinceArr = [];
-			    var cityArr = [];
-			    var buyerclassArr = [];
-			    var buyerclassHtml = "";
-			    var dateName = "";
-			    var dateHtml = "";
-			    if (areas !== "" && areas !== undefined){
-			    	for(var province in areas){
-			    		var citys = areas[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(areas)){
-						areaHtml = "全国";
-					}
-			    	$(".item_area .label_for").text(areaHtml);
-			    }
-			    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, ".");
-			    	var end = endTime.replace(/-/g, ".");
-			    	dateHtml = start + " - " + end;
-			    	$(".item_validity .label_for").text(dateHtml);
-			    }
-			    if(starts !== "" && ends !== ""){
-			    	let endYear = new Date(ends*1000).getFullYear();
-			    	let endMonth = new Date(ends*1000).getMonth()+1;
-			    	let startYear = new Date(starts*1000).getFullYear();
-			    	let startMonth = new Date(starts*1000).getMonth()+1;
-			    	let year = "";
-			    	let month = "";
-			    	if(endYear > startYear){
-			    		if(endMonth > startMonth){
-		    				year = endYear - startYear;
-		    				month = endMonth - startMonth;
-			    		}else{
-		    				year = endYear - startYear-1;
-		    				month = 12+Number(endMonth)-startMonth;
-			    			if(year === 0){
-			    				year = "";
-			    			}
-			    			if (month==12){
-		    					year=Number(year)+1;
-		    					month="";
-		    				}
-			    		}
-			    	}else if(endYear === startYear){
-		    			month = endMonth - startMonth;
-			    	}
-			    	//
-			    	if(year !== "" && month !==""){
-			    		$(".item_cycle .label_for").text(year+"年"+month+"个月");
-			    	}else if(year !== ""&& month ===""){
-			    		$(".item_cycle .label_for").text(year+"年");
-			    	}else if(year === ""&& month !==""){
-			    		$(".item_cycle .label_for").text(month+"个月");
-			    	}
-			    }
-			    var val = monthPrice * 1
-			    $(".computed_price").html("￥"+val.toFixed(1))
-			 	//
-			 	var threeDay = ends - 86400 * 3;
-			 	var nowDay = new Date().getTime()/1000;
-			 	if(nowDay >= threeDay){
-			 		$(".renew_upgrade").hide();
-			 		$(".renew_update").show();
-			 	}else{
-			 		$(".renew_update").hide();
-			 		$(".renew_upgrade").show();
-			 	}
-		    }
+        //
+        var startTime = "";
+        var starts = "";
+        var endTime = "";
+        var ends = "";
+        var monthPrice = "";
+        var yearPrice = "";
+        var oldBuyset = "";
+        //
+        $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
+            if (data.success) {
+        	    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]);
+        	    //
+        	    var areaHtml = "";
+        	    var provinceArr = [];
+        	    var cityArr = [];
+        	    var buyerclassArr = [];
+        	    var buyerclassHtml = "";
+        	    var dateName = "";
+        	    var dateHtml = "";
+        			
+        	    // }
+        		if(oldBuyset!==""&&oldBuyset!==undefined){
+        			let provinceLen = 0;
+        			provinceLen = oldBuyset.areacount
+        			let citys = oldBuyset.citys
+        			let cityLen = 0;
+        			let areaHtml = ";"
+        			for(let i in citys){
+        				cityLen += citys[i];
+        			}
+        			if(provinceLen === -1){
+        				areaHtml = "全国";
+        			}else{
+        				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(startTime !== "" && endTime !== "" && startTime !== undefined && endTime !== undefined){
+        	    	console.log(startTime)
+        	    	var start = startTime.replace(/-/g, ".");
+        	    	var end = endTime.replace(/-/g, ".");
+        	    	dateHtml = start + " - " + end;
+        	    	$(".item_validity .label_for").text(dateHtml);
+        	    }
+        	    if(starts !== "" && ends !== ""){
+        	    	let endYear = new Date(ends*1000).getFullYear();
+        	    	let endMonth = new Date(ends*1000).getMonth()+1;
+        	    	let startYear = new Date(starts*1000).getFullYear();
+        	    	let startMonth = new Date(starts*1000).getMonth()+1;
+        	    	let year = "";
+        	    	let month = "";
+        	    	if(endYear > startYear){
+        	    		if(endMonth > startMonth){
+            				year = endYear - startYear;
+            				month = endMonth - startMonth;
+        	    		}else{
+            				year = endYear - startYear-1;
+            				month = 12+Number(endMonth)-startMonth;
+        	    			if(year === 0){
+        	    				year = "";
+        	    			}
+        	    			if (month==12){
+            					year=Number(year)+1;
+            					month="";
+            				}
+        	    		}
+        	    	}else if(endYear === startYear){
+            			month = endMonth - startMonth;
+        	    	}
+        	    	//
+        	    	if(year !== "" && month !==""){
+        	    		$(".item_cycle .label_for").text(year+"年"+month+"个月");
+        	    	}else if(year !== ""&& month ===""){
+        	    		$(".item_cycle .label_for").text(year+"年");
+        	    	}else if(year === ""&& month !==""){
+        	    		$(".item_cycle .label_for").text(month+"个月");
+        	    	}
+        	    }
+        	    var val = monthPrice * 1
+        	    $(".computed_price").html("￥"+val.toFixed(1))
+        	 	//
+        	 	var threeDay = ends - 86400 * 3;
+        	 	var nowDay = new Date().getTime()/1000;
+        	 	if(nowDay >= threeDay){
+        	 		$(".renew_upgrade").hide();
+        	 		$(".renew_update").show();
+        	 	}else{
+        	 		$(".renew_update").hide();
+        	 		$(".renew_upgrade").show();
+        	 	}
+            }
         }, false);
         //
 		var nowMonth = new Date().getMonth()+1;
@@ -762,8 +747,6 @@
             }
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		"area": JSON.stringify(areas),
-	    		"industry": industrys.toString(),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":payType,
 	    		"pay_source": "Renew",
@@ -796,6 +779,20 @@
 	    	sessionStorage.removeItem("renew_price");
 	    	sessionStorage.removeItem("renew_finally_price");
 	    	sessionStorage.removeItem("buyChecks");
+	    	//
+	    	sessionStorage.removeItem("upgrade_cyclecount");
+	    	sessionStorage.removeItem("upgrade_cycleunit");
+	    	sessionStorage.removeItem("upgrade_price");
+	    	sessionStorage.removeItem("proPrice");
+	    	sessionStorage.removeItem("vipSubSelectAreaUpgrade");
+	    	sessionStorage.removeItem("vipSubSelectIndustryUpgrade");
+	    	sessionStorage.removeItem("vipSubSelectIndustryAdd");
+	    	sessionStorage.removeItem("vipSubSelectAreaAdd");
+	    	sessionStorage.removeItem("vipAddCount");
+	    	sessionStorage.removeItem("vipSubSelectCity");
+	    	sessionStorage.removeItem("buyCheck");
+	    	sessionStorage.removeItem("buyIndustry");
+	    	sessionStorage.removeItem("addIndustry");
 	    }
 	    //
 	    //校验是否支付
@@ -830,6 +827,10 @@
 		    }
 		    return false;
 		}
+		function toWillExpire(){
+			sessionStorage.removeItem("vipSubBuySet");
+			window.location.href="/jyapp/front/vipsubscribe_willExpire"
+		}
 	    
     </script>
 </body>

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

@@ -597,38 +597,39 @@
         	}
         	$("#buy").prop("checked", bCheck);
         }
-        //新增区域
-	    if(sessionStorage.vipSubSelectAreaAdd!==""&&sessionStorage.vipSubSelectAreaAdd!==undefined&&sessionStorage.vipSubSelectCity!==undefined&&sessionStorage.vipSubSelectCity!==""){
-			var vipSubSelectArea = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
+		//新增区域
+        if(sessionStorage.vipAddCount!==""&&sessionStorage.vipAddCount!==undefined&&sessionStorage.vipSubSelectCity!==undefined&&sessionStorage.vipSubSelectCity!==""&&sessionStorage.vipSubSelectAreaAdd!==undefined){
+			var vipSubSelectArea = JSON.parse(sessionStorage.vipAddCount);
+			var vipadd = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
 			let cityLen = sessionStorage.vipSubSelectCity;
-			if(vipSubSelectArea.country === -1){
+			if(vipadd.country === -1){
 				areaHtml = "已新增全国";
 				$("#area").attr("placeholder", areaHtml);
 			}else{
 				areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
 				if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
-					areaHtml = "请选择升级区域";
+					areaHtml = "选择升级区域";
 				}
 				$("#area").attr("placeholder", areaHtml);
 			}
-	    }
-	    //新增行业
-	    if(sessionStorage.vipSubSelectIndustryAdd!==""&&sessionStorage.vipSubSelectIndustryAdd!==undefined){
-	    	var vipSubSelectIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
-	    	var industryArr = [];
-	    	var isAll = "";
-	    	var industryHtml = "";
+		}
+		//新增行业
+		if(sessionStorage.vipSubSelectIndustryAdd!==""&&sessionStorage.vipSubSelectIndustryAdd!==undefined){
+			var vipSubSelectIndustry = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
+			var industryArr = [];
+			var isAll = "";
+			var industryHtml = "";
 //	    	$(".industry-list").show();
-	    	for(var i in vipSubSelectIndustry){
-	    		var industry = vipSubSelectIndustry[i];
-	    		industryArr.push(industry);
-	    		if(industry === "全部行业"){
-	    			isAll = "all";
-	    		}
-	    	}
-	    	var industryLen = industryArr.length
-	    	if(isAll === ""){
-	    		industryHtml = "已新增 "+ industryLen +" 个行业";
+			for(var i in vipSubSelectIndustry){
+				var industry = vipSubSelectIndustry[i];
+				industryArr.push(industry);
+				if(industry === "全部行业"){
+					isAll = "all";
+				}
+			}
+			var industryLen = industryArr.length
+			if(isAll === ""){
+				industryHtml = "已新增 "+ industryLen +" 个行业";
 				$("#buyerclass").attr("placeholder", industryHtml);
 			}else{
 				industryHtml = "已新增全行业";
@@ -638,7 +639,7 @@
 				industryHtml = "选择升级行业";
 				$("#buyerclass").attr("placeholder", industryHtml);
 			}
-	    }
+		}
         //支付方式
 	    if(sessionStorage.payType!==""&&sessionStorage.payType!==undefined){
 	    	var payType = sessionStorage.payType;
@@ -690,38 +691,39 @@
 	 	
 	 	//
 	 	var area = "";
-	    var buyerclass = "";
-	    var buyArea = "";
-	    var buyIndustry = "";
-	    var cycleunit = "";
-	    var cyclecount = "";
-	 	var startTime = "";
-	    var starts = "";
-	    var endTime = "";
-	    var ends = "";
-	 	$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;
+		var buyerclass = "";
+		var buyArea = "";
+		var buyIndustry = "";
+		var cycleunit = "";
+		var cyclecount = "";
+		var startTime = "";
+		var starts = "";
+		var endTime = "";
+		var ends = "";
+		var oldBuyset = "";
+		$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
+			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);
-        //
-        var completeMonth = 0;
+		},false);
+		console.log("666666666333",oldBuyset)
+		//
+		var completeMonth = 0;
 		var completeYear = 0;
 		var oldYearPrice = 0;
 		var oldMonthPrice = 0;
 		var areasArr = {};
 		var areas_arr = {};
 		var industrysArr = [];
-		// var allArea = {};
+		var allArea = {};
 		var allBuyArea = {};
 		var allIndustry = [];
 		var nowRenew = "";
@@ -764,141 +766,70 @@
 						areas_arr = {"全国":[]};
 					}
 				}
-				// if(area !== ""&&area !== undefined){
-				// 	for(let province in area){
-			 //    		let citys = area[province];
-			 //    		if(citys.length===0){
-				// 			allArea[province] = [];
-			 //    		}else{
-			 //    			allArea[province] = citys;
-			 //    		}
-			 //    	}
-				// 	for(let province in vipArea){
-				// 		let citys = vipArea[province];
-				// 		if(allArea[province] === undefined){
-				// 			allArea[province] = citys
-				// 		}else{
-				// 			let cityArr = [];
-				// 			for(let i in citys){
-				// 				cityArr.push(citys[i]);
-				// 			}
-				// 			for(let i in allArea[province]){
-				// 				cityArr.push(allArea[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++;
-				// 	            }
-				// 	       	}
-				// 			//
-				// 			allArea[province] = cityArr;
-				// 		}
-				// 		if(province === "全国"){
-				// 			allArea = {"全国":[]};
-				// 		}
-				// 	}
-				// }
-				if(buyArea !== ""&&buyArea !== undefined){
-					for(let province in buyArea){
-						let citys = buyArea[province];
+				if(area !== ""&&area !== undefined){
+					for(let province in area){
+						let citys = area[province];
 						if(citys.length===0){
-							allBuyArea[province] = [];
+							allArea[province] = [];
 						}else{
-							allBuyArea[province] = citys;
+							allArea[province] = citys;
 						}
 					}
 					for(let province in vipArea){
 						let citys = vipArea[province];
-						if(allBuyArea[province] === undefined){
-							allBuyArea[province] = citys
+						if(allArea[province] === undefined){
+							allArea[province] = citys
 						}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);
+							if(checkObj(citys)){
+								allArea[province] = [];
+							}else{
+								let cityArr = [];
+								for(let i in citys){
+									cityArr.push(citys[i]);
+								}
+								for(let i in allArea[province]){
+									cityArr.push(allArea[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++;
 									}
-									else j++;
 								}
+								//
+								allArea[province] = cityArr;
 							}
-							//
-							allBuyArea[province] = cityArr;
 						}
 						if(province === "全国"){
-							allBuyArea = {"全国":[]};
+							allArea = {"全国":[]};
 						}
 					}
 				}
-				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];
+				// areasArr = null
+				if(area !== ""&&area !== undefined){
+					for(let province in area){
+						let citys = area[province];
 						if(citys.length===0){
-							allBuyArea[province] = [];
+							allArea[province] = [];
 						}else{
-							allBuyArea[province] = citys;
+							allArea[province] = citys;
 						}
 					}
 				}
+				sessionStorage.removeItem("vipAddCount");
+				sessionStorage.removeItem("vipSubSelectAreaAdd");
+				sessionStorage.removeItem("vipSubSelectCity");
 			}
 			//
-			// 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 = ["全部行业"];
-			// 		}
-			// 	}
-			// }
-			//
-			console.log("areasArr",areasArr)
-			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);
@@ -919,24 +850,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]){
@@ -998,8 +919,10 @@
 			console.log("month",nowUpgrade)
 			//
 			if (nowUpgradeYear >= 1) {
-				let monthprice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgrade, 2])
-				let yearprice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgradeYear, 1])
+				// let monthprice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgrade, 2])
+				// let yearprice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgradeYear, 1])
+				let monthprice = getsubVipOrderPriceBybuyset(oldBuyset, [nowUpgrade, 2])
+				let yearprice = getsubVipOrderPriceBybuyset(oldBuyset, [nowUpgradeYear,1]);
 				oldPrice = yearprice + monthprice
 				if (monthprice == 0) {
 					oldMonthPrice = ((yearprice / nowUpgradeYear) / 10).toFixed(1);
@@ -1009,7 +932,7 @@
 					oldYearPrice = ((monthprice / nowUpgrade) * 10).toFixed(1);
 				}
 			} else {
-				oldPrice = getsubVipOrderPrice(buyArea, buyIndustry, [nowUpgrade, 2])
+				oldPrice = getsubVipOrderPriceBybuyset(oldBuyset, [nowUpgrade, 2])
 				oldMonthPrice = (oldPrice / nowUpgrade)
 				oldYearPrice = ((oldPrice / nowUpgrade) * 10).toFixed(1);
 			}
@@ -1018,32 +941,12 @@
 			
 			//
 			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]);
-				}
-				// let yearprice = getsubVipOrderPrice(allArea,allIndustry,[nowUpgradeYear,1]);
-				// let monthprice = getsubVipOrderPrice(allArea,allIndustry,[nowUpgrade,2]);
-				let yearprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgradeYear,1]);
-				let monthprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
-//				price = yearprice + monthprice;
-				price = addAreaPriceY + addAreaPriceM + oldAreaPriceY + oldAreaPriceM + addIndustryPriceY + addIndustryPriceM;
-//				let yearprice = addAreaPriceY + oldAreaPriceY + addIndustryPriceY;
-//				let monthprice = addAreaPriceM + oldAreaPriceM + addIndustryPriceM;
+				let newPriceY = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
+				let newPriceM = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
+				let yearprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgradeYear,1]);
+				let monthprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
+				price = newPriceY + newPriceM - oldPrice;
+				// ------- 升级延长周期价格计算 ---------
 				if(monthprice === 0){
 					completeMonth = ((yearprice / nowUpgradeYear) / 10).toFixed(1);
 					completeYear = (yearprice / nowUpgradeYear).toFixed(1);
@@ -1051,28 +954,23 @@
 					completeMonth = (monthprice / nowUpgrade).toFixed(1);
 					completeYear = ((monthprice / nowUpgrade)*10).toFixed(1);
 				}
+				// ------- 升级延长周期价格计算 ---------
 				console.log("yearprice",yearprice);
 				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]);
-				}
-				// let monthprice = getsubVipOrderPrice(allArea,allIndustry,[nowUpgrade,2]);
-				let monthprice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
-//				price = getsubVipOrderPrice(areasArr,industrysArr,[nowUpgrade,2]);
-				price = addAreaPriceM + oldAreaPriceM + addIndustryPriceM;
+				let monthprice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
+				
+				// ------- 升级价格差价计算 ---------
+				
+				// let newPrice = getsubVipOrderPrice(allBuyArea,allIndustry,[nowUpgrade,2]);
+				let newPrice = getsubVipOrderPriceBybuyset(newBuysetObj(areaObj()),[nowUpgrade,2]);
+				price = newPrice - oldPrice;
+				// ------- 升级价格差价计算 ---------
+				// ------- 升级延长周期价格计算 ---------
 				completeMonth = (monthprice / nowUpgrade).toFixed(1);
 				completeYear = ((monthprice / nowUpgrade)*10).toFixed(1);
+				// ------- 升级延长周期价格计算 ---------
 				console.log("<1",price)
 			}
 			
@@ -1083,6 +981,7 @@
 			}
 			console.log("completeMonth",completeMonth)
 			console.log("completeYear",completeYear)
+			// ------- 延长周期价格赋值 ---------
 			if(sessionStorage.upgrade_cyclecount !== undefined && sessionStorage.upgrade_cycleunit !== undefined){
 				if(sessionStorage.upgrade_cycleunit === "1"){
 					let price = (Number(sessionStorage.upgrade_cyclecount)*completeYear).toFixed(1);
@@ -1129,74 +1028,46 @@
         
         //
         $(".save_upgrade").on("click", function(){
+        	if(nowRenew>36){
+        		var overtimeWarning = `最长订阅周期不可超过3年<br />当前订阅周期：${nowRenew}个月`
+        	    weui.toast(overtimeWarning, {
+        	        duration: 3000,
+        	        className: 'custom-toast',
+        	        callback: function() {
+        	        }
+        	    })
+        	    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 allAreaArr = allArea;
-			let allIndustryArr = allIndustry;
-				// if(allAreaArr["全国"]){
-			//        allAreaArr={};
-			//    }
-			if(allIndustryArr.length==1&&allIndustryArr[0]=="全部行业"){
-				allIndustryArr=[];
-			}
-			//
-			let renew_time = $('.choose_item.lengthen .info').text();
-			let times = "";
-			if(renew_time !== "不延长"){
-				times = $('.choose_item.lengthen .info').text();
-			}
+        	//
+        	let allIndustryArr = allIndustry;
+        	if(allArea["全国"]){
+        	    allArea={};
+        	}
+        	if(allIndustryArr.length==1&&allIndustryArr[0]=="全部行业"){
+        	    allIndustryArr=[];
+        	}
+        	//
+        	let renew_time = $('.choose_item.lengthen .info').text();
+        	let times = "";
+        	if(renew_time !== "不延长"){
+        		times = $('.choose_item.lengthen .info').text();
+        	}
+        	//
+        	let vipCount = null;
+        	if(sessionStorage.vipAddCount!==undefined&&sessionStorage.vipAddCount!==""){
+        		vipCount = JSON.stringify(JSON.parse(sessionStorage.vipAddCount));
+        	}
+        	let vipIndustry = 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;
+        	    }
+        	}
 			//
-			let vipCount = null;
-			if(sessionStorage.vipAddCount!==undefined&&sessionStorage.vipAddCount!==""){
-				vipCount = JSON.stringify(JSON.parse(sessionStorage.vipAddCount));
-			}
-			let vipIndustry = 0
-			if(industrysArr!==null){
-				if(industrysArr.length==1&&industrysArr[0]=="全部行业"){
-					vipIndustry = -1;
-				}else{
-					vipIndustry = industrysArr.length;
-				}
-			}
-				//
             let payTypes = $(".weixin_pay").text();
             let payType = "wx_app";
             if(payTypes === "支付宝支付"){
@@ -1204,19 +1075,13 @@
             }
             //
 	    	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(allBuyArea),
-	    		"payWay": "wx_js",
+	    		"allBuyArea": JSON.stringify(allArea),
 	    		"pay_source" : "Upgrade",
 	    		"time": times,
 	    		"addCount":vipCount,
 	    		"addIndustryCount": vipIndustry,
+	    		"buyset":JSON.stringify(areaObj()),
 	    		"payWay": payType,
 	    	}
 	    	console.log(param)
@@ -1255,6 +1120,14 @@
 	    	sessionStorage.removeItem("vipAddCount");
 	    	sessionStorage.removeItem("vipSubSelectCity");
 	    	sessionStorage.removeItem("buyCheck");
+	    	sessionStorage.removeItem("buyIndustry");
+	    	sessionStorage.removeItem("addIndustry");
+	    	//
+	    	sessionStorage.removeItem("renew_cyclecount");
+	    	sessionStorage.removeItem("renew_cycleunit");
+	    	sessionStorage.removeItem("renew_price");
+	    	sessionStorage.removeItem("renew_finally_price");
+	    	sessionStorage.removeItem("buyChecks");
 	    }
 	    //
 	    //校验是否支付
@@ -1292,47 +1165,58 @@
 		    return false;
 		}
 	    //
-	    function addAreaObj(){
-	    	let areaObj = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade)
-	    	let buyset = JSON.parse(sessionStorage.vipSubSelectAreaAdd)
-	    	//
-	    	let provinceArr = [];
-	    	let areasObj = {};
-	    	if(buyset.country === -1){
-	    		areasObj["全国"] = [];
-	    	}else{
-	    		for(let province in areaObj){
-	//	    		console.log("666666",buyset.citys[province]);
-					let cityLen = areaObj[province].length
-		    		if(cityLen === 0){
-		    			provinceArr.push(province);
-		    		}else{
-		    			let citys = areaObj[province];
-		    			for(let i in buyset.city){
-		    				let cityCount = buyset.city[i];
-		    				if(province === i){
-		    					if(cityLen > cityCount){
-					    			let reduce = cityLen - cityCount;
-					    			areasObj[province] = citys.slice(0, -reduce);
-					    		}else{
-					    			areasObj[province] = citys;
-					    		}
-		    				}
-		    			}
-		    		}
-		    	}
-	    		if(provinceArr.length > buyset.province){
-	    			let reduce = provinceArr.length - buyset.province;
-	    			provinceArr = provinceArr.slice(0, -reduce);
+	    function areaObj(){
+	    	let newbuyset = {}
+	    	let oldset = JSON.parse(JSON.stringify(oldBuyset))
+	    	newbuyset.areacount = oldset.areacount;
+	    	newbuyset.buyerclasscount = oldset.buyerclasscount;
+	    	newbuyset.citys = oldset.citys;
+	    	// let buyset = oldBuyset
+	    	console.log("11111",newbuyset)
+	    	if(sessionStorage.vipSubSelectAreaAdd!==undefined&&sessionStorage.vipSubSelectAreaAdd!==""){
+	    		let addbuyset = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
+	    		if(addbuyset.country !== -1){
+	    			if(addbuyset.province !== 0){
+	    				newbuyset.areacount = newbuyset.areacount + addbuyset.province;
+	    			}
+	    			if(!checkObj(addbuyset.city)){
+	    				let cityArr = addbuyset.city
+	    				for(var i in cityArr){
+	    					let citysArr = newbuyset.citys
+	    					if(citysArr[i] !== undefined){
+	    						citysArr[i] = citysArr[i] + cityArr[i]
+	    					}else{
+	    						citysArr[i] = cityArr[i];
+	    					}
+	    				}
+	    			}
+	    		}else{
+	    			newbuyset.areacount = -1;
+	    			newbuyset.citys = {};
+	    		}
+	    	}
+	    	if(sessionStorage.vipSubSelectIndustryAdd!==undefined){
+	    		var addindustrys = JSON.parse(sessionStorage.vipSubSelectIndustryAdd);
+	    		if(addindustrys.length === 1 && addindustrys[0] === "全部行业"){
+	    			newbuyset.buyerclasscount = -1;
+	    		}else{
+	    			newbuyset.buyerclasscount = newbuyset.buyerclasscount + addindustrys.length;
 	    		}
-	    		console.log(provinceArr)
-	    		for(let a in provinceArr){
-	    			let province = provinceArr[a];
-	    			areasObj[province] = [];
+	    	}
+	    	console.log(JSON.stringify(newbuyset))
+	    	return newbuyset
+	    }
+	    
+	    function newBuysetObj(buyset){
+	    	let newset = JSON.parse(JSON.stringify(buyset));
+	    	for(let n in newset.citys){
+	    		if(newset.citys[n] > 2){
+	    			let cityarr = newset.citys
+	    			delete cityarr[n]
+	    			newset.areacount += 1
 	    		}
-	    		console.log(areasObj)
 	    	}
-	    	return areasObj
+	    	return newset
 	    }
 	    
     </script>

src/jfw/modules/subscribepay/src/util/msgremind.go

@@ -238,7 +238,7 @@ func init() {
 	go func() {
 		log.Println("开始加载72小时内的订单到内存中。。。")
 		startTime := time.Now().Unix() - MsgRemind.getExpireTime()
-		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTime)
+		list := Mysql.SelectBySql("select id,order_code,order_money,user_id,prepay_time,remind_status,vip_type from dataexport_order where order_money>0 and prepay_time>=? and product_type='VIP订阅' and order_status=0 and (remind_status<>2 or remind_status is null)", startTime)
 		if list == nil {
 			log.Println("加载72小时内的订单到内存中失败")
 			return

src/web/templates/common/weixinNotShare.html

@@ -0,0 +1,16 @@
+<script>
+function onBridgeReady() {
+    WeixinJSBridge.call('hideOptionMenu');
+}
+ 
+if (typeof WeixinJSBridge == "undefined") {
+    if (document.addEventListener) {
+        document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+    } else if (document.attachEvent) {
+        document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+        document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+    }
+} else {
+    onBridgeReady();
+}
+</script>

src/web/templates/pc/biddetail.html

@@ -373,7 +373,7 @@ function isWechat() {
 			</div>-->
 		</div>
 		<center class="reward text-align">
-			<br><div>打啊赏</div>
+			<br><div>打赏</div>
 		</center>
 		{{if .T.obj.urltop}}<a class="trs" style="color:white">　</a>{{end}}
 		{{if .T.isForceShare}}

src/web/templates/weixin/historypush.html

@@ -805,12 +805,16 @@
 		    background: #CFAD89;
 		    border-radius: 3px;
 		    margin: 0px 5px;
-		    padding: 1px 3px;
 		    color: #fff;
 			font-size: 14px;
 		    height: 0.40rem;
-		    line-height: 0.40rem;
 			display: inline-block;
+    		padding: 0 3px;
+   			line-height: .39rem;
+		}
+		.restime span.location,.restime span.type,.restime span.industry {
+		    padding: 0 3px;
+		    line-height: .39rem;
 		}
 		._header{
 			position: fixed;

src/web/templates/weixin/resultpreview.html

@@ -418,6 +418,10 @@ a{
 	max-height: 45px;
     overflow: hidden;
 }
+.restime span.location,.restime span.type,.restime span.industry {
+    padding: 0 3px;
+    line-height: .39rem;
+}
 </style>
 </head>
 <body>

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

@@ -12,7 +12,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}11" rel="stylesheet" type="text/css" >
 <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}12" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
@@ -23,9 +23,9 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}9"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}9"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
 <!--2.8-->
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
@@ -272,6 +272,10 @@
 	#dqbtn{
 		width: 5.5em !important;
 	}
+	.restime span.location,.restime span.type,.restime span.industry {
+	    padding: 0 3px;
+	    line-height: .39rem;
+	}
 	</style>
 </head>
 <body  style="min-height:100vh;">

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

@@ -384,6 +384,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.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>
+{{include "/common/weixinNotShare.html"}}
 <script>
     var AreaChoose = {
         selectObj: {},//已选择，未购买城市;

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

@@ -244,6 +244,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
 
     // 点击导航跳转

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

@@ -390,6 +390,7 @@
 <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/editArea.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 </body>
 
 </html>

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

@@ -44,6 +44,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
     $(window).bind("pageshow", function (event) {
         if (event.originalEvent.persisted) {

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

@@ -246,6 +246,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+{{include "/common/weixinNotShare.html"}}
 <script>
     //加载数据
     var EditIndustry = {

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

@@ -19,6 +19,7 @@
             <button class="public_btn" id="back">返回<em class="time"></em></button>
         </div>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+        {{include "/common/weixinNotShare.html"}}
         <script>
 			
             $(function(){

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

@@ -74,9 +74,6 @@
 			var starts = {{.T.startTime}};
 			var ends = {{.T.endTime}};
 			var orderCode = "";
-//			console.log("orderId",orderId)
-//			console.log("starts",starts)
-//			console.log("ends",ends)
 			var nowTime = new Date().getTime();
 			if(orderId !== "" && orderId !== undefined){
 				$DoPost("/subscribepay/renewUpgrade/getExprie", {"orderId":orderId}, function (r) {

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

@@ -576,12 +576,6 @@
         }
         
         //
-        var area = "";
-        var areas = "";
-	    var buyerclass = "";
-	    var industrys = "";
-	    var cycleunit = "";
-	    var cyclecount = "";
 	    var startTime = "";
 	    var starts = "";
 	    var endTime = "";
@@ -592,9 +586,6 @@
 	    //
 	    $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
             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;
@@ -610,27 +601,6 @@
 			    var buyerclassHtml = "";
 			    var dateName = "";
 			    var dateHtml = "";
-			    // if (areas !== "" && areas !== undefined){
-		// 	    	for(var province in areas){
-		// 	    		var citys = areas[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(areas)){
-		// 				areaHtml = "全国";
-		// 			}
-		// 	    	$(".item_area .label_for").text(areaHtml);
 					
 			    // }
 				if(oldBuyset!==""&&oldBuyset!==undefined){
@@ -812,9 +782,6 @@
 			}
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {
-	    		// "area": JSON.stringify(areas),
-	    		// "industry": industrys.toString(),
-				// "buyset": JSON.stringify(oldBuyset),
 	    		"time": $('.choose_item.select_cycle .info').val(),
 	    		"payWay":"wx_js",
 	    		"pay_source": "Renew",
@@ -864,10 +831,10 @@
 		    }
 		    return false;
 		}
-	  function toWillExpire(){
-      sessionStorage.removeItem("vipSubBuySet");
-      window.location.href="/weixin/pay/vipsubscribe_willExpire"
-    }  
+		function toWillExpire(){
+			sessionStorage.removeItem("vipSubBuySet");
+			window.location.href="/weixin/pay/vipsubscribe_willExpire"
+		}  
     </script>
 </body>
 

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

@@ -638,21 +638,7 @@
         	}
         	$("#buy").prop("checked", bCheck);
         }
-        //新增区域
-	  //   if(sessionStorage.vipSubSelectAreaAdd!==""&&sessionStorage.vipSubSelectAreaAdd!==undefined&&sessionStorage.vipSubSelectCity!==undefined&&sessionStorage.vipSubSelectCity!==""){
-			// var vipSubSelectArea = JSON.parse(sessionStorage.vipSubSelectAreaAdd);
-			// let cityLen = sessionStorage.vipSubSelectCity;
-			// if(vipSubSelectArea.country === -1){
-			// 	areaHtml = "已新增全国";
-			// 	$("#area").attr("placeholder", areaHtml);
-			// }else{
-			// 	areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
-			// 	if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
-			// 		areaHtml = "请选择升级区域";
-			// 	}
-			// 	$("#area").attr("placeholder", areaHtml);
-			// }
-	  //   }
+		//新增区域
 		if(sessionStorage.vipAddCount!==""&&sessionStorage.vipAddCount!==undefined&&sessionStorage.vipSubSelectCity!==undefined&&sessionStorage.vipSubSelectCity!==""&&sessionStorage.vipSubSelectAreaAdd!==undefined){
 			var vipSubSelectArea = JSON.parse(sessionStorage.vipAddCount);
 			var vipadd = JSON.parse(sessionStorage.vipSubSelectAreaAdd);