Merge remote-tracking branch 'origin/master'

4 years ago · c4dabc0d37
6 changed files with 92 additions and 76 deletions
--- a/app/AdminSupplier/Controllers/DepositLogController.php
+++ b/app/AdminSupplier/Controllers/DepositLogController.php
@ -2,78 +2,98 @@

 namespace App\AdminSupplier\Controllers;

-use App\AdminAgent\Controllers\AdvertisingController;
 use App\AdminSupplier\Repositories\DepositLog;
+use App\AdminSupplier\Repositories\Withdrawal;
+use App\Traits\DemandTraits;
 use App\Traits\StatementTraits;
+use App\Traits\WithdrawalTraits;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Card;

 class DepositLogController extends AdminController
 {
-    /**
-     * Make a grid builder.
-     *
-     * @return Grid
-     */
-    protected function grid()
-    {
-        return Grid::make(new DepositLog('supplier'), function (Grid $grid) {
-			$grid->model()->where('supplier_id',Admin::user()->id);
-            $grid->column('id')->sortable();
-            $grid->column('price');
-            $grid->column('supplier.name','供应商');
-            $grid->column('type','类型')->using(StatementTraits::$depositText);
-            $grid->column('created_at');
-            $grid->column('updated_at')->sortable();
+	public function index(Content $content)
+	{
+		return $content
+			->body(
+				<<<HTML
+                    <div class="content-header">
+                                <section class="content-header breadcrumbs-top">
+                                        <h1 class=" float-left">
+                                    <span class="text-capitalize">账户交易金</span>

-			$grid->disableDeleteButton();
-			$grid->disableRowSelector();
-			$grid->disableCreateButton();
-			$grid->disableActions();
-            $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('type','状态')->width(2)->select(StatementTraits::$depositText);
+                                </h1>
+                    <div class="clearfix"></div>

-            });
-        });
-    }
+                        </section>
+                        </div>
+                HTML

-    ///**
-    // * Make a show builder.
-    // *
-    // * @param mixed $id
-    // *
-    // * @return Show
-    // */
-    //protected function detail($id)
-    //{
-    //    return Show::make($id, new DepositLog(), function (Show $show) {
-    //        $show->field('id');
-    //        $show->field('price');
-    //        $show->field('supplier_id');
-    //        $show->field('type');
-    //        $show->field('created_at');
-    //        $show->field('updated_at');
-    //    });
-    //}
-	//
-    ///**
-    // * Make a form builder.
-    // *
-    // * @return Form
-    // */
-    //protected function form()
-    //{
-    //    return Form::make(new DepositLog(), function (Form $form) {
-    //        $form->display('id');
-    //        $form->text('price');
-    //        $form->text('supplier_id');
-    //        $form->text('type');
-	//
-    //        $form->display('created_at');
-    //        $form->display('updated_at');
-    //    });
-    //}
+			)
+			->body(function (Row $row) {
+
+				$row->column(4, function (Column $column) {
+					$column->row(Card::make('正常', function () {
+						$price = Admin::user()->deposit_normal ?? 0;
+						return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1 text-primary">$price</h2>
+</div>
+HTML;
+					}));
+				});
+
+				$row->column(4, function (Column $column) {
+					$column->row(Card::make('冻结', function () {
+						$price = Admin::user()->deposit_frozen ?? 0;
+						return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1 text-primary">$price</h2>
+</div>
+HTML;
+					}));
+
+				});
+
+				$row->column(4, function (Column $column) {
+					$column->row(Card::make('消费', function () {
+						$price = Admin::user()->deposit_used ?? 0;
+						return <<<HTML
+<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
+    <h2 class="ml-1 font-large-1 text-primary">$price</h2>
+</div>
+HTML;
+					}));
+
+				});
+
+			})
+			->body(
+				Grid::make(new DepositLog('supplier'), function (Grid $grid) {
+					$grid->model()->where('supplier_id', Admin::user()->id);
+					$grid->column('id')->sortable();
+					$grid->column('price');
+					$grid->column('supplier.name', '供应商');
+					$grid->column('type', '类型')->using(StatementTraits::$depositText);
+					$grid->column('created_at');
+					$grid->column('updated_at')->sortable();
+
+					$grid->disableDeleteButton();
+					$grid->disableRowSelector();
+					$grid->disableCreateButton();
+					$grid->disableActions();
+					$grid->filter(function (Grid\Filter $filter) {
+						$filter->equal('type', '状态')->width(2)->select(StatementTraits::$depositText);
+
+					});
+				})
+
+			);
+	}
 }
--- a/app/AdminSupplier/Controllers/WalletController.php
+++ b/app/AdminSupplier/Controllers/WalletController.php
@ -24,7 +24,7 @@ class WalletController extends AdminController
                    <div class="content-header">
                                <section class="content-header breadcrumbs-top">
                                        <h1 class=" float-left">
-                                    <span class="text-capitalize">我的钱包</span>
+                                    <span class="text-capitalize">账户余额</span>

                                </h1>
                    <div class="clearfix"></div>
--- a/app/AdminSupplier/Controllers/WorkorderController.php
+++ b/app/AdminSupplier/Controllers/WorkorderController.php
@ -34,11 +34,7 @@ class WorkorderController extends AdminController
 		$userList = $msgList = [];

 		$workorder = \App\Models\Workorder::query()
-			->with(['point' => function($query) {
-				$query->withTrashed();
-			},'publisher' => function($query) {
-				$query->withTrashed();
-			}])
+			->with(['point','publisher'])
 			->withCount(['items' => function($query) {
 				$query->where('is_read', 0)
 					->where('point_id',Admin::user()->id)
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@ -96,17 +96,17 @@ class Order extends BaseModel

 	public function agent()
 	{
-		return $this->belongsTo(Agent::class);
+		return $this->belongsTo(Agent::class)->withTrashed();
 	}

 	public function supplier()
 	{
-		return $this->belongsTo(Supplier::class);
+		return $this->belongsTo(Supplier::class)->withTrashed();
 	}

 	public function user()
 	{
-		return $this->belongsTo(User::class);
+		return $this->belongsTo(User::class)->withTrashed();
 	}

 	public function agentProductItem()
@ -121,7 +121,7 @@ class Order extends BaseModel

 	public function guide()
 	{
-		return $this->belongsTo(Guide::class);
+		return $this->belongsTo(Guide::class)->withTrashed();
 	}

 	//关联的计调云产品
--- a/app/Models/Withdrawal.php
+++ b/app/Models/Withdrawal.php
@ -15,12 +15,12 @@ class Withdrawal extends Model

    public function pay()
 	{
-		return $this->morphTo();
+		return $this->morphTo()->withTrashed();
 	}

 	public function user()
 	{
-		return $this->morphTo();
+		return $this->morphTo()->withTrashed();
 	}

 	public function statement()
--- a/app/Models/Workorder.php
+++ b/app/Models/Workorder.php
@ -15,12 +15,12 @@ class Workorder extends Model

 	public function publisher()
 	{
-		return $this->morphTo();
+		return $this->morphTo()->withTrashed();
 	}

 	public function point()
 	{
-		return $this->morphTo();
+		return $this->morphTo()->withTrashed();
 	}

 	public function items()