Merge branch 'phoenix' into develop

app/Admin/Controllers/v3/BannerController.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Admin\Controllers\v3;
-
-use App\Admin\Repositories\v3\Banner;
-use Dcat\Admin\Form;
-use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Controllers\AdminController;
-use App\Models\ImsCjdcMarket as MarketModel;
-use App\Models\v3\Banner as BannerModel;
-
-class BannerController extends AdminController
-{
-    /**
-     * Make a grid builder.
-     *
-     * @return Grid
-     */
-    protected function grid()
-    {
-        return Grid::make(new Banner(), function (Grid $grid) {
-            $grid->column('id')->sortable();
-            $grid->column('market_id')->display(function($markerId){
-                $market = MarketModel::getMarketInfo($markerId,'name');
-                return empty($market) ? '' : $market['name']; 
-            });
-            $grid->column('title');
-            $grid->column('cover_url')->image(50);
-            $grid->column('cover_type')->display(function($coverType){
-                return isset(BannerModel::$_coverType[$coverType]) ? BannerModel::$_coverType[$coverType] : '';
-            });
-            $grid->column('path');
-            $grid->column('path_type')->display(function($pathType){
-                return isset(BannerModel::$_pathType[$pathType]) ? BannerModel::$_pathType[$pathType] : '';
-            });
-            $grid->column('type')->display(function($type){
-                return isset(BannerModel::$_type[$type]) ? BannerModel::$_type[$type] : '';
-            });
-            $grid->column('sort')->sortable();
-            $grid->column('status')->switch();
-            // ->using(BannerModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']);
-
-            $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('id');
-        
-            });
-        });
-    }
-
-    /**
-     * Make a show builder.
-     *
-     * @param mixed $id
-     *
-     * @return Show
-     */
-    protected function detail($id)
-    {
-        return Show::make($id, new Banner(), function (Show $show) {
-            $show->field('id');
-            $show->field('market_id');
-            $show->field('title');
-            $show->field('sub_title');
-            $show->field('cover');
-            $show->field('cover_type');
-            $show->field('path');
-            $show->field('path_type');
-            $show->field('sort');
-            $show->field('status');
-            $show->field('type');
-            $show->field('created_at');
-            $show->field('updated_at');
-        });
-    }
-
-    /**
-     * Make a form builder.
-     *
-     * @return Form
-     */
-    protected function form()
-    {
-        return Form::make(new Banner(), function (Form $form) {
-            $form->hidden('id');
-            // 市场
-            $marketList = MarketModel::getMarket();
-            $form->select('market_id')->width(4)->options($marketList)->default(0);
-            // 多个市场
-            $form->multipleSelect('market_ids')->options($marketList);
-            $form->select('type')->options(BannerModel::$_type)->required();
-            $form->text('title')->required();
-            $form->text('sub_title');
-            $form->image('cover')->width(2)->required();
-            $form->select('cover_type')->options(BannerModel::$_coverType)->required();
-            $form->text('path')->default('');
-            $form->select('path_type')->options(BannerModel::$_pathType)->default('');
-            $form->number('sort')->width(2)->default(0);
-            
-
-            $form->disableResetButton();
-            $form->disableViewCheck();
-            $form->disableEditingCheck();
-            $form->disableCreatingCheck();
-        });
-    }
-}

