diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php
index ea93deb3d..dcd964320 100644
--- a/Application/Admin/Controller/CompanyGameRatioController.class.php
+++ b/Application/Admin/Controller/CompanyGameRatioController.class.php
@@ -107,47 +107,27 @@ class CompanyGameRatioController extends AdminController
             }
             
             $v['settlement_type'] = $this->SettlementType[$v['settlement_type']];
-
-            //新
-            $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : [];
-            $thisRatioDtl = "默认：{$v['ratio']}%";
-            if ($thisTurnoverRatios) {
-                
-                foreach ($thisTurnoverRatios as $thisTurnoverRatio) {
-                    $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥';
-                    $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%";
-                }
-            }
-            $v['turnover_ratio_str'] = $thisRatioDtl;
+            $this->readTurnoverRatio($v);
             $v['oplist'] = $this->OpAuth($v);
         }
+        $this->assign('data', $dbres);
         if(isset($_REQUEST['export'])){
             $GetData = $_GET;
             unset($GetData['export']);
             addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]);
-
-            data2csv($dbres,'特殊比例申请管理',array(
-                "company_name"=>"公司名称",
-                "company_belong"=>"内外团",
-                "settlement_type"=>"结算周期",
-                "game_type_name"=>"游戏类型",
-                "original_package_name"=>"原游戏名称",
-                "relation_game_name"=>"现游戏名称",
-                "valid"=>"生效时间",
-                "turnover_ratio_str"=>"分成比例"
-            ));
+            $this->display("export");
+            exit();
         }
 
         $count = M("company_game_ratio","tab_")->alias('m')->field("count(m.id) count")
                 ->join("JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
-        $this->assign('data', $dbres);
+        
         $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
-
         $this->assign("companyList",D("PromoteCompany")->getList());
         $this->assign("gameList",D("Game")->getRelationGameLits());
         $this->assign("SettlementType",$this->SettlementType);
@@ -748,6 +728,29 @@ class CompanyGameRatioController extends AdminController
         $company_id = implode(",",$company_id);
         return $company_id;
     }
+     //设置比例阶梯
+     protected function readTurnoverRatio(&$v){
+        $turnover_ratio = json_decode($v['turnover_ratio'],true);
+        $v['turnover_ratio'] = array(
+            array("ratio"=>$v['ratio']."%","name"=>"默认比例")
+        );
+        
+        foreach($turnover_ratio as $ke=>$va){
+            $t=array("ratio"=>$va["ratio"]."%");
+            if(array_key_exists("instanceof",$va)){
+                //存在
+                if($va['instanceof']=='1'){
+                    $t['name']="月流水≥".$va['turnover'];
+                }else{
+                    $t['name']="月流水＞".$va['turnover'];
+                }
+            }else{
+                $t['name']="月流水≥".$va['turnover'];
+            }
+            $v['turnover_ratio'][]=$t;
+        }
+        $v['row'] = count($v['turnover_ratio']);
+    }
 
     
 }
\ No newline at end of file
diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php
index f56269f05..eac5363f7 100644
--- a/Application/Admin/Controller/GameRatioMouldController.class.php
+++ b/Application/Admin/Controller/GameRatioMouldController.class.php
@@ -48,26 +48,16 @@ class GameRatioMouldController extends AdminController
             $v['company_belong'] ="下游".getCompanyBlong($v['company_belong']);
             $this->readTurnoverRatio($v);
        }
-    //    dd($dbres);
+       $this->assign('data', $dbres);
        //判断导出
        if(isset($_REQUEST['export'])){
             $GetData = $_GET;
             unset($GetData['export']);
             addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"推广员-推广员管理-游戏分成比例模板-导出"]);
-
-            data2csv($dbres,'游戏分成比例模板',array(
-                "game_type_name"=>"游戏类型",
-                "relation_game_name"=>"现包名",
-                "original_package_name"=>"原包名",
-                "company_belong"=>"公司类型",
-                "turnover_ratio_str"=>"比例分成",
-                "create_time"=>"时间",
-                "admin_name"=>"操作人"
-            ));
+            $this->display("export");
+            exit();
         }
