Merge branch 'feature/admin_optimize' into release

# Conflicts:
#	Data/update.sql

Application/Admin/Common/extend.php

@@ -1575,7 +1575,7 @@ function getGameList($partner_id) {
 
 function getAdminData ($uid) {
     $adminData = M('auth_group_access')
-        ->field('data_empower_type,data_president')
+        ->field('data_empower_type,data_president,show_data')
         ->join('left join sys_auth_group on sys_auth_group_access.group_id=sys_auth_group.id')
         ->where(array('uid'=>$uid))->find();
 

Application/Admin/Controller/AdminController.class.php

@@ -95,6 +95,7 @@ class AdminController extends Controller {
         $this->assign('res1',$res1);     
 
         $this->assign('__MENU__', $this->getMenus());
+        $this->assign('is_admin', IS_ROOT);
     }
     /**
      * 大菜单存在两个及以上的同方法菜单,需要进行多级菜单确认

Application/Admin/Controller/ApplyController.class.php

@@ -98,7 +98,8 @@ class ApplyController extends ThinkController
         $this -> meta_title = 'APP分包';
         $this -> m_title = '游戏盒子APP分包';
         $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'Apply/app_lists', 'status' => 1]) -> find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this -> display();
     }
 
@@ -178,7 +179,8 @@ class ApplyController extends ThinkController
         $this -> assign('list_data', $listdata);
         $this -> m_title = '游戏分包';
         $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'Apply/and_lists', 'status' => 1]) -> find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this -> display();
         //parent::order_lists(self::model_name,$_GET["p"],$map);
     }

Application/Admin/Controller/AuthManagerController.class.php

@@ -443,9 +443,11 @@ class AuthManagerController extends AdminController{
         $auth_group = M('AuthGroup')->where( array('status'=>array('egt','0'),'module'=>'admin','type'=>AuthGroupModel::TYPE_ADMIN) )
             ->getfield('id,id,title,rules');
 //        var_dump($auth_group);die();
-        $empower_type = M('AuthGroup')->field('data_empower_type')->where(array('id'=>$_GET['group_id']))->find();
+        $empower_type = M('AuthGroup')->field('data_empower_type,show_data')->where(array('id'=>$_GET['group_id']))->find();
 //        var_dump($empower_type);die();
+
         $this->assign('data_empower_type', $empower_type['data_empower_type']);
+        $this->assign('show_data', $empower_type['show_data']);
         $this->assign('auth_group', $auth_group);
         $this->display();
 
@@ -455,6 +457,7 @@ class AuthManagerController extends AdminController{
         $mid = I('id');
         $gid = I('group_id');
         $data_empower_type = I('data_empower_type');
+        $show_data = I('show_data');
         $promoteData = I('promote_data');
 
 //        dump(json_decode($promoteData,true));
@@ -479,7 +482,11 @@ class AuthManagerController extends AdminController{
             $promoteData = '';
         }
 
-        if ($AuthGroup->where("id = {$gid}")->save(array('data_empower_type'=>$data_empower_type,'data_president'=>$promoteData))) {
+        if ($AuthGroup->where("id = {$gid}")->save(array(
+            'data_empower_type'=>$data_empower_type,
+            'data_president'=>$promoteData,
+            'show_data'=>$show_data
+        ))) {
             $this->success('操作成功',U('AuthManager/index'));
         } else {
             $this->success('操作成功',U('AuthManager/index'));

Application/Admin/Controller/LaunchController.class.php

@@ -36,7 +36,8 @@ class LaunchController extends ThinkController {
 
         $this->assign('list_data',$data['data']);
         $this->assign('_page',$data['page']);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
 
     }
@@ -177,7 +178,8 @@ class LaunchController extends ThinkController {
         $this->m_title = '投放数据';
         $this->m_url = 'Launch/data';
         $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Merchandise/lists','status'=>1])->find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
 
     }

Application/Admin/Controller/MendController.class.php

@@ -31,7 +31,8 @@ class MendController extends ThinkController {
         $map['register_type'] = array('in','(0,1,2,3,4,5,6,7)');
         //为数据权限添加
         setPowerPromoteIds($map);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         parent::lists("user",$p,$map);
     }
     /**

Application/Admin/Controller/PartnerController.class.php

@@ -77,6 +77,7 @@ class PartnerController extends ThinkController
     public function add()
     {
         if ($_POST) {
+            dd($_REQUEST);
             $partner = I('post.partner', '');
             $status = intval(I('post.status', 1));
 
@@ -119,6 +120,19 @@ class PartnerController extends ThinkController
             $save['bank_account'] = I('bank_account');
             $save['opening_bank'] = I('opening_bank');
 
+            $save['matche_platform'] = I('matche_platform');
+            $save['contract_start_time'] = strtotime(I('contract_start_time'));
+            $save['contract_end_time'] = strtotime(I('contract_end_time'));
+            $save['channel_rate'] = I('channel_rate');
+            $save['invoice_rate'] = I('invoice_rate');
+            $save['is_sign_contract'] = I('is_sign_contract');
+            $save['settlement_type'] = I('settlement_type');
+            $save['has_game_evidence'] = I('has_game_evidence');
+            $save['remark'] = I('remark');
+            if (isset($save['file_info'])) {
+                $save['file_info'] = json_encode($save['file_info'],JSON_UNESCAPED_UNICODE);
+            }
+
             $save['uid'] = UID;
             $save['create_time'] = $time;
             $save['last_up_time'] = $time;
@@ -245,4 +259,56 @@ class PartnerController extends ThinkController
 
         $this->success('删除成功', U('lists'));
     }
+
+    public function addfile()
+    {
+        $this->meta_title = '文档添加';
+        return $this->display();
+    }
+
+    //处理上传图片
+    public function saveFile()
+    {
+        $path = '/Uploads/';
+        $upload = new \Think\Upload();// 实例化上传类
+        $upload->maxSize   =     0 ;// 设置附件上传大小
+        $upload->exts      =    '';// 设置附件上传类型
+        $upload->rootPath  =     '.'.$path; // 设置附件上传根目录
+        $upload->savePath  =     ''; // 设置附件上传（子）目录
+        // 上传文件
+        $info   =   $upload->upload();
+        // dump($info);
+        if(!$info) {// 上传错误提示错误信息
+            $msg = $upload->getError();
+            $array= array('status' => 0, 'info' => $msg);
+        }else{// 上传成功
+            $array=array(
+                "info"=>"上传成功",
+                "status"=>1,
+                "file_path"=>$path.$info['file']['savepath'].$info['file']['savename'],
+                "file_name"=>$_POST['file_name'],
+                "file_type"=>$_FILES['file']['type'],
+                "file_size"=>$_FILES['file']['size'],
+                "upload_time"=>date("Y-m-d H:i:s",time())
+            );
+        }
+        $this->ajaxReturn($array);
+    }
+    //删除图片
+    public function delFile()
+    {
+        $id = $_REQUEST['id'];
+        $index = $_REQUEST['index'] ?: false;
+        $file_path = $_REQUEST['file_path'] ?: false;
+        if($id == 0){
+            //未存入数据库，不用管
+            unlink("./".$file_path);
+            $this->ajaxReturn(array(
+                'status' => 1,
+                'info' => "删除成功"
+            ));
+        }
+        # code...
+    }
+
 }

Application/Admin/Controller/PromoteCoinController.class.php

@@ -254,7 +254,8 @@ class PromoteCoinController extends ThinkController
             $this->assign('_page', $page);
         }
         $this->assign('list_data', $data);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
 
     }

Application/Admin/Controller/PromoteController.class.php

@@ -18,7 +18,8 @@ class PromoteController extends ThinkController
 
     public function lists($p=1)
     {
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         switch ($_GET['type']) {
             case '':
             case 1:
@@ -645,7 +646,8 @@ class PromoteController extends ThinkController
 
         $this->m_title = '实时注册';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/ch_reg_list','status'=>1])->find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
 
         $user->user_join_v1($model, $_GET['p']);
     }
@@ -786,7 +788,8 @@ class PromoteController extends ThinkController
 
         $this->m_title = '实时充值';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/spend_list','status'=>1])->find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
 
         $user->list_($model, $_GET['p']);
     }
@@ -862,7 +865,8 @@ class PromoteController extends ThinkController
 
         $this->m_title = '会长代充记录';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/agent_list','status'=>1])->find());
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         parent::order_lists('Agent', $_GET["p"], $map);
     }
     /**
@@ -1263,7 +1267,8 @@ class PromoteController extends ThinkController
         }
         $companys = M('promote_company', 'tab_')->field('id, company_name')->select();
         $admins = M('member')->field('uid,nickname')->select();
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->assign('list_data', $list_data);
         $this->assign('companys', $companys);
         $this->assign('admins', $admins);

Application/Admin/Controller/PromoteGameRatioController.class.php

@@ -222,7 +222,8 @@ class PromoteGameRatioController extends ThinkController
         $this->assign('promoteList', getPromoteByLevel(1, intval(I('company_id', 0))));
         $this->assign('statusList', self::$statusList);
         $this->assign('reviewRule', $reviewRule);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->meta_title = $metaTitle;
         $this->display();
     }

Application/Admin/Controller/QueryController.class.php

@@ -53,7 +53,8 @@ class QueryController extends ThinkController
         $row = intval(I('row', 10));
         $group = I('group', 1);
         $this->assign('group', $group);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $promoteId = I('promote_id', 0);
 
         if ($group == 1) {
@@ -1175,7 +1176,8 @@ class QueryController extends ThinkController
         $companys = getPromoteCompanys();
         $this->assign('companys', $companys);
         $this->assign('reviewTypeList', $reviewTypeList);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->assign('list_data', $datas);
         $this->display();
     }

Application/Admin/Controller/SpendController.class.php

@@ -128,7 +128,8 @@ class SpendController extends ThinkController
         $this->assign('endDate', $endDate);
         $this->assign('list_data', $data['data']);
         $this->assign('_page', $data['page']);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
     }
     

Application/Admin/Controller/SupportController.class.php

@@ -42,7 +42,8 @@ class SupportController extends ThinkController {
         if($page) {$this->assign('_page', $page);}
         
         $this->assign('list_data', $list);
-        $this->assign('is_admin', is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->meta_title = '资源发放';
         $this->display();
     }

Application/Admin/Controller/TestResourceController.class.php

@@ -62,7 +62,8 @@ class TestResourceController extends ThinkController
       if($page) {$this->assign('_page', $page);}
       $this->meta_title = '扶持号管理';
       $this->assign('data',$data);
-      $this->assign('is_admin', is_administrator());
+      $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+      $this->assign('show_data_power', $show_data_power);
       $this->display();
 
   }

Application/Admin/Model/MemberModel.class.php

@@ -79,7 +79,8 @@ class MemberModel extends Model {
             'username'        => $user['nickname'],
             'last_login_time' => $user['last_login_time'],
             'data_empower_type'=>$adminData['data_empower_type'],
-            'data_president'=>$adminData['data_president']
+            'data_president'=>$adminData['data_president'],
+            'show_data'=>$adminData['show_data'],
         );
         //登录有效时间改为1小时
         $expireTime = 3600;

Application/Admin/View/Apply/and_lists.html

@@ -261,7 +261,7 @@
                             <tr>
                                 <td style="border-right:1px solid #DDDDDD;text-align:center"><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]" ></td>
                                 <td style="border-right:1px solid #DDDDDD;text-align:center">
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {:get_promote_account($data['promote_id'])}
                                         <else />
                                         {:encryptStr(get_promote_account($data['promote_id']))}

Application/Admin/View/AuthManager/dataempower.html

@@ -58,6 +58,24 @@
                   <input type="hidden"  name="promote_data" id="promote_data" value="[]">
                 </td>
               </tr>
+
+              <tr>
+                <td class="l noticeinfo" style="padding-left: 15px;">数据展示权限：</td>
+                <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1"  name="show_data"
+                                        <if condition="$show_data==1"> checked </if>> 是
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="0"  name="show_data"
+                                        <if condition="$show_data==0"> checked </if>> 否
+                                    </label>
+                                </span>
+                  <span class="notice-text"></span>
+                </td>
+              </tr>
+
               </tbody>
             </table>
           </div>

Application/Admin/View/BehaviorLog/index.html

@@ -140,7 +140,7 @@
                             <td>{$vo.extend}</td>
                             <td>{:set_show_time($vo['create_time'])}</td>
                             <td>
-                                <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     {$vo.user_account}
                                     <else />
                                     {$vo.user_account|encryptStr}
@@ -149,7 +149,7 @@
                             <td>{$vo.game_name}</td>
                             <td>{$vo.server_name}</td>
                             <td>
-                                <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     {$vo.promote_account}
                                     <else />
                                     {$vo.promote_account|encryptStr}

Application/Admin/View/Game/edit.html

@@ -64,6 +64,14 @@
                                 <input type="text" class="txt " name="game_name" value="{$data['game_name']}" placeholder="请输入游戏名称" readonly="true">
                                 <input type="hidden"  name="game_appid" value="{$data['game_appid']}">
                             </td>
+
+                        </tr>
+                        <tr>
+                            <td class="l">游戏原包名称：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="original_package_name" value="{$data['original_package_name']}" placeholder="请输入游戏原包名称">
+                            </td>
+
                         </tr>
                         <tr>
                             <td class="l">游戏类型：</td>

Application/Admin/View/Mend/lists.html

@@ -140,14 +140,14 @@
                             <tr>
                                 <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                                 <td>
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.user_account}
                                         <else />
                                         {$data.user_account|encryptStr}
                                     </if>
                                 </td>
                                 <td>
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {:get_promote_name($data['promote_id'])}
                                         <else />
                                         {:encryptStr(get_promote_name($data['promote_id']))}

Application/Admin/View/Partner/add.html

@@ -14,7 +14,7 @@
     <script type="text/javascript" src="__STATIC__/webuploader/webuploader.js"></script>
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
-
+    <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
 
     <!-- 标签页导航 -->
     <div class="tab-wrap">
@@ -30,12 +30,76 @@
                     <table  border="0" cellspacing="0" cellpadding="0">
                         <tbody>
                         <tr>
-                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合作方名称：</td>
+                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>合同合作方名称：</td>
                             <td class="r" >
                                 <input type="text" class="txt " name="partner" value="" placeholder="请输入合作方名称">
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->对应平台(简称)：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="matche_platform" value="" placeholder="请输入对应平台">
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l">合同期限：</td>
+                            <td class="r">
+                                <input type="text" class="txt time time1" name="contract_start_time" value="" placeholder="请选择开始时间">
+                                -<input type="text" class="txt time time2" name="contract_end_time" value="" placeholder="请选择结束时间">
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->渠道费率：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="channel_rate" value="" placeholder="请输入渠道费率">%
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l"><!--<i class="mustmark" style="margin-left:-7px">*</i>-->开票税点：</td>
+                            <td class="r" >
+                                <input type="text" class="txt " name="inoice_rate" value="" placeholder="请输入开票税点">
+                            </td>
+                        </tr>
+
+
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同：</td>
+                            <td class="r">
+                                <select name="is_sign_contract" class="select_gallery">
+                                    <option value="">请选择是否签署合同</option>
+                                    <option value="1" <if condition="$data['is_sign_contract'] eq '1'">  selected="selected"</if>>是</option>
+                                    <option value="0" <if condition="$data['is_sign_contract'] eq '0'">  selected="selected"</if>>否</option>
+                                </select>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>结算方式：</td>
+                            <td class="r">
+                                <select name="settlement_type" class="select_gallery">
+                                    <option value="0">请选择结算方式</option>
+                                    <option value="1" <if condition="$data['settlement_type'] eq '1'">  selected="selected"</if>>周结</option>
+                                    <option value="2" <if condition="$data['settlement_type'] eq '2'">  selected="selected"</if>>月结</option>
+                                </select>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>是否签署合同：</td>
+                            <td class="r">
+                                <select name="has_game_evidence" class="select_gallery">
+                                    <option value="">请选择是否有游戏资质</option>
+                                    <option value="1" <if condition="$data['has_game_evidence'] eq '1'">  selected="selected"</if>>是</option>
+                                    <option value="0" <if condition="$data['has_game_evidence'] eq '0'">  selected="selected"</if>>否</option>
+                                </select>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>联系人：</td>
                             <td class="r" >
@@ -86,6 +150,13 @@
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="l">备注：</td>
+                            <td class="r">
+                                <input type="text" name="remark" class="txt" value="" placeholder="请输入备注">
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l noticeinfo"><i class="mustmark" style="margin-left:-7px">*</i>显示状态：</td>
                             <td class="r table_radio">
@@ -100,13 +171,22 @@
                                 <span class="notice-text"></span>
                             </td>
                         </tr>
+
+                        <tr>
+                            <td class="l noticeinfo">文档管理</td>
+                            <td class="r table_radio">
+                                <input type="button" class="coin-detail" data-url="{:U('Partner/addfile')}" value="添加"
+                                       style="border-radius:5%;background: #fff;color: #333;font-weight: 400;border: 1px solid #777;width: 100px;height: 35px">
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
+                    <table  border="1" style="width: 600px;text-align: center;" cellspacing="0" cellpadding="0" id="docShow">
+
+                    </table>
                 </div>
                 <div class="form-item cf">
-                    <button class="submit_btn ajax-post" id="submit" type="submit" target-form="form-horizontal" style="margin-left:210px;">
-                        保存
-                    </button>
+                    <input class="submit_btn ajax-post" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">
                     <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Partner/lists')}" >
                         返回
                     </a>
@@ -123,14 +203,165 @@
         <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
     </div>
 
+    <script type="text/html" id="doctpl">
+        {@each list as it,index}
+        {@if index==0}
+        <thead>
+        <tr>
+            <th>文档名称</th>
+            <th>上传时间</th>
+            <th style="width:150px;">操作</th>
+        </tr>
+        </thead>
+        {@/if}
+        <tr>
+            <td style="padding:0;">${it.file_name}</td>
+            <td>${it.upload_time}</td>
+            <td>
+                <a class="filedown" data-index="${index}" data-path="${it.file_path}">下载</a>
+                <a class="filedel" data-index="${index}" data-path="${it.file_path}">删除</a>
+            </td>
+        </tr>
+        {@/each}
+    </script>
 </block>
 
 <block name="script">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script type="text/javascript">
+        $('.time1').datetimepicker({
+            format: 'yyyy-mm-dd hh:ii',
+            language:"zh-CN",
+            minView:0,startDate:new Date(),
+            autoclose:true
+        }).change(function(){
+            var start = new Date($(this).val()).getTime();
+            var end = new Date($('.time2').val()).getTime();
+
+            if(isNaN(end)) {return false;}
+
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;}
+
+            return false;
+        });
+
+        $('.time2').datetimepicker({
+            format: 'yyyy-mm-dd hh:ii',
+            language:"zh-CN",
+            minView:0,startDate:new Date(),
+            autoclose:true
+        }).change(function(){
+            var end = new Date($(this).val()).getTime();
+            var start = new Date($('.time1').val()).getTime();
+
+            if(isNaN(start)) {return false;}
+
+            if(start>=end) {layer.msg('开始时间必须小于结束时间');return false;}
+
+            return false;
+        });
+
         //导航高亮
         highlight_subnav("{:U('Partner/lists')}");
-        $('#submit').click(function(){
-            $('#form').submit();
+    </script>
+
+    <script>
+        var doc = [];
+        function addFile(info) {
+            doc.push(info);
+            layer.closeAll();
+            PROMOTE.juicerFun();
+
+            // window.parent.addFile(info);
+        }
+        $(".coin-detail").click(function () {
+            var url = $(this).data('url');
+            var title =  '文档添加';
+            layer.open({
+                type: 2,
+                title: title,
+                shadeClose: true,
+                shade: 0.8,
+                area: ['40%', '60%'],
+                content: url
+            });
         });
+        $("#submit").on("click",function(){
+            var cres = $('form').serializeArray();
+            //验证通过
+            if(doc.length > 0){
+                cres.push({"name":"file_info", "value":JSON.stringify(doc)});
+            }
+            console.log(cres)
+            //添加
+            $.ajax({
+                url:"{:U('partner/add')}",
+                type:"post",
+                data:cres,
+                dataType:"json",
+                success:function(data){
+                    if(data.status == 1){
+                        layer.msg(data.info,function(){
+                            window.location.href="{:U('partner/lists')}";
+                        });
+                    }else{
+                        layer.msg(data.info);
+                    }
+                },
+                error:function(e){
+
+                }
+            });
+
+        })
+        var PROMOTE = {
+            juicerFun(){
+                var tpl =$("#doctpl").html();
+                var html =  juicer(tpl, {list:doc});
+                $("#docShow").html(html);
+                PROMOTE.juicerEvent();
+            },
+            juicerEvent(){
+                $(".filedown,.filedel").off("click");
+                $(".filedown").on("click",function(){
+                    var url = window.location.protocol+"//"+window.location.host+$(this).data("path");
+                    // window.open(url,"_blank");
+                    var link = document.createElement('a');
+                    link.setAttribute("download", "");
+                    link.href = url;
+                    link.click()
+                });
+                $(".filedel").on("click",function(){
+                    var path = $(this).data("path");
+                    var index = $(this).data("index");
+                    console.log(index);
+                    var id = 0;
+                    $.ajax({
+                        url:"{:U('Partner/delFile')}",
+                        type:"post",
+                        data:{
+                            "id":0,
+                            "file_path":path
+                        },
+                        dataType:"json",
+                        success:function(data){
+                            if(data.status == 1){
+                                doc.splice(index,1)
+                                PROMOTE.juicerFun();
+                            }else{
+                                layer.alert(data.info);
+                            }
+                        },
+                        error:function(e){
+
+                        }
+                    });
+                })
+            }
+        }
+
     </script>
 </block>

Application/Admin/View/Partner/addfile.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="UTF-8">
+    <title></title>
+    <link href="http://admin.vlcms.com/Public/icon.ico" type="image/x-icon" rel="shortcut icon">
+    <link rel="stylesheet" type="text/css" href="__CSS__/base.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/module.css">
+    <link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
+    <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
+    <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+</head>
+<style>
+    html {
+        min-width:100%;
+    }
+    body {
+        padding: 0px;
+    }
+</style>
+<body>
+<div id="main" class="main" style="min-height: 342px;margin-top: 20px;padding-left: 50px;">
+    <table border="0" cellspacing="0" cellpadding="0">
+        <tr style="padding: 10px;height: 50px;">
+            <td class="l" style="width: 100px;">文件名称:</td>
+            <td class="r" style="margin-left: 10px;">
+                <input type="text" id="filename" name="company_name" value="" placeholder="请输入文件名称">
+            </td>
+        </tr>
+        <tr style="padding: 10px;height: 50px;">
+            <td class="l">文件选择:</td>
+            <td >
+                <input type="file" id="fileinput" name="file">
+            </td>
+        </tr>
+    </table>
+    <div class="jssearch search_list fl cf">
+        <div class="input-list">
+            <div class="sch-btn uploadfile" style="width: 100px;padding: 5px;">确认添加</div>
+        </div>
+    </div>
+</div>
+
+<script>
+    $(function(){
+
+    $(".uploadfile").on("click",function(){
+            var formData = new FormData();
+            var filename = $("#filename").val();
+            if(filename == ''){
+                layer.msg("文件名不能为空");
+                return false;
+            }
+            formData.append("file_name", filename);
+            formData.append("file", document.getElementById("fileinput").files[0]);
+            var index = layer.load();
+            $.ajax({
+                url:"{:U('Partner/saveFile')}",
+                type:"post",
+                data:formData,
+                processData:false,
+                contentType:false,
+                success:function(data){
+                    layer.close(index);  
+                    if(data.status == 1){
+                        window.parent.addFile(data);
+                    }else{
+                        layer.alert(data.info);
+                    }
+                },
+                error:function(e){
+                    
+                }
+            });        
+        })
+
+    });
+</script>
+
+</body>
+</html>

Application/Admin/View/Promote/lists.html

@@ -7,7 +7,6 @@
     <script src="__STATIC__/layer/layer.js"></script>
     <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
     <script type="text/javascript" src="__JS__/select2.min.js"></script>
-    <link rel="stylesheet" href="__CSS__/promote.css" type="text/css"/>
     <style>
         .select2-container--default .select2-selection--single {
             color: #000;
@@ -227,20 +226,18 @@
                                 <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                                 <td>{$data.id}</td>
                                 <td>
-                                   <!-- <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.account}
                                         <else />
                                         {$data.account|encryptStr}
-                                    </if>-->
-                                    {$data.account}
+                                    </if>
                                 </td>
                                 <td>
-                                  <!--  <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.mobile_phone}
                                         <else />
                                         {$data.mobile_phone|encryptStr}
-                                    </if>-->
-                                    {$data.mobile_phone}
+                                    </if>
                                 </td>
                                 <td>{$data.balance_coin}</td>
                                 <td>{:sum_promote_total_money($data['id'])}</td>
@@ -248,12 +245,11 @@
                                 <td>{:set_show_time($data['last_login_time'])}</td>
                                 <td>{:get_promote_levels($data['id'])}</td>
                                 <td>
-                                   <!-- <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {:getTopPromote($data['id'])['account']}
                                         <else />
                                         {:encryptStr(getTopPromote($data['id'])['account'])}
-                                    </if>-->
-                                    {:getTopPromote($data['id'])['account']}
+                                    </if>
                                 </td>
                                 <td>{$data['company_belong_str']}</td>
                                 <td>{$data['company_relation_str']}</td>
@@ -303,9 +299,6 @@
                                     <if condition="session('user_auth.uid') eq 1">
                                         <a class='delete' data-id="{$data.id}">删除</a>
                                     </if>
-                                    <if condition="$data['level'] eq 1">
-                                        <a href="{:U('certification', array('id' => $data['id']))}" style="cursor: pointer;">资质认证</a>
-                                    </if>
                                 </td>
                             </tr>
                         </volist>
@@ -344,7 +337,7 @@
                                 <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                                 <td>{$data.id}</td>
                                 <td>
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {:get_promote_account($data.promote_id)}
                                         <else />
                                         {:get_promote_account($data.promote_id)|encryptStr}
@@ -447,6 +440,7 @@
         </form>
         <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
     </div>
+
 </block>
 
 <block name="script">

Data/update.sql

@@ -1192,56 +1192,8 @@ ADD COLUMN `company_type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '工
 ALTER TABLE `tab_withdraw`
 ADD COLUMN `review_type` tinyint(3) NOT NULL DEFAULT 1 COMMENT '审核模式：1-人工审核 2-自动审核';
 
--- 2020-02-10 liaojinling 推广员组名/部门名
-ALTER TABLE `tab_promote`
-ADD COLUMN `group_remark` varchar(50) NOT NULL default '' COMMENT '部门分组';
-
---2020-02-10 sunke 公司录入主体信息增加--
-ALTER TABLE `tab_promote_company`
-	ADD COLUMN `settlement_contact` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '结算联系人' AFTER `last_up_time`,
-	ADD COLUMN `contact_phone` BIGINT(12) NOT NULL DEFAULT '0' COMMENT '联系电话' AFTER `settlement_contact`,
-	ADD COLUMN `address` VARCHAR(255) NOT NULL DEFAULT '0' COMMENT '所在地址' AFTER `contact_phone`,
-	ADD COLUMN `bank_card` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '银行卡号' AFTER `address`,
-	ADD COLUMN `bank_cardname` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '银行卡名' AFTER `bank_card`,
-	ADD COLUMN `bank_name` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '收款银行' AFTER `bank_cardname`,
-	ADD COLUMN `bank_address` VARCHAR(60) NOT NULL DEFAULT '0' COMMENT '开户网点' AFTER `bank_name`,
-	ADD COLUMN `content` VARCHAR(255) NULL DEFAULT '' COMMENT '备注' AFTER `bank_address`;
-
--- 2020-1-17 预付款预警
-CREATE TABLE `tab_partner_divide_warn` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '公司预警表',
-  `partner_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '公司ID',
-  `advance_amount` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '预付款',
-  `warming_amount` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '预警金额',
-  `phones` json DEFAULT NULL,
-  `warn_frequency` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '预警金额频率',
-  `status` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '状态 1正常 2删除',
-  `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
-  `upt_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '修改时间',
-  `operater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '操作者ID',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
--- 添加测试订单录入表  郑昌隆 2020-02-12
-DROP TABLE IF EXISTS `tab_test_order`;
-CREATE TABLE `tab_test_order` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `order_type` tinyint(2) DEFAULT '0' COMMENT '0-未知，1-sdk充值，2-平台币充值，3-超级签充值',
-  `server_type` tinyint(2) DEFAULT '1' COMMENT '1-测试内网 2-测试外网',
-  `order_no` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '平台充值订单号',
-  `cp_order_no` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'CP订单号',
-  `user_account` varchar(30) COLLATE utf8mb4_bin DEFAULT '' COMMENT '用户账号',
-  `game_id` int(11) DEFAULT '0' COMMENT '游戏ID',
-  `game_name` varchar(30) COLLATE utf8mb4_bin DEFAULT '' COMMENT '游戏名称',
-  `order_amount` decimal(10,2) DEFAULT NULL COMMENT '订单金额',
-  `pay_amount` decimal(10,2) DEFAULT NULL COMMENT '支付金额',
-  `pay_time` int(11) DEFAULT '0' COMMENT '交易时间',
-  `pay_way` int(11) DEFAULT NULL COMMENT '-1绑币,0平台币,1支付宝,2微信,7金猪,9双乾支付-支付宝,10双乾支付-银联,15双乾支付-快捷',
-  `add_time` int(11) DEFAULT '0' COMMENT '添加时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-
+--2020-02-12 liuweiwen 游戏-游戏有包名称
+ALTER TABLE tab_game ADD COLUMN `original_package_name` varchar(64) DEFAULT NULL COMMENT '游戏原包名称';
 -- 2020-02-12 zyx 推广提现--新增审核模式
 ALTER TABLE `tab_statement`
 MODIFY COLUMN `ext_field` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '扩展字段，如果是下游为提现单号' AFTER `pay_type`;