diff --git a/application/admin/controller/Action.php b/application/admin/controller/Action.php
index 701e9bf2..2f2920ce 100644
--- a/application/admin/controller/Action.php
+++ b/application/admin/controller/Action.php
@@ -21,7 +21,9 @@ class Action extends Admin {
 
 		$order = "id desc";
 		//获取列表数据
-		$list = model('Action')->where($map)->order($order)->paginate(10);
+		$list = model('Action')->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		// 记录当前列表页的cookie
 		Cookie('__forward__', $_SERVER['REQUEST_URI']);
diff --git a/application/admin/controller/Ad.php b/application/admin/controller/Ad.php
index 3c5bd9cf..c8dcaaf1 100644
--- a/application/admin/controller/Ad.php
+++ b/application/admin/controller/Ad.php
@@ -27,7 +27,9 @@ class Ad extends Admin {
 		$map   = array();
 		$order = "id desc";
 
-		$list = db('AdPlace')->where($map)->order($order)->paginate(10);
+		$list = db('AdPlace')->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 		$data = array(
 			'list' => $list,
 			'page' => $list->render(),
@@ -102,7 +104,9 @@ class Ad extends Admin {
 		$map['place_id'] = $id;
 		$order           = "id desc";
 
-		$list = db('Ad')->where($map)->order($order)->paginate(10);
+		$list = db('Ad')->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 		$data = array(
 			'id'   => $id,
 			'list' => $list,
@@ -118,7 +122,7 @@ class Ad extends Admin {
 		if ($this->request->isPost()) {
 			$result = $ad->change();
 			if ($result) {
-				return $this->success("添加成功！", url('admin/ad/lists', array('id' => $this->request->param('place_id'))));
+				return $this->success("添加成功！", url('admin/ad/lists', array('id' => $this->param['place_id'])));
 			} else {
 				return $this->error($ad->getError());
 			}
@@ -139,7 +143,7 @@ class Ad extends Admin {
 		if ($this->request->isPost()) {
 			$result = $ad->change();
 			if ($result) {
-				return $this->success("修改成功！", url('admin/ad/lists', array('id' => $this->reqeust->param('place_id'))));
+				return $this->success("修改成功！", url('admin/ad/lists', array('id' => $this->param['place_id'])));
 			} else {
 				return $this->error($ad->getError());
 			}
diff --git a/application/admin/controller/Addons.php b/application/admin/controller/Addons.php
index 2570e470..514a48ad 100644
--- a/application/admin/controller/Addons.php
+++ b/application/admin/controller/Addons.php
@@ -28,7 +28,9 @@ class Addons extends Admin {
 		if ($refresh) {
 			$this->addons->refresh();
 		}
-		$list = $this->addons->order('id desc')->paginate(25);
+		$list = $this->addons->order('id desc')->paginate(25, false, array(
+				'query'  => $this->request->param()
+			));
 		// 记录当前列表页的cookie
 		Cookie('__forward__', $_SERVER['REQUEST_URI']);
 
@@ -216,7 +218,9 @@ class Addons extends Admin {
 
 		$map   = array();
 		$order = "id desc";
-		$list  = model('Hooks')->where($map)->order($order)->paginate(10);
+		$list  = model('Hooks')->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		// 记录当前列表页的cookie
 		Cookie('__forward__', $_SERVER['REQUEST_URI']);
diff --git a/application/admin/controller/Attribute.php b/application/admin/controller/Attribute.php
index 78ba72fb..12c4ccd7 100644
--- a/application/admin/controller/Attribute.php
+++ b/application/admin/controller/Attribute.php
@@ -49,7 +49,9 @@ class Attribute extends Admin {
 		if (!$model_id) {
 			return $this->error('非法操作！');
 		}
-		$list = model('Attribute')->where('model_id', $model_id)->order('id desc')->paginate(25);
+		$list = model('Attribute')->where('model_id', $model_id)->order('id desc')->paginate(25, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list'     => $list,
@@ -67,7 +69,7 @@ class Attribute extends Admin {
 	 */
 	public function add($model_id = '') {
 		if ($this->request->isPost()) {
-			$result = $this->model->validate('attribute.add')->save($this->request->param());
+			$result = $this->model->validate('attribute.add')->save($this->param);
 			if (false !== $result) {
 				return $this->success("创建成功！", url('Attribute/index', array('model_id' => $model_id)));
 			} else {
@@ -90,7 +92,7 @@ class Attribute extends Admin {
 	 */
 	public function edit($id = '', $model_id = '') {
 		if ($this->request->isPost()) {
-			$result = $this->model->validate('attribute.edit')->save($this->request->param(), array('id'=>$id));
+			$result = $this->model->validate('attribute.edit')->save($this->param, array('id'=>$id));
 			if ($result) {
 				return $this->success("修改成功！", url('Attribute/index', array('model_id' => $model_id)));
 			} else {
diff --git a/application/admin/controller/Client.php b/application/admin/controller/Client.php
index 0e22fa96..fedfcdd6 100644
--- a/application/admin/controller/Client.php
+++ b/application/admin/controller/Client.php
@@ -19,7 +19,9 @@ class Client extends Admin {
 
 	
 	public function index(){
-		$list = $this->model->paginate(25);
+		$list = $this->model->paginate(25, false, array(
+				'query'  => $this->request->param()
+			));
 		$data = array(
 			'list'   => $list,
 			'page'   => $list->render()
diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php
index 0f7b03eb..7af0b26b 100644
--- a/application/admin/controller/Config.php
+++ b/application/admin/controller/Config.php
@@ -34,7 +34,9 @@ class Config extends Admin {
 			$map['name'] = array('like', '%' . $name . '%');
 		}
 
-		$list = $this->model->where($map)->order('id desc')->paginate(25);
+		$list = $this->model->where($map)->order('id desc')->paginate(25, false, array(
+				'query'  => $this->request->param()
+			));
 		// 记录当前列表页的cookie
 		Cookie('__forward__', $_SERVER['REQUEST_URI']);
 
diff --git a/application/admin/controller/Content.php b/application/admin/controller/Content.php
index d60464e7..e318c878 100644
--- a/application/admin/controller/Content.php
+++ b/application/admin/controller/Content.php
@@ -44,7 +44,9 @@ class Content extends Admin {
 		$field     = array_filter($grid_list['fields']);
 
 
-		$list = $this->model->where($map)->order($order)->paginate($this->modelInfo['list_row']);
+		$list = $this->model->where($map)->order($order)->paginate($this->modelInfo['list_row'], false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'grid' => $grid_list,
@@ -67,7 +69,7 @@ class Content extends Admin {
 	 */
 	public function add() {
 		if ($this->request->isPost()) {
-			$result = $this->model->save($this->request->param());
+			$result = $this->model->save($this->param);
 			if ($result) {
 				//记录行为
 				action_log('add_content', 'content', $result, session('auth_user.uid'));
@@ -100,7 +102,7 @@ class Content extends Admin {
 	 */
 	public function edit($id) {
 		if ($this->request->isPost()) {
-			$result = $this->model->save($this->request->param(), array('id'=> $id));
+			$result = $this->model->save($this->param, array('id'=> $id));
 			if ($result !== false) {
 				//记录行为
 				action_log('update_content', 'content', $result, session('auth_user.uid'));
@@ -137,12 +139,12 @@ class Content extends Admin {
 	 * @author molong <ycgpp@126.com>
 	 */
 	public function del() {
-		$param = $this->request->param();
-		if (!$param['id'] || (is_array($param['id']) && empty($param['id']))) {
+		$id = $this->getArrayParam('id');
+		if (empty($id)) {
 			return $this->error("非法操作！");
 		}
 
-		$map['id'] = array('IN', $param['id']);
+		$map['id'] = array('IN', $id);
 		$result    = $this->model->where($map)->delete();
 
 		if (false !== $result) {
diff --git a/application/admin/controller/Form.php b/application/admin/controller/Form.php
index cc705867..7f6d4ca6 100644
--- a/application/admin/controller/Form.php
+++ b/application/admin/controller/Form.php
@@ -27,7 +27,9 @@ class Form extends Admin {
 	public function index() {
 		$map   = array();
 		$order = "id desc";
-		$list  = $this->model->where($map)->order($order)->paginate(25);
+		$list  = $this->model->where($map)->order($order)->paginate(25, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
@@ -166,7 +168,7 @@ class Form extends Admin {
 	}
 
 	public function addattr(\think\Request $request){
-		$form_id = isset($this->request->param('form_id')) ? $this->request->param('form_id') : '';
+		$form_id = isset($this->param['form_id']) ? $this->param['form_id'] : '';
 		if (!$form_id) {
 			return $this->error('非法操作！');
 		}
@@ -193,8 +195,8 @@ class Form extends Admin {
 	}
 
 	public function editattr(\think\Request $request){
-		$form_id = isset($this->request->param('form_id')) ? $this->request->param('form_id') : '';
-		$id = isset($this->request->param('id')) ? $this->request->param('id') : '';
+		$form_id = isset($this->param['form_id']) ? $this->param['form_id'] : '';
+		$id = isset($this->param['id']) ? $this->param['id'] : '';
 		if (!$form_id || !$id) {
 			return $this->error('非法操作！');
 		}
@@ -219,7 +221,7 @@ class Form extends Admin {
 	}
 
 	public function delattr(\think\Request $request){
-		$id = isset($this->request->param('id')) ? $this->request->param('id') : 0;
+		$id = isset($this->param['id']) ? $this->param['id'] : 0;
 		if (!$id) {
 			return $this->error('非法操作！');
 		}
diff --git a/application/admin/controller/Group.php b/application/admin/controller/Group.php
index 2e036900..3bcd5d0f 100644
--- a/application/admin/controller/Group.php
+++ b/application/admin/controller/Group.php
@@ -25,7 +25,9 @@ class Group extends Admin {
 	public function index($type = 'admin') {
 		$map['module'] = $type;
 
-		$list = db('AuthGroup')->where($map)->order('id desc')->paginate(10);
+		$list = db('AuthGroup')->where($map)->order('id desc')->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
@@ -112,7 +114,9 @@ class Group extends Admin {
 	public function access($type = 'admin') {
 		$map['module'] = $type;
 
-		$list = db('AuthRule')->where($map)->order('id desc')->paginate(15);
+		$list = db('AuthRule')->where($map)->order('id desc')->paginate(15, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php
index 991c1a1e..791e8cd3 100644
--- a/application/admin/controller/Link.php
+++ b/application/admin/controller/Link.php
@@ -16,7 +16,9 @@ class Link extends Admin {
 		$map = array();
 
 		$order = "id desc";
-		$list  = db('Link')->where($map)->order($order)->paginate(10);
+		$list  = db('Link')->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
diff --git a/application/admin/controller/Model.php b/application/admin/controller/Model.php
index 57e62475..72834a69 100644
--- a/application/admin/controller/Model.php
+++ b/application/admin/controller/Model.php
@@ -26,7 +26,9 @@ class Model extends Admin {
 		$map = array('status' => array('gt', -1));
 
 		$order = "id desc";
-		$list  = $this->model->where($map)->order($order)->paginate(10);
+		$list  = $this->model->where($map)->order($order)->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
diff --git a/application/admin/controller/Seo.php b/application/admin/controller/Seo.php
index 41707748..11c409ed 100644
--- a/application/admin/controller/Seo.php
+++ b/application/admin/controller/Seo.php
@@ -25,7 +25,9 @@ class Seo extends Admin {
 		//读取规则列表
 		$map = array('status' => array('EGT', 0));
 
-		$list = $this->seo->where($map)->order('sort asc')->paginate(10);
+		$list = $this->seo->where($map)->order('sort asc')->paginate(10, false, array(
+				'query'  => $this->request->param()
+			));
 
 		$data = array(
 			'list' => $list,
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index 7016f658..8f45040b 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -17,20 +17,25 @@ class User extends Admin {
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
 	public function index() {
-		$nickname      = input('nickname');
+		$param = $this->request->param();
 		$map['status'] = array('egt', 0);
-		if (is_numeric($nickname)) {
-			$map['uid|nickname'] = array(intval($nickname), array('like', '%' . $nickname . '%'), '_multi' => true);
-		} else {
-			$map['nickname'] = array('like', '%' . (string) $nickname . '%');
+		if (isset($param['nickname']) && $param['nickname']) {
+			$map['nickname'] = array('like', '%' . $param['nickname'] . '%');
+		} 
+		if (isset($param['username']) && $param['username']) {
+			$map['username'] = array('like', '%' . (string) $param['nickname'] . '%');
 		}
 
 		$order = "uid desc";
-		$list  = model('Member')->where($map)->order($order)->paginate(15);
+		$list  = model('Member')->where($map)->order($order)
+			->paginate(15, false, array(
+				'param'  => $param
+			));
 
 		$data = array(
 			'list' => $list,
 			'page' => $list->render(),
+			'param' => $param
 		);
 		$this->assign($data);
 		$this->setMeta('用户信息');
diff --git a/application/admin/view/user/index.html b/application/admin/view/user/index.html
index d49249ed..294676fa 100644
--- a/application/admin/view/user/index.html
+++ b/application/admin/view/user/index.html
@@ -10,6 +10,23 @@
 		</div>
 	</header>
 	<div class="main-box-body clearfix">
+		<div class="navbar navbar-default">
+			<form action="" class="navbar-form form-inline" method="get">
+				<div class="form-group">
+					<label class="control-label" for="input-order-id">用户名</label>
+					<div class="input-group">
+						<input type="text" name="username" value="{$param['username']|default=''}" placeholder="用户名" class="form-control">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label" for="input-order-id">昵称</label>
+					<div class="input-group">
+						<input type="text" name="nickname" value="{$param['nickname']|default=''}" placeholder="昵称" class="form-control">
+					</div>
+				</div>
+				<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i> 筛选</button>
+			</form>
+		</div>
 		<div class="table-responsive">
 			<table class="table user-list table-hover">
 				<thead>
@@ -39,7 +56,11 @@
 					{volist name="list" id="item"}
 					<tr>
 						<td>
-							<img src="{:avatar($item['uid'])}" alt=""/>
+							{if $item['avatar_url']}
+							<img src="{$item['avatar_url']}" alt="{$item['nickname']}"/>
+							{else/}
+							<img src="{:avatar($item['uid'])}" alt="{$item['nickname']}"/>
+							{/if}
 							<a href="#" class="user-link">{$item['nickname']}</a>
 							<span class="user-subhead">{$item['username']}</span>
 						</td>
diff --git a/application/api/controller/Wechat.php b/application/api/controller/Wechat.php
index 1cb42340..27ac70ca 100644
--- a/application/api/controller/Wechat.php
+++ b/application/api/controller/Wechat.php
@@ -23,11 +23,24 @@ class Wechat extends \app\common\controller\Api{
 
 	public function jscode2session(){
 		$app = Factory::miniProgram(array(
-			'app_id' => 'wxbcf7b64b8dc6ca72',
-			'secret' => '01f8b10956ea44e6a726f1391af6e3d8',
+			'app_id' => 'wx463e346969cf5366',
+			'secret' => 'f4d830487dffc0c37f281420caea6db4',
 		));
+		$param = $this->request->param();
 
-		$info = $app->auth->session($this->request->param('jsCode'));
+		$info = $app->auth->session($param['jsCode']);
+
+		//查询用户是否已添加
+		$user = db('Member')->where('openid', $info['openid'])->find();
+		if (!$user) {
+			$other = array(
+				'avatar_url' => $param['avatar'],
+			);
+			$user = model('Member')->register($param['nickname'], $param['openid'], $param['openid'], $param['openid'].'@wx.com', false, $other);
+		}
+
+		$info['access_token'] = authcode($user['uid'].'|'.$user['username'].'|'.$user['password'], 'ENCODE');
+		$info['uid'] = $user['uid'];
 
 		$this->data['data'] = $info;
 		
diff --git a/application/common.php b/application/common.php
index 0bf7bf63..08697fba 100644
--- a/application/common.php
+++ b/application/common.php
@@ -254,9 +254,9 @@ function get_cover($cover_id, $field = null) {
 	$picture = db('Picture')->where(array('status' => 1, 'id' => $cover_id))->find();
 	if ($field == 'path') {
 		if (!empty($picture['url'])) {
-			$picture['path'] = $picture['url'] ? BASE_PATH . $picture['url'] : BASE_PATH . '/public/images/default.png';
+			$picture['path'] = $picture['url'] ? BASE_PATH . $picture['url'] : BASE_PATH . '/static/images/default.png';
 		} else {
-			$picture['path'] = $picture['path'] ? BASE_PATH . $picture['path'] : BASE_PATH . '/public/images/default.png';
+			$picture['path'] = $picture['path'] ? BASE_PATH . $picture['path'] : BASE_PATH . '/static/images/default.png';
 		}
 	}
 	return empty($field) ? $picture : $picture[$field];
diff --git a/application/common/model/Member.php b/application/common/model/Member.php
index d3cc7f46..a78be388 100644
--- a/application/common/model/Member.php
+++ b/application/common/model/Member.php
@@ -144,8 +144,8 @@ class Member extends Base {
 	function register($username, $password, $repassword, $email, $isautologin = true, $other = array()){
 		$data['username'] = $username;
 		$data['salt'] = rand_string(6);
-		$data['password'] = $password;
-		$data['repassword'] = $repassword;
+		$data['password'] = md5($password . $data['salt']);
+		$data['repassword'] = md5($repassword . $data['salt']);
 		$data['email'] = $email;
 		if (!empty($other)) {
 			$data = array_merge($data, $other);
@@ -156,7 +156,7 @@ class Member extends Base {
 			if ($isautologin) {
 				$this->autoLogin($this->data);
 			}
-			return $result;
+			return $data;
 		}else{
 			if (!$this->getError()) {
 				$this->error = "注册失败！";