Commit e3c14a5e authored by agping's avatar agping

后台优化

parent 55e74562
...@@ -51,13 +51,8 @@ ...@@ -51,13 +51,8 @@
<option value="310100">上海市</option> <option value="310100">上海市</option>
<option value="330100">杭州市</option> <option value="330100">杭州市</option>
</select>--> </select>-->
<select class="form-control btn2-city ld-Marheight-city" id="" disabled="disabled" class="user_city_choose_site"> <select class="form-control btn2-city ld-Marheight-city user_city_choose_site">
<option value="上海市">上海市</option>
<option value="杭州市">杭州市</option>
<option value="深圳市">深圳市</option>
<option value="北京市">北京市</option>
<option value="苏州市">苏州市</option>
<option value="南京市">南京市</option>
</select> </select>
<div class="dropdown"> <div class="dropdown">
......
...@@ -1460,7 +1460,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -1460,7 +1460,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
// params.city = '杭州市'; // params.city = '杭州市';
} }
params.user_id = $.trim($("#customer_name_id").val());//区域 params.user_id = $.trim($("#customer_name_id").val());//区域
params.disc = $.trim($("#user_area_choose").val());//区域 // params.disc = $.trim($("#user_area_choose").val());//区域
_startDateObj.val() != '' && (params.start_date = _startDateObj.val()); _startDateObj.val() != '' && (params.start_date = _startDateObj.val());
_endDateObj.val() != '' && (params.end_date = _endDateObj.val()); _endDateObj.val() != '' && (params.end_date = _endDateObj.val());
$.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val())); $.trim(_customerNameObj.val()) != '' && (params.customer = $.trim(_customerNameObj.val()));
...@@ -1743,7 +1743,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css' ...@@ -1743,7 +1743,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
$("#user_city_choose").val('330100'); $("#user_city_choose").val('330100');
}; };
var city_id=$("#user_city_choose").val(); var city_id=$("#user_city_choose").val();
if(city_id) { if(1) {
user.getCityAreaList(city_id, function(_data) { user.getCityAreaList(city_id, function(_data) {
var _str = '<option value="">区域</option>'; var _str = '<option value="">区域</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
......
...@@ -381,7 +381,7 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css' ...@@ -381,7 +381,7 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
$("#user_city_choose").val('330100'); $("#user_city_choose").val('330100');
}; };
var city_id=$("#user_city_choose").val(); var city_id=$("#user_city_choose").val();
if(city_id) { if(1) {
house.getCityAreaList(city_id, function(_data) { house.getCityAreaList(city_id, function(_data) {
var _str = '<option value="">区域</option>'; var _str = '<option value="">区域</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
......
...@@ -12,6 +12,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin ...@@ -12,6 +12,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
return str; return str;
}; };
}; };
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
business = { business = {
pageNo: 1, pageNo: 1,
/*第几页*/ /*第几页*/
...@@ -1266,8 +1267,8 @@ if(data.code == 200) { ...@@ -1266,8 +1267,8 @@ if(data.code == 200) {
type: 'GET', type: 'GET',
async: true, async: true,
data: { data: {
'province': province, // 'province': province,
'city': city, 'city': user_info_obj.city,
'disc': id 'disc': id
}, },
dataType: 'json', dataType: 'json',
...@@ -1362,7 +1363,7 @@ if(data.code == 200) { ...@@ -1362,7 +1363,7 @@ if(data.code == 200) {
$("#user_city_choose").val('330100'); $("#user_city_choose").val('330100');
}; };
var city_id=$("#user_city_choose").val(); var city_id=$("#user_city_choose").val();
if(city_id) { if(1) {
business.getDistrictStoreList(city_id, function(_data) { business.getDistrictStoreList(city_id, function(_data) {
var _str = '<option value="">区域</option>'; var _str = '<option value="">区域</option>';
$.each(_data, function(i, item) { $.each(_data, function(i, item) {
......
...@@ -80,13 +80,26 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function ...@@ -80,13 +80,26 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
var _doc = $(document); var _doc = $(document);
//显示 隐藏城市 默认显示 当前账号 所在城市 //显示 隐藏城市 默认显示 当前账号 所在城市
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存 $.ajax({
if(user_info_obj.city){ url: '/index/getSiteList',
$('.user_city_choose_site').val(user_info_obj.city); type: 'GET',
}else{ async: true,
$('.user_city_choose_site').val('上海市'); data: {
} },
dataType: 'json',
success: function(data) {
if(data.code == 200 && data.data != null) {
var str = '';
$.each(data.data.list, function(i, item) {
str += '<option value="' + item.id + '">' + item.city + '</option>';
});
$(".user_city_choose_site").append(str);
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
$('.user_city_choose_site').val(user_info_obj.site_id);
}
}
});
// $('#user_city_choose').hide(); // $('#user_city_choose').hide();
// if(window.location.pathname == '/index/users_list' || window.location.pathname == '/index/RemarkFollowList'){ // if(window.location.pathname == '/index/users_list' || window.location.pathname == '/index/RemarkFollowList'){
......
...@@ -1748,7 +1748,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind ...@@ -1748,7 +1748,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
if($('#user_city_choose').val() == 330100){ if($('#user_city_choose').val() == 330100){
// params.city = '杭州市' ; // params.city = '杭州市' ;
} }
params.disc = $.trim($("#user_area_choose").val());//区域 // params.disc = $.trim($("#user_area_choose").val());//区域
// 创建时间 筛选 不能超过 2个月 // 创建时间 筛选 不能超过 2个月
var start_ = params.start_date+" 00:00:00"; var start_ = params.start_date+" 00:00:00";
date_start =new Date(Date.parse(start_.replace(/-/g, "/"))); date_start =new Date(Date.parse(start_.replace(/-/g, "/")));
......
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