github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-29 14:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

更新提示文字，更新导出

Browse Source
This commit is contained in:
吴昊天 2023-02-24 17:12:26 +08:00
parent ad64063980
commit 6e9dc5b316
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crmeb/app/model/order/StoreOrder.php
View File

@ -596,6 +596,7 @@ class StoreOrder extends BaseModel
*/
public function searchIdsAttr($query, $value)
{
if ($value !== '') $query->whereIn('id', $value);
if (is_string($value)) $value = explode(',', $value);
if (count($value)) $query->whereIn('id', $value);
}
}

5
crmeb/app/model/product/product/StoreProduct.php
View File

@ -339,13 +339,14 @@ class StoreProduct extends BaseModel
}
/**
* 不在当前id中查询
* 在当前id中查询
* @param $query
* @param $value
*/
public function searchIdsAttr($query, $value)
{
if ($value != '') $query->whereIn('id', $value);
if (is_string($value)) $value = explode(',', $value);
if (count($value)) $query->whereIn('id', $value);
}
/**

2
crmeb/app/services/order/DeliveryServiceServices.php
View File

@ -158,7 +158,7 @@ class DeliveryServiceServices extends BaseServices
*/
public function saveDeliveryService(array $data)
{
if ($data['image'] == '') throw new AdminException(400466);
if ($data['image'] == '') throw new AdminException(400250);
$data['uid'] = $data['image']['uid'];
/** @var UserServices $userService */
$userService = app()->make(UserServices::class);

1
crmeb/app/services/system/admin/SystemAdminServices.php
View File

@ -138,6 +138,7 @@ class SystemAdminServices extends BaseServices
'account' => $adminInfo->getData('account'),
'head_pic' => $adminInfo->getData('head_pic'),
'level' => $adminInfo->getData('level'),
'real_name' => $adminInfo->getData('real_name'),
],
'logo' => sys_config('site_logo'),
'logo_square' => sys_config('site_logo_square'),

4
template/uni-app/manifest.json
View File

@ -2,8 +2,8 @@
"name" : "CRMEB标准版",
"appid" : "__UNI__A3F1ED4",
"description" : "CRMEB标准版",
"versionName" : "4.6.0",
"versionCode" : 461,
"versionName" : "4.7.0",
"versionCode" : 470,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {