Merge pull request 'feature/out_home_change' (#268) from feature/out_home_change into master_out

优化首页登陆
4 years ago · 3eecc67242
parent 42be5adb86 22f5a8ad56
commit 3eecc67242
28 changed files with 97 additions and 138 deletions
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@ -184,6 +184,7 @@ class DownloadController extends BaseController
        $this->assign('data',$rs);

        $this->assign('promoteNameArr',$promoteNameArr);
+        $this->meta_title = "下载管理";
       return $this->display();  
     } 

--- a/Application/Home/Controller/GameController.class.php
+++ b/Application/Home/Controller/GameController.class.php
@ -121,6 +121,7 @@ class GameController extends BaseController
        $this->assign('count', $count);
        $this->assign('pagination', $pagination);
        $this->assign('records', $records);
+        $this->assign('position', ($serverType == 1) ? '专服管理' : '混服管理');
        $this->display('index');
    }

--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@ -1097,11 +1097,11 @@ class PromoteController extends BaseController
        }

        if ($promoteType == 0) {
-            $promoteTypeName = '部门长';
+            $promoteTypeName = '部门';
        } elseif ($promoteType == 1) {
-            $promoteTypeName = '组长';
+            $promoteTypeName = '组别';
        } elseif ($promoteType == 2) {
-            $promoteTypeName = '推广员';
+            $promoteTypeName = '组员';
        }

        $parentMap = [];
@ -1274,13 +1274,13 @@ class PromoteController extends BaseController
    {
        $promoteType = $_REQUEST['promote_type'];
        if($promoteType == 0) {
-            $promoteTypeTitle = "部门长管理";
+            $promoteTypeTitle = "部门管理";
        }
        if($promoteType == 1) {
-            $promoteTypeTitle = "组长管理";
+            $promoteTypeTitle = "组别管理";
        }
        if($promoteType == 2) {
-            $promoteTypeTitle = "推广员管理";
+            $promoteTypeTitle = "组员管理";
        }
        if (IS_POST) {
            $type = $_REQUEST['type'];
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@ -273,7 +273,7 @@ class QueryController extends BaseController
        $this->assign('ownId', $ownId);
        $this->assign('payWayData', QueryController::$payWay);
        $this->assign('payStatusData', QueryController::$payStatus);
-        $this->meta_title = "订单查询";
+        $this->meta_title = "订单明细";
        $this->display();
    }

@ -750,7 +750,7 @@ class QueryController extends BaseController

    public function arpu()
    {
-        $this->meta_title = 'ARPU统计';
+        $this->meta_title = 'ARPU数据';
        $defaultTime = date('Y-m-d', time() - 6 * 24 * 3600) . ' 至 ' . date('Y-m-d');
        $time = I('time', '');
        $time = $time == '' ? $defaultTime : $time;
@ -1260,7 +1260,7 @@ class QueryController extends BaseController

        $serverData = $this->getServer($relationGameId, $sdkVersion);

-        $this->assign('meta_title', '每日概况');
+        $this->assign('meta_title', '日情况表');
        $this->assign('loginPromote', $loginPromote);
        $this->assign('ownId', $ownId);
        $this->assign('listData', $records);
@ -1882,6 +1882,7 @@ class QueryController extends BaseController
        $this->assign('pagination', $pagination);
        $this->assign('count', $count);
        $this->assign('createTime', $createTime);
+        $this->meta_title = '创角查询';
        $this->display('userRoles');
    }

@ -2329,6 +2330,7 @@ class QueryController extends BaseController
        $this->assign('count', $count);
        $this->assign('timeout', $timeout);
        $this->assign('time', $defaultTime);
+        $this->meta_title = "团队/推广员业绩";
        $this->display();
    }

@ -2985,6 +2987,7 @@ class QueryController extends BaseController
        $this->assign('data', $data);
        $this->assign('start', $start);
        $this->assign('end', $end);
+        $this->meta_title = "留存统计";
        $this->display();
    }

--- a/Application/Home/Controller/SafeController.class.php
+++ b/Application/Home/Controller/SafeController.class.php
@ -172,6 +172,7 @@ class SafeController extends BaseController{
                return false;
            }
        }
+        $this->meta_title = "密码修改";
        $this->display();
    }
    
@ -688,6 +689,7 @@ class SafeController extends BaseController{
        $this->assign('listData',$rs);
        $this->assign('initBegTime', I('begtime'));
        $this->assign('initEndTime', I('endtime'));
+        $this->meta_title = "操作管理";
        $this->display();
    }

@ -705,6 +707,7 @@ class SafeController extends BaseController{
        if(!empty($promote['login_phone'])) {
            $this->assign('login_phone', $promote['login_phone']);
        }
+        $this->meta_title = "登陆管理";
        return $this->display();
    }

