From fa2efa04319ea9e9b2708ed622497ac5ac7c9186 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 12 Nov 2019 11:03:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86->=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=B8=B8=E6=88=8F--=E6=A3=80=E7=B4=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Apply/my_game.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html
index 4784068f3..de9480ad5 100644
--- a/Application/Home/View/default/Apply/my_game.html
+++ b/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">

From db249a776e5db694e7eb119ccdcaab40d8bab9f2 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 12 Nov 2019 15:21:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86->=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95->=E6=8F=90=E7=8E=B0=E6=98=8E=E7=BB=86--?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Finance/withdrawDtl.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Application/Home/View/default/Finance/withdrawDtl.html b/Application/Home/View/default/Finance/withdrawDtl.html
index 52af935fe..334ecd7e0 100644
--- a/Application/Home/View/default/Finance/withdrawDtl.html
+++ b/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>

From cbe9117e3dc32bb6b446077a945a1d9e10aafc58 Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Tue, 12 Nov 2019 16:14:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=95=8C=E9=9D=A2bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/User/recharge.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Application/Mobile/View/User/recharge.html b/Application/Mobile/View/User/recharge.html
index 50a470c4a..a43db68b1 100644
--- a/Application/Mobile/View/User/recharge.html
+++ b/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);
                 }