diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
index 37f290871..e1653bac4 100644
--- a/Application/Admin/Controller/PromoteGameRatioController.class.php
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -126,7 +126,9 @@ class PromoteGameRatioController extends ThinkController
             $params = I('get.');
             $id = $params['id'] ?? 0;
             $id = intval($id);
+            $metaTitle = '游戏分成比例申请';
             if ($id) {
+                $metaTitle .= '--修改';
                 $field = 'promote_id, game_id, ratio, begin_time, end_time, remark';
                 $map['id'] = $id;
                 $promoteGameRatio = D(self::MODEL_NAME)->field($field)->where($map)->find();
@@ -138,7 +140,7 @@ class PromoteGameRatioController extends ThinkController
 
             $this->assign('gameList', getAllGameList());
             $this->assign('promoteList', getPromoteByLevel(1));
-            $this->meta_title = '游戏分成比例申请';
+            $this->meta_title = $metaTitle;
             $this->display();
         }
     }
diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html
index 776077526..fe674744d 100644
--- a/Application/Admin/View/PromoteGameRatio/applyRatio.html
+++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html
@@ -5,6 +5,15 @@
 <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
 <script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
 
+  <style>
+    .tabcon1711 input.time {
+      width: 150px;
+    }
+    #form .txt_area {
+      width: 300px;
+      height: 150px;
+    }
+  </style>
   <div class="cf main-place top_nav_list navtab_list">
     <h3 class="page_title">{$meta_title}</h3>
 <!--    <p class="description_text">说明：此功是创建推广员时所需填写信息</p>-->
@@ -24,15 +33,17 @@
               <td class="r">
                 <select name="promote_id" id="promote_id">
                   <option value="">会长账号</option>
-                  <volist name="promoteList" id="vo">
-                    <empty name="record">
+                  <empty name="record">
+                    <volist name="promoteList" id="vo">
                       <option  value="{$vo.id}">{$vo.account}({$vo.real_name})</option>
-                      <else/>
-                      <option value="{$vo.id}" <if condition="$vo.id eq $record.promote_id">selected</if> >{$vo.account}({$vo.real_name})</option>
-                    </empty>
-                  </volist>
+                    </volist>
+                    <else/>
+                    <volist name="promoteList" id="vo">
+                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['promote_id']">selected</if> >{$vo.account}({$vo.real_name})</option>
+                    </volist>
+                  </empty>
                 </select>
-                <span class="notice-text">通过推广员后台注册申请或者管理后台创建的账号</span>
+                <span class="notice-text">一级渠道推广员账号</span>
               </td>
             </tr>
             <tr>
@@ -40,60 +51,50 @@
               <td class="r">
                 <select id="game_id" name="game_id" class="select_gallery" >
                   <option value="">游戏名称</option>
-                  <volist name="gameList" id="vo">
-                    <empty name="record">
+                  <empty name="record">
+                    <volist name="gameList" id="vo">
                       <option value="{$vo.id}">{$vo.game_name}</option>
-                      <else/>
-                      <option value="{$vo.id}" <if condition="$vo.id eq $record.game_id">selected</if> >{$vo.game_name}</option>
-                    </empty>
-                  </volist>
+                    </volist>
+                    <else/>
+                    <volist name="gameList" id="vo">
+                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['game_id']">selected</if> >{$vo.game_name}</option>
+                    </volist>
+                  </empty>
                 </select>
-                <span class="notice-text">密码长度必须大于6位</span>
+                <span class="notice-text">会长推广平台已申请的游戏</span>
               </td>
             </tr>
             <tr>
-              <td class="l">账号状态：</td>
+              <td class="l">原分成比例：</td>
               <td class="r table_radio">
-                        <span class="form_radio table_btn">
-                            <label >
-                                <input type="radio"  value="1" name="status" checked="checked"> 开启
-                            </label >
-                            <label >
-                                <input type="radio" value="2" name="status" > 锁定
-                            </label>
-                            </span>
-                <span class="notice-text">锁定状态下，推广员账号则无法登录</span>
+                <span class="form_radio table_btn"></span>
+                <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
-              <td class="l">真实姓名：</td>
-              <td class="r">
-                <input type="text" class="txt" name="real_name" value="" placeholder=" 输入推广员负责人姓名">
+              <td class="l">现分成比例：</td>
+              <td class="r table_radio">
+                <input type="text" class="txt" name="ratio" value="{$record.ratio|default='0.00'}" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <span class="notice-text">当前需要修改成的分成比例</span>
               </td>
             </tr>
             <tr>
-              <td class="l">手机号：</td>
-              <td class="r">
-                <input type="text" class="txt" name="mobile_phone" value=""  placeholder="输入推广员负责人手机号">
+              <td class="l">开始时间：</td>
+              <td class="r table_radio">
+                <div style="float: left;">
+                  <input type="text" class="txt time" name="start_time" placeholder="开始时间" value="">
+                  -
+                  <input type="text" class="txt time" name="start_time" placeholder="结束时间" value="">
+                </div>
+                <span class="notice-text">结束时间不填则默认永久。</span>
               </td>
             </tr>
-            <td class="l">邮箱：</td>
-            <td class="r">
-              <input type="text" class="txt" name="email" value=""  placeholder="输入推广员邮箱">
-            </td>
-            </tr>
             <tr>
