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

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

@@ -508,7 +508,8 @@
                     }else{
                     	$(dom).attr('disabled', !canClick).parents().siblings('.tab')
                         .addClass('selected').children('.province').children('.checkbox').attr({
-                            "checked": true
+                            "checked": true,
+                            "disabled": "disabled"
                         })
                     }
                 }

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

@@ -10,7 +10,7 @@
         <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/choose_industry.css?v={{Msg "seo" "version"}}">
+        <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}3">
         {{include "/common/weixin.html"}}
         
     </head>

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

@@ -921,6 +921,16 @@
 							for(let i in areasArr[province]){
 								cityArr.push(areasArr[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++;
+					            }
+					       	}
+							//
 							areasArr[province] = cityArr;
 						}
 						if(province === "全国"){
@@ -1112,6 +1122,9 @@
 				console.log("proprice",proPrice);
 				cPrice = (Number(cPrice) + Number(proPrice)).toFixed(1);
 			}
+//			if(effect === "notnow"){
+//				cPrice = cPrice -(completeMonth - oldMonthPrice);
+//			}
 			if(cPrice < 0){
 				cPrice = 0;
 			}