-
        $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count'];
-       $this->assign('data', $dbres);
         $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
diff --git a/Application/Admin/View/CompanyGameRatio/export.html b/Application/Admin/View/CompanyGameRatio/export.html
new file mode 100644
index 000000000..6e2ecd4fd
--- /dev/null
+++ b/Application/Admin/View/CompanyGameRatio/export.html
@@ -0,0 +1,91 @@
+<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">
+    <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
+    <script src="__STATIC__/table2excel.js"></script>
+</head>
+<style>
+    html {
+        min-width: 100%;
+    }
+
+    body {
+        padding: 0px;
+    }
+</style>
+
+<body>
+    <div style="margin:auto;font-size: 16px;color: red;line-height: 3;padding: 20px;">
+        导出进行中。。。<br />
+        如果导出成功你也可以手动关闭此页面
+    </div>
+    <table border="1" id="exporttable" style="opacity: 0;">
+        <!-- 表头 -->
+        <thead>
+        <tr>
+            <th>公司名称</th>
+            <th>内外团</th>
+            <th>结算周期</th>
+            <th>游戏类型</th>
+            <th>原游戏名称</th>
+            <th>现游戏名称</th>
+            <th>生效时间</th>
+            <th colspan="2">比例分成</th>
+        </tr>
+        </thead>
+
+        <!-- 列表 -->
+        <tbody>
+        <if condition = "empty($data)">
+            <tr>
+                <td colspan="9" class="text-center">aOh! 暂时还没有内容!</td>
+            </tr>
+            <else/>
+            <volist name="data" id="data">
+                <tr>
+                    <td rowspan="{$data.row}">{$data.company_name}</td>
+                    <td rowspan="{$data.row}">{$data.company_belong}</td>
+                    <td rowspan="{$data.row}">{$data.settlement_type}</td>
+                    <td rowspan="{$data.row}">{$data.game_type_name}</td>
+                    <td rowspan="{$data.row}">{$data.original_package_name}</td>
+                    <td rowspan="{$data.row}">{$data.relation_game_name}</td>
+                    <td rowspan="{$data.row}">{$data.valid}</td>
+                    <notempty name="data['turnover_ratio'][0]">
+                        <td>{$data['turnover_ratio'][0]['name']|default="--"}</td>
+                        <td>{$data['turnover_ratio'][0]['ratio']|showPercent}</td>
+                    <else />
+                        <td>--</td>
+                        <td>--</td>
+                    </notempty> 
+                </tr>
+                <if condition="$data['row'] gt 1">
+                    <foreach name="data['turnover_ratio']" item="game_ratio" key="gamekey">
+                        <if condition="$gamekey gt 0">
+                            <tr>
+                                <td>{$game_ratio['name']|default="--"}</td>
+                                <td>{$game_ratio['ratio']|showPercent}</td>
+                            </tr>
+                        </if>
+                    </foreach>
+                </if>
+            </volist>
+        </if>
+        </tbody>
+    </table>
+
+    <script>
+        $(function () {
+            $("#exporttable").table2excel({
+                filename: "游戏特殊比例申请.xls", // do include extension
+                preserveColors: false // set to true if you want background colors and font colors preserved
+            });
+        });
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html
index b539e6bf4..931d7ec20 100644
--- a/Application/Admin/View/CompanyGameRatio/index.html
+++ b/Application/Admin/View/CompanyGameRatio/index.html
@@ -41,12 +41,11 @@
             cursor:pointer
         }
         .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;}