--- a/Application/Home/View/default/Download/listsIndex.html
+++ b/Application/Home/View/default/Download/listsIndex.html
@ -68,7 +68,7 @@
    padding-left: 10px;
    padding-right: 10px;
    height: 34px;
-    border: 1px solid #06C;
+    border: 1px solid #cc6600;
    color: red;
    border-radius: 4px;
    line-height: 34px;
@ -79,10 +79,10 @@
  <div class="page-search normal_list query-recharge-search jssearch">
      <div class="trunk-title">
          <div class="location">
-            <div class="location-container">当前位置：<span>下载管理></span><span>控制台</span></div>
+            <div class="location-container">当前位置：<span>安全管理></span><span>{$meta_title}</span></div>
          </div>
          <img src="__IMG__/20180207/icon_zhuce.png">
-          <span class="title_main">下载日志</span>
+          <span class="title_main">{$meta_title}</span>
          <span class="details">记录数据管理中导出数据事件</span>
        </div>
    <div class="trunk-content article">
--- a/Application/Home/View/default/Index/index.html
+++ b/Application/Home/View/default/Index/index.html
@ -8,8 +8,8 @@
        <!--<a href="http://wpa.qq.com/msgrd?v=3&uin={:C('CH_SET_SERVER_QQ')}&site=qq&menu=yes" class="qqbtn" target="_blank"><img src="__IMG__/20170913/qq.png">QQ咨询</a>-->
        <div class="lrwrapper clearfix">
            <div class="lrbox clearfix">
-                <div class="lrpane tab-pane fade active in" id="lr-login">
-                    <h4 class="title"><span class="titletext">欢迎回来！</span></h4>
+                <div class="lrpane tab-pane fade active in" id="lr-login" style="top: 20vh;left: -15vw;">
+                    <h4 class="title"><span class="titletext">WELCOME!</span></h4>
                    <form id="loginForm" class="form-horizontal" method="post"  novalidate="novalidate">

                        <div class="form-group clearfix">
@ -42,7 +42,7 @@
 <!--                             <a target="_blank" href="{:U('forget')}" class="forget_password right" ><span>忘记密码?</span></a> -->
                        </div>
                        <div >
-                            <input id="loginButton" type="submit" class="btn btn_primary" value="登 录">
+                            <input id="loginButton" type="submit" class="btn btn_primary" style="background-color: #0099CC;" value="login">
                        </div>
                    </form>

@ -68,7 +68,7 @@
    </div>
 </div>
 </notempty>
-<div class="advantage page-aside">
+<!-- <div class="advantage page-aside"> -->
   <!-- <div class="inner">
        <h2 class="aside-title"><span>平台优势</span></h2>
        <div class="aside-content clearfix">
@ -80,7 +80,7 @@
            </ul>
        </div>
    </div>-->
-</div>
+<!-- </div> -->

 <!--<div class="app page-aside">
    <div class="inner">
@ -112,7 +112,7 @@
    </div>
 </div>-->

-<div class="join page-aside">
+<!-- <div class="join page-aside"> -->
   <!-- <div class="inner">
        <h2 class="aside-title"><span>如何加入我们</span></h2>
        <div class="aside-content clearfix">
@ -125,7 +125,7 @@
            <a href="{:U('register')}" class="joinbtn" >开始加入</a>
        </div>
    </div>-->
-</div>
+<!-- </div> -->

 <div class="gotop"><img src="/Public/Home/images/index/gotop.png"></div>
 </block>
--- a/Application/Home/View/default/Public/bases.html
+++ b/Application/Home/View/default/Public/bases.html
@ -59,7 +59,7 @@
          </a>
        </if>
        <i></i>
-        <span class="text"><span>手游推广</span><span>联盟中心</span></span>
+        <span class="text"><span>开心平台</span><span>快乐游戏</span></span>
      </div>
      <ul class="nav clearfix">
        <think:nav name="nav">
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@ -39,7 +39,7 @@
 			<a href="{:U('Promote/index')}" class="subNav <?=is_active_class(['Promote'], ['index'])?>"> 后台首页 </a>
 			<?php if ($loginer['ts_over_manage'] == 0) :?>
 				<?php if ($loginer['level'] < 4) :?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>管理中心</span><i class="arrow_icon"></i></div>
+				<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>组织架构</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
 					<?php
 						function promote_is_active_class($promoteType)
@ -54,13 +54,13 @@
 						}
 					?>
 					<?php if (in_array($loginer['level'], [1])):?>
-					<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<?=promote_is_active_class(0)?>">部门长管理</a>
+					<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<?=promote_is_active_class(0)?>">部门管理</a>
 					<?php endif;?>
 					<?php if (in_array($loginer['level'], [1, 2])):?>