app/Admin/Controllers/v3/BannersController.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace App\Admin\Controllers\v3;
+
+use App\Admin\Repositories\v3\Banners;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+use App\Models\ImsCjdcMarket as MarketModel;
+use App\Models\v3\Banners as BannersModel;
+
+class BannersController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Banners(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('market_id')->display(function($markerId){
+                $market = MarketModel::getMarketInfo($markerId,'name');
+                return empty($market) ? '' : $market['name'];
+            });
+            $grid->column('title');
+            $grid->column('cover_url')->image(50);
+            $grid->column('cover_type_text');
+            $grid->column('path');
+            $grid->column('path_type_text');
+            $grid->column('type_text');
+            $grid->column('sort')->sortable();
+            $grid->column('status')->switch();
+            // ->using(BannersModel::$_status)->label(['default' => 'primary',1 => 'primary', 0 => 'danger']);
+            $grid->model()->orderby('id','desc');
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new Banners(), function (Show $show) {
+
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->field('id');
+                $show->width(6)->field('market_id')->as(function ($marketId){
+                    $market = MarketModel::getMarketInfo($marketId,'name');
+                    return empty($market) ? '' : $market->name;
+                });
+                $show->width(6)->field('title');
+                $show->width(6)->field('sub_title');
+                $show->width(6)->field('cover_type_text');
+                $show->width(6)->field('cover')->image();
+                $show->width(6)->field('type_text');
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->field('path_type_text');
+                $show->width(6)->field('path');
+                $show->width(6)->field('status_text');
+                $show->width(6)->field('sort');
+                $show->width(6)->field('created_at');
+                $show->width(6)->field('updated_at');
+            });
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new Banners(), function (Form $form) {
+
+            $form->column(6, function (Form $form) {
+                $form->hidden('id');
+                // 市场
+                $marketList = MarketModel::getMarket();
+                $form->select('market_id')->options($marketList)->default(0);
+                // 多个市场
+                $form->multipleSelect('market_ids')->options($marketList);
+                $form->select('type')->options(BannersModel::$_type)->required();
+                $form->text('title')->required();
+                $form->text('sub_title');
+                $form->number('sort')->default(0);
+                $form->switch('status')
+                    ->customFormat(function ($v) {
+                        return $v == '正常' ? 1 : 0;
+                    })
+                    ->saving(function ($v) {
+                        return $v;
+                    });
+            });
+            $form->column(6, function (Form $form) {
+                $form->image('cover')->required();
+                $form->select('cover_type')->options(BannersModel::$_coverType)->required();
+                $form->text('path')->default('');
+                $form->select('path_type')->options(BannersModel::$_pathType)->default('');
+            });
+
+            $form->disableResetButton();
+            $form->disableViewCheck();
+            $form->disableEditingCheck();
+            $form->disableCreatingCheck();
+        });
+    }
+}

app/Admin/Controllers/v3/GoodsController.php

@@ -59,28 +59,65 @@ class GoodsController extends AdminController
      */
     protected function detail($id)
     {
+        // $g = GoodsModel::find(1572);
+        // dd($g->toArray());
         return Show::make($id, new Goods(), function (Show $show) {
-            $show->id;
-            $show->name;
-            $show->type_id;
-            $show->store_id;
-            $show->cover_img;
-            $show->price;
-            $show->original_price;
-            $show->vip_price;
-            $show->on_sale;
-            $show->inventory;
-            $show->content;
-            $show->sort;
-            $show->restrict_num;
-            $show->start_num;
-            $show->is_infinite;
-            $show->good_unit;
-            $show->tags;
-            $show->details_imgs;
-            $show->spec;
-            $show->created_at;
-            $show->updated_at;
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->field('id');
+                $show->width(6)->field('name');
+                $show->width(6)->category_id->as(function ($categoryId){
+                    $item = CategoryModel::getCategoryInfo($categoryId,'title');
+                    return empty($item) ? '' : $item->title;
+                });
+                $show->width(6)->store_id->as(function ($storeId){
+                    $item = StoreModel::getStoreInfo($storeId,'name');
+                    return empty($item) ? '' : $item->name;
+                });
+                $show->width(6)->cover_img->image();
+                $show->width(6)->price;
+                $show->width(6)->original_price;
+                $show->width(6)->vip_price;
+                $show->width(6)->inventory;
+                $show->width(6)->good_unit;
+
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->on_sale_text;
+                $show->width(6)->content;
+                $show->width(6)->sort;
+                $show->width(6)->restrict_num;
+                $show->width(6)->start_num;
+                $show->width(6)->is_infinite_text;
+
+                $show->width(6)->tags->as(function ($value){
+                    return $value;
+                });
+                $show->width(6)->spec->as(function ($value){
+                    $text = '';
+                    foreach ($value as $v){
+                        $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                    }
+                    return $text;
+                });
+                $goodsModel = new GoodsModel();
+                $show->html(function () use($goodsModel){
+                    if(empty($this->details_imgs)){
+                        return '';
+                    }else{
+                        // 还需要优化
+                        $value = $this->details_imgs;
+                        $text = '';
+                        foreach ($value as $v){
+                            $img = $goodsModel->imageUrl($v);
+                            $text .= "<img src='$img' />";
+                        }
+                        return $text;
+                    }
+                });
+
+                // $show->created_at;
+                // $show->updated_at;
+            });
         });
     }
 
