github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-11 01:52:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

调整seeion

Browse Source
This commit is contained in:
liaofei 2019-11-19 14:56:25 +08:00
parent 84f81ab7e4
commit 850a88bfb6
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/app/admin/controller/agent/AgentManage.php
View File

@ -221,11 +221,11 @@ class AgentManage extends AuthController
}
/*
*
* 获取公众号二维码
* */
public function wechant_code($uid)
{
$qr_code = \crmeb\services\QrcodeService::getTemporaryQrcode('spread',$uid);
$qr_code = \crmeb\services\QrcodeService::getForeverQrcode('spread',$uid);
if(isset($qr_code['url']))
return ['code_src'=>$qr_code['url']];
else

3
crmeb/app/admin/model/system/SystemAdmin.php
View File

@ -67,6 +67,7 @@ class SystemAdmin extends BaseModel
{
Session::set('adminId',$adminInfo['id']);
Session::set('adminInfo',$adminInfo->toArray());
Session::save();
}
/**
@ -76,7 +77,7 @@ class SystemAdmin extends BaseModel
{
Session::delete('adminInfo');
Session::delete('adminId');
Session::clear();
Session::save();
}
/**

2
crmeb/app/admin/model/wechat/WechatQrcode.php
View File

@ -105,7 +105,7 @@ class WechatQrcode extends BaseModel
self::createForeverQrcode($id, $type);
$res = self::getForeverQrcode($type, $id);
}
if(!$res['ticket']) exception('临时二维码获取错误');
if(!$res['ticket']) exception('永久二维码获取错误');
return $res;
}

4
crmeb/app/api/controller/publics/ArticleController.php
View File

@ -22,8 +22,8 @@ class ArticleController
public function lst(Request $request, $cid)
{
list($page, $limit) = UtilService::getMore([
['page',0],
['limit',0],
['page',1],
['limit',10],
],$request, true);
$list = Article::cidByArticleList($cid,$page,$limit,"id,title,image_input,visit,from_unixtime(add_time,'%Y-%m-%d %H:%i') as add_time,synopsis,url") ?? [];
if(is_object($list)) $list = $list->toArray();

2
crmeb/app/api/controller/store/CategoryController.php
View File

@ -9,7 +9,7 @@ class CategoryController
{
public function category(Request $request)
{
$cateogry = StoreCategory::with('children')->where('is_show',1)->where('pid',0)->select();
$cateogry = StoreCategory::with('children')->where('is_show',1)->order('sort desc,id desc')->where('pid',0)->select();
return app('json')->success($cateogry->hidden(['add_time','is_show','sort','children.sort','children.add_time','children.pid','children.is_show'])->toArray());
}
}

6
crmeb/crmeb/traits/LogicTrait.php
View File

@ -145,13 +145,11 @@ trait LogicTrait
*/
public function __call($method, $ages)
{
$keys = property_exists($this, 'propsRule') ? array_keys($this->providers) : [];
$keys = property_exists($this, 'providers') ? array_keys($this->providers) : [];
$propsRuleKeys = property_exists($this, 'propsRule') ? array_keys($this->propsRule) : [];
if (strstr($method, 'set') !== false) {
$attribute = lcfirst(str_replace('set', '', $method));
if (property_exists($this, $attribute)
&& in_array($attribute, $propsRuleKeys)
&& isset($this->propsRule[$attribute])) {
if (property_exists($this, $attribute) && in_array($attribute, $propsRuleKeys)) {
$propsRuleValeu = $this->propsRule[$attribute];
$type = $propsRuleValeu[1] ?? 'string';
$callable = $propsRuleValeu[2] ?? null;