Merge branch 'master' of https://git.okayapps.com/lihengyi/sunac-quanmin

html/application/controllers/admin/distributionadmin.php

@@ -193,9 +193,7 @@ class Distributionadmin extends CI_Controller
 		//$where = 'R.user_id = ' . $user_id;
 		$where = 'B.id in (' . $manager_info['building_id'].')';
 		$con_arr = array();
-
 		if ($get) {
-
 			$con_arr = array(
 					'company_name' => $get['company_name'] ? : '',
 					'uniqid_id'    => $get['uniqid_id'] ? : ''
@@ -205,7 +203,7 @@ class Distributionadmin extends CI_Controller
 				$where .= ' and D.company_name like "%' . trim($get['company_name']) . '%"';
 			}
 
-			if (isset($get['uniqid_id']) && $get['uniqid_id']) {
+			if (isset($get['uniqid_id'])) {
 				$where .= ' and D.uniqid_id like "%' . trim($get['uniqid_id']) . '%"';
 			}
 		}

html/application/models/channel_model.php

@@ -35,7 +35,7 @@ class Channel_model extends My_Model{
 		//按首字母排列
 		//$where.=' order by B.create_time desc';
 
-		$this->db->select('B.id,A.customer_user,A.customer_mobile,A.customer_type,B.create_time,B.recommend_status,H.user_name sale_name,F.manager_name channel_name,C.company_name,I.building_title,J.user_name,B.remark,RR.region_name')
+		$this->db->select('B.id,A.customer_user,A.customer_mobile,A.customer_type,B.sale_id,B.create_time,B.recommend_status,H.user_name sale_name,F.manager_name channel_name,C.company_name,I.building_title,J.user_name,B.remark,RR.region_name')
 
 			->from('tb_customer_building B')
 			->join('tb_customer A','A.id=B.customer_id')

html/application/views/admin/login.php

@@ -66,7 +66,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<input type="text" name="captcha" id="captcha" class="input-sm input-small" onkeypress="EnterPress()">
+				<input type="text" name="captcha" id="captcha" class="input-sm input-small" onkeypress="EnterPress()" onkeydown="EnterPress(event)">
 
 				<?php  echo isset($image)?$image:'no';?>
 			</div>
@@ -116,7 +116,8 @@
 		       // $("#password").val($.cookie("password"));
 		    }
 		});
-		function EnterPress(){ 
+		function EnterPress(e){ //传入 event
+		    var e = e || window.event;
 		  if(event.keyCode == 13){
 		   		$('.login-btn').trigger('click');
 		  }

html/application/views/admin/report/index_info.php

@@ -367,8 +367,7 @@
             format: 'yyyy-mm-dd',
             language: 'cn',
         });
-       var aa = "<?php echo $customer['recommend_status']?>";
-       console.log(aa);
+
        //分销商筛选
        $('#parent_name').on('keyup click',function(){
                 $('#channel_list').show();