Merge remote-tracking branch 'origin/dev' into dev

Application/Sdk/View/default/Spend/pay_way.html

@@ -99,7 +99,7 @@
                         <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/yee_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
                             <div>
                                 <img src="__IMG__/pay_way/xianshang.png" alt="">
-                                <span>快捷易宝支付</span>
+                                <span>快捷银行</span>
                             </div>
                             <img src="__IMG__/pay_way/dagou1.png" alt="">
                         </div>
@@ -212,7 +212,7 @@
                         <div class="payment_rest_way way_btn" data-type="shorcut" data-url="{:U('Shortcut/yee_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token'),'code'=>1,'extend'=>I('extend'),'api_ver'=>2))}">
                             <div>
                                 <img src="__IMG__/pay_way/xianshang.png" alt="">
-                                <span>快捷易宝支付</span>
+                                <span>快捷银行</span>
                             </div>
                             <img src="__IMG__/pay_way/dagou1.png" alt="">
                         </div>