Skip to content

T
tl_estate
Commit 4aa541e5 authored by agping's avatar agping
Browse files
Options

后台适配

parent 1d011330
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 33 deletions
public/resource/css/public.css
View file @ 4aa541e5
...@@ -3,13 +3,41 @@ body { ...@@ -3,13 +3,41 @@ body {
/*min-width: 1335px !important;*/ /*min-width: 1335px !important;*/
width: 1160px !important; width: 1160px !important;
min-width:1160px !important; /*min-width:1160px !important;*/
margin: 0; margin: 0;
margin: 0 auto; margin: 0 auto;
background-color: #F2F2F2; background-color: #F2F2F2;
list-style:none; list-style:none;
padding-right:0px!important; padding-right:0px!important;
} }
/*适配 不同屏幕*/
@media (min-width:1920px){
body{
width:1560px !important;
};
};
@media (min-width:1680px){
body{
width:1460px !important;
}
};
@media (min-width:1600px){
body{
width:1460px !important;
}
};
@media (min-width:1440px){
body{
width:1200px !important;
}
};
@media (min-width:1280px){
body{
width:1160px !important;
}
};
html { overflow-y: scroll; } html { overflow-y: scroll; }
a:hover{ a:hover{
text-decoration:none; text-decoration:none;
...@@ -88,8 +116,8 @@ a:hover{ ...@@ -88,8 +116,8 @@ a:hover{
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
transition: all 0.5s ease; transition: all 0.5s ease;
width: 136px; /*width: 136px;*/
/*width: 14%;*/ width: 12%;
z-index: 1000; z-index: 1000;
float: left; float: left;
} }
...@@ -103,7 +131,7 @@ a:hover{ ...@@ -103,7 +131,7 @@ a:hover{
}*/ }*/
/*新版本 样式*/ /*新版本 样式*/
#page-content-wrapper { #page-content-wrapper {
width: 1024px; width: 88%;
float: left; float: left;
} }
/*隐藏按钮 样式*/ /*隐藏按钮 样式*/
...@@ -116,8 +144,8 @@ a:hover{ ...@@ -116,8 +144,8 @@ a:hover{
float: right; float: right;
} }
.width-136-hide{ .width-136-hide{
width: 136px; /*width: 136px;*/
/*width: 14%;*/ width: 12%;
height: 36px; height: 36px;
color: #fff; color: #fff;
line-height: 36px; line-height: 36px;
...@@ -172,15 +200,12 @@ a:hover{ ...@@ -172,15 +200,12 @@ a:hover{
margin: 0; margin: 0;
padding: 0; padding: 0;
top: 10px; top: 10px;
width: 136px;
/*width: 220px;*/
} }
.sidebar-nav li { .sidebar-nav li {
display: inline-block; display: inline-block;
line-height: 20px; line-height: 20px;
position: relative; position: relative;
/*width: 100%;*/ width: 100%;
width: 136px;
} }
.sidebar-nav .dropdown-menu li:before { .sidebar-nav .dropdown-menu li:before {
background:rgba(255,148,25,0.1) !important; background:rgba(255,148,25,0.1) !important;
...@@ -227,6 +252,7 @@ a:hover{ ...@@ -227,6 +252,7 @@ a:hover{
width: 136px; width: 136px;
left: 0; left: 0;
top: 0; top: 0;
} }
.sidebar-nav li a:hover, .sidebar-nav li a:hover,
.sidebar-nav li a:active, .sidebar-nav li a:active,
......
public/resource/js/performance_subsidiary.js
View file @ 4aa541e5
...@@ -1332,26 +1332,17 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1332,26 +1332,17 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
}, },
// 导出业绩列表 // 导出业绩列表
maintableExport: function(pageNo) { maintableExport: function(pageNo) {
console.log(2); var shop_type= $('#maintable_shop_type_yeji').val();
bargain.pageNo = pageNo; var trade_type=$('#maintable_deal_type').val();
var params = {}; var create_time_start=$.trim($('#maintable_create_time').val());
var excel_two = 1; var create_time_end=$.trim($('#maintable_end_time').val());
var user_name = $.trim($('#customer_name').val()); var landmark=$.trim($('#maintable_internal_address').val());
var start_time = $('#start_date').val(); var house_id=$.trim($('#maintable_shop_num').val());
var end_time = $('#end_date').val(); var district_id=$("select[name='district_id'] option:selected").val();
var internal_address = $('#shop_name').val(); var store_id=$("select[name='store_id'] option:selected").val();
var user_phone = $('#customer_phone').val(); var name= $.trim($('#agent_name').val());
var id = $('#shop_num').val(); var phone= $.trim($('#agent_phone').val());
var store_name = $('#store_name').val(); window.open('/index/getPerformanceInfoExcel?' + 'shop_type=' + shop_type + '&trade_type=' + trade_type + '&create_time_start=' + create_time_start + '&create_time_end=' + create_time_end + '&landmark=' + landmark + '&house_id=' + house_id + '&district_id=' + district_id + '&store_id=' + store_id + '&name=' + name + '&phone=' + phone);
var report_phone = $('#applicant_phone').val();
var report_name = $('#applicant_name').val();
var store_id = $("select[name='store_id'] option:selected").val();
var district_id = $("select[name='district_id'] option:selected").val();
var pay_type = $("select[name='maintable_shop_type_2'] option:selected").val();
var type = $("select[name='maintable_shop_type_1'] option:selected").val();
window.open('/index/getPerformanceExcel');
// window.open('/index/getCollection?' +
// 'excel=' + excel_two + '&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&user_phone=' + user_phone + '&id=' + id + '&store_name=' + store_name + '&report_phone=' + report_phone + '&report_name=' + report_name+ '&store_id=' + store_id+ '&district_id=' + district_id+ '&pay_type=' + pay_type+ '&type=' + type);
}, },
//获取一级审核，二级审核，三级审核，结单数据列表共用的方法 //获取一级审核，二级审核，三级审核，结单数据列表共用的方法
......
public/resource/js/public.js
View file @ 4aa541e5
...@@ -120,11 +120,11 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -120,11 +120,11 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
if($.trim(_this.html()).indexOf("隐藏")!=-1){ if($.trim(_this.html()).indexOf("隐藏")!=-1){
$('#sidebar-wrapper').hide(); $('#sidebar-wrapper').hide();
_this.html('显示<img src="/resource/image/icon_down_hide@2x.png" class="text-icon-hide"/>'); _this.html('显示<img src="/resource/image/icon_down_hide@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","1160px");//内容显示大小 $("#page-content-wrapper").css("width","100%");//内容显示大小
}else{ }else{
$('#sidebar-wrapper').show(); $('#sidebar-wrapper').show();
_this.html('隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>'); _this.html('隐藏<img src="/resource/image/icon_down@2x.png" class="text-icon-hide"/>');
$("#page-content-wrapper").css("width","1024px");//内容显示大小 $("#page-content-wrapper").css("width","88%");//内容显示大小
} }
}); });
//显示操作里的按钮 //显示操作里的按钮
......
public/resource/template/performance_subsidiary_template_tpl.html
View file @ 4aa541e5
<script id="performance_subsidiary_list_tpl" type="text/template"> <script id="performance_subsidiary_list_tpl" type="text/template">
[% if(it) { %] [% if(it[0]) { %]
[% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %] [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
[% for(var item in it){ %] [% for(var item in it){ %]
<tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]"> <tr class="text-center" data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]" data-fatherid="[%= it[item]['father_id'] %]">
......
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