-					<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<?=promote_is_active_class(1)?>">组长管理</a>
+					<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<?=promote_is_active_class(1)?>">组别管理</a>
 					<?php endif;?>
 					<?php if (in_array($loginer['level'], [1, 2, 3])):?>
-					<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<?=promote_is_active_class(2)?>">推广员管理</a>
+					<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<?=promote_is_active_class(2)?>">组员管理</a>
 					<?php endif;?>
 				</div>
 				<?php endif;?>
@ -68,71 +68,45 @@
 					$isOpenQuery = true;
 				?>
 				<?php if($isOpenQuery):?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
+				<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据统计</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
-					<a href="{:U('Query/dailySummary')}" class="<?=is_active_class(['Query'], ['dailySummary'])?>">每日概况</a>
+					<a href="{:U('Query/dailySummary')}" class="<?=is_active_class(['Query'], ['dailySummary'])?>">日情况表</a>
 					<a href="{:U('Query/summary')}" class="<?=is_active_class(['Query'], ['summary'])?>">数据汇总</a>
 					<?php if($canViewUserRecharge):?>
-					<a href="{:U('Query/recharge')}" class="<?=is_active_class(['Query'], ['recharge', 'viewSpendDetailed'])?>">订单查询</a>
+					<a href="{:U('Query/recharge')}" class="<?=is_active_class(['Query'], ['recharge', 'viewSpendDetailed'])?>">订单明细</a>
 					<?php endif;?>
 					<a href="{:U('Query/register')}" class="<?=is_active_class(['Query'], ['register', 'viewRole'])?>">注册明细</a>
 					<?php if($canViewUserRecharge):?>
-					<a href="{:U('Query/arpu')}" class="<?=is_active_class(['Query'], ['arpu'])?>">ARPU统计</a>
+					<a href="{:U('Query/arpu')}" class="<?=is_active_class(['Query'], ['arpu'])?>">ARPU数据</a>
 					<?php endif;?>
 					<!-- <a href="{:U('Query/retention_analysis')}" class="<?=is_active_class(['Query'], ['retention_analysis'])?>">留存统计</a> -->
-					<a href="{:U('Query/userRoles')}" class="<?=is_active_class(['Query'], ['userRoles'])?>">角色查询</a>
+					<a href="{:U('Query/userRoles')}" class="<?=is_active_class(['Query'], ['userRoles'])?>">创角查询</a>
 					<?php if($canViewUserRecharge):?>
 					<a href="{:U('Query/userRecharges')}" class="<?=is_active_class(['Query'], ['userRecharges'])?>">充值玩家</a>
 					<?php endif;?>
 					<a href="{:U('Query/achievement')}" class="<?=is_active_class(['Query'], ['achievement'])?>">团队/推广员业绩</a>
 					<!-- <a href="{:U('Query/promoteQuota')}" class="<?=is_active_class(['Query'], ['promoteQuota', 'quotaDtl'])?>">推广员指标</a> -->
-					<a href="{:U('Query/iosDownLoadData')}" class="<?=is_active_class(['Query'], ['iosDownLoadData'])?>">IOS下载数统计</a>
-					<a href="{:U('Query/userretention')}" class="<?=is_active_class(['Query'], ['userretention'])?>">用户留存率</a>
+					<a href="{:U('Query/userretention')}" class="<?=is_active_class(['Query'], ['userretention'])?>">留存统计</a>
 					<a href="{:U('Query/gameData')}" class="<?=is_active_class(['Query'], ['gameData'])?>">游戏分区数据汇总</a>
 				</div>
 				<?php endif;?>
-				<?php if ($canViewUserRecharge && $loginer['level'] == 1) :?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div>
-				<div class="navContent jsnavContent">
-					<a href="{:U('Finance/index')}" class="<?=is_active_class(['Finance'], ['index'])?>">结算中心</a>
-					<a href="{:U('Finance/settlementDtl')}" class="<?=is_active_class(['Finance'], ['settlementDtl'])?>">结算明细</a>
-					<a href="{:U('Finance/withdrawRecord')}" class="<?=is_active_class(['Finance'], ['withdrawRecord', 'withdrawDtl', 'settlementOrder'])?>">提现记录</a>
-					<?php if ($loginer['withdraw_show'] == 1) :?>
-					<a href="{:U('Withdraw/index')}" class="<?=is_active_class(['Withdraw'], ['index', 'withdrawDetail', 'withdrawOrderDetail'])?>">公司结算</a>
-					<?php endif;?>
-				</div>
-				<?php endif ;?>
+
 				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
 					<a href="{:U('Game/index')}" class="<?=is_active_class(['Game'], ['index'])?>">专服管理</a>
 					<?php if($isOpenQuery):?>
 					<a href="{:U('Game/mix')}" class="<?=is_active_class(['Game'], ['mix'])?>">混服管理</a>
