Merge branch 'feature/promote' into dev

Application/Home/View/default/Apply/my_game.html

@@ -7,6 +7,11 @@
   <link href="__STATIC__/icons_alibaba/iconfont.css" rel="stylesheet">
   <link href="__STATIC__/jqueryselect/css/layui.css" rel="stylesheet">
   <script src="__STATIC__/jqueryselect/js/MySearch.js" type="text/javascript" charset="utf-8"></script>
+  <style>
+    .btn-role-border {
+      border-left: 0;
+    }
+  </style>
 </block>
 
 <block name="body">

Application/Home/View/default/Finance/withdrawDtl.html

@@ -96,9 +96,8 @@
       <div class="trunk-search clearfix jssearch">
         <!--  <form action="{:U('Finance/settlementDtl')}" method="get" enctype="multipart/form-data" class="normal_form"> -->
         <div class="form-group normal_space" style="margin-left: 0;">
-          <label>游戏名称：</label>
           <select id="game_id" name="game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
-            <option value="">全部</option>
+            <option value="">请选择游戏</option>
             <volist name=":getPromoteSearchGame()" id="vo">
               <option value="{$vo.id}" title="{$vo.game_name}"
               <if condition="I('game_id') eq $vo['id']">selected</if>

Application/Mobile/View/User/recharge.html

@@ -217,8 +217,14 @@
             rr.val('');sib.val('');
             if (ratio !='0.00' && ratio != '') {
                 rr.val(ratio);
-                sib.val(ratio+'折');
+                if (ratio) {
+                    sib.val(ratio+'折');
+                }
+
                 if (rc) {
+                    if (!ratio) {
+                        ratio = 10;
+                    }
                     var rmnum = Math.floor(ratio*100 * rc/10)/100;
                     rm.val(rmnum);
                 }