diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 392ec9170..a40c1dcd9 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5303,8 +5303,10 @@ if ($key == 'model'){
             $xlsCell = array(
                 array('count_date','月份'),
                 array('cash_count','游戏现金流水'),
-                array('balance_coin_count','平台币流水'),
+                array('balance_coin_deposit','平台币收入'),
                 array('inside_cash_count','内冲流水'),
+                array('bind_coin_count','内充支出'),
+                array('balance_coin_count','平台币支出'),
                 array('all_count','总流水'),
             );
 
@@ -5341,21 +5343,23 @@ if ($key == 'model'){
 //            $sumAll = D("spend_count")->sumSpendCountField($map,$allField);
             $order = "id DESC";
             $xlsData = M('spend_month_count','tab_')
-                ->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date")
+                ->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date,balance_coin_deposit,bind_coin_count")
                 ->where($map)
                 ->order($order)
                 ->select();
 
             $sumData = M('spend_month_count','tab_')
-                ->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date")
+                ->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date,sum(balance_coin_deposit) as balance_coin_deposit,sum(bind_coin_count) as bind_coin_count")
                 ->where($map)
                 ->order($order)
                 ->find();
 
             $sumData = [['count_date'=>'总计',
                 'cash_count'=>$sumData['cash_count'],
-                'balance_coin_count'=>$sumData['balance_coin_count'],
+                'balance_coin_deposit'=>$sumData['balance_coin_deposit'],
                 'inside_cash_count'=>$sumData['inside_cash_count'],
+                'bind_coin_count'=>$sumData['bind_coin_count'],
+                'balance_coin_count'=>$sumData['balance_coin_count'],
                 'all_count'=>$sumData['all_count']]];
             $xlsData = array_merge($xlsData,$sumData);
 
@@ -5373,8 +5377,8 @@ if ($key == 'model'){
             array('game_name','游戏'),
             array('partner_name','合作方'),
             array('cash_count','游戏现金流水'),
-            array('balance_coin_count','平台币流水'),
-            array('inside_cash_count','内冲流水'),
+            array('balance_coin_count','平台币支出'),
+            array('inside_cash_count','公会内充支出'),
             array('all_cash_count','总流水'),
         );
 
@@ -5397,7 +5401,7 @@ if ($key == 'model'){
         }
 
         if (!empty(I('partner_id'))) {
-            $map['partner_id']=I('collaborate_id');
+            $map['partner_id']=I('partner_id');
         }
 
         if (I('sign') == 2&&empty(I('root_id'))) {
@@ -5465,12 +5469,14 @@ if ($key == 'model'){
 
     function gameFinanceDetail() {
 
-
+        set_time_limit(0);
+        ini_set('memory_limit', '512M');
         $month = I("game_name");
         $xlsName = $month.'充值流水';
 
         $xlsCell = array(
             array('pay_order_number','支付订单号'),
+            array('extend','游戏订单号'),
             array('pay_time','充值时间'),
             array('user_account','玩家账号'),
             array('game_name','游戏名称'),
@@ -5509,6 +5515,13 @@ if ($key == 'model'){
             $map['promote_id'] = ['in',$promote_id];
         }
 
+        if (!empty(I('partner_id'))&&empty(I("game_id"))) {
+            $wherePartner = I('partner_id');
+            $gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
+            $gameId = implode(',',array_column($gameId,'id'));
+            $map['game_id'] = ['in',$gameId];
+        }
+
         if (!empty(I("count_date"))) {
             $month = I("count_date");
             $tarry = explode('-',$month);
@@ -5527,22 +5540,102 @@ if ($key == 'model'){
             $map['user_nickname'] = array('like',I("user_nickname").'%');
         }
 
-        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way";
+        $field = "pay_order_number,FROM_UNIXTIME(pay_time) as pay_time,user_account,game_name,promote_account,spend_ip,server_name,game_player_name,pay_amount,cost,pay_way,extend";
         $group = "";
         $order = "pay_time DESC";
-        $xlsData = D('spend')->getSpendData($map,$field,$group,$order);
+        for($start = $startTime;$start<$endTime;$start=$start+86400) {
+
+            $map['pay_time'] = array('between',array($start,$start+86400));
+
+            $xlsData1 = D('spend')->getSpendData($map,$field,$group,$order);
+
+            if ($xlsData1)  {
+                $xlsData[date('m-d',$start)] = $xlsData1;
+            }
+        }
 
         foreach($xlsData as $key => $value) {
-            $xlsData[$key]['pay_way'] = getPayType($value['pay_way']);
+            foreach ($value as $k => $v) {
+                $xlsData[$key][$k]['pay_way'] = getPayType($v['pay_way']);
+                $xlsData[$key][$k]['extend'] = "'".$v['extend'];
+            }
         }
+//        dump($xlsData);die();
+
+
+        $map['pay_time'] = array('between',array($startTime,$endTime));
 
         $sum = D('spend')->sumSpend($map,'pay_amount');
 
-        $sumData = [['pay_order_number'=>'总计',
+        $xlsData['10-'] = [['pay_order_number'=>'总计',
             'pay_way'=>$sum]];
-        $xlsData = array_merge($xlsData,$sumData);
+//        $xlsData = array_merge($xlsData,$sumData);
+//        dump($xlsData);die();
 
-        $this->exportExcel($xlsName, $xlsCell, $xlsData);
+        $this->exportNewExcel($xlsName, $xlsCell, $xlsData);
+    }
+
+    public function exportNewExcel($expTitle, $expCellName, $expTableData)
+    {
+        $xlsTitle = iconv('utf-8', 'gb2312', $expTitle);//文件名称
+//        $fileName = session('user_auth.username').date('_YmdHis');//or $xlsTitle 文件名称可根据自己情况设定
+        $fileName = $expTitle;
+        $cellNum = count($expCellName);
+        $dataNum = count(current($expTableData));
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $cellName = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK', 'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV', 'AW', 'AX', 'AY', 'AZ');
+        $objPHPExcel->getActiveSheet(0)->mergeCells('A1:' . $cellName[$cellNum - 1] . '1');//合并单元格
+        $objPHPExcel->setActiveSheetIndex(0)->setCellValue('A1', $expTitle);
+        $objPHPExcel->setActiveSheetIndex(0)->getStyle('A1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+
+        $objPHPExcel->setActiveSheetIndex(0)->setTitle(key($expTableData));
+        for ($i = 0; $i < $cellNum; $i++) {
+            $objPHPExcel->setActiveSheetIndex(0)->setCellValue($cellName[$i] . '2', $expCellName[$i][1]);
+        }
+        for ($i = 0; $i < $dataNum; $i++) {
+            for ($j = 0; $j < $cellNum; $j++) {
+                $objPHPExcel->getActiveSheet(0)->setCellValue($cellName[$j] . ($i + 3), current($expTableData)[$i][$expCellName[$j][0]]);
+            }
+        }
+//        var_dump($expTableData);die();
+        unset($expTableData[key($expTableData)]);
+
+        $sheetNum = 1;
+        foreach($expTableData as $key => $value) {
+            $dataNum = count($value);
+            $objPHPExcel->createSheet();
+
+            if ($key==0) {
+                break;
+            }
+            if ($key == '10-') {
+                $objPHPExcel->setActiveSheetIndex($sheetNum)->setTitle('总计');
+            } else {
+                $objPHPExcel->setActiveSheetIndex($sheetNum)->setTitle($key);
+            }
+
+            $objPHPExcel->getActiveSheet($sheetNum)->mergeCells('A1:' . $cellName[$cellNum - 1] . '1');//合并单元格
+            $objPHPExcel->setActiveSheetIndex($sheetNum)->setCellValue('A1', $expTitle);
+            $objPHPExcel->setActiveSheetIndex($sheetNum)->getStyle('A1')->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
+            for ($i = 0; $i < $cellNum; $i++) {
+                $objPHPExcel->setActiveSheetIndex($sheetNum)->setCellValue($cellName[$i] . '2', $expCellName[$i][1]);
+            }
+            for ($i = 0; $i < $dataNum; $i++) {
+                for ($j = 0; $j < $cellNum; $j++) {
+                    $objPHPExcel->getActiveSheet($sheetNum)->setCellValue($cellName[$j] . ($i + 3), $value[$i][$expCellName[$j][0]]);
+                }
+            }
+            $sheetNum++;
+        }
+//die();
+        ob_end_clean();//清除缓冲区,避免乱码
+        header('pragma:public');
+        header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $xlsTitle . '.xls"');
+        header("Content-Disposition:attachment;filename=$fileName.xls");//attachment新窗口打印inline本窗口打印
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        $objWriter->save('php://output');
+        exit;
     }
 
     function getPromoteList($root_id = 0) {
@@ -5574,8 +5667,9 @@ if ($key == 'model'){
         $xlsCell = array(
             array('promote_account','会长渠道'),
             array('cash_count','游戏现金流水'),
-            array('balance_coin_count','平台币流水'),
-            array('inside_cash_count','内充流水'),
+            array('balance_coin_count','平台币支出'),
+            array('inside_cash_count','公会内充发放'),
+            array('bind_coin_count','公会内充支出'),
             array('all_count','总流水'),
         );
 
@@ -5586,13 +5680,13 @@ if ($key == 'model'){
         $map['parent_id'] = 0;
         $map['root_id'] = 0;
         $xlsData = M('spend_user_count','tab_')
-            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->group('promote_id')
             ->select();
 
         $sumData = M('spend_user_count','tab_')
-            ->field('sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->find();
 
@@ -5601,6 +5695,7 @@ if ($key == 'model'){
             'cash_count'=>$sumData['cash_count'],
             'balance_coin_count'=>$sumData['balance_coin_count'],
             'inside_cash_count'=>$sumData['inside_cash_count'],
+            'bind_coin_count'=>$sumData['bind_coin_count'],
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
@@ -5644,10 +5739,11 @@ if ($key == 'model'){
         $xlsName = '组长月结统计';
 
         $xlsCell = array(
-            array('promote_account','组长渠道'),
+            array('promote_account','会长渠道'),
             array('cash_count','游戏现金流水'),
-            array('balance_coin_count','平台币流水'),
-            array('inside_cash_count','内充流水'),
+            array('balance_coin_count','平台币支出'),
+            array('inside_cash_count','公会内充发放'),
+            array('bind_coin_count','公会内充支出'),
             array('all_count','总流水'),
         );
 
@@ -5655,7 +5751,7 @@ if ($key == 'model'){
 //        $map['parent_id'] =$root_id;
 
         $xlsData = M('spend_user_count','tab_')
-            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->group('promote_id')
             ->select();
@@ -5664,7 +5760,7 @@ if ($key == 'model'){
         }
 
         $sumData = M('spend_user_count','tab_')
-            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->find();
         if (empty(I("root_name"))) {
@@ -5672,12 +5768,14 @@ if ($key == 'model'){
             $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count'] + $parentData[0]['balance_coin_count'], 2, '.', '');
             $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count'] + $parentData[0]['inside_cash_count'], 2, '.', '');
             $sumData['all_count'] = number_format($sumData['all_count'] + $parentData[0]['all_count'], 2, '.', '');
+            $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count'] + $parentData[0]['bind_coin_count'], 2, '.', '');
         }
 
         $sumData = [['promote_account'=>'总计',
             'cash_count'=>$sumData['cash_count'],
             'balance_coin_count'=>$sumData['balance_coin_count'],
             'inside_cash_count'=>$sumData['inside_cash_count'],
+            'bind_coin_count'=>$sumData['bind_coin_count'],
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
@@ -5715,16 +5813,17 @@ if ($key == 'model'){
         $xlsName = '推广员月结统计';
 
         $xlsCell = array(
-            array('promote_account','推广员渠道'),
+            array('promote_account','会长渠道'),
             array('cash_count','游戏现金流水'),
-            array('balance_coin_count','平台币流水'),
-            array('inside_cash_count','内充流水'),
+            array('balance_coin_count','平台币支出'),
+            array('inside_cash_count','公会内充发放'),
+            array('bind_coin_count','公会内充支出'),
             array('all_count','总流水'),
         );
 
         //获取数据
         $xlsData = M('spend_user_count','tab_')
-            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->group('promote_id')
             ->select();
@@ -5732,18 +5831,20 @@ if ($key == 'model'){
         $xlsData = array_merge($parentData,$xlsData);
 
         $sumData = M('spend_user_count','tab_')
-            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
             ->find();
         $sumData['cash_count'] = number_format($sumData['cash_count']+$parentData[0]['cash_count'],2,'.','');
         $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count']+$parentData[0]['balance_coin_count'],2,'.','');
         $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count']+$parentData[0]['inside_cash_count'],2,'.','');
         $sumData['all_count'] = number_format($sumData['all_count']+$parentData[0]['all_count'],2,'.','');
+        $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count']+$parentData[0]['bind_coin_count'],2,'.','');
 
         $sumData = [['promote_account'=>'总计',
             'cash_count'=>$sumData['cash_count'],
             'balance_coin_count'=>$sumData['balance_coin_count'],
             'inside_cash_count'=>$sumData['inside_cash_count'],
+            'bind_coin_count'=>$sumData['bind_coin_count'],
             'all_count'=>$sumData['all_count'],
         ]];
         $xlsData = array_merge($xlsData,$sumData);
@@ -5767,19 +5868,20 @@ if ($key == 'model'){
             }
 
             $data = M('spend_user_count','tab_')
-                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map)->select();
 
             $map1['parent_id'] = $data[0]['promote_id'];
             $map1['count_date'] = $date;
             $sunData = M('spend_user_count','tab_')
-                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count')
+                ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map1)->find();
 
             $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.','');
             $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.','');
             $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.','');
             $data[0]['all_count'] = number_format($data[0]['all_count']-$sunData['all_count'],2,'.','');
+            $data[0]['bind_coin_count'] = number_format($data[0]['bind_coin_count']-$sunData['bind_coin_count'],2,'.','');
 
 //            $map['inside_cash_count'] = ['neq',0];
 //            $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date");
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 9f94d658c..82e92ea12 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -153,9 +153,9 @@ class FinanceController extends ThinkController
             }
         }
 
-//        if (!empty(I('partner_id'))) {
-//            $map['partner_id']=I('collaborate_id');
-//        }
+        if (!empty(I('partner_id'))) {
+            $map['partner_id']=I('partner_id');
+        }
 
 
 
@@ -232,6 +232,7 @@ class FinanceController extends ThinkController
 
     function gameFinanceDetail($p = 1) {
 
+        set_time_limit(0);
         if (!empty(I("promote_id"))) {
             $promote_id[] = I("promote_id");
         }
@@ -257,7 +258,13 @@ class FinanceController extends ThinkController
             $map['promote_id'] = ['in',$promote_id];
         }
 
-
+        if (!empty(I('partner_id'))&&empty(I("game_id"))) {
+            $wherePartner = I('partner_id');
+            $gameId = M("game","tab_")->field("id")->where("partner_id={$wherePartner}")->select();
+            $gameId = implode(',',array_column($gameId,'id'));
+            $map['game_id'] = ['in',$gameId];
+        }
+//        var_dump($map);die();
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $row=10;
diff --git a/Application/Admin/Controller/SdkMenuController.class.php b/Application/Admin/Controller/SdkMenuController.class.php
index 309f4d59a..a2cf93f67 100644
--- a/Application/Admin/Controller/SdkMenuController.class.php
+++ b/Application/Admin/Controller/SdkMenuController.class.php
@@ -10,6 +10,12 @@ class SdkMenuController extends ThinkController{
 		'2' => '外部链接',
 	];
 
+	public $menu_version = [
+		'0' => '双平台',
+		'1' => '安卓',
+		'2' => 'ios',
+	];
+
 	public function lists()
 	{
 		$menu_name = I('get.menu_name','sdk_menu');
@@ -21,6 +27,7 @@ class SdkMenuController extends ThinkController{
 			{
 				$config[$k]['icon'] = is_https()?'https://':'http://' . $_SERVER['HTTP_HOST'] . $v['icon'];
 				$config[$k]['type'] = $this->but_type[$v['type']];
+				$config[$k]['menu_version'] = $this->menu_version[$v['menu_version']];
 			}
 		}
 		$this->assign('list',$config);
@@ -70,6 +77,7 @@ class SdkMenuController extends ThinkController{
 		$this->assign('data',$data);
 		$this->assign('menu_name',$menu_name);
 		$this->assign('but_type',$this->but_type);
+		$this->assign('menu_version',$this->menu_version);
 		$this->display('add');
 	}
 
@@ -121,6 +129,7 @@ class SdkMenuController extends ThinkController{
 		$this->assign('data',$data);
 		$this->assign('menu_name',$menu_name);
 		$this->assign('but_type',$this->but_type);
+		$this->assign('menu_version',$this->menu_version);
 		$this->display('add');
 	}
 
diff --git a/Application/Admin/View/Finance/gameFinance.html b/Application/Admin/View/Finance/gameFinance.html
index cc67e94bc..9d1d4f65c 100644
--- a/Application/Admin/View/Finance/gameFinance.html
+++ b/Application/Admin/View/Finance/gameFinance.html
@@ -177,7 +177,7 @@
               <a href="{:U('Finance/gameFinanceDetail',
                 array('count_date'=>$_REQUEST['count_date'],'root_id'=>$_GET['root_id'],'partner_id'=>$_REQUEST['partner_id'],
                 'parent_id'=>$_REQUEST['parent_id'],'promote_id'=>$_REQUEST['promote_id'],'game_id'=>$_REQUEST['game_id'],'game_name'=>'全部游戏',
-                'sign'=>$_REQUEST['sign'],'from'=>$_REQUEST['from']))}" >查看</a>
+                'sign'=>$_REQUEST['sign'],'from'=>$_REQUEST['from'],'all'=>1))}" >查看</a>
             </td>
           </tr>
         </notemtpy>
diff --git a/Application/Admin/View/Finance/gameFinanceDetail.html b/Application/Admin/View/Finance/gameFinanceDetail.html
index 95339bf98..72c538978 100644
--- a/Application/Admin/View/Finance/gameFinanceDetail.html
+++ b/Application/Admin/View/Finance/gameFinanceDetail.html
@@ -42,8 +42,10 @@
 
       <div class="input-list">
         <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
-        <a class="sch-btn" href="{:U('Export/gameFinanceDetail',
-                array('count_date'=>$_GET['count_date'],'game_id'=>$_GET['game_id'],'game_name'=>$_GET['game_name'],'user_account'=>$_GET['user_account'],'user_nickname'=>$_GET['user_nickname'],'parent_id'=>$_GET['parent_id'],'root_id'=>$_GET['root_id'],false))}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        <if condition="$_GET['all'] neq 1">
+          <a class="sch-btn" href="{:U('Export/gameFinanceDetail',
+                  array('count_date'=>$_GET['count_date'],'game_id'=>$_GET['game_id'],'game_name'=>$_GET['game_name'],'user_account'=>$_GET['user_account'],'user_nickname'=>$_GET['user_nickname'],'parent_id'=>$_GET['parent_id'],'root_id'=>$_GET['root_id'],false))}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        </if>
       </div>
       <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
       <input type="hidden" name="game_id" value="{$_GET['game_id']}"/>
diff --git a/Application/Admin/View/SdkMenu/add.html b/Application/Admin/View/SdkMenu/add.html
index b0dde8bd1..6e1f166ee 100644
--- a/Application/Admin/View/SdkMenu/add.html
+++ b/Application/Admin/View/SdkMenu/add.html
@@ -31,6 +31,23 @@
                     <input type="text" class="" name="title" value="{$data.title|default=''}" >
                 </td>
             </tr>
+            <tr>
+                <td class="l noticeinfo">平台</td>
+                <td class="r table_radio">
+                    <span class="form_select">
+                        <select name="menu_version">
+                            <foreach name="menu_version" item="vo" key="k">
+                                <if condition="$data['menu_version'] == $k">
+                                    <option value="{$k}" selected="selected">{$vo}</option>
+                                <else />
+                                    <option value="{$k}">{$vo}</option>
+                                </if>
+                            </foreach>
+
+                        </select>
+                    </span>
+                </td>
+            </tr>
             <tr>
                 <td class="l noticeinfo">菜单链接</td>
                 <td class="r table_radio">
diff --git a/Application/Admin/View/SdkMenu/lists.html b/Application/Admin/View/SdkMenu/lists.html
index 7857daaa5..cc7003278 100644
--- a/Application/Admin/View/SdkMenu/lists.html
+++ b/Application/Admin/View/SdkMenu/lists.html
@@ -35,6 +35,7 @@
 					<th style="text-align:center">ID</th>
 					<th style="text-align:center">菜单名称</th>
 					<th style="text-align:center">菜单标题</th>
+                    <th style="text-align:center">平台</th>
 					<th style="text-align:center">菜单图标</th>
 					<th style="text-align:center">菜单链接</th>
 					<th style="text-align:center">url类型</th>
@@ -52,6 +53,7 @@
 						<td>{$channel.id}</td>
 						<td>{$channel.name}</td>
 						<td>{$channel.title}</td>
+                        <td>{$channel.menu_version}</td>
 						<td><img src="{$channel.icon}"></td>
 						<td>{$channel.url}</td>
                         <td>{$channel.type}</td>
diff --git a/Application/Common/Common/function.php b/Application/Common/Common/function.php
index a2c806fe8..d3a793b4e 100644
--- a/Application/Common/Common/function.php
+++ b/Application/Common/Common/function.php
@@ -1389,3 +1389,26 @@ function curl_post($url = '', $post_data = array()) {
 	return $data;
 }
 
+if(!function_exists('dd')){
+    function dd($var){
+        if (func_num_args() > 1) {
+            $var = func_get_args();
+        }
+        $debug = debug_backtrace();
+        echo '<pre class="yun-debug" style="background:#EAEAEA;padding:10px;">';
+        echo '<div class="file" style="color:#f00;">',$debug[0]['file'],'    ',$debug[0]['line'],PHP_EOL,'</div>';
+        if (is_object($var) || is_array($var)) {
+            $mode = 0;
+        } else {
+            $mode = 1;
+        }
+        switch($mode){
+            case 0: print_r($var); break;
+            case 1: var_dump($var); break;
+            default: print_r($var);
+        }
+        echo '</pre>';
+        exit;
+    }
+}
+
diff --git a/Data/README.md b/Data/README.md
index 9c05dfd67..05d950f7c 100644
--- a/Data/README.md
+++ b/Data/README.md
@@ -1 +1 @@
-# 数据备份文件夹，请勿删除
\ No newline at end of file
+# 数据备份文件夹，请勿删除。
\ No newline at end of file
diff --git a/Public/Media/css/collaborate.css b/Public/Media/css/collaborate.css
new file mode 100644
index 000000000..8dc1742d2
--- /dev/null
+++ b/Public/Media/css/collaborate.css
@@ -0,0 +1,43 @@
+.collaborate_swiper{
+    margin-top: 0.02rem;
+    width: 100%;
+    height: 5rem;
+}
+.collaborate_swiper>img{
+    width: 100%;
+    height: 100%;
+}
+.collaborate_introduce{
+    padding: 0.7rem 3.6rem 0.8rem;
+    background-color:  #F6F7FB;
+}
+.collaborate_info{
+
+}
+.collaborate_info .title{
+    padding: 0.11rem 0 0.11rem 0.27rem;
+    border-left: 0.05rem solid #2BBDEE;
+    font-size: 0.28rem;
+    color: #292929;
+}
+.collaborate_info .del{
+    margin: 0.29rem 0;
+    font-size: 0.24rem;
+    color: #292929;
+    font-weight: 300;
+}
+.collaborate_info>p{
+    font-size: 0.24rem;
+    color: #292929;
+    font-weight: 300;
+    margin-bottom: 0.1rem;
+}
+.map-box{
+    width: 100%;
+    height: 4.08rem;
+    margin-top: 0.81rem;
+}
+#container{    
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file
diff --git a/Public/Media/css/foot.css b/Public/Media/css/foot.css
new file mode 100644
index 000000000..1ec4bd837
--- /dev/null
+++ b/Public/Media/css/foot.css
@@ -0,0 +1,80 @@
+.foot{
+    
+}
+.foot_box{
+    padding: 0.37rem 3.61rem 0.31rem 3.59rem;
+    background-color: #282B2D;
+}
+.foot_top{
+    display: flex;
+    align-items: center;
+    padding-bottom: 0.2rem;
+    border-bottom: 1px solid #fff;
+}
+.foot_top>img{
+    width: 0.84rem;
+    height: 1.06rem;
+}
+.foot_top_ri{
+    margin-left: 0.39rem;
+    padding-left: 0.3rem;
+    border-left: 1px dashed #F5F5F5;
+}
+.foot_link{
+    display: flex;
+    align-items: center;
+}
+.foot_link>a{
+    font-size: 0.14rem;
+    color: #fff;
+    cursor: pointer;
+}
+.foot_link>a:first-child{
+    padding-right: 0.19rem;
+    border-right: 1px solid #fff;
+    margin-right: 0.2rem;
+}
+.foot_serial{
+    margin-top: 0.2rem;
+    display: flex;
+    align-items: center;
+}
+.foot_serial>span{
+    font-size: 0.12rem;
+    color: #fff;
+}
+.foot_serial>span:first-child{
+    margin-right: 0.44rem;
+}
+.foot_code{
+    margin-top: 0.11rem;
+    font-size: 0.12rem;
+    color: #fff;
+}
+.foot_approve{
+    margin-top: 0.14rem;
+    width: 0.68rem;
+    height: 0.24rem;
+    font-size: 0.12rem;
+}
+.foot_approve>img{
+    width: 100%;
+    height: 100%;
+}
+.foot_bom{
+    margin-top: 0.15rem;
+    text-align: center;
+    font-size: 0.14rem;
+    color: #D5D4D4;
+}
+.side_tabbar{
+    position: fixed;
+    right: 0.63rem;
+    top: 4.23rem;
+    width: 2.70rem;
+    height: 3.70rem;
+}
+.side_tabbar img{
+    width: 100%;
+    height: 100%;
+}
\ No newline at end of file
diff --git a/Public/Media/css/heard.css b/Public/Media/css/heard.css
new file mode 100644
index 000000000..b5c2cd00b
--- /dev/null
+++ b/Public/Media/css/heard.css
@@ -0,0 +1,47 @@
+.heard{
+    width: 100%;
+    height: 1.5rem;
+    display: flex;
+    justify-content: center;
+    position: relative;
+}
+.heard_logo{
+    position: absolute;
+    left: 0.66rem;
+    top: 0.45rem;
+    width: 2.10rem;
+    height: 0.6rem;
+    font-size: 0.24rem;
+}
+.heard_logo>img{
+    width: 100%;
+    height: 100%;
+}
+.heard_tabbar ul{
+    display: flex;
+    font-size: 0.24rem;
+    color: #5B5B5B;
+    margin-top: 0.54rem;
+}
+.heard_tabbar ul li{
+    margin-right: 1.2rem;
+   cursor: pointer;
+}
+.heard_tabbar ul li a{
+   font-size: 0.28rem;
+   color: #5B5B5B;
+   padding-bottom: 0.54rem;
+   border-bottom: 0.04rem solid #fff;
+
+}
+.heard_tabbar ul li a:hover{
+    color: #2BBDEE;
+    border-bottom: 0.04rem solid #2BBDEE;
+}
+.heard_tabbar ul li .active{
+    color: #2BBDEE;
+    border-bottom: 0.04rem solid #2BBDEE;
+}
+.heard_tabbar ul li:last-child{
+    margin-right: 0;
+}
\ No newline at end of file
diff --git a/Public/Media/css/product.css b/Public/Media/css/product.css
new file mode 100644
index 000000000..c2a993a76
--- /dev/null
+++ b/Public/Media/css/product.css
@@ -0,0 +1,126 @@
+.product_swiper{
+    margin-top: 0.02rem;
+    width: 100%;
+    height: 2.9rem;
+}
+.product_swiper>img{
+    width: 100%;
+    height: 100%;
+}
+.product_home{
+    padding: 0.7rem 3.6rem 0.81rem 0.55rem;
+    background-color: #F6F7FB;
+    display: flex;
+    align-items: flex-start;
+}
+.product_left{
+    width: 2.5rem;
+}
+.product_left>img{
+    width: 2.5rem;
+    height: 1.38rem;
+}
+.recharge{
+    margin-top: 0.3rem;
+    background-color: #fff;
+}
+.recharge_box{
+    padding: 0 0.15rem;
+    padding-bottom: 0.34rem;
+}
+.recharge_box .title{
+    font-size: 0.28rem;
+    color: #949494;
+    text-align: center;
+    padding: 0.2rem 0;
+    border-bottom: 1px solid #EEEEEE;
+}
+.recharge_box  .del{
+    font-size: 0.2rem;
+    color: #949494;
+    padding: 0.25rem 0.12rem 0.31rem 0.2rem;
+}
+.recharge_box .voucher{
+    font-size: 0.2rem;
+    color: #fff;
+    width: 1.5rem;
+    height: 0.4rem;
+    background-color: rgba(43,189,238,1);
+    border-radius: 0.2rem;
+    text-align: center;
+    line-height: 0.4rem;
+    margin: 0 auto;
+    cursor:pointer;
+}
+.product_right{
+    margin-left: 0.55rem;
+}
+.product_right .title{
+    padding: 0.12rem 0 0.12rem 0.27rem;
+    border-left: 0.05rem solid #2BBDEE;
+    font-size: 0.28rem;
+    color: #292929;
+}
+.not_product{
+    width: 12rem;
+    margin-top: 0.26rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+.not_product>img{
+    width: 7.2rem;
+    height: 4rem;
+}
+.not_product>div{
+    color: #A9A9A9;
+    font-size: 0.28rem;
+    margin-top: 0.16rem;
+}
+.have_product{
+    margin-top: 0.3rem;
+}
+.have_product ul{
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+}
+.have_product ul li{
+    background-color: #fff;
+    width: 3.8rem;
+    margin-right: 0.2rem;
+    margin-bottom: 0.3rem;
+}
+.have_product ul li:nth-child(3n){
+    margin-right: 0;
+}
+.have_product ul li>img{
+    width: 3.8rem;
+    height: 2.14rem;
+}
+.have_product ul li .have_product_box{
+    padding: 0.3rem 0.33rem 0.07rem;
+}
+.have_product ul li .have_product_box .name{
+    font-size: 0.24rem;
+    color: #002929;
+    font-weight: 600;
+}
+.have_product ul li .have_product_box .del{
+    font-size: 0.16rem;
+    color: #A9A9A9;
+    margin-top: 0.33rem;
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+    padding-bottom: 0.3rem;
+    border-bottom: 1px solid #F6F7FB;
+}
+.have_product ul li .have_product_box .enter{
+    font-size: 0.16rem;
+    color: #A9A9A9;
+    text-align: right;
+    margin-top: 0.1rem;
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/Public/Media/images/foot_logo.png b/Public/Media/images/foot_logo.png
index 098bc4f16..14a1dd00d 100644
Binary files a/Public/Media/images/foot_logo.png and b/Public/Media/images/foot_logo.png differ
diff --git a/Public/Media/images/foot_slide.png b/Public/Media/images/foot_slide.png
new file mode 100644
index 000000000..7fddb6c78
Binary files /dev/null and b/Public/Media/images/foot_slide.png differ
diff --git a/Public/Media/images/img_left.png b/Public/Media/images/img_left.png
new file mode 100644
index 000000000..018252ef5
Binary files /dev/null and b/Public/Media/images/img_left.png differ
diff --git a/Public/Media/images/inner_banner1.png b/Public/Media/images/inner_banner1.png
new file mode 100644
index 000000000..a46ef1a8c
Binary files /dev/null and b/Public/Media/images/inner_banner1.png differ
diff --git a/Public/Media/images/logo.png b/Public/Media/images/logo.png
index d0d934c29..01fbe8fd1 100644
Binary files a/Public/Media/images/logo.png and b/Public/Media/images/logo.png differ
diff --git a/Public/Media/images/lunbo.png b/Public/Media/images/lunbo.png
new file mode 100644
index 000000000..fd0a15130
Binary files /dev/null and b/Public/Media/images/lunbo.png differ
diff --git a/Public/Media/images/lunbo2.png b/Public/Media/images/lunbo2.png
new file mode 100644
index 000000000..3ceb64f4d
Binary files /dev/null and b/Public/Media/images/lunbo2.png differ
diff --git a/Public/Media/images/lunbo3.png b/Public/Media/images/lunbo3.png
new file mode 100644
index 000000000..29c4f41a8
Binary files /dev/null and b/Public/Media/images/lunbo3.png differ
diff --git a/Public/Media/images/not_data.png b/Public/Media/images/not_data.png
new file mode 100644
index 000000000..ec74c2083
Binary files /dev/null and b/Public/Media/images/not_data.png differ
diff --git a/Public/Media/images/play.png b/Public/Media/images/play.png
new file mode 100644
index 000000000..7fe316132
Binary files /dev/null and b/Public/Media/images/play.png differ
diff --git a/Public/Media/js/collaborate.js b/Public/Media/js/collaborate.js
new file mode 100644
index 000000000..acd2d2d94
--- /dev/null
+++ b/Public/Media/js/collaborate.js
@@ -0,0 +1,70 @@
+$(function() {
+	
+	// 百度地图API功能
+	var mp = new BMap.Map("container", {
+		enableMapClick: false
+	});
+	var addPoint = new BMap.Point(119.280631, 26.08057);
+	var marker = new BMap.Marker(addPoint); // 创建标注    
+	mp.addOverlay(marker); // 将标注添加到地图中
+	mp.centerAndZoom(addPoint, 15);
+	mp.enableScrollWheelZoom();
+	// 复杂的自定义覆盖物
+	function ComplexCustomOverlay(point, text) {
+		this._point = point;
+		this._text = text;
+	}
+	ComplexCustomOverlay.prototype = new BMap.Overlay();
+	ComplexCustomOverlay.prototype.initialize = function(map) {
+		this._map = map;
+		var div = this._div = document.createElement("div");
+		div.style.position = "absolute";
+		div.style.zIndex = BMap.Overlay.getZIndex(this._point.lat);
+		//					div.style.border = "0.01rem solid #BC3B3A";
+		//					div.style.backgroundColor = "#ffffff";
+		div.style.padding = "0.02rem";
+		div.style.height = "0.18rem";
+		div.style.width = "3rem";
+		//					div.style.lineHeight = "0.18rem";
+		//					div.style.whiteSpace = "nowrap";
+		div.style.MozUserSelect = "none";
+		div.style.fontSize = "0.18rem"
+		var p = this._span = document.createElement("p");
+		p.style.position = "absolute";
+		p.style.top = "-450%";
+		p.style.left = "-50%";
+		p.style.width = "3rem";
+		p.style.backgroundColor = "#ffffff";
+		p.style.lineHeight = "0.3rem";
+		p.style.textAlign = "center";
+		div.appendChild(p);
+		p.appendChild(document.createTextNode(this._text));
+		var that = this;
+
+		var arrow = this._arrow = document.createElement("div");
+		arrow.style.background = "url(../images/address-point.png) center no-repeat";
+		arrow.style.backgroundSize = "120% 120%";
+		arrow.style.position = "absolute";
+		arrow.style.width = "0.3rem";
+		arrow.style.height = "0.3rem";
+		arrow.style.top = "-80%";
+		arrow.style.left = "-8%";
+		arrow.style.overflow = "hidden";
+		div.appendChild(arrow);
+		
+
+		mp.getPanes().labelPane.appendChild(div);
+
+		return div;
+	}
+	ComplexCustomOverlay.prototype.draw = function() {
+		var map = this._map;
+		var pixel = map.pointToOverlayPixel(this._point);
+		this._div.style.left = pixel.x - parseInt(this._arrow.style.left) + "px";
+		this._div.style.top = pixel.y - 30 + "px";
+	}
+
+	var myCompOverlay = new ComplexCustomOverlay(addPoint, "福建省福州市鼓楼区福大怡山文化创意园11号楼");
+
+	mp.addOverlay(myCompOverlay);
+});
\ No newline at end of file
diff --git a/Public/Media/js/rem.js b/Public/Media/js/rem.js
new file mode 100644
index 000000000..1b006ad9f
--- /dev/null
+++ b/Public/Media/js/rem.js
@@ -0,0 +1,34 @@
+(function(doc, win) {
+	var docEl = doc.documentElement,
+		resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+		recalc = function() {
+
+			var clientWidth = docEl.clientWidth;
+			if(!clientWidth) return;
+			if(clientWidth > 1080) {
+				var whdef = 100 / 1920; // 表示1920的设计图,使用100PX的默认值
+				var wH = window.innerHeight; // 当前窗口的高度
+				var wW = window.innerWidth; // 当前窗口的宽度
+				var rem = wW * whdef; // 以默认比例值乘以当前窗口宽度,得到该宽度下的相应FONT-SIZE值
+				docEl.style.fontSize = rem + "px";
+				
+			} else if(640 < clientWidth <= 1080) {
+				docEl.style.fontSize = '50px';
+			} else {
+				docEl.style.fontSize = 100 * (clientWidth / 640) + 'px';
+			}
+
+		};
+
+	if(!doc.addEventListener) return;
+	recalc();
+	win.addEventListener(resizeEvt, recalc, false);
+	doc.addEventListener('DOMContentLoaded', recalc, false);
+	/*DOMContentLoaded文档加载完成不包含图片资源 onload包含图片资源*/
+})(document, window);
+
+/*
+
+var iWidth=document.documentElement.clientWidth  //getBoundingClientRect().width;
+ iWidth=iWidth>640?640:iWidth;
+ document.getElementsByTagName("html")[0].style.fontSize=iWidth/6.4+"px";*/
\ No newline at end of file