-					<if condition="getParentPromoteId(PID) eq 0">
-						<a href="{:U('GameDivide/index')}" class="<?=is_active_class(['GameDivide'], ['index'])?>">分成比例</a>
-						<a href="{:U('Promote/setChildGamePermission')}" class="<?=is_active_class(['Promote'], ['setChildGamePermission'])?>">设置</a>
-					</if>
-					<a href="{:U('Apply/feature')}" class="<?=is_active_class(['Apply'], ['feature'])?>">资料专区</a>
 					<?php endif;?>
 				</div>
 				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>安全管理</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
 					<!--<a href="{:U('Apply/app_index')}" class="<?=is_active_class(['Apply'], ['app_index'])?>">APP列表</a>-->
-					<a href="{:U('Safe/bindTel')}" class="<?=is_active_class(['Safe'], ['bindTel'])?>">短信登陆设置</a>
-					<a href="{:U('Download/listsIndex')}" class="<?=is_active_class(['Download'], ['listsIndex'])?>">下载日志管理</a>
-					<a href="{:U('Safe/modifyloginpassword')}" class="<?=is_active_class(['Safe'], ['modifyloginpassword'])?>">修改登录密码</a>
-					<a href="{:U('Safe/setSafeIndex')}" class="<?=is_active_class(['Safe'], ['setSafeIndex'])?>">设置安全密码</a>
-					<?php if ($loginer['level'] == 1) :?>
-					<a href="{:U('Safe/modifyBaseInfo')}" class="<?=is_active_class(['Safe'], ['modifyBaseInfo'])?>">用户基本信息</a>
-					<?php endif;?>
-					<a href="{:U('Safe/promoteLogs')}" class="<?=is_active_class(['Safe'], ['promoteLogs'])?>">操作日志</a>
+					<a href="{:U('Safe/bindTel')}" class="<?=is_active_class(['Safe'], ['bindTel'])?>">登陆管理</a>
+					<a href="{:U('Download/listsIndex')}" class="<?=is_active_class(['Download'], ['listsIndex'])?>">下载管理</a>
+					<a href="{:U('Safe/modifyloginpassword')}" class="<?=is_active_class(['Safe'], ['modifyloginpassword'])?>">密码修改</a>
+					<a href="{:U('Safe/setSafeIndex')}" class="<?=is_active_class(['Safe'], ['setSafeIndex'])?>">安全密码</a>
+					<a href="{:U('Safe/promoteLogs')}" class="<?=is_active_class(['Safe'], ['promoteLogs'])?>">操作管理</a>
 				</div>
-				<?php if($loginer['level'] == 1 || $loginer['ts_over_apply'] == 1):?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
-				<div class="navContent jsnavContent">
-					<a href="{:U('TestingResource/index')}" class="<?=is_active_class(['TestingResource'], ['index'])?>">测试资源申请</a>
-					<a href="{:U('TestingResource/batches')}" class="<?=is_active_class(['TestingResource'], ['batches'])?>">测试资源申请记录</a>
-				</div>
-				<?php endif;?>
 				<?php if(C('APP_ENV') == 'dev' || $company['type'] == 1):?>
 				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>评级管理</span><i class="arrow_icon"></i></div>
 				<div class="navContent jsnavContent">
@ -152,29 +126,8 @@
 				</eq> -->

 				<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
-				<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
-				<div class="navContent jsnavContent">
-					<a href="{:U('PromoteCoin/myCoin')}" class="<?=is_active_class(['PromoteCoin'], ['myCoin', 'coinRecord', 'coinRecordDesc'])?>">我的平台币</a>
-					<a href="{:U('PromoteCoin/transferLogs')}" class="<?=is_active_class(['PromoteCoin'], ['shift', 'transferLogs'])?>">平台币转移</a>
-					<?php if($loginer['level'] == 1):?>
-					<a href="{:U('CoinOrder/order_list')}" class="<?=is_active_class(['CoinOrder'], ['order_list', 'order_add', 'order_detail'])?>">平台币充值</a>
-					<?php endif;?>
-				</div>
-
-				<?php if($canViewUserRecharge):?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>玩家管理</span><i class="arrow_icon"></i></div>
-				<div class="navContent jsnavContent">
-					<a href="{:U('Players/playAction')}" class="<?=is_active_class(['Players'], ['playAction'])?>">行为日志</a>
-				</div>
-				<?php endif;?>
 			<?php else:?>
