Merge branch 'hotfix-phoenix'

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){
+                if($form->coordinates){
                     $coordinates = explode(',',$form->coordinates);
                     $form->lng = $coordinates[0];
                     $form->lat = $coordinates[1];
                     $form->deleteInput('coordinates');
+                }
             });
 
             $form->deleting(function (Form $form){

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
 {

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]);
             // 店铺
@@ -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);
+                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');

app/Admin/Extensions/OrderDetailCopy.php

@@ -0,0 +1,55 @@
+<?php
+
+
+namespace App\Admin\Extensions;
+
+use Dcat\Admin\Grid\RowAction;
+use Dcat\Admin\Widgets\Modal;
+use Illuminate\Http\Request;
+
+
+class OrderDetailCopy extends RowAction
+{
+    protected $title;
+    protected $order_id;
+    protected $currentPage;
+    public function __construct($orderId,$currentPage,$title=null)
+    {
+        $this->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 <<<JS
+//$('.detail_{$this->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();
+    }
+
+}