From d57e4a211f1bae65f13215bb3676bcff03dc4a22 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 8 Nov 2019 11:50:27 +0800
Subject: [PATCH 1/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->=E7=BB=93=E7=AE=97=E5=8D=95--=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Finance/settlementOrder.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/View/default/Finance/settlementOrder.html b/Application/Home/View/default/Finance/settlementOrder.html
index 16dfbf387..d05184dc1 100644
--- a/Application/Home/View/default/Finance/settlementOrder.html
+++ b/Application/Home/View/default/Finance/settlementOrder.html
@@ -124,7 +124,7 @@
                 <else/>
                 {$withdraw.sum_money}
               </if>
-              <span style="color: red;">(实际提现金额=提现金额+奖惩金额)</span>
+              <span style="color: red;">(实际提现金额=收益金额+奖惩金额)</span>
             </span>
           </div>
         </div>

From c11814f902b0f86a39d5a9fbe8346f9b4195d2a3 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Fri, 8 Nov 2019 11:54:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/View/default/Game/game_detail.html | 4 ++--
 Public/Media/css/base1.css                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Media/View/default/Game/game_detail.html b/Application/Media/View/default/Game/game_detail.html
index b0cc95f9a..49bc81019 100644
--- a/Application/Media/View/default/Game/game_detail.html
+++ b/Application/Media/View/default/Game/game_detail.html
@@ -8,8 +8,8 @@
 <link href="__CSS__/viewer.min.css" rel="stylesheet" />
 <script type="text/javascript" src="__JS__/viewer.min.js"></script>
 <script type="text/javascript" src="__JS__/game.js"></script>
-  <div class="">
-    <img src="__IMG__/inner_banner1.jpg">
+  <div class="" style="background: url(__IMG__/inner_banner1.jpg) no-repeat 100%/cover;height: 3rem;">
+    <!-- <img src="__IMG__/inner_banner1.jpg"> -->
   </div>
   <div class="official">
   <div class="inner clearfix">
diff --git a/Public/Media/css/base1.css b/Public/Media/css/base1.css
index 30f8073de..13aba14cc 100644
--- a/Public/Media/css/base1.css
+++ b/Public/Media/css/base1.css
@@ -1,6 +1,6 @@
 @charset "utf-8";
 html{font-family:"Microsoft YaHei","Helvetica Neue",Helvetica,sans-serif,Arial,"tahoma";}
-body{background:#fff; font:12px/22px "Microsoft YaHei"; min-width:1200px;}
+/* body{background:#fff; font:12px/22px "Microsoft YaHei"; min-width:1200px;} */
 body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,p,img,select,input{padding:0; margin:0; list-style:none; vertical-align:middle;}
 input,textarea:focus{outline:none;}
 input::-webkit-input-placeholder,input:-ms-input-placeholder,input::-moz-placeholder{color:#999;}

From 47e2706e266ceb1b93aefd1f39a96599cdd434b8 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Fri, 8 Nov 2019 14:17:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Repository/SpendRepository.class.php | 5 +++++
 Application/Home/View/default/Promote/children.html   | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Application/Base/Repository/SpendRepository.class.php b/Application/Base/Repository/SpendRepository.class.php
index c47409034..9f7e41df2 100644
--- a/Application/Base/Repository/SpendRepository.class.php
+++ b/Application/Base/Repository/SpendRepository.class.php
@@ -337,4 +337,9 @@ class SpendRepository
         $items = M('spend', 'tab_')->field('count(DISTINCT user_id) as count, game_id')->where($conditions)->group('game_id')->find();
         return $this->assembleRecords($items, $gameIds, 'count', 'game_id');
     }
+
+    public function getCommonQuery($params, $columns = '*')
+    {
+        // return M('spend', 'tab_')->field($columns)->where($map);
+    }
 }
\ No newline at end of file
diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html
index f4a597db0..e2d515343 100644
--- a/Application/Home/View/default/Promote/children.html
+++ b/Application/Home/View/default/Promote/children.html
@@ -376,7 +376,9 @@ $(function(){
 
   $('.cancel-shift-btn').on({
     click: function() {
-      var id = $(this).parents('tr').eq(0).attr('data-id')
+      var tr = $(this).parents('tr').eq(0)
+      var id = tr.attr('data-id')
+      var parentId = tr.attr('data-parent-id')
       var shiftType = $(this).attr('data-promote-shift-type')
       var shiftTypeName = getShiftTypeName(shiftType)
       layer.confirm('是否要取消' + shiftTypeName, {icon: 3, title:'提示'}, function(index){