-				<?php if($loginer['level'] == 1 || $loginer['ts_over_apply'] == 1):?>
-				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
-				<div class="navContent jsnavContent">
-					<a href="{:U('TestingResource/index')}" class="<?=is_active_class(['TestingResource'], ['index'])?>">测试资源申请</a>
-					<a href="{:U('TestingResource/batches')}" class="<?=is_active_class(['TestingResource'], ['batches'])?>">测试资源申请记录</a>
-				</div>
-				<?php endif;?>
+
 			<?php endif;?>
 		</div>
 	</div>
@ -183,11 +136,6 @@
 		<div class="trunk_con">
 			<!--头部个人信息-->
 			<div class="header">
-				<if condition="$company['marketing_director_show'] eq 1">
-					<div style="position: absolute;padding-left: 1.5%;">
-						<span class="pinfo" style="color: #1239f2">市场总监联系方式：<span>13637338237(李总监)</span></span>
-					</div>
-				</if>
 				<div class="header-right">
 					<span class="pinfo jstime">今天是：<span></span></span>
 					<span class="pinfo">您好！{:session('promote_auth.account')}</span>
--- a/Application/Home/View/default/Public/verify_password.html
+++ b/Application/Home/View/default/Public/verify_password.html
@ -25,7 +25,7 @@
      height: 2.4rem;
      border: 0;
      border-radius: 5px;
-      background-color: #358fe4;
+      background-color: #cc6600;
      color: #fff;
    }

--- a/Application/Home/View/default/Query/achievement.html
+++ b/Application/Home/View/default/Query/achievement.html
@ -19,10 +19,10 @@
  <div class="page-list normal_list promote-mychlid-list">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>团队推广业绩</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_normal_game.png">
-      <span class="title_main">团队推广业绩</span>
+      <span class="title_main">{$meta_title}</span>
    </div>
    <div class="trunk-content article">
        <div class="trunk-search clearfix">
@ -74,7 +74,7 @@
            </div>
            <?php if ($prevParentId > 0):?>
            <div class="form-group">
-              <a class="submit normal_space" href="{:U('Query/achievement', ['row'=>I('get.row'), 'parent_id' => $prevParentId,'time'=>$time])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
+              <a class="submit normal_space" href="{:U('Query/achievement', ['row'=>I('get.row'), 'parent_id' => $prevParentId,'time'=>$time])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #996600; cursor: pointer;">返回上级</a>
            </div>
            <?php endif;?>
          </form>
--- a/Application/Home/View/default/Query/arpu.html
+++ b/Application/Home/View/default/Query/arpu.html
@ -65,10 +65,10 @@
    <div class="page-search normal_list query-recharge-search">
      <div class="trunk-title">
      	<div class="location">
-		<div class="location-container">当前位置：<span>数据管理></span><span>ARPU统计</span></div>
+		<div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
 		</div>
      	<img src="__IMG__/20180207/icon_normal_ARPU.png">
-      	<span class="title_main">ARPU统计</span>
+      	<span class="title_main">{$meta_title}</span>
      	<span class="details">根据日期，游戏，推广员分析ARPU等相关数据信息（排除绑币）</span>
      	<div class="keywords_information" style="clear: both;">
        <i class="keywords_mark"><span>关键词说明</span></i>
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@ -68,10 +68,10 @@
  <div class="page-search normal_list query-recharge-search jssearch">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>订单查询</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_chongzhi.png">
-      <span class="title_main">订单数据</span>
+      <span class="title_main">{$meta_title}</span>
      <span class="details">对所有渠道用户玩家产生的订单信息，进行记录的功能</span>
    </div>
    <div class="trunk-content article">
--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@ -30,10 +30,10 @@
  <div class="page-list normal_list promote-mychlid-list">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>玩家充值</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_normal_game.png">
-      <span class="title_main">玩家充值</span>
+      <span class="title_main">{$meta_title}</span>
      <span class="details">说明：玩家角色充值统计</span>
    </div>
    <div class="trunk-content article">
--- a/Application/Home/View/default/Query/userRoles.html
+++ b/Application/Home/View/default/Query/userRoles.html
@ -30,10 +30,10 @@
  <div class="page-list normal_list promote-mychlid-list">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>角色查询</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_normal_game.png">
-      <span class="title_main">角色查询</span>
+      <span class="title_main">{$meta_title}</span>
    </div>
    <div class="trunk-content article">
        <div class="trunk-search clearfix jssearch">
--- a/Application/Home/View/default/Query/userretention.html
+++ b/Application/Home/View/default/Query/userretention.html
@ -30,10 +30,10 @@
  <div class="page-list normal_list promote-mychlid-list">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>数据管理></span><span>用户留存率</span></div>
