后台样式优化

application/index/view/agent/agent.html

@@ -11,7 +11,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/auth/access.html

@@ -2,7 +2,7 @@
 <!--<input type="hidden" class="page-load" id="access" />&lt;!&ndash;关联js文件&ndash;&gt;-->
 <div id="page-content-wrapper">
     <div class="container">
-        <div class="col-lg-10 col-lg-offset-0">
+        <div class="">
             <div class="builder-tabs builder-form-tabs">
                 <ul class="nav nav-tabs">
                     <li class=""><a  id="href1" href="">角色信息</a></li>

application/index/view/auth/accessUser.html

 {layout name="global/frame_tpl" /}
 <div id="page-content-wrapper">
     <div class="container">
-        <div class="col-lg-10 col-lg-offset-0">
+        <div class="">
             <div class="builder-tabs builder-form-tabs">
                 <ul class="nav nav-tabs">                    
                     <li class=""><a href="/admin.php/index/roleedit/1.html">角色信息</a></li>

application/index/view/auth/auth_rule_index.html

@@ -11,7 +11,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">权限管理</a></li>

application/index/view/auth/index.html

@@ -11,7 +11,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">角色管理</a></li>

application/index/view/auth/role_edit.html

@@ -4,7 +4,7 @@
 <input type="hidden" name="id" value="" />
 <div id="page-content-wrapper">
     <div class="container">
-        <div class="col-lg-10 col-lg-offset-0">
+        <div class="">
             <div class="builder-tabs builder-form-tabs">
                 <ul class="nav nav-tabs">
                     <li class="active"><a href="/admin.php/index/roleedit/1.html">角色信息</a></li>

application/index/view/banner/advertising.html

@@ -10,7 +10,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">首页弹框广告</a></li>

application/index/view/banner/banner.html

@@ -10,7 +10,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">首页轮播图</a></li>

application/index/view/business_district/index.html

@@ -9,7 +9,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">商圈列表</a></li>

application/index/view/cell_phone/agentIndex.html

@@ -3,7 +3,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">通话统计</a></li>

application/index/view/cell_phone/index.html

@@ -8,7 +8,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">通话记录</a></li>

application/index/view/collection/getCollection.html

@@ -196,7 +196,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/district/index.html

@@ -4,7 +4,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">部门列表</a></li>

application/index/view/evaluation/evaluation_list.html

@@ -39,7 +39,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>

application/index/view/finance/account_statement.html

@@ -4,7 +4,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/finance/commission.html

@@ -52,7 +52,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">分佣提成明细表</a></li>

application/index/view/finance/commission_total.html

@@ -69,7 +69,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/finance/finance_update_log.html

@@ -65,7 +65,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/finance/refundList.html

@@ -53,7 +53,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">退款审核</a></li>

application/index/view/finance/refund_order_list.html

@@ -53,7 +53,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">已退款</a></li>

application/index/view/finance/statement.html

@@ -52,7 +52,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">分佣提成明细表</a></li>

application/index/view/finance/statement_backout.html

@@ -52,7 +52,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">成交报告-已撤销</a></li>

application/index/view/finance/tax.html

@@ -52,7 +52,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">税费承担明细表</a></li>

application/index/view/finance/wait_backout.html

@@ -53,7 +53,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">成交报告-待撤销</a></li>

application/index/view/global/frame_tpl.html

@@ -31,6 +31,12 @@
         </ul>
     </div>
 </div>
+<!--添加隐藏按钮-->
+<div id="hide_menu">
+	<span class="width-136-hide">
+		隐藏
+	</span>
+</div>
 
 <div id="wrapper">
     {include file="global/navigation" /}

application/index/view/houses/HouseFollowUp.html

@@ -46,7 +46,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/houses/edit.html

@@ -5,7 +5,7 @@
 <div id="page-content-wrapper" style="display: none;">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading">新增商铺</div>
 					<div class="panel-body">

application/index/view/houses/houseList.html

@@ -55,7 +55,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">商铺列表</a></li>

application/index/view/inspection/inspectionRecord.html

@@ -42,7 +42,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/label/index.html

@@ -4,7 +4,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">商铺标签</a></li>

application/index/view/label/u_label_index.html

@@ -4,7 +4,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">客户标签</a></li>

application/index/view/marchin/marchin_list.html

@@ -31,7 +31,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>

