Merge remote-tracking branch 'origin/master'

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

@@ -13,7 +13,7 @@
 	#vip_type_time { margin-top: 15px; }
 	#vip_type_time { margin-top: 15px; }
 	.pay_dl #vip_type_time .g-time.on { border-color: #A3E460; color: #A3E460; }
 	.pay_dl #vip_type_time .g-time.on { border-color: #A3E460; color: #A3E460; }
 	.vip_pay_way .vip_pay_way_item { padding: 15xp 15px; }
 	.vip_pay_way .vip_pay_way_item { padding: 15xp 15px; }
-	.g-true { width: 116px; height: 80px; border-radius: 25px; background: #A3E460; color: 14px; line-height: 80px; text-align: center; }
+	.money_box .g-true { width: 116px; height: 40px; border-radius: 25px; background: #A3E460; color: 14px; line-height: 40px; text-align: center; float: right; margin-right: 12px; margin-top: 4px; }
 </style>
 </style>
 <div class="body">
 <div class="body">
 	<!-- <div class="header2">
 	<!-- <div class="header2">