@@ -96,7 +133,7 @@ class GoodsController extends AdminController
         return Form::make($builder, function (Form $form) {
             $form->hidden('id');
 
-            // 二级分类 
+            // 二级分类
             $categoryList = CategoryModel::getCategoryArray([['parent_id','>',0]]);
             // 店铺
             $storeList = StoreModel::getStoreArray();
@@ -116,7 +153,7 @@ class GoodsController extends AdminController
                 $form->currency('original_price')->required()->floatTwo()->symbol('￥');
                 $form->currency('vip_price')->required()->floatTwo()->symbol('￥');
                 $form->text('good_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
-                $form->radio('is_infinite')->options([1=>'开启',2=>'关闭'])->default(1);
+                $form->radio('is_infinite')->options(['关闭','开启'])->default(1);
                 $form->number('inventory')->required()->attribute('min', 1)->default(1);
                 $form->number('restrict_num')->attribute('min', 0)->default(0)->help('0表示不限购');
                 $form->number('start_num')->attribute('min', 1)->default(1);

app/Admin/Controllers/v3/StoreController.php

@@ -65,39 +65,57 @@ class StoreController extends AdminController
     protected function detail($id)
     {
         return Show::make($id, new Store(), function (Show $show) {
-            $show->id;
-            $show->mm_user_id;
-            $show->market_id;
-            $show->name;
-            $show->address;
-
-            $show->tel;
-            $show->announcement;
-            $show->is_rest;
-            $show->logo;
-            $show->details;
-            $show->coordinates;
-            $show->business_license;
-            $show->store_type_id;
-            $show->is_open;
-            $show->sort;
-            $show->user_id;
-            $show->environment;
-            $show->expire_time;
-            $show->zm_img;
-            $show->fm_img;
-            $show->link_name;
-            $show->link_tel;
-            $show->admin_id;
-            $show->loudspeaker_imei;
-
-            $show->time;
-            $show->time2;
-            $show->time3;
-            $show->time4;
-
-            $show->created_at;
-            $show->updated_at;
+
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->id;
+                $show->width(6)->mm_user_id->as(function ($mmUserId){
+                    $item = MminfoModel::getMmInfo($mmUserId,'name');
+                    return empty($item) ? '' : $item->name;
+                });
+                $show->width(6)->market_id->as(function ($marketId){
+                    $item = MarketModel::getMarketInfo($marketId,'name');
+                    return empty($item) ? '' : $item->name;
+                });
+                $show->width(6)->category_id->as(function ($categoryId){
+                    $item = CategoryModel::getCategoryInfo($categoryId,'title');
+                    return empty($item) ? '' : $item->title;
+                });
+                $show->width(6)->name;
+                $show->width(6)->logo->image();
+                $show->width(6)->user_id->as(function ($userId){
+                    $item = UserModel::getUserInfo($userId,'nick_name');
+                    return empty($item) ? '' : $item->nick_name;
+                });
+                $show->width(6)->admin_id->as(function ($userId){
+                    $item = UserModel::getUserInfo($userId,'nick_name');
+                    return empty($item) ? '' : $item->nick_name;
+                });
+                $show->width(6)->business_license->image();
+                $show->width(6)->zm_img->image();
+                $show->width(6)->fm_img->image();
+                $show->width(6)->tel;
+                $show->width(6)->link_name;
+                $show->width(6)->link_tel;
+                $show->width(6)->time;
+                $show->width(6)->time2;
+                $show->width(6)->time3;
+                $show->width(6)->time4;
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(6)->announcement;
+                $show->width(6)->address;
+                $show->width(6)->coordinates;
+
+                $show->width(6)->is_rest_text;
+                $show->width(6)->is_open_text;
+                $show->width(6)->sort;
+                // $show->width(6)->environment;
+                $show->width(6)->expire_time;
+                $show->width(6)->loudspeaker_imei;
+            });
+
+            // $show->created_at;
+            // $show->updated_at;
         });
     }
 
@@ -145,12 +163,12 @@ class StoreController extends AdminController
                     })->default(1);
                 $form->text('address');
             });
