Commit 777772e1 authored by hujun's avatar hujun

Merge branch 'tab-liu' into 0102-v3.0.4

# Conflicts: # application/index/extend/Basic.php # public/resource/js/public.js
parents 80b8abdc c51dda88
......@@ -197,4 +197,11 @@ class Login extends Basic
return $this->response(200, '');
}
}
public function mainIndex()
{
if (!$this->request->isAjax()) {
return view('main_index/main_index');
}
}
}
\ No newline at end of file
......@@ -70,6 +70,7 @@ class Basic extends Controller
'index/getConfigWeek',
'index/getSystemMessageByUser',
'index/userModalList',
'index/mainIndex'
);
/**
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="dayAchievementsReport" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="weekAchievementsReport" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--<input type="hidden" class="page-load" id="access" />&lt;!&ndash;关联js文件&ndash;&gt;-->
<div id="page-content-wrapper">
<div class="container">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<div id="page-content-wrapper">
<div class="container">
<div class="">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--关联js元素-->
<input type="hidden" class="page-load" id="auth_rule_box" />
<!--关联js元素-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--关联js元素-->
<input type="hidden" class="page-load" id="auth_rule_index" />
<style>
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--角色管理页面-->
<input type="hidden" class="page-load" id="auth" />
<style>
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="role_edit"/>
<input type="hidden" name="id" value="" />
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="banner" />
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="banner" />
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="black_list" />
<style>
.clear{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="agent" />
<!--关联经纪人列表liudanjs文件-->
<style>
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="performance_adjustment" />
<style>
#note_text {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="professionalList" />
<style type="text/css">
.left{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="save_agent" /><!--关联js文件-->
<input type="hidden" name="id" value="" />
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="business_district" />
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="callPhoneIndex" />
<style>
.modal-body1 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--角色管理页面-->
<input type="hidden" class="page-load" id="district" />
<div id="page-content-wrapper">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="evaluationList" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="reportList" />
<style type="text/css">
.clear{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="adjustment" />
<style>
.modal-body-height {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="commission" />
<style>
#note_text{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="commissionTotal" />
<style>
#note_text {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="financial_manager_daily_list" />
<style type="text/css">
/*图片*/
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="financial_daily_list" />
<style type="text/css">
.clear{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="finance_update_log" />
<style>
#note_text {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="getCollection" />
<style>
.reportArea{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="receivables" />
<style>
.reportArea{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="refundList" />
<style>
.modal-body-height {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="refundOrderList" />
<style>
#note_text{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="stateMent" />
<style>
#note_text{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="statementBackout" />
<style>
#note_text{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="tax" />
<style>
#note_text{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="waitBackout" />
<style type="text/css">
.clear{
......
......@@ -9,6 +9,8 @@
<link rel="stylesheet" href="//qidian.gtimg.com/lulu/theme/peak/css/common/ui/Pagination.css">
<link rel="stylesheet" href="/resource/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/resource/css/bootstrap-datetimepicker.min.css">
<link rel="stylesheet" href="/resource/css/b-liu.tabs.css">
<title>同联商业</title>
<style>
/*隐藏显示按钮(梯形)样式代码*/
......@@ -16,50 +18,123 @@
position: relative;
right:1px;
border-top: 0px solid transparent;
border-bottom: 20px solid transparent;
border-right: 22px solid #1a1a1a;
border-left: 0px solid #1a1a1a ;
border-bottom: 0px solid transparent;
border-right: 25px solid rgba(255,255,255,.2);
border-left: 0px solid #ffffFF0000ff ;
height: 80px;
width: 0;
line-height: 20px;
font-size:12px;
font-size:14px;
color:#fffff;
}
.hideBtn2{
position: relative;
right:1px;
border-top: 0px solid transparent;
/*border-top: 0px solid transparent;
border-bottom: 20px solid transparent;
border-right: 0px solid #ff9419;
border-left: 22px solid #ff9419 ;
border-left: 22px solid #ff9419 ; */
border-top: 0px solid transparent;
border-bottom: 0px solid transparent;
border-right: 20px solid #ff9419;
border-left: 0px solid #ff9419 ;
height: 80px;
width: 0;
line-height: 20px;
font-size:12px;
font-size:14px;
color:#fffff;
}
.new_class {
background-color:#FF750E !important;
border : none ;
border-radius: 0px;
box-shadow: none;
color:#ffffff;
width : auto ;
margin-left:0px;
padding:0px;
}
.address_control{
width:10px;
height:12px;
float:left;
margin-top:19px;
margin-left:30px;
}
.c-user>li>a {
background-color:rgba(255,255,255) !important;
color:#333333 !important;
opacity: 30% !important;
/*padding-top:0px;*/
/*padding-bottom:0px;*/
}
.c-user{
/*padding-top:0px;*/
/*padding-bottom:0px;*/
border: none ;
box-shadow: 0 0px 22px -9px ;
}
.c-user li a:hover,
.c-user li a:active,
.c-user li a:focus,
.c-user>li>a:hover {
background-color:#cccccc !important;
color:#333333 !important;
/*padding-bottom:0px;*/
/*padding-top:0px;*/
}
.new_btn{
background-color:#FF750E !important;
background-image : none;
border :none ;
text-shadow : none ;
border-radius: 0px;
box-shadow: none;
width:auto;
padding-left :0px;
padding-right:0px;
float:left;
color:#ffffff !important;
margin-right:10px;
font-size:14px;
}
.down_control {
width : auto ;
margin-right:30px;
margin-top:12px;
}
.divider{
background-color: #F8F9FB !important;
}
</style>
</head>
<body>
<body style="margin: 0 auto !important">
<div class="navbar" style="background: #ff9419 !important;">
<div class="navbar" style="background: #FF750E !important;">
<div class="container-fluid">
<a class="brand">
<i><img src="/resource/image/houtai_footer_icon1.png" class="houtai_footer_icon1"></i>
<span class="hidden-phone">同联商业后台管理中心</span>
<i><img src="/resource/image/logo@1x.png" class="houtai_footer_icon1"></i>
<!--<span class="hidden-phone">同联商业后台管理中心</span>-->
</a>
</div>
<!--<select class="form-control btn2-city ld-Marheight-city" id="user_city_choose">
<option value="310100">上海市</option>
<option value="330100">杭州市</option>
</select>-->
<select class="form-control btn2-city ld-Marheight-city user_city_choose_site" disabled="disabled">
<i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i>
<select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled">
</select>
<div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span class="caret"></span>
<button class="btn btn-default dropdown-toggle new_btn" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<!--<span class="caret"></span>-->
<i><img src="/resource/image/Path20@1x.png" class="down_control"></i>
<ul class="dropdown-menu c-user" aria-labelledby="dropdownMenu1">
<li><a href="#">修改密码</a></li>
<li role="separator" class="divider"></li>
<li><a href="/index/logout" id="logout">退出登录</a></li>
......@@ -69,16 +144,16 @@
<!--<div id="hideLine" style="width:2px;height:80px;background-color: #000000;float:left;display:inline;display:none"></div>
--><!--添加隐藏按钮-->
<div id="hide_menu" class="" style="width:2%;display:inline;">
<div id="hide_menu" class="" style="width:2%;display:inline;position:absolute;z-index:10000;top:80px;left:0px;">
<div class="width-136-hide hideBtn1" style=";text-align:center;">
<span style="position:relative;left:3px;top:10px">隐藏</span>
<div style="width:100%;"><img src="/resource/image/-@1x.png" style="width:14px;height:14px;margin-left:6px;margin-top:14px" class="houtai_footer_icon1"></div>
<span style="position:absolute;left:6px;top:34px">隐藏</span>
<!--<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>-->
</div>
</div>
<div id="wrapper" style="width:100% !important;float:left !important;display:inline">
<div id="wrapper" style="width:98% !important;float:right !important;display:inline">
{include file="global/navigation" /}
{__CONTENT__}
{include file="global/footer_tpl" /}
</div>
......
<!DOCTYPE html>
<html lang="en-us">
<head>
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
{include file="global/header_tpl" /}
<link rel="stylesheet" href="/resource/css/bootstrap.css" type="text/css" />
<link rel="stylesheet" href="/resource/css/public.css" type="text/css" />
<link rel="stylesheet" href="//qidian.gtimg.com/lulu/theme/peak/css/common/ui/Pagination.css">
<link rel="stylesheet" href="/resource/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/resource/css/bootstrap-datetimepicker.min.css">
<link rel="stylesheet" href="/resource/css/b-liu.tabs.css">
<title>同联商业</title>
<style>
/*隐藏显示按钮(梯形)样式代码*/
.hideBtn1{
position: relative;
right:1px;
border-top: 0px solid transparent;
border-bottom: 20px solid transparent;
border-right: 22px solid #1a1a1a;
border-left: 0px solid #1a1a1a ;
height: 80px;
width: 0;
line-height: 20px;
font-size:12px;
}
.hideBtn2{
position: relative;
right:1px;
border-top: 0px solid transparent;
border-bottom: 20px solid transparent;
border-right: 0px solid #ff9419;
border-left: 22px solid #ff9419 ;
height: 80px;
width: 0;
line-height: 20px;
font-size:12px;
}
</style>
</head>
<body>
<!--<div id="hideLine" style="width:2px;height:80px;background-color: #000000;float:left;display:inline;display:none"></div>
--><!--添加隐藏按钮-->
<div id="wrapper" style="width:100% !important;float:left !important;display:inline">
{__CONTENT__}
{include file="global/footer_tpl" /}
</div>
</body>
</html>
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="houseFollowUp" />
<style>
.modal-body {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="shop_edit" />
<style>
.half{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="houseList" />
<style>
.clear{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="inspectionRecord" />
<style>
.modal-body {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="inviteStatisticsList" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--商铺标签页面-->
<input type="hidden" class="page-load" id="label" />
<div id="page-content-wrapper">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--客户标签页面-->
<input type="hidden" class="page-load" id="u_label" />
<div id="page-content-wrapper">
......
{layout name="global/frame_tpl" /}
{include file="global/navigation" /}
<input type="hidden" class="page-load" id="mainIndex" />
<style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
html{
font-size:640%;
/*overflow:hidden !important;*/
}
body {
overflow: hidden;;
}
.container{
width: 100%;
height:100%;
padding:0px;
}
#page-content-wrapper{
height:100%;
}
iframe {
overflow: hidden;;
}
#mainFrameTabs {
padding-left:1%;
width:86%;
}
.nav-tabs {
border : none ;
}
#topList {
background-color : #ffffff;
padding : 0px;
padding-bottom:3px;
margin:0px;
}
#topList > li {
background-color : #F6F7FC ;
}
#topList > li > a{
background-color : #F6F7FC ;
}
#topList > .active{
background : #F3E8CE ;
}
#topList > .active > a {
background : #F3E8CE ;
border : none ;
}
.tab-content{
border: none ;
}
/* 左侧目录标签的滚动条样式 */
.iframe-type #document html::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3) !important;
background-color: #ccc !important;
}
/* 滚动条的滑轨背景颜色 */
.iframe-type #document html::-webkit-scrollbar{
width: 2px !important;
background-color: #FF2F2F !important;
}
/* 滑块颜色 */
.iframe-type #document html::-webkit-scrollbar-thumb{
background-color: #CCCCCC !important;
}
</style>
<!--<div class="backer"></div>-->
<!--切换不同的页面 框架-->
<div id="mainFrameTabs">
<ul class="nav nav-tabs" role="tablist" id="topList">
<li class="active">
<a href="#bTabs_indexperformanceRanking" data-toggle="tab" aria-expanded="true">首页</a>
</li>
</ul>
<div class="tab-content">
<div class="tab-pane active" style="width:100%;" id="bTabs_indexperformanceRanking">
<div id="page-content-wrapper">
<div class="container">
<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px;overflow-x:hidden" src="/index/PerformanceRanking">
</iframe>
</div>
</div>
</div>
</div>
</div>
<!--加载图标-->
<!--<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div>-->
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="marchinList" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="home" />
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="user" />
<style>
/*关联客户相关*/
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="myCollectionShopList" />
<style>
.modal-body {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--商铺标签页面-->
<input type="hidden" class="page-load" id="myCollectionUserList" />
<style>
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="schoolBusiness" />
<style>
.modal-body1 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="schoolBusinessNew" />
<style>
.modal-body1 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="addNoticeView" />
<style>
.modal-body1 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="notice" />
<style>
.modal-body1 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="operationalDataList" />
<style type="text/css">
.left{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="performance_ranking" />
<style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
html{
font-size:640%;
width : 98.9%;
overflow : hidden ;
}
.panel {
margin-bottom:0rem;
overflow:hidden;
......@@ -190,9 +195,8 @@
font-size:.15rem;
margin-left:.1rem;
}
</style>
<div class="backer"></div>
<!--<div class="backer"></div>-->
<div id="page-content-wrapper">
<div class="container">
<div class="row">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="performance_subsidiary" />
<style type="text/css">
.clear{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="phone_list" />
<div id="page-content-wrapper">
<div class="container">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="pictureShow" />
<style>
.p-a-0 {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="pkList" />
<style>
.pk-container-detail{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="pkWeekList" />
<style>
.pk-container-detail{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="professionalList" />
<style type="text/css">
.left{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="realtimePerformance" />
<style type="text/css">
.left{
......@@ -93,7 +93,7 @@
}
</style>
<div id="page-content-wrapper">
<div id="page-content-wrapper tab-content">
<div class="container">
<div class="row">
<div class="">
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="RemarkFollowIndex" />
<style>
.follow-up-modal-list-area{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="inspectionRecordAll" />
<style>
.modal-body {
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="setting"/>
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="shopInspectionLog" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<!--关联js元素-->
<input type="hidden" class="page-load" id="site_list" />
<style>
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="storeList" />
<style>
/*获取百度经纬度样式*/
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="carryOut" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="visitShop" />
<style>
.modal-body{
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="transfer"/>
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="version"/>
<!--导航star-->
......
{layout name="global/frame_tpl" /}
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="watch_shop" />
<style type="text/css">
.clear{
......
......@@ -341,7 +341,7 @@ Route::group('index', [
'getPerformanceExcel' => ['index/Performance/getPerformanceExcel', ['method' => 'POST|GET']],
'pictureShow' => ['index/PictureShow/pictureShow', ['method' => 'POST|GET']], //商铺图库 杜欣源 2018-08-31
'PerformanceRanking' => ['index/PerformanceRanking/performanceRanking', ['method' => 'POST|GET']], //效绩排行 杜欣源 2018-11-12
'mainIndex' => ['index/login/mainIndex', ['method' => 'POST|GET']], //首页 杜欣源 2018-11-12
//c端商铺图库相关
'addImageDepot' => ['index/ImageDepot/addImageDepot', ['method' => 'get | post']],//上传保存图片
......
@CHARSET "UTF-8";
.bTabs{
/*margin-top: 10px;*/
height: 100%;
width: 88%;
float: left;
}
.bTabs button.navTabsCloseBtn {
font-size: 23px !important;
cursor: pointer;
margin-left: 10px;
font-style: normal;
line-height: 20px;
font-family: inherit;
font-weight: normal;
position: relative;
top: -2px;
color: #AAAAAA;
-webkit-appearance: none;
padding: 0;
cursor: pointer;
background: 0 0;
border: 0;
float: right;
line-height: 1;
text-shadow: 0 1px 0 #fff;
}
.bTabs button.navTabsCloseBtn:hover{
color: red !important;
font-weight: 700;
}
.bTabs .nav-tabs{
margin-bottom: 5px;
padding-left: 20px;
}
.bTabs .nav-tabs>li {
margin-right: 5px;
}
.bTabs .nav-tabs>li>a {
padding-top: 5px;
padding-bottom: 5px;
color: #333333;
}
.bTabs .nav-tabs li.active a {
color: #131E42;
font-weight: bold;
}
.bTabs .nav-tabs li.active a button.navTabsCloseBtn{
color: #666666;
}
.bTabs div.tab-content {
height: 100%;
overflow-y: hidden;
}
.bTabs div.tab-content div.tab-pane {
height: 100%;
}
\ No newline at end of file
......@@ -2,13 +2,19 @@ body {
/*width: 1335px !important;*/
/*min-width: 1335px !important;*/
width: 1230px !important;
/*width: 1230px !important;*/
/*min-width:1160px !important;*/
margin: 0;
margin: 0 auto;
/*margin: 0 auto;*/
background-color: #F2F2F2;
list-style:none;
padding-right:0px!important;
/*margin-left:0px;
margin-right:0px;*/
}
iframe > html > body {
margin:0px;
padding:0px;
}
/*适配 不同屏幕*/
@media (min-width:1680px){
......@@ -41,10 +47,12 @@ a:hover{
text-decoration:none;
}
.houtai_footer_icon1{
width: 27px;
height: 27px;
/*width: 140px;*/
height: 30px;
float: left;
margin-top: 10px;
margin-left:53px;
font-size:14px;
}
.dropdown{
float: right;
......@@ -90,19 +98,38 @@ a:hover{
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
-webkit-transition: all 0.5s ease;
background: #1a1a1a;
background: -webkit-linear-gradient(#0B1223, #172452);
background: -o-linear-gradient(#0B1223, #172452);
background: -moz-linear-gradient(#0B1223, #172452);
background: linear-gradient(#0B1223, #172452);
/*background: #1a1a1a;*/
height: 100%;
overflow-x: hidden;
overflow-y: auto;
/*transition: all 0.5s ease;*/
/*width: 136px;*/
width: 12%;
width: 14%;
z-index: 1000;
float: left;
/*animation: show-mulu-action 1.3s;*/
/*目录显示的动画效果(from透明 to 全部显示,用时1.5秒)*/
}
/* 左侧目录标签的滚动条样式 */
#sidebar-wrapper::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #ccc;
}
/* 滚动条的滑轨背景颜色 */
#sidebar-wrapper::-webkit-scrollbar{
width: 2px !important;
background-color: #FF2F2F;
}
/* 滑块颜色 */
#sidebar-wrapper::-webkit-scrollbar-thumb{
background-color: #CCCCCC;
}
@keyframes show-mulu-action
{
0% {
......@@ -126,7 +153,7 @@ a:hover{
}*/
/*新版本 样式*/
#page-content-wrapper {
width: 88%;
width: 100%;
float: left;
}
/*隐藏按钮 样式*/
......@@ -153,20 +180,24 @@ a:hover{
}
/*菜单图标的样式*/
#icon_more_menu{
width: 9px;
height: 14px;
width: 14px;
height: 9px;
margin-left: 10px;
float: right;
margin-top: 2px;
background: url(/resource/image/icon_more@2x.png) no-repeat center center/9px 9px;
/*background: url(/resource/image/icon_more@2x.png) no-repeat center center/9px 9px;*/
background: url(/resource/image/Path2@1x.png) no-repeat center center/9px 9px;
}
.open>a #icon_more_menu{
width: 9px;
height: 14px;
width: 8px;
height: 12px;
margin-left: 10px;
float: right;
margin-top: 2px;
background: url(/resource/image/icon_down02@2x.png) no-repeat center center/9px 7px;
margin-top: 7px;
/*background: url(/resource/image/icon_down02@2x.png) no-repeat center center/9px 7px;*/
background: url(/resource/image/Path20@1x.png) no-repeat center center/9px 7px;
}
.glyphicon-zhanwei{
margin-left:10px;
......@@ -180,12 +211,18 @@ a:hover{
.sidebar-nav li{
border-bottom: 1px solid #1a1a1a;
}
.dropdown li {
background-color : #22345E;
border : none
}
.navbar{
border: none;
}
.container{
width: 100%;
padding:0px !important;
}
/*-------------------------------*/
/* Sidebar nav styles */
......@@ -220,7 +257,7 @@ a:hover{
font-size: 12px;
}
.sidebar-nav .dropdown-menu li a{
padding: 13px 0 13px;
padding: 8px 0 8px 30px;
}
.sidebar-nav .open a{
font-weight: 400;
......@@ -228,7 +265,10 @@ a:hover{
}
.sidebar-nav .open .dropdown-toggle{
font-weight: 700;
}
.dropdown-toggle {
margin-left:30px;
}
.sidebar-nav li.open:hover before {
......@@ -259,6 +299,22 @@ a:hover{
color: #ffffff;
text-decoration: none;
}
/*二级下拉菜单鼠标移动到上面的颜色设置*/
.sidebar-nav .dropdown-menu li a:hover,
.sidebar-nav .dropdown-menu li a:active,
.sidebar-nav .dropdown-menu li a:focus,
.sidebar-nav .dropdown-menu li.open a:hover,
.sidebar-nav .dropdown-menu li.open a:active,
.sidebar-nav .dropdown-menu li.open a:focus {
background: -webkit-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -o-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -moz-linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: linear-gradient(#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2) !important;
color :#1a1a1a;
text-decoration: none;
}
.sidebar-nav > .sidebar-brand {
font-size: 20px;
height: 65px;
......@@ -376,8 +432,12 @@ a:hover{
.menu-sub-alink.active-a{
/*background-color: #ff9419!important;*/
background-color: rgba(255, 148, 25,.7)!important;
/*background-color: rgba(255, 148, 25,.7)!important;*/
background: -webkit-linear-gradient(45deg,#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -o-linear-gradient(45deg,#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: -moz-linear-gradient(45deg,#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2)!important;
background: linear-gradient(45deg,#FFFFFF, #F2E7CC,#F5EDD9,#EFE1C1,#ECDAB2) !important;
color :#1a1a1a;
}
/*商铺列表,商铺动态,跟进信息样式*/
......@@ -710,6 +770,9 @@ p{margin: 0;}
/*去掉 内容区距离 顶部的距离*/
.breadcrumb{
margin-bottom: 0px!important;
background-image:none !important;
background-color:#ffffff!important;
/*display: none !important;*/
}
/*去掉每个页面的 表格头部的边框 宽度*/
.table-bordered > thead > tr > th, .table-bordered > thead > tr > td{
......
......@@ -145,7 +145,8 @@ $(function() {
if(typeof data === 'object') {
if(data.code == 200) {
localStorage.setItem('pcUserInfo', encodeURIComponent(JSON.stringify(data.data))); //存储PC后台登录用户所有信息
location.href = '/admin.php/index/performanceRanking';
// location.href = '/admin.php/index/performanceRanking';
location.href = '/admin.php/index/mainIndex';
localStorage.removeItem('id_details_str');
} else {
alert(data['msg']);
......
......@@ -23,6 +23,10 @@ require.config ({
'blow-up': 'lib/js/blow-up',
'97datePicker': 'lib/js/my97datePicker/WdatePicker',
'photo-gallery': 'lib/js/jquery-photo-gallery/jquery.photo.gallery',
'b-liu-tabs': 'lib/js/b-liu.tabs',
'demo-liu': 'lib/js/demo-liu',
},
'shim': {
......@@ -71,6 +75,14 @@ require.config ({
'photo-gallery': {
'deps': ['jquery'],
'exports': 'photo-gallery'
},
'b-liu-tabs': {
'deps': ['jquery'],
'exports': 'b-liu-tabs'
},
'demo-liu': {
'deps': ['jquery', 'b-liu-tabs'],
'exports': 'demo-liu'
}
},
......@@ -83,4 +95,4 @@ require.config ({
}
});
require(['require', 'jquery', 'doT', 'layer', "datetimepicker", 'bootstrapJs', 'pagination', 'paginationStart', 'checkLogin', 'photo-gallery', '97datePicker', 'app/public']);
\ No newline at end of file
require(['require', 'jquery', 'doT', 'layer', "datetimepicker", 'bootstrapJs', 'pagination', 'paginationStart', 'checkLogin', 'photo-gallery', '97datePicker', 'app/public','b-liu-tabs','demo-liu',]);
\ No newline at end of file
define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT,template) {
var performanceRanking = {
pageNo: 1, /*第几页*/
pageSize: 15, /*每页显示多少条*/
user_id : 0,
urls: '',
agent_id_two:'',
agent_id2 : 0,
modal_btn_id : '' ,
init: function () {
//初始化dot
performanceRanking.event ();
},
event: function () {
var that = this ;
//只在首页显示 菜单
menu_bar(function(){
//回调部分
//记录tab的点击状态,对应的标签内容展开,并高亮显示
var _hash = location.pathname.replace('/admin.php/', '/');
var _tempObj = $('[href="'+_hash+'"]');
_tempObj.addClass('active-a').siblings().removeClass('active-a');
_tempObj.closest('.dropdown-menu').prev().attr('aria-expanded', true).parents().addClass('open').siblings().removeClass('open');
});
//初始化首页被选中
$('.menuSideBar').find('li').each(function(index,e){
var str = $(this).find("span.span-list").text();
if ( str == "首页" ){
$(this).find("a").addClass("active-a");
$(this).parent().parent().addClass("open");
$(this).parent().parent().addClass("active-main-li");
}
})
$(document).on('click','#topList li', function(e){
var title = $(this).find("a").text();
if ( title == "首页" ){
title = title.replace(/(^\s*)|(\s*$)/g, "") ;
} else {
title = title.substr(0,title.length-1).replace(/(^\s*)|(\s*$)/g, "");
}
$('.active-a').removeClass("active-a");
$('.open').removeClass("open");
$('.active-main-li').removeClass("active-main-li");
$('.menuSideBar').find('li').each(function(index,e){
var str = $(this).find("span.span-list").text();
if ( str == title ){
$(this).find("a").addClass("active-a");
$(this).parent().parent().addClass("open");
$(this).parent().parent().addClass("active-main-li");
}
})
});
function menu_bar(fn) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
//登录时间无效 直接跳转登录页面
if(!user_info_obj){
alert('登录失效,请您重新登录');
window.location.href="login.html";
}
$ ("#menu_bar").append (template);
if (user_info_obj) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#dropdownMenu1").append(user_info_obj['name']);
$ ("#menu_bar").html (doTtmpl (user_info_obj['menu']));
//回调
fn && fn();
} else {
$.ajax ({
url: '/index/getMenu',
type: 'POST',
async: true,
data: "",
dataType: 'json',
success: function (data) {
var temp = document.getElementById ('menu_tpl').innerHTML;
var doTtmpl = doT.template (temp);
$ ("#menu_bar").html (doTtmpl (data.data.menu));
//回调
fn && fn();
}
});
}
}
},
};
return performanceRanking;
});
//$('#bTabs_indexperformanceRanking .navbar').hide()
$(".iframe-type").contents().find(".navbar").hide();
\ No newline at end of file
......@@ -93,6 +93,11 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
performanceRanking.loadTable2Data();
})
$(document).on('click','#initOder',function(){
performanceRanking.loadTableData();
performanceRanking.loadTable2Data();
})
},
initDate : function(){
......
define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function (doT, $,template, layer) {
//初始化左侧隐藏按钮的位置(屏幕宽度-body宽度 之后再/ 2 + px)
//使用jquery进行数据处理
//代码行数:2
//修改人:杜欣源
var totalHeighe = ($(document).width() - $("body").width()) / 2 +"px";
$('#hide_menu').css("left",totalHeighe);
var init = {
doTinit: function () {
doT.templateSettings = {
......@@ -75,7 +83,6 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
}
}
$("#logout").click(function () {
localStorage.removeItem('pcUserInfo');
});
......@@ -112,6 +119,8 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
e.preventDefault();
e.stopPropagation();
var _this = $(this);
$('.active-a').removeClass("active-a");
_this.addClass("active-a");
location.href = _this.attr('href');
});
......@@ -131,11 +140,12 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
//$('#hideLine').show(); //隐藏一条线,作用是在目录隐藏的时候附加的一个显示效果
$('.width-136-hide').removeClass("hideBtn1");
$('.width-136-hide').addClass("hideBtn2");
$('.width-136-hide').find('span').css("left","-17px"); //通过绝对定位来操作文字的位置,如果后期有所偏移可以纪念性微调
// $('.width-136-hide').find('span').css("left","-17px"); //通过绝对定位来操作文字的位置,如果后期有所偏移可以纪念性微调
$('#sidebar-wrapper').hide();
$('.width-136-hide').find('span').text("显示");
//_this.html('显示<img src="/resource/image/icon_down_hide@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","100%");//内容显示大小
$('#mainFrameTabs').css("width","100%");
}else{
//$('#hideLine').hide();
$('.width-136-hide').removeClass("hideBtn2");
......@@ -143,8 +153,9 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
$('.width-136-hide').find('span').css("left","3px");
$('#sidebar-wrapper').show();
//_this.html('隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","88%");//内容显示大小
$("#page-content-wrapper").css("width","100%");//内容显示大小
$('.width-136-hide').find('span').text("隐藏");
$('#mainFrameTabs').css("width","");
}
});
//显示操作里的按钮
......
/**
* b.tabs.js
* base on Bootstrap Tab
*
* 导航功能扩展,可动态添加,可关闭
* 使用后可将系统改造为以标签页来打开页面的模式
*
* @author Terry
* created : 2016.03.17
*
* changelog:
* 2017.07.21 - 重构代码
* 解决IE下关闭标签页后切换其它标签页不能获得焦点问题
*
*/
!function ($) {
"use strict";
var maxWin = 10 ;
var defaults = {
/**
* 载入标签页内容,登录超时后跳转的链接
*/
'loginUrl' : '/',
/**
* 自定义样式
*/
'className' : undefined,
/**
* 浏览窗口尺寸发生变化时执行的回调
*/
'resize' : undefined
};
/**
* 常量
*/
var constants = {
closeBtnTemplate : '<button type="button" class="navTabsCloseBtn" title="关闭" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>',
//设置该样式的tab不会被关闭
noCloseClass : 'noclose',
prefixKey : 'bTabs_'
};
var bTabs = function(box,p){
this.$container = box;
this.openTabs = new Array();
this.p = p;
};
/**
* 版本
*/
bTabs.version = '1.0';
/**
* 初始化
*/
bTabs.prototype.init = function(){
var self = this,c = constants, $tabs = this.$container, openTabs = this.openTabs, p = this.p;
$($tabs).addClass('bTabs');
if(p.className) $($tabs).addClass(p.className);
$('ul.nav-tabs a',$($tabs)).each(function(i,row){
var li = $(this).closest('li');
if(li && !$(li).hasClass(c.noCloseClass)){
if ( $(row).html() == '首页' ){
// $(row).attr("aria-expanded","true");
openTabs.push('bTabs_indexperformanceRanking');
// never close this modal
} else {
$(row).append(c.closeBtnTemplate);
}
// console.log($(row).html())
}
});
$('div.tab-content div.tab-pane',$tabs).each(function(i,row){
openTabs.push($(this).attr('id'));
});
//为关闭图标绑定事件,并适用于动态新增的
$('ul.nav-tabs',$tabs).on('click','button',function(e){
var id = $(this).parent().attr('href').replace('#', '');
self.closeTab(id);
});
if(p && p.resize && $.isFunction(p.resize)){
$(window).off('resize.bTabs').on('resize.bTabs',function(e){
p.resize();
});
}
};
/**
* 新增一个tab,但如果是已存在的tab则只是激活它,而不再新增
*
* @param id {string} 模块ID
* @param title {string} 标题
* @param url {string} 目标链接地址
* @param loginCheck {function}可选参数,不传则直接使用iframe打开界面
*/
bTabs.prototype.addTab = function(id,title,url,loginCheck){
if(!id || !title || !url) console.error('新增tab时,id,title,url参数为必须传递参数!');
var c = constants, $tabs = this.$container, openTabs = this.openTabs, p = this.p;
var tabId = c.prefixKey + id;
console.log(openTabs);
if(openTabs && $.isArray(openTabs) && openTabs.length>0){
var exist = false;//是否已存在
$.each(openTabs,function(i,row){
if(row == tabId){
exist = true;
return false;
}
});
//若功能已存在,则直接切换
if(exist){
$('ul.nav-tabs a[href="#'+tabId+'"]',$tabs).tab('show');
return;
} else {
if ( maxWin < openTabs.length){
alert("最多可以同时打开"+ maxWin +"个窗口")
return false ;
}
}
}else {
openTabs = new Array();
}
$('ul.nav-tabs',$tabs).append('<li><a href="#'+tabId+'" data-toggle="tab">'+title+c.closeBtnTemplate+'</a></li>');
var content = $('<div class="tab-pane" id="'+tabId+'"></div>');
$('div.tab-content',$tabs).append(content);
//切换到新增加的tab上
$('ul.nav-tabs li:last a',$tabs).tab('show');
openTabs.push(tabId);
var openIframe = function(){
$(content).append('<iframe frameborder="0" class="iframe-type" scrolling="yes" style="width:100%;height:100%;border:0px;" src="'+url+'"></iframe>');
};
//进行登录验证
if(loginCheck && $.isFunction(loginCheck)){
if(loginCheck()) openIframe();
else if(p && p.loginUrl) window.top.location.replace(p.loginUrl);
}else openIframe();
};
/**
* 关闭tab
* @param id
*/
bTabs.prototype.closeTab = function(id){
var c = constants, $tabs = this.$container, openTabs = this.openTabs;
var thisTab = $('#' + id);
//在移除标签页之前,先把iframe移除,解决在IE下,窗口上的输入控件获得不了焦点的问题
if($('iframe',$(thisTab)).size() > 0) $('iframe',$(thisTab)).remove();
//移除内容区
$(thisTab).remove();
var a = $('ul.nav-tabs a[href="#'+id+'"]',$tabs);
var li = $(a).closest('li');
//获得当前tab的前一个tab
var prevLi = $(li).prev();
//移除Tab
li.remove();
if(openTabs && $.isArray(openTabs) && openTabs.length>0){
var index = -1;
$.each(openTabs,function(i,d){
if(d == id){
index = i;
return false;
}
});
if(index != -1) openTabs.splice(index,1);
}
//激活被关闭Tab邻的Tab,若没有则不处理
if(prevLi.size() > 0 ) $('a',$(prevLi)).tab('show');
};
/**
* 插件初始化入口
*/
function Plugin(p){
return this.each(function(){
//参数合并时允许读取在html元素上定义的'data-'系列的参数
var $this = $(this),
data = $this.data('bTabs'),
params = $.extend({}, defaults, $this.data(), typeof p == 'object' && p);
if(!data) $this.data('bTabs', (data = new bTabs(this,params)));
data.init();
});
}
/**
* 新增标签页
*/
function bTabsAdd(id,title,url,loginCheck){
return this.each(function(){
if(!title || !url) return;
var $this = $(this),data = $this.data('bTabs');
if(data) data.addTab(id,title,url,loginCheck);
});
}
/**
* 关闭标签页
*/
function bTabsClose(id){
return this.each(function(){
if(!title || !url) return;
var $this = $(this),data = $this.data('bTabs');
if(data) data.closeTab(id);
});
}
var old = $.fn.bTabs;
$.fn.bTabs = Plugin;
$.fn.bTabs.Constructor = bTabs;
$.fn.bTabsAdd = bTabsAdd;
$.fn.bTabsClose = bTabsClose;
// 处理新旧版本冲突
// =================
$.fn.bTabs.noConflict = function () {
$.fn.bTabs = old;
return this;
};
}(window.jQuery);
\ No newline at end of file
$(function(){
//计算内容区域高度
var calcHeight = function(){
var browserHeight = $(window).innerHeight();
var topHeight = $('#mainFrameHeadBar').outerHeight(true);
var tabMarginTop = parseInt($('#mainFrameTabs').css('margin-top'));//获取间距
var tabHeadHeight = $('ul.nav-tabs',$('#mainFrameTabs')).outerHeight(true) + tabMarginTop;
var contentMarginTop = parseInt($('div.tab-content',$('#mainFrameTabs')).css('margin-top'));//获取内容区间距
var contentHeight = browserHeight - topHeight - tabHeadHeight - contentMarginTop;
$('div.tab-content',$('#mainFrameTabs')).height(contentHeight);
};
//菜单点击
$(document).on('click','.menuSideBar a', function(e){
e.stopPropagation();
var li = $(this).closest('li');
var menuId = $(this).parent().attr('data-funurl').replace(/\//g,'')
var url = $(li).attr('data-funurl');
var title = $(this).text();
$('#mainFrameTabs').bTabsAdd(menuId,title,url);
//计算Tab可用区域高度
calcHeight();
});
//初始化
$('#mainFrameTabs').bTabs();
});
\ No newline at end of file
......@@ -10,9 +10,10 @@
<span id="icon_more_menu">
</span></a>
<!--<img src="/resource/image/icon_more@2x.png" id=""/>-->
<ul class="dropdown-menu" role="menu">
<ul class="dropdown-menu menuSideBar" role="menu">
[% for(var item_menu in it[item]["_child"]){ %]
<li><a href="/[%= it[item]['_child'][item_menu]['name'] %]" target="_blank" class="menu-sub-alink"><span class="glyphicon-zhanwei"></span> <span class="span-list">[%= it[item]["_child"][item_menu]['title'] %]</span></a></li>
<li data-funurl="/[%= it[item]['_child'][item_menu]['name'] %]"><a href="javascript:void(0);" class="menu-sub-alink"><span class="glyphicon-zhanwei"></span> <span class="span-list">[%= it[item]["_child"][item_menu]['title'] %]</span></a></li>
[% } %]
</ul>
[% }%]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment