mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-11-20 00:40:30 +00:00
Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev
This commit is contained in:
commit
48f1361c03
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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'),
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="" id="shopp-manager">
|
||||
<div class="i-layout-page-header header_top">
|
||||
<div class="i-layout-page-header fl_header">
|
||||
<div class="i-layout-page-header header-title">
|
||||
<div class=" fl_header">
|
||||
<router-link :to="{ path: $routeProStr + '/product/product_list' }"
|
||||
><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
|
||||
>
|
||||
|
||||
@ -514,8 +514,9 @@ body {
|
||||
padding: 7px 32px 0 32px;
|
||||
}
|
||||
.header-title {
|
||||
padding: 18px 32px;
|
||||
padding: 10px 16px;
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.ivu-page-header-title {
|
||||
display: inline-block;
|
||||
|
||||
@ -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" : {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user