|
...
|
...
|
@@ -5,6 +5,7 @@ namespace app\admin\controller\general; |
|
|
|
use app\admin\model\Admin;
|
|
|
|
use app\common\controller\Backend;
|
|
|
|
use fast\Random;
|
|
|
|
use think\Db;
|
|
|
|
use think\Session;
|
|
|
|
use think\Validate;
|
|
|
|
|
|
...
|
...
|
@@ -44,6 +45,8 @@ class Profile extends Backend |
|
|
|
|
|
|
|
return json($result);
|
|
|
|
}
|
|
|
|
$row = Db::name('store')->where(['admin_id'=>$this->auth->id])->find();
|
|
|
|
$this->assign('row',$row);
|
|
|
|
return $this->view->fetch();
|
|
|
|
}
|
|
|
|
|
|
...
|
...
|
@@ -55,14 +58,21 @@ class Profile extends Backend |
|
|
|
if ($this->request->isPost()) {
|
|
|
|
$this->token();
|
|
|
|
$params = $this->request->post("row/a");
|
|
|
|
$money = $params['money'];
|
|
|
|
$freight = $params['freight'];
|
|
|
|
$phone = $params['phone'];
|
|
|
|
$address = $params['address'];
|
|
|
|
$lng = $params['lng'];
|
|
|
|
$lat = $params['lat'];
|
|
|
|
$content = $params['content'];
|
|
|
|
$params = array_filter(array_intersect_key(
|
|
|
|
$params,
|
|
|
|
array_flip(array('email', 'nickname', 'password', 'avatar'))
|
|
|
|
));
|
|
|
|
unset($v);
|
|
|
|
if (!Validate::is($params['email'], "email")) {
|
|
|
|
/*if (!Validate::is($params['email'], "email")) {
|
|
|
|
$this->error(__("Please input correct email"));
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
if (isset($params['password'])) {
|
|
|
|
if (!Validate::is($params['password'], "/^[\S]{6,16}$/")) {
|
|
|
|
$this->error(__("Please input correct password"));
|
|
...
|
...
|
@@ -70,15 +80,19 @@ class Profile extends Backend |
|
|
|
$params['salt'] = Random::alnum();
|
|
|
|
$params['password'] = md5(md5($params['password']) . $params['salt']);
|
|
|
|
}
|
|
|
|
$exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find();
|
|
|
|
/*$exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find();
|
|
|
|
if ($exist) {
|
|
|
|
$this->error(__("Email already exists"));
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
if ($params) {
|
|
|
|
$admin = Admin::get($this->auth->id);
|
|
|
|
$admin->save($params);
|
|
|
|
//因为个人资料面板读取的Session显示，修改自己资料后同时更新Session
|
|
|
|
Session::set("admin", $admin->toArray());
|
|
|
|
$store_id = Db::name('admin')->where(['id'=>$this->auth->id])->value('store_id');
|
|
|
|
if(!empty($store_id)){
|
|
|
|
echo Db::name('store')->where(['id'=>$store_id])->update(['money'=>$money,'freight'=>$freight,'phone'=>$phone,'address'=>$address,'lng'=>$lng,'lat'=>$lat,'content'=>$content]);
|
|
|
|
}
|
|
|
|
$this->success();
|
|
|
|
}
|
|
|
|
$this->error();
|
...
|
...
|
|