-        .layui-layer-title {
-            text-align: center;
-            height: 80px;
-            line-height: 80px;
-            font-weight: 600;
-            font-size: 18px;
+        .data_list table td{
+            line-height: 2;
+        }
+        tr{
+            border-bottom: 1px solid #e6e6e6;
         }
     </style>
 
@@ -154,7 +153,7 @@
                     <th>原游戏名称</th>
                     <th>现游戏名称</th>
                     <th>生效时间</th>
-                    <th>分成比例</th>
+                    <th colspan="2">比例分成</th>
                     <th>操作</th>
                 </tr>
                 </thead>
@@ -168,25 +167,37 @@
                     <else/>
                     <volist name="data" id="data">
                         <tr>
-                            <td>{$data.company_name}</td>
-                            <td>{$data.company_belong}</td>
-                            <td>{$data.settlement_type}</td>
-                            <td>{$data.game_type_name}</td>
-                            <td>{$data.original_package_name}</td>
-                            <td>{$data.relation_game_name}</td>
-                            <td>{$data.valid}</td>
-                            <td style="line-height: 16px;text-indent: 0;">
-                                <div style="text-align: left;width: 90%;margin-left: 5%;margin-top: 10px;margin-bottom: 10px;">
-                                    {$data.turnover_ratio_str}
-                                </div>
-                            </td>
+                            <td rowspan="{$data.row}">{$data.company_name}</td>
+                            <td rowspan="{$data.row}">{$data.company_belong}</td>
+                            <td rowspan="{$data.row}">{$data.settlement_type}</td>
+                            <td rowspan="{$data.row}">{$data.game_type_name}</td>
+                            <td rowspan="{$data.row}">{$data.original_package_name}</td>
+                            <td rowspan="{$data.row}">{$data.relation_game_name}</td>
+                            <td rowspan="{$data.row}">{$data.valid}</td>
+                            <notempty name="data['turnover_ratio'][0]">
+                                <td>{$data['turnover_ratio'][0]['name']|default="--"}</td>
+                                <td>{$data['turnover_ratio'][0]['ratio']|showPercent}</td>
+                            <else />
+                                <td>--</td>
+                                <td>--</td>
+                            </notempty> 
 
-                            <td>
+                            <td rowspan="{$data.row}">
                                 <foreach name="data.oplist" item="vo" >
                                     {$vo}
                                  </foreach>
                             </td>
                         </tr>
+                        <if condition="$data['row'] gt 1">
+                            <foreach name="data['turnover_ratio']" item="game_ratio" key="gamekey">
+                                <if condition="$gamekey gt 0">
+                                    <tr>
+                                        <td>{$game_ratio['name']|default="--"}</td>
+                                        <td>{$game_ratio['ratio']|showPercent}</td>
+                                    </tr>
+                                </if>
+                            </foreach>
+                        </if>
                     </volist>
                 </if>
                 </tbody>
@@ -196,8 +207,7 @@
     </div>
 
     <div class="page">
-            <a class="sch-btn export-btn"
-               href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+            <a class="sch-btn export-btn" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
     <!--弹出层-->
@@ -248,6 +258,23 @@ $(function(){
             $("#search").click();
         }
     });
