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

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

@@ -33,7 +33,8 @@
 	    left: 0;
 	}
 	.vip_update .choose_condition, .vip_renew .choose_condition {
-	    -webkit-overflow-scrolling: touch
+	    -webkit-overflow-scrolling: touch;
+	    height: 100%;
 	}
 	
 </style>

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

@@ -34,7 +34,8 @@
 	    left: 0;
 	}
 	.vip_update .choose_condition, .vip_renew .choose_condition {
-	    -webkit-overflow-scrolling: touch
+	    -webkit-overflow-scrolling: touch;
+	    height: 100%;
 	}
 	
 </style>