From 57c9888d7589aa7d6334e7d7d1dcab222baa4745 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 10:23:59 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=20=E9=80=80=E6=AC=BE=E5=A4=87=E6=B3=A8?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/orderdetail.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 708d6de..ed97f45 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -28,7 +28,7 @@
- | 拒绝退款原因：{{total_refund_note}} |
+ 退款原因：{{total_refund_note}} |
From 2689160dff5ac2582328dba416782cf2d1cc3ef0 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 11:04:43 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=80=80=E6=AC=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/orderdetail.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index ed97f45..5e2133f 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -49,7 +49,7 @@
￥{{goods.price}}
- {{refund_2}}
+ {{refund_2}}
{{refund_3}}
{{refund_3}}
From b0160dade631319220dba4d44ddb43be36932fea Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 12:58:25 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/ImsCjdcOrderMainController.php | 17 +++++++++--------
config/admin.php | 4 +++-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 5691890..2390ccb 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -69,19 +69,20 @@ class ImsCjdcOrderMainController extends AdminController
$grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
$state = $actions->row->state;
+ $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '详情
'));
+
if ($state == 2) {
- $actions->append(new OrderStateHandle('接单
', 3));
+ $actions->append(new OrderStateHandle('接单
', 3));
} elseif ($state == 311) {
- $actions->append(new OrderStateHandle('完成
', 4));
- $actions->append(new OrderPrint('打印
'));
+ $actions->append(new OrderStateHandle('完成
', 4));
+ $actions->append(new OrderPrint('打印
'));
} elseif ($state == 3) {
- $actions->append(new OrderPrint('打印
'));
- $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送
'));
+ $actions->append(new OrderPrint('打印
'));
+ $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送
'));
} elseif ($state == 8) {
- $actions->append(new OrderStateHandle('同意退款
', 9));
- $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款
'));
+ $actions->append(new OrderStateHandle('同意
', 9));
+ $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝
'));
}
- $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '详情
'));
});
diff --git a/config/admin.php b/config/admin.php
index cb25c10..d653267 100644
--- a/config/admin.php
+++ b/config/admin.php
@@ -157,7 +157,9 @@ return [
| The global Grid action display class.
|--------------------------------------------------------------------------
*/
- 'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class,
+ //'grid_action_class' => Dcat\Admin\Grid\Displayers\DropdownActions::class,
+ 'grid_action_class' => Dcat\Admin\Grid\Displayers\Actions::class,
+ //'grid_action_class' => Dcat\Admin\Grid\Displayers\ContextMenuActions::class,
],
/*
From 5c28239d31d590a00fe06cd09d2a0c860be9e372 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 14:17:33 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD,=20=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2=E5=92=8C=E9=87=91=E9=A2=9D?=
=?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Controllers/ImsCjdcOrderMainController.php | 2 ++
app/Admin/Repositories/ImsCjdcOrderMain.php | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 2390ccb..bd3bdc8 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -91,6 +91,8 @@ class ImsCjdcOrderMainController extends AdminController
if (!(Admin::user()->isRole('market_service'))){
$filter->equal('market_id','所属市场')->select(ImsCjdcMarket::getMarket());
}
+ $filter->between('created_at','下单时间')->datetime();
+ $filter->between('money','订单金额');
});
$grid->disableViewButton();
diff --git a/app/Admin/Repositories/ImsCjdcOrderMain.php b/app/Admin/Repositories/ImsCjdcOrderMain.php
index 220a7ad..eac9aed 100644
--- a/app/Admin/Repositories/ImsCjdcOrderMain.php
+++ b/app/Admin/Repositories/ImsCjdcOrderMain.php
@@ -17,6 +17,7 @@ class ImsCjdcOrderMain extends EloquentRepository
public function get(Grid\Model $model)
{
+
$builder = new \App\Models\ImsCjdcOrderMain();
$builder = $builder::leftJoin('lanzu_user','lanzu_user.id','lanzu_order_main.user_id')
->with('market')
@@ -33,6 +34,12 @@ class ImsCjdcOrderMain extends EloquentRepository
$value['arguments'][1] = $this->getGridColumns();
} elseif ($value['method'] == 'get') {
$value['arguments'] = [$this->getGridColumns()];
+ }elseif ($value['method']=='whereBetween'){
+ if ($value['arguments'][0]=='created_at'){
+ $value['arguments'][0] = 'lanzu_order_main.created_at';
+ $value['arguments'][1][0] = strtotime($value['arguments'][1][0]);
+ $value['arguments'][1][1] = strtotime($value['arguments'][1][1]);
+ }
}
$query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
});
From a8585de018c065f099f36290fa841e5f139aaf9a Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 14:53:12 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=BC=80=E5=85=B3=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Controllers/ImsCjdcMarketController.php | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php
index 2eae5c7..8210f71 100644
--- a/app/Admin/Controllers/ImsCjdcMarketController.php
+++ b/app/Admin/Controllers/ImsCjdcMarketController.php
@@ -54,6 +54,7 @@ class ImsCjdcMarketController extends AdminController
}
});
$grid->address;
+ $grid->column('status')->switch();
$grid->created_at->display(function ($time){
return date('Y-m-d H:i:s',$time);
});
@@ -168,10 +169,12 @@ class ImsCjdcMarketController extends AdminController
$form->hidden('lat');
$form->saving(function (Form $form){
- $coordinates = explode(',',$form->coordinates);
- $form->lng = $coordinates[0];
- $form->lat = $coordinates[1];
- $form->deleteInput('coordinates');
+ if($form->coordinates){
+ $coordinates = explode(',',$form->coordinates);
+ $form->lng = $coordinates[0];
+ $form->lat = $coordinates[1];
+ $form->deleteInput('coordinates');
+ }
});
$form->deleting(function (Form $form){
From 4e2955bb059f5ecea2b9d12245f049c787885066 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 16:20:39 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=8C=89=E5=B8=82=E5=9C=BA=E8=BF=87=E8=99=91=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ImsCjdcOrderMainController.php | 2 +
app/Admin/Controllers/v3/GoodsController.php | 17 +++++-
app/Admin/Extensions/OrderDetailCopy.php | 55 +++++++++++++++++++
3 files changed, 71 insertions(+), 3 deletions(-)
create mode 100644 app/Admin/Extensions/OrderDetailCopy.php
diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index bd3bdc8..0a268c2 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -7,6 +7,7 @@ use App\Admin\Common\Rpc;
use App\Admin\Extensions\CheckRow;
use App\Admin\Extensions\MyDetailPage;
use App\Admin\Extensions\OrderDetail;
+use App\Admin\Extensions\OrderDetailCopy;
use App\Admin\Extensions\OrderPrint;
use App\Admin\Extensions\OrderRefund;
use App\Admin\Extensions\OrderStateHandle;
@@ -19,6 +20,7 @@ use Dcat\Admin\Layout\Content;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use Dcat\Admin\Widgets\Lazy;
+use Dcat\Admin\Widgets\Modal;
class ImsCjdcOrderMainController extends AdminController
{
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index b855eb5..01051b5 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -4,7 +4,9 @@ namespace App\Admin\Controllers\v3;
use App\Admin\Actions\Grid\v3\GoodsCopy;
use App\Admin\Actions\Grid\v3\GoodsImage;
+use App\Admin\Common\Auth;
use App\Admin\Repositories\v3\Goods;
+use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
@@ -25,7 +27,14 @@ class GoodsController extends AdminController
*/
protected function grid()
{
- return Grid::make(new Goods(), function (Grid $grid) {
+ $marketId = Auth::getMarket();
+ if ($marketId){
+ $build = new \App\Models\v3\Goods();
+ $build = $build::where('market_id',$marketId);
+ }else{
+ $build = new Goods();
+ }
+ return Grid::make($build, function (Grid $grid) {
// 二级分类
$categoryList = CategoryModel::getArray([['parent_id','>',0]],['选择分类'=>0]);
// 店铺
@@ -49,7 +58,7 @@ class GoodsController extends AdminController
$item .= $specKey.'：'.$specValue.'';
}
}
-
+
return $item;
});
$grid->column('market_id')->display(function($marketId) use($marketList){
@@ -77,7 +86,9 @@ class GoodsController extends AdminController
$filter->equal('store_id')->select($storeList);
$filter->equal('category_id')->select($categoryList);
$filter->equal('goods_category_id')->select($goodsCategoryList);
- $filter->equal('market_id')->select($marketList);
+ if (!(Admin::user()->isRole('market_service'))){
+ $filter->equal('market_id')->select($marketList);
+ }
$filter->equal('on_sale')->select(GoodsModel::$_ONSALE);
$filter->equal('price');
$filter->equal('goods_unit');
diff --git a/app/Admin/Extensions/OrderDetailCopy.php b/app/Admin/Extensions/OrderDetailCopy.php
new file mode 100644
index 0000000..aebd95a
--- /dev/null
+++ b/app/Admin/Extensions/OrderDetailCopy.php
@@ -0,0 +1,55 @@
+order_id = $orderId;
+ $this->currentPage = $currentPage;
+ parent::__construct($title);
+ }
+
+ public function render()
+ {
+
+ // 实例化表单类并传递自定义参数
+ $form = MyDetailPage::make(['order_id' => $this->order_id]);
+ return Modal::make()
+ ->xl()
+ ->title('订单详情')
+ ->body($form)
+ ->button($this->title);
+
+ }
+
+// /**
+// * 添加JS
+// * @return string
+// */
+// protected function script()
+// {
+// return <<order_id}').on('click', function () {
+// window.location.href ="detail?order_id={$this->order_id}&page={$this->currentPage}";
+// });
+//JS;
+// }
+//
+ public function html()
+ {
+ $this->setHtmlAttribute(['class'=>"detail_{$this->order_id}"]);
+ return parent::html();
+ }
+
+}
From 79acb6566756f4364bb07704d977cfe8397ce3e1 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 17:18:27 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/orderdetail.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 5e2133f..1e811ec 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -49,7 +49,7 @@
￥{{goods.price}}
- {{refund_2}}
+ {{refund_2}}
{{refund_3}}
{{refund_3}}
From 3eb9c25ba7823eb3ad6a522045167c227407685a Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 19:45:06 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=87=8C=E6=B2=A1=E6=9C=89=E5=A4=87=E6=B3=A8?=
=?UTF-8?q?=E7=9A=84=20=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
resources/views/orderdetail.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 1e811ec..697f483 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -23,7 +23,7 @@
配送费：{{delivery_money}} 元 |
- | 订单备注：{{note}} |
+ 订单备注：{{note}} |
拒绝退款原因：{{refuse_refund_note}} |