+    $("#downloadexcel").on("click",function(){
+        var url = $(this).attr("url");
+        var title =  '游戏特殊比例申请导出,请耐心等待数据处理....';
+        var index = layer.load(2);
+        layer.open({
+            type: 2,
+            title: title,
+            shadeClose: false,
+            shade: 0.8,
+            area: ['40%', '30%'],
+            content: url,
+            success:function(){
+                layer.closeAll();   
+            }
+            
+        });
+    })
 
     $(".delGameRatio").on("click",function(){
         var id = $(this).data("id");
diff --git a/Application/Admin/View/CompanyGameRatio/lists.html b/Application/Admin/View/CompanyGameRatio/lists.html
index c6acd692e..85ef27603 100644
--- a/Application/Admin/View/CompanyGameRatio/lists.html
+++ b/Application/Admin/View/CompanyGameRatio/lists.html
@@ -48,6 +48,9 @@
             font-weight: 600;
             font-size: 18px;
         }
+        .data_list table td{
+            line-height: 2;
+        }
     </style>
 
     <div class="cf top_nav_list">
@@ -239,8 +242,6 @@
     </div>
 
     <div class="page">
-            <a class="sch-btn export-btn"
-               href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
         {$_page|default=''}
     </div>
     <!--弹出层-->
diff --git a/Application/Admin/View/GameRatioMould/export.html b/Application/Admin/View/GameRatioMould/export.html
new file mode 100644
index 000000000..0728badf2
--- /dev/null
+++ b/Application/Admin/View/GameRatioMould/export.html
@@ -0,0 +1,89 @@
+<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">
+    <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
+    <script src="__STATIC__/table2excel.js"></script>
+</head>
+<style>
+    html {
+        min-width: 100%;
+    }
+
+    body {
+        padding: 0px;
+    }
+</style>
+
+<body>
+    <div style="margin:auto;font-size: 16px;color: red;line-height: 3;padding: 20px;">
+        导出进行中。。。<br />
+        如果导出成功你也可以手动关闭此页面
+    </div>
+    <table border="1" id="exporttable" style="opacity: 0;">
+        <!-- 表头 -->
+        <thead>
+        <tr>
+            <th>游戏类型</th>
+            <th>现包名</th>
+            <th>原包名</th>
+            <th>公司类型</th>
+            <th colspan="2">比例分成</th>
+            <th>时间</th>
+            <th>操作人</th>
+        </tr>
+        </thead>
+
+        <!-- 列表 -->
+        <tbody>
+        <if condition = "empty($data)">
+            <tr>
+                <td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
+            </tr>
+            <else/>
+            <volist name="data" id="data">
+                <tr>
+                    <td rowspan="{$data.row}">{$data.game_type_name}</td>
+                    <td rowspan="{$data.row}">{$data.relation_game_name}</td>
+                    <td rowspan="{$data.row}">{$data.original_package_name}</td>
+                    <td rowspan="{$data.row}">{$data.company_belong}</td>
+                    <notempty name="data['turnover_ratio'][0]">
+                        <td>{$data['turnover_ratio'][0]['name']|default="--"}</td>
+                        <td>{$data['turnover_ratio'][0]['ratio']|showPercent}</td>
+                    <else />
+                        <td>--</td>
+                        <td>--</td>
+                    </notempty> 
+                    <td rowspan="{$data.row}">{$data.create_time}</td>
+                    <td rowspan="{$data.row}">{$data.admin_name}</td>
+                </tr>
+                <if condition="$data['row'] gt 1">
+                    <foreach name="data['turnover_ratio']" item="game_ratio" key="gamekey">
+                        <if condition="$gamekey gt 0">
+                            <tr>
+                                <td>{$game_ratio['name']|default="--"}</td>
+                                <td>{$game_ratio['ratio']|showPercent}</td>
+                            </tr>
+                        </if>
+                    </foreach>
+                </if>
+            </volist>
+        </if>
+        </tbody>
+    </table>
+
+    <script>
+        $(function () {
+            $("#exporttable").table2excel({
+                filename: "游戏分成比例模板.xls", // do include extension
+                preserveColors: false // set to true if you want background colors and font colors preserved
+            });
+        });
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html
index 56374ab90..bdb66d21b 100644
--- a/Application/Admin/View/GameRatioMould/index.html
+++ b/Application/Admin/View/GameRatioMould/index.html
@@ -45,6 +45,9 @@
         tr{
             border-bottom: 1px solid #e6e6e6;
         }
+        .data_list table td{
+            line-height: 2;
+        }
     </style>
 
     <div class="cf top_nav_list">
@@ -158,10 +161,7 @@
     </div>
 
     <div class="page">
-        <if condition="$role_export_check eq true ">
-            <a class="sch-btn export-btn"
-               href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
-        </if>
+        <a class="sch-btn export-btn" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
     <!--弹出层-->
@@ -211,6 +211,23 @@ $(function(){
             $("#search").click();
         }
     });
+    $("#downloadexcel").on("click",function(){
+        var url = $(this).attr("url");
+        var title =  '游戏分成比例模板,请耐心等待数据处理....';
+        var index = layer.load(2);
+        layer.open({
+            type: 2,
+            title: title,
+            shadeClose: false,
+            shade: 0.8,
+            area: ['40%', '30%'],
+            content: url,
+            success:function(){
+                layer.closeAll();   
+            }
+            
+        });
+    })
     $(".ratio_del").on("click",function(){
         var url  = $(this).data("url");
         layer.confirm('删除后将无法恢复，请慎重选择', {