Merge branch 'hotfix-phoenix' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into 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){
-                $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){

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
 {
@@ -69,19 +71,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(), '<div type="button"  class="btn btn-outline-primary btn-sm">详情</div>'));
+
                 if ($state == 2) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-danger">接单</div>', 3));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-danger btn-sm">接单</div>', 3));
                 } elseif ($state == 311) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-warning">完成</div>', 4));
-                    $actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-warning btn-sm">完成</div>', 4));
+                    $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
                 } elseif ($state == 3) {
-                    $actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
-                    $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-info">自送</div>'));
+                    $actions->append(new OrderPrint('<div type="button"  class="btn btn-outline-dark btn-sm">打印</div>'));
+                    $actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-info btn-sm">自送</div>'));
                 } elseif ($state == 8) {
-                    $actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-secondary">同意退款</div>', 9));
-                    $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-secondary">拒绝退款</div>'));
+                    $actions->append(new OrderStateHandle('<div type="button"  class="btn btn-outline-secondary btn-sm">同意</div>', 9));
+                    $actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button"  class="btn btn-outline-secondary btn-sm">拒绝</div>'));
                 }
-                $actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-primary">详情</div>'));
             });
 
 
@@ -90,6 +93,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();

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);
-                $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');

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();
+    }
+
+}

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'] ?? []);
         });

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,
     ],
 
     /*

resources/views/orderdetail.php

@@ -23,12 +23,12 @@
             <td colspan="5">配送费：{{delivery_money}} 元</td>
         </tr>
         <tr>
-            <td class="text-nowrap" scope="col">订单备注：{{note}}</td>
+            <td class="text-nowrap" scope="col" v-if="note">订单备注：{{note}}</td>
             <td class="text-nowrap" scope="col" v-if="refuse_refund_note">拒绝退款原因：{{refuse_refund_note}}</td>
 
         </tr>
         <tr>
-            <td class="text-nowrap" scope="col" v-if="total_refund_note">拒绝退款原因：{{total_refund_note}}</td>
+            <td class="text-nowrap" scope="col" v-if="total_refund_note">退款原因：{{total_refund_note}}</td>
         </tr>
         </tbody>
     </table>
@@ -49,7 +49,7 @@
 
                 </div>
                 <p class="mb-0" style="color: red;font-size: 1.4rem;">￥{{goods.price}}</p>
-                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="state==4&&show_refund[goods.id].show_refund_2">{{refund_2}}</el-button>
+                <el-button type="info" plain style="float: right;" @click="refundNote(goods.name,goods.id,item.id)" v-if="(state==4||state==9)&&(goods.status!=3)&&(show_refund[goods.id].show_refund_2)">{{refund_2}}</el-button>
                 <p style="float: right; color: red" v-if="goods.status==3">{{refund_3}}</p>
                 <p style="float: right; color: red" v-if="show_refund[goods.id].show_refund_3">{{refund_3}}</p>
             </div>