Merge branch 'test'

application/index/controller/Member.php

@@ -203,16 +203,14 @@ class Member extends Basic{
             }*/
 
             //客方门店
-            if (!empty($params['store_name']) && empty($params['referrer_store_name'])) {
-                $store = new AStore();
-                $where['b.store_id'] =  $store->getStoreKeyById('id', ['store_name'=>$params['store_name']]);
+            if (!empty($params['store_id']) && empty($params['referrer_store_id'])) {
+                $where['b.store_id'] = $params['store_id'];
                 $type = 3;
             }
 
             //邀请人门店
-            if (!empty($params['referrer_store_name']) && empty($params['store_name'])) {
-                $store = new AStore();
-                $where['b.store_id'] =  $store->getStoreKeyById('id', ['store_name'=>$params['referrer_store_name']]);
+            if (!empty($params['referrer_store_id']) && empty($params['store_id'])) {
+                $where['b.store_id'] =  $params['referrer_store_id'];
                 $type = 4;
             }
 

application/index/controller/Store.php

@@ -34,16 +34,16 @@ class Store extends Basic
             $where['a.status'] = 0;
             $join = 0;
             //门店名
-            if (!empty($this->params['store_name'])) {
-                $where['store_name'] = ['LIKE',$this->params['store_name'].'%'];
+            if (!empty($this->params['store_id'])) {
+                $where['a.id'] = $this->params['store_id'];
             }
 
             if (!empty($this->params['city'])) {
-                $where['city'] = $this->params['city'];
+                $where['a.city'] = $this->params['city'];
             }
 
-            if (!empty($this->params['district'])) {
-                $where['district'] = $this->params['district'];
+            if (!empty($this->params['district_id'])) {
+                $where['a.district_id'] = $this->params['district_id'];
             }
 
             //店长姓名

public/resource/js/agent.js

@@ -19,7 +19,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
 					_objTemp.html('');//先清空
 					if(_id && _id != '0'){
 						agent.getDistrictStoreList(_id, function(_data){
-							var _str = '';
+//							var _str = '';
+							var _str = '<option value="0">全部</option>';
 	                        $.each(_data, function(i,item) {
 	                            _str += '<option value="'+item.id+'">'+item.store_name+'</option>';
 	                        });
@@ -139,7 +140,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
 	                        $("[name = district_id]").val(data.data.district_id);
 	                        if(data.data.district_id){
 	                        	agent.getDistrictStoreList(data.data.district_id, function(_data){
-									var _str = '';
+//									var _str = '';
+							        var _str = '<option value="0">全部</option>';
 			                        $.each(_data, function(i,item) {
 			                            _str += '<option value="'+item.id+'">'+item.store_name+'</option>';
 			                        });

public/resource/js/storeList.js

@@ -43,9 +43,10 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 					_this.next().html('');//先清空
 					if(_id && _id != '0'){
 						store.getDistrictStoreList(_id, function(_data){
-							var _str = '';
+//							var _str = '';
+							var _str = '<option value="0">全部</option>';
 	                        $.each(_data, function(i,item) {
-	                            _str += '<option value="'+item.store_name+'">'+item.store_name+'</option>';
+	                            _str += '<option value="'+item.id+'">'+item.store_name+'</option>';
 	                        });
 	                        _this.next().html(_str);
 						});
@@ -292,7 +293,7 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 			params.pageNo = store.pageNo;
 			params.pageSize = store.pageSize;
 			params.district_id= $("#qx-store option:selected").val();//部门id
-			params.store_name = $('#mend_name').val(); //门店名
+			params.store_id= $('#mend_name').val(); //门店名
 			params.agents_name = $('#name').val(); //店长名
 			params.agents_phone = $('#phone').val(); //手机号
 			$.ajax({

public/resource/js/user.js

@@ -29,9 +29,10 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
 					_this.next().html('');//先清空
 					if(_id && _id != '0'){
 						user.getDistrictStoreList(_id, function(_data){
-							var _str = '';
+//							var _str = '';
+							var _str = '<option value="0">全部</option>';
 	                        $.each(_data, function(i,item) {
-	                            _str += '<option value="'+item.store_name+'">'+item.store_name+'</option>';
+	                            _str += '<option value="'+item.id+'">'+item.store_name+'</option>';
 	                        });
 	                        _this.next().html(_str);
 						});
@@ -417,8 +418,8 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             params.activate = $("select[name=activate]").val();
             params.rent_user=$("select[name=public_status]").val();
             params.public_user=$("select[name=male_status]").val();
-            params.store_name=$("#guest_stores").val();
-            params.referrer_store_name=$("#guest_stores2").val();
+            params.store_id=$("#guest_stores").val();
+            params.referrer_store_id=$("#guest_stores2").val();
             params.district_id=$("#district_id").val()
             params.referrer_district_id=$("#district_id2").val()
             params.login_status = $("select[name=login_status]").val();