Merge branch 'feature/admin_optimize' into release

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;

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])

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"

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')}",

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;">
                 <!-- 表头 -->
@@ -81,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>

Application/Admin/View/Partner/lists.html

@@ -242,17 +242,8 @@
     $(function(){
         $("#downloadexcel").on("click",function(){
             var url = $(this).attr("url");
-            var title =  '合作方导出';
+            window.open(url, "blank");
-            layer.open({
+        });
-                type: 2,
-                title: title,
-                shadeClose: true,
-                shade: 0.8,
-                area: ['40%', '60%'],
-                content: url
-
-            });
-        })
         $('#time-start').datetimepicker({
             format: 'yyyy-mm-dd',
             language: "zh-CN",