+        <div class="location-container">当前位置：<span>数据管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_normal_game.png">
-      <span class="title_main">用户留存率</span>
+      <span class="title_main">{$meta_title}</span>
    </div>
    <div class="trunk-content article">
        <div class="trunk-search clearfix jssearch">
--- a/Application/Home/View/default/Safe/bindTel.html
+++ b/Application/Home/View/default/Safe/bindTel.html
@ -37,7 +37,7 @@
    <div class="page-list normal_list promote-base_info-form">
      <div class="trunk-title">
     
-      	<span class="title_main">手机号绑定</span>
+      	<span class="title_main">{$meta_title}</span>
      </div>
      <div class="trunk-content article">
          <div class="trunk-list baseInfo">
--- a/Application/Home/View/default/Safe/modifyBaseInfo.html
+++ b/Application/Home/View/default/Safe/modifyBaseInfo.html
@ -108,7 +108,7 @@
                            <input type="hidden" name="idcarpic" id="cover_id_{$field.name}" value="{$promoteinfo['idcarpic']}"/>
                              <div id="uploader-demo" >
                                   <div id="idpic">
-                                       <div class="webuploader-pick" style="line-height:30px;" onclick="">上传证件</div>
+                                       <div class="webuploader-pick" style="line-height:30px;background-color: red;" onclick="">上传证件</div>
                                   </div>
                                    <div id="idpicList" class="uploader-list" style="display: flex;"></div>
                        </td>
--- a/Application/Home/View/default/Safe/modifyloginpassword.html
+++ b/Application/Home/View/default/Safe/modifyloginpassword.html
@ -32,11 +32,11 @@
        
        #tab{
            margin-top:30px;
-            border-left:3px solid #26C7DB;
+            border-left:3px solid #CC6600;
            height:46px;display:flex;
            justify-content: space-between;
            align-items: center;
-            background: #ecf4f5;
+            background: #FFCC99;
        }
    </style>
 </block>
@ -47,12 +47,12 @@
      <div class="trunk-title">
     
      	<img src="__IMG__/20180207/icon_normal_zhanghu.png">
-      	<span class="title_main">修改登录密码</span>
+      	<span class="title_main">{$meta_title}</span>
      </div>
      <div class="trunk-content article">
          <div class="trunk-list baseInfo">
              <div style="" id="tab">
-                  <span style="padding-left:20px;color:#26c7dbd4" >注意：密码必须由字母与数字组合</span>
+                  <span style="padding-left:20px;color:#CC6600" >注意：密码必须由字母与数字组合</span>
              </div>
              <form action="{:U('Safe/modifyLoginPassword')}" novalidate="novalidate" method="post" class="paw_info">
                  <table class="table2" style="margin-top:20px;margin-left:30px">
--- a/Application/Home/View/default/Safe/promoteLogs.html
+++ b/Application/Home/View/default/Safe/promoteLogs.html
@ -68,10 +68,10 @@
  <div class="page-search normal_list query-recharge-search jssearch">
    <div class="trunk-title">
      <div class="location">
-        <div class="location-container">当前位置：<span>安全管理></span><span>操作日志</span></div>
+        <div class="location-container">当前位置：<span>安全管理></span><span>{$meta_title}</span></div>
      </div>
      <img src="__IMG__/20180207/icon_chongzhi.png">
-      <span class="title_main">说明</span>
+      <span class="title_main">{$meta_title}</span>
      <span class="details">工作人员在推广平台内的操作日志</span>
    </div>
    <div class="trunk-content article">
--- a/Application/Home/View/default/Safe/setSafeIndex.html
+++ b/Application/Home/View/default/Safe/setSafeIndex.html
@ -41,7 +41,7 @@
      </div>
      <div class="trunk-content article">
          <div class="trunk-list baseInfo">
-                <span style="margin-top:50px;font-size:15px;color:#26c7db85">为了保证您的账户安全，提现和转账等操作需要使用安全密码进行确认(请不要和登陆密码一样)</span>
+                <span style="margin-top:50px;font-size:15px;color:#CC6600">为了保证您的账户安全，提现和转账等操作需要使用安全密码进行确认(请不要和登陆密码一样)</span>
              <form action="{:U('Safe/modifypwdindex')}" novalidate="novalidate" method="post" class="paw_info">
                  <table class="table2" style="margin-top:30px;margin-left:50px" >
                      <!-- <tr>
