From 52668ace854050b8fdcc6785746e4aa81a8382cf Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 17 Feb 2020 10:38:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E4=BD=9C=E6=96=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Partner/export.html |  7 +++++++
 Application/Admin/View/Partner/lists.html  | 13 ++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html
index e45d2ce9d..2eb9c0548 100644
--- a/Application/Admin/View/Partner/export.html
+++ b/Application/Admin/View/Partner/export.html
@@ -7,6 +7,9 @@
 <script type="text/javascript" src="__JS__/select2.min.js"></script>
     <script src="__STATIC__/table2excel.js"></script>
     <style>
+        html{
+            display: none;
+        }
         .select2-container--default .select2-selection--single {
             color: #000;
             resize: none;
@@ -38,6 +41,10 @@
 
     <!-- 数据列表 -->
     <div class="data_list data_game_list">
+        <div style="margin:auto;font-size: 20px;color: red;line-height: 3;padding: 20px;">
+            导出进行中。。。<br/>
+            如果导出成功你也可以手动关闭此页面
+        </div>
         <div class="">
             <table border="1" id="exporttable" style="opacity: 0;">
                 <!-- 表头 -->
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index 40b9d269f..0d6ec1471 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -242,17 +242,8 @@
     $(function(){
         $("#downloadexcel").on("click",function(){
             var url = $(this).attr("url");
-            var title =  '合作方导出';
-            layer.open({
-                type: 2,
-                title: title,
-                shadeClose: true,
-                shade: 0.8,
-                area: ['40%', '60%'],
-                content: url
-
-            });
-        })
+            window.open(url, "blank");
+        });
         $('#time-start').datetimepicker({
             format: 'yyyy-mm-dd',
             language: "zh-CN",

From 00a5fed6fdc726e71a4f060611d02a42cde8e151 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 17 Feb 2020 11:16:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Model/SpendModel.class.php       | 2 +-
 Application/Admin/View/Finance/gameStatistics.html | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Model/SpendModel.class.php b/Application/Admin/Model/SpendModel.class.php
index 9242d01ec..bab8b51aa 100644
--- a/Application/Admin/Model/SpendModel.class.php
+++ b/Application/Admin/Model/SpendModel.class.php
@@ -844,7 +844,7 @@ class SpendModel extends Model
             ->field("s.game_id,s.game_name,p.partner as partner_name, g.game_type_name,
             SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
 SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
-SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count")
+SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version")
             ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
             ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
             ->where(['s.pay_status' => 1, 'pay_game_status' => 1])
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index b486d0ee5..59bbbf751 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/Application/Admin/View/Finance/gameStatistics.html
@@ -161,6 +161,8 @@
 
           <th >游戏</th>
 
+          <th >设备类型</th>
+
           <th>游戏类型</th>
 
           <th ><div class="tooltip">游戏现金金额<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
@@ -191,6 +193,7 @@
             <tr>
               <td ><if condition="$data.partner_name neq ''">{$data.partner_name}<else/>无</if></td>
               <td ><if condition="$data.game_name neq ''">{$data.game_name}<else/>无</if></td>
+              <td ><if condition="$data.sdk_version eq 1">安卓<elseif condition="$data.sdk_version eq 2"/>苹果</if></td>
               <td ><if condition="$data.game_type_name neq ''">{$data.game_type_name}<else/>无</if></td>
               <td ><if condition="$data.cash_count neq ''">{$data.cash_count}<else/>0</if></td>
               <td class="coin-detail" data-pay_type="0" style="color: #0066cc;cursor: pointer"

From 04bb4a7bb7fe2649f9a578522e55d047b4c66767 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 17 Feb 2020 11:46:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E4=BD=9C=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PartnerController.class.php | 4 +---
 Application/Admin/View/Partner/edit.html                 | 6 ++++--
 Application/Admin/View/Partner/export.html               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index ec4e0583d..35c3d9f6a 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -345,9 +345,7 @@ class PartnerController extends ThinkController
             $save['has_game_evidence'] = I('has_game_evidence');
             $save['company_type'] = I('company_type');
             $save['remark'] = I('remark');
-            if (!empty(I('file_info'))) {
-                $save['file_info'] = I('file_info');
-            }
+            $save['file_info'] = I('file_info');
 
             $save['status'] = $status;
             $save['last_up_time'] = $time;
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index eaa819262..f0b4f5915 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -283,11 +283,10 @@
     </script>
 
     <script>
-        var doc = {$data.file_info};
+        var doc = <?php echo ($data['file_info'] ?: "''") ?>;
         if(!doc){
             doc = [];
         }
-
         function addFile(info) {
             doc.push(info);
             layer.closeAll();
@@ -308,11 +307,14 @@
             });
         });
         $("#submit2").on("click",function(){
+            console.log(111);
             var cres = $('form').serializeArray();
+            console.log(222);
             //验证通过
             if(doc.length > 0){
                 cres.push({"name":"file_info", "value":JSON.stringify(doc)});
             }
+            console.log(333);
             //添加
             $.ajax({
                 url:"{:U('partner/edit')}",
diff --git a/Application/Admin/View/Partner/export.html b/Application/Admin/View/Partner/export.html
index 2eb9c0548..34cb3dbad 100644
--- a/Application/Admin/View/Partner/export.html
+++ b/Application/Admin/View/Partner/export.html
@@ -88,7 +88,7 @@
                             <td rowspan="{$data.row}">{$data.contract_time}</td>
                             <td rowspan="{$data.row}">{$data.invoice_rate}%</td>
                             <td rowspan="{$data.row}">{$data.settlement_type}</td>
-                            <td rowspan="{$data.row}">{$data.bank_account}</td>
+                            <td rowspan="{$data.row}">&nbsp;{$data.bank_account}</td>
                             <td rowspan="{$data.row}">{$data.opening_bank}</td>
                             <td rowspan="{$data.row}">{$data.remark}</td>
                             <td rowspan="{$data.row}">{$data.has_game_evidence}</td>