-            $form->column(6, function (Form $form) {
+            $form->column(6, function (Form $form) use($userList){
                 $form->image('business_license')->required();
                 $form->image('zm_img')->required();
                 $form->image('fm_img')->required();
-                $form->text('admin_id')->required();/*需要优化 一个用户只能绑定一家店铺*/
-                $form->text('user_id')->required();/*需要优化 一个用户只能绑定一家店铺*/
+                $form->select('admin_id')->options($userList)->required();/*需要优化 一个用户只能绑定一家店铺*/
+                $form->select('user_id')->options($userList)->required();/*需要优化 一个用户只能绑定一家店铺*/
                 $form->timeRange('time1','time2','营业时间段一')->required();
                 $form->timeRange('time3','time4','营业时间段二');
             });

app/Admin/Repositories/v3/Banner.php → app/Admin/Repositories/v3/Banners.php

@@ -2,10 +2,10 @@
 
 namespace App\Admin\Repositories\v3;
 
-use App\Models\v3\Banner as Model;
+use App\Models\v3\Banners as Model;
 use Dcat\Admin\Repositories\EloquentRepository;
 
-class Banner extends EloquentRepository
+class Banners extends EloquentRepository
 {
     /**
      * Model.

app/Admin/routes.php

@@ -53,7 +53,7 @@ Route::group([
     // 商品
     $router->resource('/goods', 'v3\GoodsController');
     // banner
-    $router->resource('/banner', 'v3\BannerController');
+    $router->resource('/banners', 'v3\BannersController');
 	$router->any('/test', 'Test@test');
 });
 

app/Models/v3/Banner.php → app/Models/v3/Banners.php

@@ -6,7 +6,7 @@ use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
 
-class Banner extends Model
+class Banners extends Model
 {
 	use HasDateTimeFormatter;
     use SoftDeletes;
@@ -16,6 +16,10 @@ class Banner extends Model
 
     protected $appends = [
         'cover_url',
+        'cover_type_text',
+        'path_type_text',
+        'type_text',
+        'status_text'
     ];
     protected $casts = [
         'market_ids'=>'array',
@@ -32,6 +36,26 @@ class Banner extends Model
         return $this->imageUrl($value);
     }
 
+    public function getCoverTypeTextAttribute($value)
+    {
+        $value = $value ? $value : $this->cover_type;
+        return isset(self::$_coverType[$value]) ? self::$_coverType[$value] : '';
+    }
+    public function getPathTypeTextAttribute($value)
+    {
+        $value = $value ? $value : $this->path_type;
+        return isset(self::$_pathType[$value]) ? self::$_pathType[$value] : '';
+    }
+    public function getTypeTextAttribute($value)
+    {
+        $value = $value ? $value : $this->type;
+        return isset(self::$_type[$value]) ? self::$_type[$value] : '';
+    }
+    public function getStatusTextAttribute($value)
+    {
+        $value = $value ? $value : $this->stauts;
+        return isset(self::$_status[$value]) ? self::$_status[$value] : '';
+    }
     /**
      * 处理旧图片
      * @param $value

app/Models/v3/Goods.php

@@ -15,6 +15,8 @@ class Goods extends Model
     protected $dateFormat = 'U';
     protected $appends = [
         'cover_img_url',
+        'on_sale_text',
+        'is_infinite_text'
     ];
 
     protected $casts = [
@@ -23,12 +25,24 @@ class Goods extends Model
         'spec'=>'array',
     ];
 
+    public static $_onSale = ['否','是'];
+    public static $_isInfinite = ['关闭','开启'];
+
     public function getCoverImgUrlAttribute($value)
     {
         $value = $value ? $value : $this->cover_img;
         return $this->imageUrl($value);
     }
-
+    public function getOnSaleTextAttribute($value)
+    {
+        $value = $value ? $value : $this->on_sale;
+        return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : '';
+    }
+    public function getIsInfiniteTextAttribute($value)
+    {
+        $value = $value ? $value : $this->is_infinite;
+        return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
+    }
     public function ImageBanners(){
         return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',1);
     }

app/Models/v3/GoodsBanners.php

@@ -11,7 +11,7 @@ class GoodsBanners extends Model
     use HasDateTimeFormatter;
     use SoftDeletes;
 
-    protected $table = 'lanzu_goods_banner';
+    protected $table = 'lanzu_goods_banners';
     protected $dateFormat = 'U';
     protected $fillable = ['path', 'id', 'goods_id','type','url'];
 

app/Models/v3/Store.php

@@ -16,14 +16,30 @@ class Store extends Model
 
     protected $appends = [
         'logo_url',
+        'is_rest_text',
+        'is_open_text'
     ];
 
+    public static $_isRest= ['否','是'];
+    public static $_isOpen = ['关闭','开启'];
+
     public function getLogoUrlAttribute($value)
     {
         $value = $value ? $value : $this->logo;
         return $this->imageUrl($value);
     }
-  
+
+    public function getIsRestTextAttribute($value)
+    {
+        $value = $value ? $value : $this->is_rest;
+        return isset(self::$_onRest[$value]) ? self::$_onRest[$value] : '';
+    }
+    public function getIsOpenTextAttribute($value)
+    {
+        $value = $value ? $value : $this->is_iopen;
+        return isset(self::$_isOpen[$value]) ? self::$_isOpen[$value] : '';
+    }
+
     /**
      * 获取商家环境图片
      * @param $value $this->environment

resources/lang/zh-CN/banner.php → resources/lang/zh-CN/banners.php

@@ -1,8 +1,8 @@
-<?php 
+<?php
 return [
     'labels' => [
-        'Banner' => '横幅管理',
-        'banner' => '横幅管理',
+        'Banners' => '横幅管理',
+        'banners' => '横幅管理',
     ],
     'fields' => [
         'market_id' => '市场',
@@ -12,11 +12,15 @@ return [
         'cover' => '封面图',
         'cover_url' => '封面图',
         'cover_type' => '封面类型',
+        'cover_type_text' => '封面类型',
         'path' => '链接',
         'path_type' => '链接类型',
+        'path_type_text' => '链接类型',
         'sort' => '排序',
         'status' => '状态',
+        'status_text' => '状态',
         'type' => '位置',
+        'type_text' => '位置',
     ],
     'options' => [
     ],

resources/lang/zh-CN/goods.php

@@ -17,12 +17,14 @@ return [
         'original_price' => '原价',
         'vip_price' => '会员价',
         'on_sale' => '是否上架',
+        'on_sale_text' => '是否上架',
         'inventory' => '库存',
         'content' => '简介',
         'sort' => '排序',
         'restrict_num' => '限购份数',
         'start_num' => '起售份数',
         'is_infinite' => '开启无限库存',
+        'is_infinite_text' => '开启无限库存',
         'good_unit' => '商品单位',
         'tags' => '标签',
         'details_imgs' => '详情图片',

resources/lang/zh-CN/store.php

@@ -16,6 +16,7 @@ return [
         'tel' => '电话（座机）',
         'announcement' => '公告',
         'is_rest' => '是否休息',
+        'is_rest_text' => '是否休息',
         'logo' => 'logo',
         'logo_url' => 'logo',
         'introduction' => '商家简介',
@@ -24,6 +25,7 @@ return [
         'category_id' => '店铺所属分类',
         'category_name' => '店铺分类',
         'is_open' => '开启门店',
+        'is_open_text' => '开启门店',
         'sort' => '排序',
         'user_id' => '提现用户',
         'environment' => '商家环境',