--- a/Public/Home/css/20170913/common.css
+++ b/Public/Home/css/20170913/common.css
@ -25,7 +25,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 .page-aside .aside-title:after {content:'';display:table;width:2em;height:3px;background-color:#5A90EE;position:absolute;left:0;right:0;margin:-.3em auto 0;left:50%\9;margin-left:-1em\9;}

 /* head */
-.header {height:63px;padding:10px 0;font-size:16px;background:#0B53A2;color:#FFF;}
+.header {height:63px;padding:10px 0;font-size:16px;color:#FFF;}
 .header .logo {float:left;} 
 .header .logo img {
 	max-height:60px;
--- a/Public/Home/css/20170913/index.css
+++ b/Public/Home/css/20170913/index.css
@ -13,8 +13,11 @@
 /*  */
 .header {position:absolute;top:0;left:0;right:0;width:100%;z-index:20;}
 /* banner */
-.banner {background:url(../../images/20170913/banner.png) center 0 no-repeat;height:630px;position:relative;}
-.banner .inner{height:100%;position:absolute;top:110px;left:0;right:0;}
+#app{
+    background:url(../../images/20170913/banner.jpg) center 100% no-repeat ;height:100vh;background-size:cover;
+}
+.banner {position:relative; }
+.banner .inner{height:100%;position:absolute;left:0;right:0;}

 .banner .qqbtn {background:#26C7DB;color:#FFF;width:138px;height:44px;display:block;border-radius:5px;text-align:center;line-height:44px;position:absolute;top:340px;}
 .banner .qqbtn img {width:26px;height:26px;vertical-align:middle;margin-top:-4px;margin-right:5px;}
--- a/Public/Home/css/20180207/account.css
+++ b/Public/Home/css/20180207/account.css
@ -28,8 +28,8 @@
 .trunk-list .table2 .r input[type=text] {width: 230px;height: 32px;padding-left: 10px; border: 1px solid #E5E5E5;border-radius: 4px;line-height: 32px;color: #535875;}
 .trunk-list .table2 .r input[type=password] {width: 230px;height: 32px;padding-left: 10px; border: 1px solid #E5E5E5;border-radius: 4px;line-height: 32px;color: #535875;}
 .trunk-list .table2 .r .radio-item {margin-right: 10px;}
-.trunk-list .table2 .r .tj{width: 118px;height: 36px;line-height:36px;background: #26C7DB;color: #fff;border-radius: 4px;border: none;padding: 0;}
-.trunk-list .table2 .r .tj:hover{background: #2bd8ed;}
+.trunk-list .table2 .r .tj{width: 118px;height: 36px;line-height:36px;background: #cc6600;color: #fff;border-radius: 4px;border: none;padding: 0;}
+.trunk-list .table2 .r .tj:hover{background: #996600;}
 .trunk-list .table2 .r .tj.disabled {background:#CCC;}
 .trunk-list .table2 .r .back_btn{width: 118px;height: 36px;line-height:36px;background: #E5E5E5;color: #8B8CA0;border-radius: 4px;display: inline-block;text-align: center;margin-left: 20px;}
 .table2 .form-radio label {position:relative;margin-right:20px;cursor:pointer;}
--- a/Public/Home/css/20180207/common.css
+++ b/Public/Home/css/20180207/common.css
@ -38,7 +38,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 }

 /*左侧导航栏*/
-.nav_new{width: 195px;height: 100%;background: #374760;position: fixed;z-index: 9;}
+.nav_new{width: 195px;height: 100%;background: #cc6600;position: fixed;z-index: 9;}
 .nav_new .logo_picture{padding: 20px; text-align: center;}
 .subNavBox{width: 100%;text-align: center;}
 .subNavBox .subNav{
@ -48,7 +48,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 	line-height: 50px;
 	position: relative;
 }
-.subNavBox .subNav:hover{background: #25354E;color: #fff;}
+.subNavBox .subNav:hover{background: #996600;color: #fff;}
 .subNavBox .subNav:hover:not(.currentDd) .arrow_icon{background: url(../../images/20180207/icon_selected_xiala.png) center;}
 .subNavBox .subNav:hover .icon_guanli{background: url(../../images/20180207/icon_selected_guanli.png) center;}
 .subNavBox .subNav:hover .icon_shujvi{background: url(../../images/20180207/icon_selected_shujv.png) center;}
@ -56,10 +56,10 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 .subNavBox .subNav:hover .icon_fenbao{background: url(../../images/20180207/icon_selected_fenbao.png) center;}
 .subNavBox .subNav:hover .icon_fuli{background: url(../../images/20180207/icon_selected_fuli.png) center;}
 .subNavBox .subNav:hover .icon_zhandian{background: url(../../images/20180207/icon_selected_zhandian.png) center;}
-.subNavBox .navContent{background: #25354E;text-align: center;display: none;}
-.subNavBox .navContent a{display: block;color: rgba(231,234,255,.7);padding-bottom: 15px;text-align: left;padding-left: 49px;}
-.subNavBox .navContent a:hover{color: #26c7db;}
-.subNavBox .navContent .active{color: #26c7db;}
+.subNavBox .navContent{background: #663300;text-align: center;display: none;}
+.subNavBox .navContent a{display: block;color:#FFFFCC;padding-bottom: 15px;text-align: left;padding-left: 49px;}
+.subNavBox .navContent a:hover{color: #FFFF99;}
+.subNavBox .navContent .active{color: #FFFF99;}
 .subNavBox .subNav span{vertical-align: middle;margin-left: -40px;}
 .subNavBox .subNav .prev_icon{
 	position: absolute;
@ -86,7 +86,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 .subNavBox .subNav .icon_zhandian{background: url(../../images/20180207/icon_normal_lianmeng.png) center;}
 .subNavBox .currentDd{
 	color: #fff;
-	background: #25354E;
+	background: #996600;
    cursor: pointer;
    font-size: 14px;
    line-height: 50px;
@ -134,8 +134,8 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 .normal_list{min-height: 80vh;background: #fff;position: relative;border: 1px solid #E3E8EC;}
 .normal_space{margin-left: 10px;}
 .normal_space .select_gallery{height: 32px;padding-left: 10px;border: 1px solid #E5E5E5;border-radius: 4px;line-height: 32px;}
-.form-group .submit{width: 95px;height: 36px;display: block;background: #409eff;color: #fff;border: none;border-radius: 4px;}
-.form-group .submit:hover{background: #2bd8ed;}
+.form-group .submit{width: 95px;height: 36px;display: block;background: #cc6600;color: #fff;border: none;border-radius: 4px;}
+.form-group .submit:hover{background: #996600;}
 .normal_table{width: 100%;text-align: center;}
 .normal_table tr{height: 40px;}
 .normal_table tr:nth-child(2n-1){background: #FAFAFC;border-top: 1px solid #f3f5f9;border-bottom: 1px solid #f3f5f9;} 
@ -327,7 +327,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
    text-align: center;
 }

-.chakan:hover{color: #2bd8ed;}
+.chakan:hover{color: #cc6600;}
 .summary td:last-child {text-align:right;padding-right:20px;}
 .summary td:last-child {text-align:right;padding-right:20px;}

@ -387,7 +387,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
    height: 34px;
    display: inline-block;
    text-align: center;
-    background: #3A97FF;
+    background: #cc6600;
    color: #fff;
    border-radius: 4px;
    padding: 0 15px;
@ -397,7 +397,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
    padding: 5px 0px;
 }
 .normal_table tr td a {
-    color: #06C
+    color: #cc6600
 }

 .page-list .summary{
@ -443,8 +443,8 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}

 .el-button-primary {
    color: #fff;
-    background-color: #409eff;
-    border-color: #409eff;
+    background-color: #cc6600;
+    border-color: #cc6600;
 }

 .el-button-success {
@ -612,8 +612,8 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}

 .el-tag-plain.el-tag-success {
    background-color: #fff;
-    border-color: #c2e7b0;
-    color: #67c23a;
+    border-color: #FF9933;
+    color: #FF9933;
 }

 .el-tag-plain.el-tag-info {
--- a/Public/Home/css/20180207/data.css
+++ b/Public/Home/css/20180207/data.css
@ -23,8 +23,8 @@ label.includes input[type="checkbox"]:checked+.check_icon {
 }

 .tab .tab-item{display: inline-block;margin-right: 10px;padding-left: 10px;padding-right: 10px;height: 34px;border: 1px solid #E5E5E5;color: #a5a6bb;border-radius: 4px;line-height: 34px;text-align: center;}
-.tab .tab-item.current{border: 1px solid #26C7DB;color: #26C7DB;}
-.tab .tab-item:hover {text-decoration: none; color: #67c23a; border-color: #67c23a;}
+.tab .tab-item.current{border: 1px solid #996600;color: #996600;}
+.tab .tab-item:hover {text-decoration: none; color: #663300; border-color: #663300;}

 .btn_calc{width: 96px;height: 36px;display: block;background: #3A97FF;
 color: #fff;
--- a/Public/Home/css/game_detailed.css
+++ b/Public/Home/css/game_detailed.css
@ -377,11 +377,11 @@
 }

 .tab .inline-btn {
-    border: 1px solid #409eff;
+    border: 1px solid #cc6600;
    width: 88px;
    line-height: 34px;
    text-align: center;
-    color: #409eff;
+    color: #cc6600;
    cursor: pointer;
    text-decoration: none;
 }
@ -393,7 +393,7 @@

 .highlight {
    color: #fff!important;
-    background-color: #409eff;
+    background-color: #cc6600;
 }

 .game-window-box {
--- a/Public/Home/images/20170913/banner.jpg
+++ b/Public/Home/images/20170913/banner.jpg