Commit e678db22 by html5-李恒逸

Bug fix

parent 27ce5ed8
<?php <?php
if ( ! defined('BASEPATH')) exit('No direct script access allowed'); if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/** /**
*管理员管理 *管理员管理
...@@ -46,9 +46,9 @@ class Manageradmin extends CI_Controller ...@@ -46,9 +46,9 @@ class Manageradmin extends CI_Controller
$con[1] = $mobile; $con[1] = $mobile;
} }
$where = rtrim($where, ' and'); $where = rtrim($where, ' and');
// echo $where;//exit; // echo $where;die;
$this->data['con_arr'] = $con; $this->data['con_arr'] = $con;
$count = $this->manager->get_count($where); $count = $this->manager->get_count($where);
//获取所有的角色 //获取所有的角色
$this->data['type'] = $this->get_roles(); $this->data['type'] = $this->get_roles();
...@@ -63,15 +63,15 @@ class Manageradmin extends CI_Controller ...@@ -63,15 +63,15 @@ class Manageradmin extends CI_Controller
$admins = array(); $admins = array();
$admins = $this->manager->get_page(array('where' => $where), $page_no, self::PAGE_SIZE); $admins = $this->manager->get_page(array('where' => $where), $page_no, self::PAGE_SIZE);
$this->data['admins'] = $admins; $this->data['admins'] = $admins;
//获取分页 //获取分页
$this->data['num_link'] = set_page1( $this->data['num_link'] = set_page1(
$this,site_url('admin/manageradmin/index?name=' . urlencode($name) . '&mobile=' . $mobile), $this,site_url('admin/manageradmin/index?name=' . urlencode($name) . '&mobile=' . $mobile),
$count,self::PAGE_SIZE,4,'',true, $count,self::PAGE_SIZE,4,'',true,
array('num_links'=>3,'show_total' => false, 'page_query_string' => true)); array('num_links'=>3,'show_total' => false, 'page_query_string' => true));
} }
$this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE + 1; $this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE + 1;
$this->load->view('admin/manager/index',$this->data); $this->load->view('admin/manager/index',$this->data);
} }
//获取权限列表 //获取权限列表
...@@ -87,7 +87,7 @@ class Manageradmin extends CI_Controller ...@@ -87,7 +87,7 @@ class Manageradmin extends CI_Controller
} }
return $return; return $return;
} }
//获取地区数据列表 //获取地区数据列表
public function get_region(){ public function get_region(){
$this->load->model('region_model', 'region'); $this->load->model('region_model', 'region');
...@@ -101,7 +101,7 @@ class Manageradmin extends CI_Controller ...@@ -101,7 +101,7 @@ class Manageradmin extends CI_Controller
} }
return $return; return $return;
} }
//获取楼盘数据列表 //获取楼盘数据列表
public function get_building(){ public function get_building(){
$this->load->model('building_model', 'building'); $this->load->model('building_model', 'building');
...@@ -117,7 +117,7 @@ class Manageradmin extends CI_Controller ...@@ -117,7 +117,7 @@ class Manageradmin extends CI_Controller
} }
/** /**
* *
* 新增外部人员 * 新增外部人员
* @author wenhuijang * @author wenhuijang
* @version 2013-11-15 * @version 2013-11-15
...@@ -129,17 +129,17 @@ class Manageradmin extends CI_Controller ...@@ -129,17 +129,17 @@ class Manageradmin extends CI_Controller
{ {
$this->data['data'] = array(); $this->data['data'] = array();
$this->data['op'] = '添加'; $this->data['op'] = '添加';
//角色类型 //角色类型
$this->data['type'] = $this->get_roles(); $this->data['type'] = $this->get_roles();
//获取地区数据 //获取地区数据
$this->data['region'] = $this->get_region(); $this->data['region'] = $this->get_region();
//获取楼盘数据列表 //获取楼盘数据列表
$this->data['building'] = $this->get_building(); $this->data['building'] = $this->get_building();
$this->load->view('admin/manager/edit',$this->data); $this->load->view('admin/manager/edit',$this->data);
return; return;
} }
//入库 //入库
$data = array(); $data = array();
$data['manager_name'] = $this->input->post('manager_name'); $data['manager_name'] = $this->input->post('manager_name');
...@@ -158,7 +158,7 @@ class Manageradmin extends CI_Controller ...@@ -158,7 +158,7 @@ class Manageradmin extends CI_Controller
return; return;
} }
$data['manager_pwd'] = md5($data['manager_pwd']); $data['manager_pwd'] = md5($data['manager_pwd']);
//校验是否存在该用户 //校验是否存在该用户
$info = array(); $info = array();
$info = $this->manager->get(array('manager_name' => $data['manager_name'])); $info = $this->manager->get(array('manager_name' => $data['manager_name']));
...@@ -168,7 +168,7 @@ class Manageradmin extends CI_Controller ...@@ -168,7 +168,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('register',$log); $this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index')); alert_redirect(site_url('admin/manageradmin/index'));
...@@ -176,7 +176,7 @@ class Manageradmin extends CI_Controller ...@@ -176,7 +176,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_insert_succ'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('register',$log); $this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index')); alert_redirect(site_url('admin/manageradmin/index'));
...@@ -184,7 +184,7 @@ class Manageradmin extends CI_Controller ...@@ -184,7 +184,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_insert_fail'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_insert_fail'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('register',$log); $this->loger->add_op_log('register',$log);
alert_redirect(site_url('admin/manageradmin/index','添加管理员失败,请重试')); alert_redirect(site_url('admin/manageradmin/index','添加管理员失败,请重试'));
...@@ -192,7 +192,7 @@ class Manageradmin extends CI_Controller ...@@ -192,7 +192,7 @@ class Manageradmin extends CI_Controller
} }
/** /**
* *
* 新增内部人员 * 新增内部人员
* @author wenhuijang * @author wenhuijang
* @version 2013-11-15 * @version 2013-11-15
...@@ -211,10 +211,10 @@ class Manageradmin extends CI_Controller ...@@ -211,10 +211,10 @@ class Manageradmin extends CI_Controller
} }
$this->data['count'] = $count; $this->data['count'] = $count;
$this->load->view('admin/manager/add_staff', $this->data); $this->load->view('admin/manager/add_staff', $this->data);
return; return;
} }
/** /**
* *
* 修改管理员信息 * 修改管理员信息
* @param int a_id 管理员id * @param int a_id 管理员id
* @author wenhuijang * @author wenhuijang
...@@ -253,7 +253,7 @@ class Manageradmin extends CI_Controller ...@@ -253,7 +253,7 @@ class Manageradmin extends CI_Controller
if(!empty($pwd)) if(!empty($pwd))
{ {
$info['manager_pwd'] = $pwd; $info['manager_pwd'] = $pwd;
} }
$is_check = true; $is_check = true;
if(isset($info['manager_pwd'])) if(isset($info['manager_pwd']))
...@@ -266,7 +266,7 @@ class Manageradmin extends CI_Controller ...@@ -266,7 +266,7 @@ class Manageradmin extends CI_Controller
{ {
$info['manager_pwd'] = md5($info['manager_pwd']); $info['manager_pwd'] = md5($info['manager_pwd']);
} }
} }
if($is_check == false) if($is_check == false)
...@@ -279,7 +279,7 @@ class Manageradmin extends CI_Controller ...@@ -279,7 +279,7 @@ class Manageradmin extends CI_Controller
alert_redirect(site_url('admin/manageradmin/index'),'输入参数错误'); alert_redirect(site_url('admin/manageradmin/index'),'输入参数错误');
return; return;
} }
if(empty($info['region_id'])){ if(empty($info['region_id'])){
alert_redirect(site_url('admin/manageradmin/index'),'请选择管理地区'); alert_redirect(site_url('admin/manageradmin/index'),'请选择管理地区');
return; return;
...@@ -289,7 +289,7 @@ class Manageradmin extends CI_Controller ...@@ -289,7 +289,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/index'),'修改成功'); alert_redirect(site_url('admin/manageradmin/index'),'修改成功');
...@@ -297,18 +297,18 @@ class Manageradmin extends CI_Controller ...@@ -297,18 +297,18 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/edit/' . $id),'修改失败'); alert_redirect(site_url('admin/manageradmin/edit/' . $id),'修改失败');
} }
} }
/** /**
* *
* 修改内部管理员信息 * 修改内部管理员信息
* @param int a_id 管理员id * @param int a_id 管理员id
* @author wenhuijang * @author wenhuijang
...@@ -349,7 +349,7 @@ class Manageradmin extends CI_Controller ...@@ -349,7 +349,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/index'),'修改成功'); alert_redirect(site_url('admin/manageradmin/index'),'修改成功');
...@@ -357,7 +357,7 @@ class Manageradmin extends CI_Controller ...@@ -357,7 +357,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email']) 'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, '管理员email:'.$info['email'])
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
alert_redirect(site_url('admin/manageradmin/edit_staff/' . $id),'修改失败'); alert_redirect(site_url('admin/manageradmin/edit_staff/' . $id),'修改失败');
...@@ -379,7 +379,7 @@ class Manageradmin extends CI_Controller ...@@ -379,7 +379,7 @@ class Manageradmin extends CI_Controller
$this->load->driver('cache'); $this->load->driver('cache');
$managers = unserialize($this->cache->file->get('managers')); $managers = unserialize($this->cache->file->get('managers'));
$ids = $this->input->post('ids', true); $ids = $this->input->post('ids', true);
$add_data = array(); $add_data = array();
$other = array( $other = array(
'create_time' => $_SERVER['REQUEST_TIME'], 'create_time' => $_SERVER['REQUEST_TIME'],
...@@ -411,13 +411,13 @@ class Manageradmin extends CI_Controller ...@@ -411,13 +411,13 @@ class Manageradmin extends CI_Controller
} }
/** /**
* *
* @author wenhuijang * @author wenhuijang
*/ */
private function rsync() private function rsync()
{ {
$this->load->driver('cache'); $this->load->driver('cache');
//获取时间 //获取时间
$begin_time = $this->cache->file->get('manager_rsync_begin_time'); $begin_time = $this->cache->file->get('manager_rsync_begin_time');
$managers = '';//unserialize($this->cache->file->get('managers')); $managers = '';//unserialize($this->cache->file->get('managers'));
...@@ -426,10 +426,10 @@ class Manageradmin extends CI_Controller ...@@ -426,10 +426,10 @@ class Manageradmin extends CI_Controller
$param = array('head' => array('row' => "", 'lastId' => ""), 'body' => array('currentTime' => (string)date('Y-m-d H:i:s', strtotime('-3 months')))); $param = array('head' => array('row' => "", 'lastId' => ""), 'body' => array('currentTime' => (string)date('Y-m-d H:i:s', strtotime('-3 months'))));
if(empty($begin_time)) if(empty($begin_time))
{ {
$begin_time = strtotime('-3 years'); $begin_time = strtotime('-3 years');
} }
$param['body']['currentTime'] = (string) date('Y-m-d H:i:s', $begin_time); $param['body']['currentTime'] = (string) date('Y-m-d H:i:s', $begin_time);
$this->load->helper('rpc'); $this->load->helper('rpc');
$data = rpc('accounts', $param, 'GET'); $data = rpc('accounts', $param, 'GET');
if(empty($data) || $data['head']['rspCode'] != 0 || empty($data['body'])) if(empty($data) || $data['head']['rspCode'] != 0 || empty($data['body']))
...@@ -471,7 +471,7 @@ class Manageradmin extends CI_Controller ...@@ -471,7 +471,7 @@ class Manageradmin extends CI_Controller
} }
/** /**
* *
* 更新用户API * 更新用户API
* @param int u_id 要查看的用户的id * @param int u_id 要查看的用户的id
* @author wenhuijang * @author wenhuijang
...@@ -496,14 +496,14 @@ class Manageradmin extends CI_Controller ...@@ -496,14 +496,14 @@ class Manageradmin extends CI_Controller
echo json_encode(array('errcode' => 42002, 'errmsg' => $this->lang->line('err_42002'))); echo json_encode(array('errcode' => 42002, 'errmsg' => $this->lang->line('err_42002')));
return; return;
} }
$flag = $this->manager->update($where,$data); $flag = $this->manager->update($where,$data);
if($flag){ if($flag){
echo json_encode(array('errcode' => 0,'errmsg' => '')); echo json_encode(array('errcode' => 0,'errmsg' => ''));
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, "管理员id:".$id."已逻辑删除") 'log' => sprintf($this->lang->line('op_update_succ'), $this->u_name, "管理员id:".$id."已逻辑删除")
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
return; return;
...@@ -511,7 +511,7 @@ class Manageradmin extends CI_Controller ...@@ -511,7 +511,7 @@ class Manageradmin extends CI_Controller
//记录日志 //记录日志
$log = array( $log = array(
'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, "管理员id:".$id."已逻辑删除") 'log' => sprintf($this->lang->line('op_update_fail'), $this->u_name, "管理员id:".$id."已逻辑删除")
); );
$this->loger->add_op_log('update',$log); $this->loger->add_op_log('update',$log);
echo json_encode(array('errcode' => 50001,'errmsg' => $this->lang->line('err_50001'))); echo json_encode(array('errcode' => 50001,'errmsg' => $this->lang->line('err_50001')));
...@@ -519,4 +519,4 @@ class Manageradmin extends CI_Controller ...@@ -519,4 +519,4 @@ class Manageradmin extends CI_Controller
} }
} }
} }
\ No newline at end of file
...@@ -2,33 +2,33 @@ ...@@ -2,33 +2,33 @@
<div class="clearfix"> </div> <div class="clearfix"> </div>
<!-- BEGIN CONTAINER --> <!-- BEGIN CONTAINER -->
<div class="page-container"> <div class="page-container">
<!-- BEGIN SIDEBAR --> <!-- BEGIN SIDEBAR -->
<?php $this->load->view('admin/leftbar');?> <?php $this->load->view('admin/leftbar');?>
<!-- END SIDEBAR --> <!-- END SIDEBAR -->
<!-- BEGIN CONTENT --> <!-- BEGIN CONTENT -->
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="page-content"> <div class="page-content">
<!-- BEGIN PAGE HEADER--> <!-- BEGIN PAGE HEADER-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PAGE TITLE & BREADCRUMB--> <!-- BEGIN PAGE TITLE & BREADCRUMB-->
<ul class="page-breadcrumb breadcrumb"> <ul class="page-breadcrumb breadcrumb">
<li> <i class="fa fa-home"></i> <a href="<?php site_url('admin/index')?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li> <li> <i class="fa fa-home"></i> <a href="<?php site_url('admin/index')?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li>
<li> 渠道管理 <i class="fa fa-angle-right"></i> </li> <li> 渠道管理 <i class="fa fa-angle-right"></i> </li>
<li> 客户查看 </li> <li> 客户查看 </li>
</ul> </ul>
<!-- END PAGE TITLE & BREADCRUMB--> <!-- END PAGE TITLE & BREADCRUMB-->
</div> </div>
</div> </div>
<!-- END PAGE HEADER--> <!-- END PAGE HEADER-->
<!-- BEGIN PAGE CONTENT--> <!-- BEGIN PAGE CONTENT-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN EXAMPLE TABLE PORTLET--> <!-- BEGIN EXAMPLE TABLE PORTLET-->
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <i class="fa fa-globe"></i>客户明细列表 </div> <div class="caption"> <i class="fa fa-globe"></i>客户明细列表 </div>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
?> ?>
</select> </select>
项目: 项目:
<input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>> <input type="text" class="form-control input-inline input-small" name="building_title" id="building_title" <?php if(isset($building_title) && !empty($building_title)):?>value="<?php echo $building_title;?>"<?php endif;?>>
时间: 时间:
<select class="form-control input-inline" name="time" id="time"> <select class="form-control input-inline" name="time" id="time">
<option value="">全部</option> <option value="">全部</option>
...@@ -78,14 +78,15 @@ ...@@ -78,14 +78,15 @@
<option <?php if(isset($saixuan) && $saixuan == '月度'):?> selected ="selected" <?php endif;?> value="月度">月度</option> <option <?php if(isset($saixuan) && $saixuan == '月度'):?> selected ="selected" <?php endif;?> value="月度">月度</option>
<option <?php if(isset($saixuan) && $saixuan == '季度'):?> selected ="selected" <?php endif;?> value="季度">季度</option> <option <?php if(isset($saixuan) && $saixuan == '季度'):?> selected ="selected" <?php endif;?> value="季度">季度</option>
<option <?php if(isset($saixuan) && $saixuan == '年度'):?> selected ="selected" <?php endif;?> value="年度">年度</option> <option <?php if(isset($saixuan) && $saixuan == '年度'):?> selected ="selected" <?php endif;?> value="年度">年度</option>
</select> </select>
<button type="submit" class="btn blue" id="search">搜索</button> <button type="submit" class="btn blue" id="search">搜索</button>
<input type="reset" class="btn red" name="button2" value="清空"> <input type="reset" class="btn red" name="button2" value="清空">
<input type="reset" class="btn green" name="export" id="export" value="导出">
</form> </form>
<button type="submit" class="btn green" id="export">导出</button>
</div> </div>
</div> </div>
<div class="girdScroller" style="overflow:auto;"> <div class="girdScroller" style="overflow:auto;">
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
<td><?php echo $customer['id'];?></td> <td><?php echo $customer['id'];?></td>
<td><?php echo $customer['customer_user'];?></td> <td><?php echo $customer['customer_user'];?></td>
<td><?php echo $customer['customer_mobile']?></td> <td><?php echo $customer['customer_mobile']?></td>
<td><?php <td><?php
if($customer['customer_type']==0){ if($customer['customer_type']==0){
echo '新客户'; echo '新客户';
}else if($customer['customer_type']==1){ }else if($customer['customer_type']==1){
...@@ -127,7 +128,7 @@ ...@@ -127,7 +128,7 @@
} }
?></td> ?></td>
<td><?php echo date('Y-m-d h:i',$customer['create_time']);?></td> <td><?php echo date('Y-m-d h:i',$customer['create_time']);?></td>
<td><?php <td><?php
if($customer['recommend_status']==0){ if($customer['recommend_status']==0){
echo '已推荐'; echo '已推荐';
}else if($customer['recommend_status']==1){ }else if($customer['recommend_status']==1){
...@@ -189,32 +190,32 @@ ...@@ -189,32 +190,32 @@
<?php endif;?> <?php endif;?>
</div> </div>
</div> </div>
<!-- END EXAMPLE TABLE PORTLET--> <!-- END EXAMPLE TABLE PORTLET-->
</div> </div>
</div> </div>
<!-- END PAGE CONTENT--> <!-- END PAGE CONTENT-->
</div> </div>
</div> </div>
<!-- END CONTENT --> <!-- END CONTENT -->
</div> </div>
<!-- END CONTAINER --> <!-- END CONTAINER -->
<!-- BEGIN FOOTER --> <!-- BEGIN FOOTER -->
<?php $this->load->view('admin/footer');?> <?php $this->load->view('admin/footer');?>
<!-- BEGIN PAGE LEVEL PLUGINS --> <!-- BEGIN PAGE LEVEL PLUGINS -->
<link rel="stylesheet" href="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.css"/> <link rel="stylesheet" href="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/css/datepicker.css"/> <link rel="stylesheet" type="text/css" href="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/css/datepicker.css"/>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS --> <!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script> <script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
App.init(); App.init();
}); });
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
$(function (){ $(function (){
$("#export").click(function(){ $("#export").click(function(){
...@@ -224,7 +225,7 @@ ...@@ -224,7 +225,7 @@
var building_title = $("#building_title").val(); var building_title = $("#building_title").val();
var time = $('#time').val(); var time = $('#time').val();
location.href = "<?php echo site_url('admin/channeladmin/export_actions')?>?tag_name=customerExport&distributor_name=" location.href = "<?php echo site_url('admin/channeladmin/export_actions')?>?tag_name=customerExport&distributor_name="
+ distributor_name + "&status=" + distributor_name + "&status="
+ status + "&channel_id=" + status + "&channel_id="
+ channel_id + "&building_title=" + channel_id + "&building_title="
+ building_title + "&time=" + building_title + "&time="
...@@ -232,7 +233,7 @@ ...@@ -232,7 +233,7 @@
}); });
}); });
</script> </script>
</body><!-- END BODY --> </body><!-- END BODY -->
</html> </html>
\ No newline at end of file
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- BEGIN PAGE CONTENT--> <!-- BEGIN PAGE CONTENT-->
<!-- BEGIN DASHBOARD STATS --> <!-- BEGIN DASHBOARD STATS -->
<div class="row"> <div class="row">
<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12"> <!-- <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
<div class="dashboard-stat green"> <div class="dashboard-stat green">
<div class="visual"> <div class="visual">
<i class="fa fa-group"></i> <i class="fa fa-group"></i>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
更多<i class="m-icon-swapright m-icon-white"></i> 更多<i class="m-icon-swapright m-icon-white"></i>
</a> </a>
</div> </div>
</div> </div> -->
<div class="col-lg-4 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-4 col-md-3 col-sm-6 col-xs-12">
<div class="dashboard-stat yellow"> <div class="dashboard-stat yellow">
<div class="visual"> <div class="visual">
...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
echo "<li>暂无管理员操作记录</li>"; echo "<li>暂无管理员操作记录</li>";
endif; endif;
?> ?>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<!-- BEGIN PAGE LEVEL SCRIPTS --> <!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script> <script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
// initiate layout and plugins // initiate layout and plugins
App.init(); App.init();
//FormSamples.init(); //FormSamples.init();
...@@ -171,4 +171,3 @@ ...@@ -171,4 +171,3 @@
</body> </body>
<!-- END BODY --> <!-- END BODY -->
</html> </html>
\ No newline at end of file
...@@ -3,29 +3,29 @@ ...@@ -3,29 +3,29 @@
<div class="clearfix"> </div> <div class="clearfix"> </div>
<!-- BEGIN CONTAINER --> <!-- BEGIN CONTAINER -->
<div class="page-container"> <div class="page-container">
<!-- BEGIN SIDEBAR --> <!-- BEGIN SIDEBAR -->
<?php $this->load->view('admin/leftbar');?> <?php $this->load->view('admin/leftbar');?>
<!-- END SIDEBAR --> <!-- END SIDEBAR -->
<!-- BEGIN CONTENT --> <!-- BEGIN CONTENT -->
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="page-content"> <div class="page-content">
<!-- BEGIN PAGE HEADER--> <!-- BEGIN PAGE HEADER-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN PAGE TITLE & BREADCRUMB--> <!-- BEGIN PAGE TITLE & BREADCRUMB-->
<ul class="page-breadcrumb breadcrumb"> <ul class="page-breadcrumb breadcrumb">
<li> <i class="fa fa-home"></i> <a href="<?php echo site_url('admin/index');?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li> <li> <i class="fa fa-home"></i> <a href="<?php echo site_url('admin/index');?>"> 主页 </a> <i class="fa fa-angle-right"></i> </li>
<li> <a href="javascript:;"> 系统设置 </a> <i class="fa fa-angle-right"></i> </li> <li> <a href="javascript:;"> 系统设置 </a> <i class="fa fa-angle-right"></i> </li>
<li> <a href="javascript:;"> 系统用户管理 </a> </li> <li> <a href="javascript:;"> 系统用户管理 </a> </li>
</ul> </ul>
<!-- END PAGE TITLE & BREADCRUMB--> <!-- END PAGE TITLE & BREADCRUMB-->
</div> </div>
</div> </div>
<!-- END PAGE HEADER--> <!-- END PAGE HEADER-->
<!-- BEGIN PAGE CONTENT--> <!-- BEGIN PAGE CONTENT-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!-- BEGIN EXAMPLE TABLE PORTLET--> <!-- BEGIN EXAMPLE TABLE PORTLET-->
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<button class="btn yellow" onclick="window.location.href='<?php echo site_url('/admin/manageradmin/add_staff');?>'"> 内部管理员 <i class="fa fa-plus"></i> </button> <button class="btn yellow" onclick="window.location.href='<?php echo site_url('/admin/manageradmin/add_staff');?>'"> 内部管理员 <i class="fa fa-plus"></i> </button>
</div> </div>
</div> </div>
<div style="margin-bottom: 20px;background: #F9FCEF;padding: 10px 0;border: 1px solid #ccc;" class="text-center"> <div style="margin-bottom: 20px;background: #F9FCEF;padding: 10px 0;border: 1px solid #ccc;" class="text-center">
<form method="get" action="<?php echo site_url('admin/manageradmin/index');?>" name='form'> <form method="get" action="<?php echo site_url('admin/manageradmin/index');?>" name='form'>
姓名: 姓名:
<input type="text" class="form-control input-inline input-small" value="<?php echo !empty($con_arr[0]) && $con_arr[0] !="NULL" ? $con_arr[0] : "";?>" id="name" name="name"> <input type="text" class="form-control input-inline input-small" value="<?php echo !empty($con_arr[0]) && $con_arr[0] !="NULL" ? $con_arr[0] : "";?>" id="name" name="name">
...@@ -69,14 +69,14 @@ ...@@ -69,14 +69,14 @@
?> ?>
<tr> <tr>
<td><?php echo $num_start++; ?></td> <td><?php echo $num_start++; ?></td>
<td><?php echo $admin['id'];?></td> <td class="s_id"><?php echo $admin['id'];?></td>
<td><?php echo $admin['manager_name'];?></td> <td><?php echo $admin['manager_name'];?></td>
<td><?php echo $admin['manager_phone'];?></td> <td><?php echo $admin['manager_phone'];?></td>
<td><?php echo isset($type[$admin['role_id']]['role_title']) ? $type[$admin['role_id']]['role_title'] : '';?></td> <td><?php echo isset($type[$admin['role_id']]['role_title']) ? $type[$admin['role_id']]['role_title'] : '';?></td>
<td><?php echo $admin['is_staff'] == 1 ? '内部人员' : '外部人员';?></td> <td><?php echo $admin['is_staff'] == 1 ? '内部人员' : '外部人员';?></td>
<td><?php echo $admin['is_deleted'] == 1 ? '已删除' : '正常';?></td> <td><?php echo $admin['is_deleted'] == 1 ? '已删除' : '正常';?></td>
<td> <td>
<?php if($admin['is_staff'] == 0):?> <?php if($admin['is_staff'] == 0):?>
<a href="<?php echo site_url('admin/manageradmin/edit/' . $admin['id']);?>" class="btn default btn-xs purple"><i class="fa fa-edit"></i>编辑</a> <a href="<?php echo site_url('admin/manageradmin/edit/' . $admin['id']);?>" class="btn default btn-xs purple"><i class="fa fa-edit"></i>编辑</a>
<?php else:;?> <?php else:;?>
<a href="<?php echo site_url('admin/manageradmin/edit_staff/' . $admin['id']);?>" class="btn default btn-xs yellow"><i class="fa fa-edit"></i>授权</a> <a href="<?php echo site_url('admin/manageradmin/edit_staff/' . $admin['id']);?>" class="btn default btn-xs yellow"><i class="fa fa-edit"></i>授权</a>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
else: else:
?> ?>
<tr> <tr>
<td colspan="7" align="center">还没有添加管理员.</td> <td colspan="8" align="center">还没有添加管理员.</td>
</tr> </tr>
<?php <?php
endif; endif;
...@@ -115,32 +115,32 @@ ...@@ -115,32 +115,32 @@
</div> </div>
<?php endif;?> <?php endif;?>
</div> </div>
<!-- END EXAMPLE TABLE PORTLET--> <!-- END EXAMPLE TABLE PORTLET-->
</div> </div>
</div> </div>
<!-- END PAGE CONTENT --> <!-- END PAGE CONTENT -->
</div> </div>
</div> </div>
<!-- END CONTENT --> <!-- END CONTENT -->
</div> </div>
<!-- END CONTAINER --> <!-- END CONTAINER -->
<!-- BEGIN FOOTER --> <!-- BEGIN FOOTER -->
<?php $this->load->view('admin/footer');?> <?php $this->load->view('admin/footer');?>
<!-- BEGIN PAGE LEVEL PLUGINS --> <!-- BEGIN PAGE LEVEL PLUGINS -->
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/select2/select2.min.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/jquery.dataTables.js"></script>
<script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script> <script type="text/javascript" src="<?php echo APPLICATION_PATH ?>/assets/plugins/data-tables/DT_bootstrap.js"></script>
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<!-- BEGIN PAGE LEVEL SCRIPTS --> <!-- BEGIN PAGE LEVEL SCRIPTS -->
<script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script> <script src="<?php echo APPLICATION_PATH ?>/assets/js/backend/core/app.js"></script>
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
jQuery(".delete").click(function (){ jQuery(".delete").click(function (){
var is_true = confirm("您确定要删除这个管理员吗?"); var is_true = confirm("您确定要删除这个管理员吗?");
if(is_true) if(is_true)
{ {
_this = $(this); _this = $(this);
var a_id = _this.parents("tr").find("td:first").text(); var a_id = _this.parents("tr").find(".s_id").text();
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '<?php echo site_url("admin/manageradmin/update");?>', url: '<?php echo site_url("admin/manageradmin/update");?>',
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
dataType: "json", dataType: "json",
success: function(res){ success: function(res){
if(res.errcode == 0){ if(res.errcode == 0){
window.location.reload(); window.location.href='<?php echo site_url("admin/manageradmin/index");?>';
}else{ }else{
alert(res.errmsg); alert(res.errmsg);
} }
...@@ -158,11 +158,11 @@ ...@@ -158,11 +158,11 @@
} }
); );
}); });
</script> </script>
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
App.init(); App.init();
}); });
</script> </script>
</body><!-- END BODY --> </body><!-- END BODY -->
</html> </html>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<body> <body>
<style> <style>
#pullDown .pullDownIcon, #pullUp .pullUpIcon { #pullDown .pullDownIcon, #pullUp .pullUpIcon {
display:block; display:block;
width:30px; height:30px; width:30px; height:30px;
background:url(<?php echo APPLICATION_PATH ?>/assets/css/images/rc_loading.jpg) 0 0 no-repeat; background:url(<?php echo APPLICATION_PATH ?>/assets/css/images/rc_loading.jpg) 0 0 no-repeat;
-webkit-background-size:30px 60px; -webkit-background-size:30px 60px;
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<!--添加curr为字变橙色的样式--> <!--添加curr为字变橙色的样式-->
<li class="curr"><a><?php echo $username ?></a></li> <li class="curr"><a><?php echo $username ?></a></li>
<li><a id="reset-pwd" href="<?php echo site_url('channel/index/resetpassword') ?>">修改密码</a></li> <li><a id="reset-pwd" href="<?php echo site_url('channel/index/resetpassword') ?>">修改密码</a></li>
<li><a id="log-out" href="<?php echo site_url('channel/login/logout') ?>">退出登录</a></li> <li><a id="log-out" >退出登录</a></li>
</ul> </ul>
</div> </div>
<header> <header>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<div class="right search-input"> <div class="right search-input">
<input class="search-field" type="search" name="search-field" placeholder="请输入客户名称或手机号"> <input class="search-field" type="search" name="search-field" placeholder="请输入客户名称或手机号">
<!--搜索图标定位--> <!--搜索图标定位-->
<a class="search-icon" href="javascript:;" style="float: right;"></a> <a class="search-icon" href="javascript:;" style="float: right;"></a>
<!--关闭图标定位--> <!--关闭图标定位-->
<a class="search-close" href="javascript:;"></a> <a class="search-close" href="javascript:;"></a>
</div> </div>
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div> <div>
<div id="pullDown" style="background:#FFF;display:none;"> <div id="pullDown" style="background:#FFF;display:none;">
<span class="pullDownIcon"></span> <span class="pullDownIcon"></span>
</div> </div>
<ul id="rc_list"> <ul id="rc_list">
</ul> </ul>
<div id="pullUp" style="display:none;"> <div id="pullUp" style="display:none;">
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<?php foreach($buildings as $val):?> <?php foreach($buildings as $val):?>
<li data="<?php echo $val['id']?>" building_code="<?php echo $val['building_id']?>"><?php echo $val['building_title'] ?></li> <li data="<?php echo $val['id']?>" building_code="<?php echo $val['building_id']?>"><?php echo $val['building_title'] ?></li>
<?php endforeach;?> <?php endforeach;?>
</ol> </ol>
<div class="clearf"></div> <div class="clearf"></div>
</li> </li>
<li> <li>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<div class="right right-choose" id='date_click'>&nbsp</div> <div class="right right-choose" id='date_click'>&nbsp</div>
<div class="right-input left right-xia" style="width: 40%;"> <div class="right-input left right-xia" style="width: 40%;">
<input id="date_picked" name="date_picked" type="text" class="form-control input-inline date-picker"> <input id="date_picked" name="date_picked" type="text" class="form-control input-inline date-picker">
</div> </div>
<div class="clearf"></div> <div class="clearf"></div>
</li> </li>
<li> <li>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<li data="3">认购</li> <li data="3">认购</li>
<li data="4">签约</li> <li data="4">签约</li>
<li data="9">结佣</li> <li data="9">结佣</li>
</ol> </ol>
<div class="clearf"></div> <div class="clearf"></div>
</li> </li>
<li style="position: relative;"> <li style="position: relative;">
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<input placeholder="" class="distributor_name" name="distributor_name" > <input placeholder="" class="distributor_name" name="distributor_name" >
<input type="hidden" name="distributor_id" class="distributor_id"> <input type="hidden" name="distributor_id" class="distributor_id">
</div> </div>
<ol class="distributors select-option" id='distributors_list' style="width:100%;max-height:300px;overflow-y: scroll;-webkit-overflow-scrolling:touch"> <ol class="distributors select-option" id='distributors_list' style="width:100%;max-height:300px;overflow-y: scroll;-webkit-overflow-scrolling:touch">
<ul> <ul>
<?php foreach($distributors as $val):?> <?php foreach($distributors as $val):?>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<li data="<?php echo $val['id']?>" manager_name="<?php echo $val['manager_name']?>"><?php echo $val['manager_name'] ?></li> <li data="<?php echo $val['id']?>" manager_name="<?php echo $val['manager_name']?>"><?php echo $val['manager_name'] ?></li>
<?php endforeach;?> <?php endforeach;?>
</ul> </ul>
</ol> </ol>
<div class="clearf"></div> <div class="clearf"></div>
</li> </li>
</ul> </ul>
...@@ -290,11 +290,11 @@ ...@@ -290,11 +290,11 @@
foreach($building_list as $key => $val){ ?> foreach($building_list as $key => $val){ ?>
<ul> <ul>
<li class="first-li"><?php echo $key; ?></li> <li class="first-li"><?php echo $key; ?></li>
<?php <?php
foreach ($val as $k => $v) { ?> foreach ($val as $k => $v) { ?>
<li building_id="<?php echo $v['id'];?>" building_code="<?php echo $v['building_id']?>"><?php echo $v['building_title'];?></li> <li building_id="<?php echo $v['id'];?>" building_code="<?php echo $v['building_id']?>"><?php echo $v['building_title'];?></li>
<?php } ?> <?php } ?>
</ul> </ul>
<?php } <?php }
} }
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
var _val = $.trim($(this).val()); var _val = $.trim($(this).val());
$("#building_list li").hide().filter(":contains('"+ _val +"')").show();//filter和contains共同来实现了这个功能。 $("#building_list li").hide().filter(":contains('"+ _val +"')").show();//filter和contains共同来实现了这个功能。
}) })
//async_getlist_pulldown(); //async_getlist_pulldown();
async_getlist_pullup(); async_getlist_pullup();
//下拉更新数据 //下拉更新数据
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
status_html+='<li class="'+(data.data.curr_status == '99' ? 'curr' : '')+' status_li" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="'+(data.data.curr_status == '99' ? 'curr' : '')+' status_li" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
$('.select-result').find('.left').html('筛选结果:'+data.data.type_counts[j].type_count+'条'); $('.select-result').find('.left').html('筛选结果:'+data.data.type_counts[j].type_count+'条');
}else{ }else{
status_html+='<li class="'+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+' status_li" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="'+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+' status_li" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
} }
} }
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
bindClick(); bindClick();
return ; return ;
} }
var customer_html='',status_html=''; var customer_html='',status_html='';
for(var i=0;i<data.data.customers.length;i++){ for(var i=0;i<data.data.customers.length;i++){
customer_html+="<li class='customer_li' id='"+data.data.customers[i].id+"'><div class='box-left'><div>"+data.data.customers[i].customer_user+"</div><div class='client-mid'>"+ data.data.customers[i].region_name + ' / ' +data.data.customers[i].building_title+"</div><div class='client-ren'>推荐人:"+data.data.customers[i].user_name+"</div><div class='client-fenxiao'>分销商:"+data.data.customers[i].company_name+"</div></div><div class='box-right'> <a class='client-btn' href='javascript:;'>"+data.data.customers[i].recommend_status+"</a> <div class='client-date'>"+data.data.customers[i].create_time+"</div></div> </li>"; customer_html+="<li class='customer_li' id='"+data.data.customers[i].id+"'><div class='box-left'><div>"+data.data.customers[i].customer_user+"</div><div class='client-mid'>"+ data.data.customers[i].region_name + ' / ' +data.data.customers[i].building_title+"</div><div class='client-ren'>推荐人:"+data.data.customers[i].user_name+"</div><div class='client-fenxiao'>分销商:"+data.data.customers[i].company_name+"</div></div><div class='box-right'> <a class='client-btn' href='javascript:;'>"+data.data.customers[i].recommend_status+"</a> <div class='client-date'>"+data.data.customers[i].create_time+"</div></div> </li>";
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
$('.status_li[id="99"]').find('a').text(_stat99 + _num99); $('.status_li[id="99"]').find('a').text(_stat99 + _num99);
} }
//console.log(customer_html); //console.log(customer_html);
// status_html+=data.data.type_counts.foreach(renderStatusList); // status_html+=data.data.type_counts.foreach(renderStatusList);
/*var currStatus=99; /*var currStatus=99;
...@@ -488,17 +488,17 @@ ...@@ -488,17 +488,17 @@
for(var j=0;j<data.data.type_counts.length;j++){ for(var j=0;j<data.data.type_counts.length;j++){
if(j==0){ if(j==0){
if(data.data.type_counts[j].type_status==currStatus){ if(data.data.type_counts[j].type_status==currStatus){
status_html+='<li class="status_li '+(data.data.curr_status == '99' ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="status_li '+(data.data.curr_status == '99' ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
}else{ }else{
status_html+='<li class="status_li '+(data.data.curr_status == 99 ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="status_li '+(data.data.curr_status == 99 ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
} }
$('.select-result').find('.left').html('筛选结果:'+data.data.type_counts[j].type_count+'条'); $('.select-result').find('.left').html('筛选结果:'+data.data.type_counts[j].type_count+'条');
}else{ }else{
if(data.data.type_counts[j].type_status==currStatus){ if(data.data.type_counts[j].type_status==currStatus){
status_html+='<li class="status_li '+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="status_li '+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
}else{ }else{
status_html+='<li class="status_li '+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>'; status_html+='<li class="status_li '+(data.data.curr_status == data.data.type_counts[j].type_status ? 'curr' : '')+'" id="'+data.data.type_counts[j].type_status+'"><a href="#">'+data.data.type_counts[j].type_name+data.data.type_counts[j].type_count+'</a></li>';
} }
} }
}*/ }*/
...@@ -514,16 +514,16 @@ ...@@ -514,16 +514,16 @@
} }
}); });
} }
//初始化绑定iScroll控件 //初始化绑定iScroll控件
document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false); document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
document.addEventListener('DOMContentLoaded', loaded, false); document.addEventListener('DOMContentLoaded', loaded, false);
function loaded() { function loaded() {
pullDownEl = document.getElementById('pullDown'); pullDownEl = document.getElementById('pullDown');
pullDownOffset = pullDownEl.offsetHeight; pullDownOffset = pullDownEl.offsetHeight;
pullUpEl = document.getElementById('pullUp'); pullUpEl = document.getElementById('pullUp');
pullUpOffset = pullUpEl.offsetHeight; pullUpOffset = pullUpEl.offsetHeight;
/** /**
* 初始化iScroll控件 * 初始化iScroll控件
*/ */
...@@ -533,11 +533,11 @@ ...@@ -533,11 +533,11 @@
onRefresh : function () { onRefresh : function () {
if (pullDownEl.className.match('loading')) { if (pullDownEl.className.match('loading')) {
pullDownEl.className = ''; pullDownEl.className = '';
//pullDownEl.querySelector('.pullDownLabel').innerHTML = '下拉刷新...'; //pullDownEl.querySelector('.pullDownLabel').innerHTML = '下拉刷新...';
} else if (pullUpEl.className.match('loading')) { } else if (pullUpEl.className.match('loading')) {
pullUpEl.className = ''; pullUpEl.className = '';
//pullUpEl.querySelector('.pullUpLabel').innerHTML = '上拉加载更多...'; //pullUpEl.querySelector('.pullUpLabel').innerHTML = '上拉加载更多...';
} }
}, },
...@@ -557,11 +557,11 @@ ...@@ -557,11 +557,11 @@
onScrollEnd: function () { onScrollEnd: function () {
if (pullDownEl.className.match('flip')) { if (pullDownEl.className.match('flip')) {
pullDownEl.className = 'loading'; pullDownEl.className = 'loading';
//pullDownEl.querySelector('.pullDownLabel').innerHTML = '加载中...'; //pullDownEl.querySelector('.pullDownLabel').innerHTML = '加载中...';
pullDownAction(); pullDownAction();
} else if (pullUpEl.className.match('flip')) { } else if (pullUpEl.className.match('flip')) {
pullUpEl.className = 'loading'; pullUpEl.className = 'loading';
//pullUpEl.querySelector('.pullUpLabel').innerHTML = '加载中...'; //pullUpEl.querySelector('.pullUpLabel').innerHTML = '加载中...';
pullUpAction(); pullUpAction();
} }
} }
...@@ -570,7 +570,7 @@ ...@@ -570,7 +570,7 @@
//分销商列表滚动 //分销商列表滚动
var distributors_list = new iScroll('distributors_list', { var distributors_list = new iScroll('distributors_list', {
hScrollbar:false, hScrollbar:false,
vScrollbar:false, vScrollbar:false,
onScrollMove: function () {}, onScrollMove: function () {},
onScrollEnd: function () {} onScrollEnd: function () {}
...@@ -578,7 +578,7 @@ ...@@ -578,7 +578,7 @@
//渠道列表滚动 //渠道列表滚动
var channels_list = new iScroll('channels_list', { var channels_list = new iScroll('channels_list', {
hScrollbar:false, hScrollbar:false,
vScrollbar:false, vScrollbar:false,
onScrollMove: function () {}, onScrollMove: function () {},
onScrollEnd: function () {} onScrollEnd: function () {}
...@@ -586,7 +586,7 @@ ...@@ -586,7 +586,7 @@
//楼盘列表滚动 //楼盘列表滚动
var building_list_list = new iScroll('building_list', { var building_list_list = new iScroll('building_list', {
hScrollbar:false, hScrollbar:false,
vScrollbar:false, vScrollbar:false,
onScrollMove: function () {}, onScrollMove: function () {},
onScrollEnd: function () {} onScrollEnd: function () {}
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
} else { } else {
$(this).parent().parent().find('.channels').show(); $(this).parent().parent().find('.channels').show();
} }
}); });
$('.channels').on('click','li',function(){ $('.channels').on('click','li',function(){
$(this).parent().parent().parent().find('.channel_name').val($(this).text()); $(this).parent().parent().parent().find('.channel_name').val($(this).text());
...@@ -685,11 +685,11 @@ ...@@ -685,11 +685,11 @@
var timestamp = Date.parse(new Date(s_time)); var timestamp = Date.parse(new Date(s_time));
timestamp = timestamp / 1000; timestamp = timestamp / 1000;
postdata.start_time=timestamp; postdata.start_time=timestamp;
if($('#end_day').val()!=''){ if($('#end_day').val()!=''){
$('#date_picked').val($('#start_day').val()+'至'+$('#end_day').val()); $('#date_picked').val($('#start_day').val()+'至'+$('#end_day').val());
}else{ }else{
$('#date_picked').val($('#start_day').val()+'起'); $('#date_picked').val($('#start_day').val()+'起');
} }
console.log(s_time); console.log(s_time);
}); });
...@@ -707,7 +707,7 @@ ...@@ -707,7 +707,7 @@
if($('#start_day').val()!=''){ if($('#start_day').val()!=''){
$('#date_picked').val($('#start_day').val()+'至'+$('#end_day').val()); $('#date_picked').val($('#start_day').val()+'至'+$('#end_day').val());
}else{ }else{
$('#date_picked').val('截止至'+$('#end_day').val()); $('#date_picked').val('截止至'+$('#end_day').val());
} }
console.log(e_time); console.log(e_time);
}); });
...@@ -773,10 +773,10 @@ ...@@ -773,10 +773,10 @@
$('#confirm').on('click',function(){ $('#confirm').on('click',function(){
$('#rc_list').html(''); $('#rc_list').html('');
var choose_building=$('.building_id').val(),choose_status=$('.status_id').val(), var choose_building=$('.building_id').val(),choose_status=$('.status_id').val(),
choose_distributor=$('.distributor_id').val(),choose_channel=$('.channel_id').val(); choose_distributor=$('.distributor_id').val(),choose_channel=$('.channel_id').val();
if(choose_building!=''){ if(choose_building!=''){
postdata.building_id=choose_building; postdata.building_id=choose_building;
} }
if(choose_status!=''){ if(choose_status!=''){
postdata.status=choose_status; postdata.status=choose_status;
} }
...@@ -799,7 +799,7 @@ ...@@ -799,7 +799,7 @@
$('.select-result').siblings('.rc-top-con').hide(); $('.select-result').siblings('.rc-top-con').hide();
}); });
$('#reset').on('click',function(){ $('#reset').on('click',function(){
resetSelector(); resetSelector();
postdata.building_id=''; postdata.building_id='';
postdata.status=''; postdata.status='';
postdata.distributor_id=''; postdata.distributor_id='';
...@@ -870,7 +870,9 @@ ...@@ -870,7 +870,9 @@
$('#wrap_select').siblings('.rc-wrap').hide(); $('#wrap_select').siblings('.rc-wrap').hide();
}); });
$('#log-out').on('click',function(){ $('#log-out').on('click',function(){
window.location.href='<?php echo site_url('channel/login/logout')?>'; if(confirm('确定要退出登录吗?')){
window.location.href='<?php echo site_url('channel/login/logout')?>';
}
}); });
$('.mask-top').on('click',function(){ $('.mask-top').on('click',function(){
$('.settings').hide(); $('.settings').hide();
...@@ -901,7 +903,7 @@ ...@@ -901,7 +903,7 @@
$('.customer_li').on('click',function(){ $('.customer_li').on('click',function(){
var ids=$(this).attr('id'); var ids=$(this).attr('id');
window.location.href="<?php echo site_url('channel/index/follow/"+ids+"')?>" window.location.href="<?php echo site_url('channel/index/follow/"+ids+"')?>"
}); });
$('.status_li').unbind(); $('.status_li').unbind();
$('.status_li').on('click',function(){ $('.status_li').on('click',function(){
$("#rc_list").html(''); $("#rc_list").html('');
...@@ -918,7 +920,7 @@ ...@@ -918,7 +920,7 @@
} }
_loading = true; _loading = true;
async_getlist_pullup(); async_getlist_pullup();
}); });
} }
bindClick(); bindClick();
...@@ -927,7 +929,7 @@ ...@@ -927,7 +929,7 @@
$('.building_id').val(''); $('.building_id').val('');
$('.status_id').val(''); $('.status_id').val('');
$('.distributor_id').val(''); $('.distributor_id').val('');
$('.channel_id').val(''); $('.channel_id').val('');
$('.building_name').val(''); $('.building_name').val('');
$('.status_name').val(''); $('.status_name').val('');
$('.distributor_name').val(''); $('.distributor_name').val('');
...@@ -962,9 +964,9 @@ ...@@ -962,9 +964,9 @@
var nowData=new Date(); var nowData=new Date();
var opt= { var opt= {
theme:'ios', //设置显示主题 theme:'ios', //设置显示主题
mode:'scroller', //设置日期选择方式,这里用滚动 mode:'scroller', //设置日期选择方式,这里用滚动
...@@ -972,7 +974,7 @@ ...@@ -972,7 +974,7 @@
preset : 'date', //日期:年 月 日 时 分 datetime preset : 'date', //日期:年 月 日 时 分 datetime
//minDate: nowData, //minDate: nowData,
//maxDate:new Date(nowData.getFullYear(),nowData.getMonth(),nowData.getDate()+7,22,00), //maxDate:new Date(nowData.getFullYear(),nowData.getMonth(),nowData.getDate()+7,22,00),
...@@ -982,7 +984,7 @@ ...@@ -982,7 +984,7 @@
stepMinute: 5, //设置分钟步长 stepMinute: 5, //设置分钟步长
yearText:'年', yearText:'年',
monthText:'月', monthText:'月',
...@@ -1002,4 +1004,4 @@ ...@@ -1002,4 +1004,4 @@
}); });
</script> </script>
<?php $this->load->view('channel/footer')?> <?php $this->load->view('channel/footer')?>
\ No newline at end of file
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