pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x

release
李静 2022-02-24 10:55:11 +08:00
parent f43f28ee19 109a78f8bb
commit 9a013dcb7e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -8,13 +8,15 @@ RUN set -eux \
freetype \ freetype \
libjpeg-turbo \ libjpeg-turbo \
libpng \ libpng \
libzip \
&& apk add --no-cache --virtual .build-deps \ && apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
freetype-dev \ freetype-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libpng-dev \ libpng-dev \
libzip-dev \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) bcmath gd pdo pdo_mysql \ && docker-php-ext-install -j$(nproc) bcmath gd pdo pdo_mysql zip \
&& pecl install redis-5.3.4 \ && pecl install redis-5.3.4 \
&& docker-php-ext-enable redis \ && docker-php-ext-enable redis \
&& apk del --no-network .build-deps && apk del --no-network .build-deps

6
app/Admin/Controllers/DealerOrderController.php
View File

@ -114,9 +114,9 @@ class DealerOrderController extends AdminController
}); });
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(); $filter->panel();
$filter->equal('user.phone')->width(3); $filter->like('user.phone')->width(3);
$filter->equal('consignor.phone')->width(3); $filter->like('consignor.phone')->width(3);
$filter->equal('sn')->width(3); $filter->like('sn')->width(3);
$filter->between('paied_time')->dateTime()->width(5); $filter->between('paied_time')->dateTime()->width(5);
$filter->between('created_at')->dateTime()->width(5); $filter->between('created_at')->dateTime()->width(5);
// $filter->equal('id'); // $filter->equal('id');

4
app/Admin/Controllers/OrderController.php
View File

@ -128,8 +128,8 @@ class OrderController extends AdminController
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->panel(); $filter->panel();
$filter->equal('sn')->width(3); $filter->like('sn')->width(3);
$filter->equal('user.phone')->width(3); $filter->like('user.phone')->width(3);
$filter->where('tags', function ($query) { $filter->where('tags', function ($query) {
$query->whereHas('tags', function ($q) { $query->whereHas('tags', function ($q) {
$q->whereIn('tags.id', $this->input); $q->whereIn('tags.id', $this->input);