-              <td class="l">商务专员</td>
-              <td class="r">
-                <select name="ba_id" id="admin">
-                  <option value="0">请选择商务专员</option>
-                  <volist name=":get_business_affairs_list()" id="vo">
-                    <option  value="{$vo.id}">{$vo.account}</option>
-                  </volist>
-                </select>
-                <span class="notice-text">设置该推广员所属的商务专员组</span>
+              <td class="l">备注：</td>
+              <td class="r table_radio">
+                <textarea type="text" name="introduction" class="txt_area"></textarea>
+                <span class="notice-text"></span>
               </td>
-
             </tr>
             </tbody>
           </table>
@@ -124,7 +125,11 @@
 </block>
 
 <block name="script">
-<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script><script type="text/javascript" src="__STATIC__/provincecityarea/area1.js"></script>
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+  <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">
 //导航高亮
 highlight_subnav('{:U('PromoteGameRatio/lists')}');
@@ -132,6 +137,11 @@ Think.setValue("game_type_id", {$data.game_type_id|default = 0});
 Think.setValue("category", {$data.category|default = 0});
 
 $(function(){
+    $('.time').datetimepicker({
+        language:"zh-CN",
+        hour: 13,
+        minute: 15
+    });
     showTab();
     prov="{:substr($data['bank_area'],0,2)}";
     city="{:substr($data['bank_area'],2,2)}";
diff --git a/Application/Admin/View/PromoteGameRatio/lists.html b/Application/Admin/View/PromoteGameRatio/lists.html
index 209559541..305976f2d 100644
--- a/Application/Admin/View/PromoteGameRatio/lists.html
+++ b/Application/Admin/View/PromoteGameRatio/lists.html
@@ -133,7 +133,7 @@
                             <td>{$record.applicant}</td>
                             <td>{$record.reviewer}</td>
                             <td>
-                                <a href="{:U('edit', array('id'=>$record['id']))}" class="">修改</a>
+                                <a href="{:U('applyRatio', array('id'=>$record['id']))}" class="">修改</a>
                             </td>
                         </tr>
                     </volist>
diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php
index 2162efa41..53af22fda 100644
--- a/Application/Home/Controller/PlayersController.class.php
+++ b/Application/Home/Controller/PlayersController.class.php
@@ -77,9 +77,9 @@ class PlayersController extends BaseController {
             $rs[$key]['extend'] = encryption($v['extend']);
             $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
             $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find();
-            $serverId = $v['server_id'];
+            $serverId1 = $v['server_id'];
             $gameId = $v['game_id'];
-            $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find();
+            $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find();
             $rs[$key]['server_name'] = $serverInfo['server_name'];
             $rs[$key]['promote_id']= $promoteInfo['account']; 
         }
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 9d82ca4ab..fc1d02789 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1888,7 +1888,7 @@ class QueryController extends BaseController
                 if (empty($list['user_account']) ) {
                     $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
                 }
-                $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                $list['user_account'] = empty($list['user_account']) ? '--' : $list['user_account'];
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
                 $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];
diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html
index 494a43ef9..f61386b50 100644
--- a/Application/Home/View/default/Home/landingPage2.html
+++ b/Application/Home/View/default/Home/landingPage2.html
@@ -52,18 +52,16 @@
 <?php endif;?>
 
 <div class="h_wrap">
-  <div id="data-2">
+  <div id="data-2" style="position: relative;">
+    <?php if (!empty($game['flooring_page_video'])):?>
+    <div class="home-video">
+      <video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264" poster="{$game['flooring_page_video_cover']}" data-setup='{}'>
+        <source src="{$game['flooring_page_video']}" type='video/mp4' />
+      </video>
+    </div>
+    <?php endif;?>
     <volist name="game['flooring_page_imgs']" id="item" key="k">
-      <div style="position: relative;">
-        <?php if ($k == 1) :?>
-        <?php if (!empty($game['flooring_page_video'])):?>
-        <div class="home-video">
-          <video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264" poster="{$game['flooring_page_video_cover']}" data-setup='{}'>
-            <source src="{$game['flooring_page_video']}" type='video/mp4' />
-          </video>
-        </div>
-        <?php endif;?>
-        <?php endif ;?>
+      <div>
         <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
         <a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a>
         <?php else :?>
diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html
index 949beb895..5eb2574b4 100644
--- a/Application/Mobile/View/Index/business.html
+++ b/Application/Mobile/View/Index/business.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
     <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
     <script type="text/javascript" src="__JS__/getRem.js"></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
     <script type="text/javascript" src="__JS__/business.js"></script>
     <div class="business">
         <div class="business_box">
diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js
index 20448a92e..0437178f6 100644
--- a/Public/Media/js/recharge.js
+++ b/Public/Media/js/recharge.js
@@ -43,7 +43,7 @@ $(function() {
         var apitype = $("#apitype").val();
         if (apitype == 'weixin') {
             var loading = new Cute.ui.dialog().loading('加载中...',{mask:true});
-            Cute.api.post("/media.php/Recharge/beginPay",that.serialize(), function(json){
+            Cute.api.post("/media.php?s=/Recharge/beginPay",that.serialize(), function(json){
                 loading.close();
                 if(json.status > 0){