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

@@ -638,6 +638,8 @@ $(function () {
         $('.optional').remove()
         init();
         $(".tips_d_text").hide();
+        $(".btns .reset-btn").prop("disabled",false);
+        $(".btns .save-btn").prop("disabled",false);
     })
 
     // 7.锚点跳转

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

@@ -46,11 +46,11 @@
             <ul class="chooseList">
                 <li class="detail_item">
                         <div class="item_info item_area">
-                            <span class="label">已订阅区域：</span>
+                            <span class="label">已购买区域：</span>
                             <span class="label_for">河南省、郑州市、洛阳市、淮南市</span>
                         </div>
                         <div class="item_info item_industry">
-                            <span class="label">已订阅行业：</span>
+                            <span class="label">已购买行业：</span>
                             <span class="label_for">保监、城管保监</span>
                         </div>
                         <div class="item_info item_cycle">
@@ -766,7 +766,7 @@
                     try {
                         if (pay_way == "wx_app") {
                             JyObj.wxPay(r.data.res);
-                        } else {
+                        } else if(pay_way === "ali_app"){
                             JyObj.aliPay(r.data.res)
                         }
                         //校验是否支付完成

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

@@ -601,6 +601,9 @@
 				$("#area").attr("placeholder", areaHtml);
 			}else{
 				areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
+				if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
+					areaHtml = "请选择升级区域";
+				}
 				$("#area").attr("placeholder", areaHtml);
 			}
 	    }
@@ -1247,6 +1250,8 @@
 		    					if(cityLen > cityCount){
 					    			let reduce = cityLen - cityCount;
 					    			areasObj[province] = citys.slice(0, -reduce);
+					    		}else{
+					    			areasObj[province] = citys;
 					    		}
 		    				}
 		    			}

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

@@ -638,6 +638,8 @@ $(function () {
         $('.optional').remove()
         init();
         $(".tips_d_text").hide();
+        $(".btns .reset-btn").prop("disabled",false);
+        $(".btns .save-btn").prop("disabled",false);
     })
 
     // 7.锚点跳转

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

@@ -295,6 +295,7 @@
 						},500)*/
 						checkPaySuccess(ordercode);
 					}
+				});
   			}   
 		}catch(e){
 		  console.log(e)
@@ -641,6 +642,9 @@
 				$("#area").attr("placeholder", areaHtml);
 			}else{
 				areaHtml = "已新增 "+ vipSubSelectArea.province +" 个省级区域、"+ cityLen +" 个地市";
+				if(Number(vipSubSelectArea.province) === 0 && Number(cityLen) === 0){
+					areaHtml = "请选择升级区域";
+				}
 				$("#area").attr("placeholder", areaHtml);
 			}
 	    }
@@ -1231,6 +1235,8 @@
 		    					if(cityLen > cityCount){
 					    			let reduce = cityLen - cityCount;
 					    			areasObj[province] = citys.slice(0, -reduce);
+					    		}else{
+					    			areasObj[province] = citys;
 					    		}
 		    				}
 		    			}