@@ -77,9 +77,8 @@ class LoginServices extends BaseServices | |||
{ | |||
/** @var BaseAuth $services */ | |||
$services = app()->make(BaseAuth::class); | |||
$adminInfo = $services->parseToken($token, function ($id) { | |||
return $this->dao->get($id); | |||
}); | |||
[$id, $type] = $services->parseToken($token); | |||
$adminInfo = $this->dao->get($id); | |||
return $adminInfo->hidden(['password', 'ip', 'status']); | |||
} | |||
@@ -134,9 +134,11 @@ class StoreBrandServices extends BaseServices | |||
$menus = array_merge($menus, $list); | |||
$data2 = []; | |||
foreach ($menus as $k => $v) { | |||
$cx = $v['value']; | |||
if (!isset($data2[$cx])) { | |||
$data2[$cx] = $v; | |||
if (isset($v['value'])) { | |||
$cx = $v['value']; | |||
if (!isset($data2[$cx])) { | |||
$data2[$cx] = $v; | |||
} | |||
} | |||
} | |||
$data2 = array_values($data2); |
@@ -124,11 +124,11 @@ class StoreCategoryServices extends BaseServices | |||
// if (!isset($v['children'])) { | |||
// unset($data[$k]); | |||
// } | |||
$cx = $v['value']; | |||
if (isset($data2[$cx])) { | |||
} else { | |||
$data2[$cx] = $v; | |||
if (isset($v['value'])) { | |||
$cx = $v['value']; | |||
if (!isset($data2[$cx])) { | |||
$data2[$cx] = $v; | |||
} | |||
} | |||
} | |||
$data2 = array_values($data2); |
@@ -1244,6 +1244,9 @@ class StoreProductServices extends BaseServices | |||
$list = $this->getProduceOtherList($list, $uid, isset($where['type']) && !!$where['type']); | |||
$list = $this->getProductPromotions($list, $promotions_type); | |||
} | |||
foreach ($list as $k => $v) { | |||
$list[$k]['price'] = two_num($v['price'] + $v['coin']); | |||
} | |||
return $list; | |||
} | |||
@@ -2,6 +2,7 @@ | |||
namespace crmeb\basic; | |||
use Firebase\JWT\JWT; | |||
use think\helper\Str; | |||
class BaseAuth | |||
@@ -88,4 +89,12 @@ class BaseAuth | |||
return true; | |||
} | |||
public function parseToken(string $jwt) | |||
{ | |||
$token = $jwt; | |||
list($headb64, $bodyb64, $cryptob64) = explode('.', $token); | |||
$payload = JWT::jsonDecode(JWT::urlsafeB64Decode($bodyb64)); | |||
return [$payload->jti->id, $payload->jti->type]; | |||
} | |||
} |
@@ -54,20 +54,28 @@ abstract class BaseController | |||
return $res; | |||
} | |||
public function success($data = []) | |||
public function success($msg = [], $data = []) | |||
{ | |||
if (is_array($data)) { | |||
if (is_array($msg)) { | |||
$res = [ | |||
'status' => 200, | |||
'msg' => 'ok', | |||
'data' => $data, | |||
'data' => $msg, | |||
]; | |||
} else { | |||
$res = [ | |||
'status' => 200, | |||
'msg' => $data, | |||
'data' => [], | |||
]; | |||
if ($data) { | |||
$res = [ | |||
'status' => 200, | |||
'msg' => $msg, | |||
'data' => $data, | |||
]; | |||
} else { | |||
$res = [ | |||
'status' => 200, | |||
'msg' => $msg, | |||
'data' => [], | |||
]; | |||
} | |||
} | |||
return $res; | |||
} |