application/index/view/member/diagram_list.html

@@ -9,7 +9,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                             <li><a href="#">首页轮播图</a></li>

application/index/view/member/member.html

@@ -33,6 +33,7 @@
     </div>
 </div>
 
+
 <nav class="navbar navbar-inverse" id="sidebar-wrapper" role="navigation">
     <ul class="nav sidebar-nav">
 

application/index/view/member/users_list.html

@@ -257,7 +257,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/news/index.html

@@ -238,7 +238,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/news/new_text.html

@@ -234,7 +234,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/notice/add_notice_view.html

@@ -234,7 +234,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/notice/index.html

@@ -131,7 +131,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/phone/phone_list.html

@@ -3,7 +3,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">号码管理</a></li>

application/index/view/realtime/realtimePerformance.html

@@ -24,7 +24,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/remark/remark_follow_index.html

 {layout name="global/frame_tpl" /}
 <input type="hidden" class="page-load" id="RemarkFollowIndex" />
 <style>
-	/*.modal-body {
-		height: 600px;
-		overflow-y: auto;
-		padding-bottom: 60px;
-	}
-	
-	.modal-body1 {
-		width: 800px;
-	}
-	
-	.user-ul2 {
-		width: 100%;
-		height: auto;
-		padding-bottom: 15px;
-		float: left;
-	}
-	
-	.user-ul2 li {
-		list-style: none;
-		line-height: 30px;
-	}
-	
-
-	.clear {
-		clear: both;
-	}
-	
-	*/
 	/*同步客户列表的样式*/
 	.btn6-1 {
 		width: 70%;
@@ -278,7 +250,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading breadcrumb">
 						<li>

application/index/view/setting/index.html

@@ -10,7 +10,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="javascript:;">参数管理</a></li>

application/index/view/shopinspection/shopinspectionLogList.html

@@ -34,7 +34,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>

application/index/view/store/index.html

@@ -167,7 +167,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>门店列表</li>

application/index/view/supervise/carryOut.html

@@ -31,7 +31,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>

application/index/view/supervise/visitShop.html

@@ -31,7 +31,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li>

application/index/view/transfer/index.html

@@ -10,7 +10,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         委托转铺列表

application/index/view/version/index.html

@@ -10,7 +10,7 @@
 <div id="page-content-wrapper">
     <div class="container">
         <div class="row">
-            <div class="col-lg-10 col-lg-offset-0">
+            <div class="">
                 <div class="panel panel-default">
                     <div class="panel-heading breadcrumb">
                         <li><a href="#">app版本管理</a></li>

application/index/view/watch_shop/watch_list.html

@@ -14,7 +14,7 @@
 <div id="page-content-wrapper">
 	<div class="container">
 		<div class="row">
-			<div class="col-lg-10 col-lg-offset-0">
+			<div class="">
 				<div class="panel panel-default">
 					<div class="panel-heading">
 						预约看铺列表

public/resource/css/public.css

 body {
-    width: 1335px !important;
-    min-width: 1335px !important;
+    /*width: 1335px !important;*/
+    /*min-width: 1335px !important;*/
+    width: 1200px !important;
+    min-width: 1200px !important;
     margin: 0;
     margin: 0 auto;
     background-color: #F2F2F2;
@@ -85,7 +87,8 @@ a:hover{
     overflow-x: hidden;
     overflow-y: auto;
     transition: all 0.5s ease;
-    width: 220px;
+    /*width: 220px;*/
+    width: 12%;
     z-index: 1000;
     float: left;
 }
@@ -93,8 +96,41 @@ a:hover{
 #sidebar-wrapper::-webkit-scrollbar {
     display: block;
 }
-#page-content-wrapper {
+/*老版本 样式*/
+/*#page-content-wrapper {
     width: 100%;
+}*/
+/*新版本 样式*/
+#page-content-wrapper {
+    width: 88%;
+    float: left;
+}
+/*隐藏按钮 样式*/
+#hide_menu{
+	overflow: hidden;
+	margin-top: -10px;
+	
+}
+.glyphicon-chevron-down{
+	float: right;
+}
+.width-136-hide{
+	width: 12%;
+	height: 36px;
+	color: #fff;
+	line-height: 36px;
+	text-align: center;
+	float: left;
+	background-color: rgba(0,0,0,.2);
+	font-size:16px;
+	cursor:pointer;
+
+}
+/*菜单图标的样式*/
+#icon_more_menu{
+	width: 12px;
+	height: 13px;
+	margin-left: 10px;
 }
 .navbar{
     border: none;
@@ -110,7 +146,7 @@ a:hover{
     margin: 0;
     padding: 0;
     top: 10px;
-    width: 220px;
+    /*width: 220px;*/
 }
 .sidebar-nav li {
     display: inline-block;
@@ -142,7 +178,7 @@ a:hover{
 .sidebar-nav li a {
     color: #dddddd;
     display: block;
-    padding: 13px 15px 13px 30px;
+    padding: 13px 15px 13px 15px;
     text-decoration: none;
     font-weight: 700;
     font-size: 14px;

public/resource/js/evaluationList.js

@@ -47,6 +47,7 @@ define(['doT', 'text!temp/evaluation_list_template_tpl.html', 'css!style/home.cs
 //				console.log('follow.house_id');
 				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+follow.house_id);
 			});
+
 			$("#search").click(function() {
 				follow.getList(1);
 			});

public/resource/js/public.js

@@ -89,6 +89,23 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
     	var _this = $(this);
     	_this.addClass('active-main-li').siblings().removeClass('active-main-li');
     });
+    //隐藏菜单 显示菜单
+     _doc.on('click', '.width-136-hide', function(e){
+    	e.preventDefault();
+    	e.stopPropagation();
+    	var _this = $(this);
+    	if($.trim(_this.html())=='隐藏'){
+    		$('#sidebar-wrapper').hide();
+    		$('.width-136-hide').html('显示');
+    		_this.html('显示');
+    		console.log(2);
+    		$("#page-content-wrapper").css("width","100%");
+    	}else{
+    		$('#sidebar-wrapper').show();
+    		_this.html('隐藏');
+    		$("#page-content-wrapper").css("width","88%");
+    	}
+    });
     
     layerTipsX=function(n){layer.open({content:n,skin:"msg",time:2})};//注册一个layer自定义全局函数
     

public/resource/js/realtimePerformance.js

@@ -9,6 +9,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
 		district_id: 0,//部门id
 		store_id: 0,//门店id
 		store_id_Two: 0,//二级门店id
+		is_today_yeji:0,//默认搜索的不是今天 传参数0
 		panfangData: null,
 		init: function() {
 			//初始化dot
@@ -47,6 +48,7 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
 			    var currentdate_=getNowFormatDate();
 				$("#maintable_create_time").val(currentdate_);
 				$("#maintable_end_time").val(currentdate_);
+				realtime.is_today_yeji=1;
 			    realtime.getList(1);
 			});
 			
