Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/PartnerController.class.php

@@ -155,8 +155,11 @@ class PartnerController extends ThinkController
                 $value['settlement_type'] = '月结';
             }
             $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
-            $value['contract_time'] = time_format($value['contract_start_time'], 'Y/m/d') . '-' .
+            $contract_start_time = $value['contract_start_time'] ?
-                time_format($value['contract_end_time'], 'Y/m/d');
+                time_format($value['contract_start_time'], 'Y/m/d') : '-';
+            $contract_end_time = $value['contract_end_time'] ?
+                time_format($value['contract_end_time'], 'Y/m/d') : '-';
+            $value['contract_time'] = $contract_start_time . '-' . $contract_end_time;
             $row2 = array_sum(array_column($value['game'], 'row')) ;
             $value['row'] = empty($row2) ? 1: $row2;
             $parseData[$value['partner_id']][] = $value;
@@ -374,8 +377,12 @@ class PartnerController extends ThinkController
             if (empty($data)) {
                 $this->error('数据异常', U('lists'));
             }
-            $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
+            if ($data['contract_start_time']) {
-            $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+                $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
+            }
+            if ($data['contract_end_time']) {
+                $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+            }
             $data['channel_rate'] *= 100;//存的是小数，显示百分比
             $data['invoice_rate'] *= 100;//存的是小数，显示百分比
 //            dd($data);

Application/Admin/Controller/StatementMangementController.class.php

@@ -259,7 +259,7 @@ class StatementMangementController extends ThinkController
                 $item['reward_type_desc'] = $item['reward_type'] == 1 ? "奖励" : "惩罚";
                 $item['company_type_desc'] = $item['company_type'] == 1 ? "上游公司" : "下游公司";
                 $item['relation_game_name'] = $games[$item['relation_game_id']];
-                $item['reward_time'] = date('Y-m-d H:i:s', $item['reward_time']);
+                $item['reward_time'] = $item['reward_time'] ? date('Y-m-d H:i:s', $item['reward_time']) : '-';
                 // if ($item['company_type'] == 1) {
 
                 // } else {

Application/Admin/View/StatementMangement/rewardManageList.html

@@ -153,7 +153,7 @@
                                 <td>{$data.content}</td>
                                 <td>{$data.money}</td>
                                 <td>{$data.remark}</td>
-                                <td>{:date('Y-m-d H:i:s',$data['reward_time'])}</td>
+                                <td>{$data['reward_time']}</td>
                                 <td>{:get_admin_nickname($data['creater_id'])}</td>
                                 <td>
                                     <a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>

Application/Admin/View/StatementMangement/rewardManageSave.html

@@ -63,7 +63,7 @@
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
           class="form-horizontal form_info_ml" id="form">
-        <div class="formtitle"><span>奖惩编辑</span></div>
+        <div class="formtitle"><span>奖惩<?php if ($_GET['id']):?>编辑 <?php else:?>新增<?php endif;?></span></div>
         <ul class="form_info ">
             <input type="hidden" name="id" value="{$data.id}" />
             <li>

Application/Admin/View/Tool/company_info.html

@@ -157,7 +157,7 @@
 </script>
 <script type="text/javascript">
     //导航高亮
-    highlight_subnav("{:U('lists')}");
+    highlight_subnav("{:U('Tool/company_info')}");
     $(function(){
         //搜索功能
         $("#search").click(function(){

Data/update.sql

@@ -1171,7 +1171,7 @@ CREATE TABLE `tab_reward_record` (
   `creater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者ID',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
+-- 2020-02-10 liuweiwen 内部公司信息
 CREATE TABLE `tab_company_info` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `partner` varchar(60) NOT NULL COMMENT '合作方名称',