Merge remote-tracking branch 'origin/master'

apps/home/Tpl/default/User/recharge_w3g.html

@@ -177,6 +177,14 @@
 			},
 			},
 			yearFrame: function() {
 			yearFrame: function() {
 				return this.isYear ? 'vip_buy_price_frame_none' : 'vip_buy_price_frame'
 				return this.isYear ? 'vip_buy_price_frame_none' : 'vip_buy_price_frame'
+			},
+			monthPrice: function() {
+				//this.vips.hx_firstOf( r => { return r.id == this.type }).
+				return "0元/月"
+			},
+			yearPrice: function() {
+				//this.vips.hx_firstOf( r => { return r.id == this.type }).
+				return "0元/月"
 			}
 			}
 		},
 		},
 		created:function(){
 		created:function(){