@@ -76,12 +78,14 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
 			_doc.on('click', '#maintable_search', function(e) {
 				e.preventDefault();
 				e.stopPropagation();
+				realtime.is_today_yeji=0;
 				realtime.getList(1); //一级审核搜索
 			});
 			
 			//搜索的重置
 			$("#maintable_reset").click(function() {
 				document.getElementById("maintable_form_search").reset();
+				realtime.is_today_yeji=0;
 			});
 
 		},
@@ -120,6 +124,8 @@ define(['doT', 'text!temp/real_time_performance_template_tpl.html', 'css!style/h
 				'pageSize': realtime.pageSize,
 				'start_day':$('#maintable_create_time').val(),
 				'end_day':$('#maintable_end_time').val(),
+				'is_today':realtime.is_today_yeji,
+				
 			};
 			$.ajax({
 				type: 'GET',

public/resource/template/menu_template_tpl.html

@@ -7,6 +7,7 @@
             [% } else { %]
                 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> <span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span><span class="span-list">[%= it[item]["title"] %]</span>
                     <span class="glyphicon glyphicon-hand-down" aria-hidden="true"></span></a>
+                    <!--<img src="/resource/image/icon_more@2x.png" id="icon_more_menu"/>-->
                 <ul class="dropdown-menu" role="menu">
                     [% for(var item_menu in it[item]["_child"]){ %]
                         <li><a href="javascript:;" target="_blank" class="menu-sub-alink" data-href="/[%= it[item]['_child'][item_menu]['name'] %]"><span class="glyphicon glyphicon-dashboard" aria-hidden="true"></span> <span class="span-list">[%= it[item]["_child"][item_menu]['title'] %]</span></a></li>