Browse Source

排序修改

moshaorui 4 months ago
parent
commit
6441b0280d

+ 2 - 4
app/Admin/Controllers/BaseProductCategoryController.php

@@ -70,7 +70,6 @@ class BaseProductCategoryController extends AdminController
     protected function form()
     {
         return Form::make(new BaseProductCategory(), function (Form $form) {
-            $form->display('id', 'ID');
             $form->select('parent_id', admin_trans_field('parent'))
                 ->options(BaseProductCategory::selectMainOptions(function ($query) {
                     // 在这里定义查询条件
@@ -82,9 +81,8 @@ class BaseProductCategoryController extends AdminController
             $form->text('name')->required();
             $form->select('parameter_id', admin_trans_field('parameter_name'))->options(BaseProductParameter::selectOptions())->required();
             $form->number('order')
-                ->default(100)
-                ->rules('numeric')
-                ->help(admin_trans_label('order_tips')); // 添加备注
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(1);
           //  $form->display('created_at');
           //  $form->display('updated_at');

+ 12 - 4
app/Admin/Controllers/BaseProductController.php

@@ -16,10 +16,16 @@ use Illuminate\Http\Request;
 use App\Libraries\CommonHelper;
 class BaseProductController extends AdminController
 {
+
+    public function title()
+    {
+        return admin_trans( 'admin.products_list');
+    }
+
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.products_list'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -48,7 +54,7 @@ class BaseProductController extends AdminController
                 $dataImages = array_slice($dataImages, 0, 2);
                 return CommonHelper::displayImage($dataImages,100);
             });
-            $grid->column('order')->orderable();
+            $grid->column('order');
             $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
@@ -63,7 +69,7 @@ class BaseProductController extends AdminController
                 $filter->equal('enabled')->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
+            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc')->orderBy('id','desc');
         });
     }
 
@@ -124,7 +130,6 @@ class BaseProductController extends AdminController
     protected function form()
     {
         return Form::make(BaseProduct::with('images'), function (Form $form) {
-            $form->display('id');
             $form->select('category_id', admin_trans_label('category_name'))
                 ->options(BaseProductCategory::selectOptions())
                 ->required();
@@ -156,6 +161,9 @@ class BaseProductController extends AdminController
                 });
             $form->editor('content');
             $form->switch('is_pinned')->default(0);
+            $form->number('order')
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(1);
 
             $form->radio('visibility')->when(1,function (Form $form) {

+ 8 - 6
app/Admin/Controllers/BaseProductParameterController.php

@@ -34,7 +34,7 @@ class BaseProductParameterController extends AdminController
             $grid->paginate(config('admin.per_page'));
             $grid->column('id','ID')->sortable();
             $grid->column('name');
-            $grid->column('order')->orderable();
+            $grid->column('order');
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -52,7 +52,7 @@ class BaseProductParameterController extends AdminController
             $grid->disableEditButton();
             //$grid->quickSearch('name');
             //排序
-            $grid->model()->orderBy("order",'asc')->orderBy('id', 'asc');
+            $grid->model()->orderBy("order",'desc')->orderBy('id', 'desc');
         });
     }
 
@@ -65,14 +65,16 @@ class BaseProductParameterController extends AdminController
     protected function form()
     {
         return Form::make(new BaseProductParameter(), function (Form $form) {
-            $form->display('id');
             $form->text('name')->required();
-            $form->table('content',admin_trans_field('parameter_name'), function (NestedForm $table) {
+            $form->table('content',admin_trans_label('attribute'), function (NestedForm $table) {
                 $table->text('key')->required();
                 $table->text('value')->required();
-            })->default([
-                ['key' => 'color', 'value' => 'white'],
+            })->setLabelClass('control-label')->default([
+                ['key' => '', 'value' => ''],
             ]);
+            $form->number('order')
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(1);
         });
     }

+ 11 - 11
app/Admin/Controllers/BaseVideoCategoryController.php

@@ -13,13 +13,17 @@ use Dcat\Admin\Admin;
 
 class BaseVideoCategoryController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.video_category');
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.video_category'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -38,7 +42,7 @@ class BaseVideoCategoryController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('name');
             //$grid->column('parent_id');
-            $grid->column('order')->orderable();
+            $grid->column('order');
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -56,7 +60,7 @@ class BaseVideoCategoryController extends AdminController
             $grid->enableDialogCreate();
             $grid->disableEditButton();
             //排序
-            $grid->model()->orderBy('order', 'asc');
+            $grid->model()->orderBy('order', 'desc')->orderBy('id','desc');
         });
     }
 
@@ -68,15 +72,11 @@ class BaseVideoCategoryController extends AdminController
     protected function form()
     {
         return Form::make(new BaseVideoCategory(), function (Form $form) {
-            $form->display('id');
+            //$form->display('id');
             $form->text('name');
-            /*
-            $form->select('parent_id', admin_trans_field('parent'))
-                ->options(BaseVideoCategory::selectOptions())
-                ->saving(function ($v) {
-                    return (int) $v;
-                });
-            */
+            $form->number('order')
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(1);
         });
     }

+ 12 - 4
app/Admin/Controllers/BaseVideoController.php

@@ -14,13 +14,17 @@ use Dcat\Admin\Layout\Content;
 
 class BaseVideoController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.video_list');
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.video_list'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -44,7 +48,7 @@ class BaseVideoController extends AdminController
                 $dataImages = [$image];
                 return CommonHelper::displayImage($dataImages,100);
             });
-            $grid->column('order')->orderable();
+            $grid->column('order');
             $grid->column('is_pinned')->switch();
             $grid->column('enabled')->switch();
             $grid->column('created_at');
@@ -59,7 +63,7 @@ class BaseVideoController extends AdminController
                 $filter->equal('enabled', admin_trans_label('enabled'))->select(admin_trans_array(config('dictionary.enabled')))->width(2);
             });
             //排序
-            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc');
+            $grid->model()->orderBy("is_pinned",'desc')->orderBy("order",'desc')->orderBy('id','desc');
             //按钮
         });
     }
@@ -103,6 +107,7 @@ class BaseVideoController extends AdminController
                 return $html;
             })->unescape();
             $show->field('remark')->unescape();
+            $show->field('order');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
@@ -117,7 +122,7 @@ class BaseVideoController extends AdminController
     protected function form()
     {
         return Form::make(new BaseVideo(), function (Form $form) {
-            $form->display('id');
+            //$form->display('id');
             $form->text('title')->required();
             $form->select('category_id', admin_trans_field('category_name'))
                 ->options(BaseVideoCategory::selectOptions())
@@ -131,6 +136,9 @@ class BaseVideoController extends AdminController
             $form->url("video_url")->required();
             $form->editor('remark');
             $form->switch('is_pinned')->default(0);
+            $form->number('order')
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(1);
         });
     }

+ 8 - 116
app/Admin/Controllers/DistAdminDistributorController.php

@@ -17,13 +17,17 @@ use Illuminate\Support\Facades\DB;
 
 class DistAdminDistributorController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.distro_list');
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.distro_management'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -90,46 +94,10 @@ class DistAdminDistributorController extends AdminController
             $show->field('dist_contact_number',admin_trans_label('contact_number'));
             $show->field('secondary_domain');
             $show->field('country');
+            $show->field('address');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
-            /*
-            $show->field('company_name');
-            $show->field('company_address');
-            $show->field('site_name');
-            $show->field('logo')->as(function ($image) {
-                // 开始生成 HTML
-                $dataImages = [$image];
-                return CommonHelper::displayImage($dataImages,100);
-            })->unescape();
-            $show->field('domain_type',admin_trans_label('domain'))->as(function ($domainType) {
-                $title = "";
-                if ($domainType == 0) {
-                    $title = $this->secondary_domain;
-                } else {
-                    $title = $this->custom_domain;
-                }
-                return "<span style='color:#586cb1'>$title</span>";
-            })->unescape();
-            $show->field('appearance.title' ,admin_trans_field('appearance'));
-            $show->field('country');
-            $show->field('contact_number');
-            $show->field('service_hotline');
-            $show->field('whats_app');
-            $show->field('facebook');
-            $show->field('instagram');
-            $show->field('youtube');
-            $show->field('linkedin');
-            $show->field('tiktok');
-            $show->field('remark');
-            $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
-            $show->field('created_at');
-            $show->field('updated_at');
-            $show->field('copy_right');
-            $show->field('seo_title');
-            $show->field('seo_keywords');
-            $show->field('seo_description');
-            */
             // 按钮
             $show->disableDeleteButton();
 
@@ -151,86 +119,10 @@ class DistAdminDistributorController extends AdminController
                 ->required()
                 ->help('Please enter the domain name, such as demo.'.env('TOP_DOMAIN'));
             $form->text('country')->width(9,3)->required();
+            $form->text('address')->width(9,3);
             $form->switch('enabled')->width(9,3)->default(1);
-            /*
-            $form->text('company_name')->width(9,3)->required();
-            $form->text('company_address',)->width(9,3);
-            $form->text('site_name')->width(9,3)->required();
-            $form->image("logo")
-                ->autoUpload()
-                ->uniqueName()
-                ->accept(config('distributor.upload.oss_image.accept'))
-                ->maxSize(config('distributor.upload.oss_image.max_size'))
-                ->dir(config("distributor.upload.directory.image").'/logo')
-                ->width(9,3);
-            $form->radio('domain_type')
-                ->width(9,3)
-                ->when(0, function (Form $form) {
-                    $form->text('secondary_domain')->width(9,3)->help('Please enter the domain name, such as demo.'.env('TOP_DOMAIN'));
-                })
-                ->when(1, function (Form $form) {
-                    $form->text('custom_domain')->width(9,3)->help('Please enter the domain name, such as www.example.com,and bind the domain name to the IP address '.env('DIST_SITE_IP'));
-                })
-                ->default(0)
-                ->options([0=>'second-level domain',1=>'custom domain'])
-                ->required();
-            $form->select('appearance_id',admin_trans_field('appearance'))->width(9,3)->options(DistAppearance::selectOptions())->required();
-            $form->text('country')->width(9,3)->required();
-            $form->text('contact_number')->width(9,3);
-            $form->text('service_hotline')->width(9,3);
-            $form->text('whats_app')->width(9,3);
-            $form->text('facebook')->width(9,3);
-            $form->text('instagram')->width(9,3);
-            $form->text('youtube')->width(9,3);
-            $form->text('linkedin')->width(9,3);
-            $form->text('tiktok')->width(9,3);
-            $form->textarea('remark')->width(9,3);
-            $form->switch('enabled')->width(9,3)->default(1);
-            $form->text('copy_right')->width(9,3);
-            $form->text('seo_title')->width(9,3)->required();
-            $form->text('seo_keywords')->width(9,3);
-            $form->textarea('seo_description')->width(9,3);
-            */
-
-            //保存前回调
-//            $form->saving(function (Form $form) {
-//                if (!$form->isCreating()) {
-//                    //如果appearance_id有变化,则更新模版与变量
-//                    if ($form->model()->appearance_id != $form->input('appearance_id')) {
-//                        $id = $form->model()->id;
-//                        //更新模版与变量
-//                        DistAppearance::switchTheme($form->input('appearance_id'), $id);
-//                    }
-//                }
-//            });
-            //保存后回调
-//            $form->saved(function (Form $form, $result) {
-//                if ($form->isCreating()) {
-//                    //创建后创建默认分类
-//                    $newId = $form->getKey();
-//                    $appearanceId = $form->input('appearance_id');
-//                    //初始化分销商
-//                    DistAdminDistributor::initDist($appearanceId,$newId);
-//                    //更新模版与变量
-//                    DistAppearance::switchTheme($appearanceId, $newId);
-//                }
-//            });
         });
     }
 
-    /*
-     * 新增事件事务
-     */
-//    public function store()
-//    {
-//        try {
-//            DB::beginTransaction();
-//            $result =  parent::store();
-//            DB::commit();
-//            return $result;
-//        } catch (\Exception $e) {
-//            DB::rollBack();
-//            throw $e;
-//        }
-//    }
+
 }

+ 5 - 1
app/Admin/Controllers/DistAdminUserController.php

@@ -13,13 +13,17 @@ use Dcat\Admin\Layout\Content;
 
 class DistAdminUserController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.distro_user');
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.users_management'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());

+ 11 - 2
app/Admin/Controllers/DistAppearanceController.php

@@ -14,13 +14,17 @@ use Dcat\Admin\Admin;
 
 class DistAppearanceController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.template_list');
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.appearance'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
@@ -47,7 +51,7 @@ class DistAppearanceController extends AdminController
                 return CommonHelper::displayImage($dataImages,100);
             });
             // 排序
-            $grid->column('order')->orderable();
+            $grid->column('order');
             //是否导入
             $grid->column('imported')->using(config('dictionary.whether'))->label([
                 0 => 'default',
@@ -70,6 +74,7 @@ class DistAppearanceController extends AdminController
                 $actions->disableDelete();
                 $actions->append(new AppearanceImport());
             });
+            $grid->model()->orderBy('order', 'desc')->orderBy('id', 'desc');
         });
     }
 
@@ -92,6 +97,7 @@ class DistAppearanceController extends AdminController
                 return CommonHelper::displayImage($dataImages,100);
             })->unescape();
             $show->field('describe');
+            $show->field('order');
             $show->field('enabled')->using(admin_trans_array(config('dictionary.enabled')));
             $show->field('created_at');
             $show->field('updated_at');
@@ -117,6 +123,9 @@ class DistAppearanceController extends AdminController
                 ->maxSize(config('admin.upload.oss_image.max_size'))
                 ->dir(config("admin.upload.directory.image").'/appearance/'.date("Ymd"));//
             $form->textarea('describe');
+            $form->number('order')
+                ->default(0)
+                ->rules('numeric');
             $form->switch('enabled')->default(0);
             $form->saving(function (Form $form) {
                 if ($form->isCreating() && $form->input('enabled') == 1) {

+ 6 - 1
app/Admin/Controllers/DistInquiryController.php

@@ -13,13 +13,18 @@ use App\Admin\Actions\Grid\InquiryAssignment;
 
 class DistInquiryController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans( 'admin.inquiry_list');
+    }
+
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header(admin_trans( 'admin.inquiry_management'))
+            ->header($this->title())
             ->description('')
             ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());

+ 1 - 1
app/Admin/Controllers/DistSiteController.php

@@ -147,7 +147,6 @@ class DistSiteController extends AdminController
                     ->maxSize(config('distributor.upload.oss_image.max_size'))
                     ->dir(config("distributor.upload.directory.image").'/logo')
                     ->width(4,3);
-                $form->textarea('statistics_js')->width(9,3);
             });
             $form->column(6, function (Form $form) {
                 $form->text('company_name')->width(9,3);
@@ -160,6 +159,7 @@ class DistSiteController extends AdminController
                 $form->text('linkedin')->width(9,3);
                 $form->text('tiktok')->width(9,3);
                 $form->text('copy_right')->width(9,3);
+                $form->textarea('statistics_js')->width(9,3);
             });
             //保存前回调
             $form->saving(function (Form $form) {

+ 1 - 2
app/Admin/Controllers/HomeController.php

@@ -22,10 +22,9 @@ class HomeController extends Controller
     public function index(Content $content)
     {
 
-        $alert = Alert::make('','Welcome to Mietubl');
                 $content =  $content
                     ->view('admin.layouts.content')
-                    ->header('Prime Admin')
+                    ->header(' ')
                     ->description('')
                    // ->row($alert->info())
                     ->row(function (Row $row) {

+ 1 - 1
app/Admin/Repositories/BaseProductCategory.php

@@ -83,7 +83,7 @@ class BaseProductCategory extends EloquentRepository
         // 获取模型对象
         $obj = $this->model();
         // 获取数据
-        $tree = $obj->orderBy('order', 'asc')->get();
+        $tree = $obj->orderBy('order', 'desc')->orderBy('id', 'desc')->get();
 
         // 构建树形结构
         $data=buildTree($tree->toArray());

+ 1 - 2
app/Distributor/Controllers/HomeController.php

@@ -15,8 +15,7 @@ class HomeController extends Controller
     {
         return $content
             ->view('distributor.layouts.content')
-            ->header('Dashboard')
-            ->description('Description...')
+            ->header(' ')
             ->body(function (Row $row) {
                 $row->column(12, function (Column $column) {
                    $column->row(Dashboard::title());

+ 1 - 1
app/Models/BaseProduct.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
 use Spatie\EloquentSortable\Sortable;
 use Spatie\EloquentSortable\SortableTrait;
 
-class BaseProduct extends Model implements Sortable
+class BaseProduct extends Model
 {
     use HasDateTimeFormatter;
     use SortableTraitPinned;

+ 1 - 1
app/Models/BaseProductParameter.php

@@ -11,7 +11,7 @@ use Spatie\EloquentSortable\Sortable;
 use Spatie\EloquentSortable\SortableTrait;
 use Illuminate\Database\Eloquent\Builder;
 
-class BaseProductParameter extends Model implements Sortable
+class BaseProductParameter extends Model
 {
     use SortableTrait;
 

+ 1 - 1
app/Models/BaseVideo.php

@@ -9,7 +9,7 @@ use Spatie\EloquentSortable\Sortable;
 use Spatie\EloquentSortable\SortableTrait;
 use App\Traits\SortableTraitPinned;
 
-class BaseVideo extends Model implements Sortable
+class BaseVideo extends Model
 {
 	use HasDateTimeFormatter;
     use SortableTraitPinned;

+ 1 - 1
app/Models/BaseVideoCategory.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Traits\ModelTree;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\EloquentSortable\Sortable;
 
-class BaseVideoCategory extends Model implements Sortable
+class BaseVideoCategory extends Model
 {
     use HasDateTimeFormatter,
         ModelTree {

+ 1 - 1
app/Models/DistAppearance.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
 use Spatie\EloquentSortable\Sortable;
 use Spatie\EloquentSortable\SortableTrait;
 
-class DistAppearance extends Model implements Sortable
+class DistAppearance extends Model
 {
 	use HasDateTimeFormatter;
     use SortableTrait;

+ 5 - 0
lang/zh_CN/admin.php

@@ -249,4 +249,9 @@ return [
     'pages_tag'  => '标签',
     'product_import'  => '产品导入',
     'site_management'  => '站点管理',
+    'template_list' => '模板列表',
+    'distro_list'=> '分销商列表',
+    'distro_user'=> '分销商用户',
+    'inquiry_list' => '询盘列表',
+
 ];

+ 2 - 0
lang/zh_CN/global.php

@@ -86,6 +86,7 @@ return [
         'referer_url'           => '来源URL',
         'file'                  => '文件',
         'statistics_js'         => '统计代码',
+        'address'               => '地址',
     ],
     'labels' => [
         'list'         => '列表',
@@ -157,6 +158,7 @@ return [
         'domain_type'          => '域名类型',
         'custom_domain'        => '自定义域名',
         'secondary_domain'    => '二级域名',
+        'attribute'       => '属性',
     ],
     'options' => [
         //

+ 16 - 7
lang/zh_CN/menu.php

@@ -4,7 +4,7 @@ return [
     'titles' => [
         'index'         => '主页',
         'admin'         => '系统',
-        'users'         => '管理',
+        'users'         => '用户管理',
         'roles'         => '角色',
         'permission'    => '权限',
         'menu'          => '菜单',
@@ -15,19 +15,19 @@ return [
         'icons'         => '图标',
         'products'         => '产品',
         'title'    => '标题',
-        'product_management'    => '产品管理',
+        'product_admin'    => '产品管理',
         'product_category'    => '产品分类',
         'product_parameter'    => '产品参数',
         'video_category'       => '视频分类',
-        'video_management'     => '视频管理',
+        'video_admin'     => '视频管理',
         'import_product'     => '产品导入',
         'base_product'    => '基础产品',
         'template'    => '模板',
         'template_edit'    => '模板编辑',
-        'site_management'    => '站点管理',
-        'distro_management'    => '分销商管理',
-        'users_management'    => '用户管理',
-        'inquiry_management'    => '询价管理',
+        'site_admin'    => '站点管理',
+        'distro_admin'    => '分销商管理',
+        'users_admin'    => '用户管理',
+        'inquiry_admin'    => '询盘管理',
         'appearance'    => '外观',
         'settings'    => '设置',
         'domain'    => '域名',
@@ -39,5 +39,14 @@ return [
         'user_setting' => '用户',
         'information' => '信息',
         'clear_cache' => '清除缓存',
+        'template_list' => '模板列表',
+        'site_list'         =>'站点列表',
+        'distro_list'         =>'分销商列表',
+        'distro_users' => '分销商用户',
+        'product_list' => '产品列表',
+        'product_attribute' => '产品属性',
+        'video_list' => '视频列表',
+        'inquiry_list' => '询盘列表',
+        'password_change' => '密码修改',
     ],
 ];

+ 9 - 1
resources/views/admin/pages-custom/ace.blade.php

@@ -5,6 +5,7 @@
     .left-panel {
         background-color: #fff; /* 左侧面板的背景色 */
         height: 100vh; /* 高度占满 */
+
     }
     .main-panel {
         background-color: #e9ecef; /* 右侧面板的背景色 */
@@ -46,7 +47,14 @@
         max-width: 75%; /* 或其他所需的宽度 */
     }
 
-    field_dist_id. .form-control {
+    .field_dist_id {
+        max-height: 30px;
+        white-space: nowrap; /* 防止文字换行 */
+        overflow: hidden; /* 隐藏超出部分 */
+        text-overflow: ellipsis; /* 显示省略号 */
+    }
+
+    .field_dist_id .form-control {
         height: 17px; /* 设置高度为 17px */
         overflow: hidden; /* 隐藏超出部分 */
         display: flex; /* 使用 flexbox 布局 */

+ 1 - 1
resources/views/admin/partials/alerts.blade.php

@@ -38,4 +38,4 @@
         <h4><i class="icon fa fa-warning"></i> &nbsp;{{ \Illuminate\Support\Arr::get($warning->get('title'), 0) }}</h4>
         <p>{!!  \Illuminate\Support\Arr::get($warning->get('message'), 0) !!}</p>
     </div>
-@endif
+@endif

+ 2 - 0
resources/views/admin/partials/breadcrumb.blade.php

@@ -29,6 +29,7 @@
     <div class="breadcrumb-wrapper col-12">
     <ol class="breadcrumb float-right text-capitalize">
         <li class="breadcrumb-item"><a href="{{ admin_url('/') }}"><i class="fa fa-dashboard"></i> {{admin_trans('admin.home')}}</a></li>
+        <!--
         @for($i = 2; $i <= ($len = count(Request::segments())); $i++)
             <li class="breadcrumb-item">
                 @if($i == $len) <a href=""> @endif
@@ -36,6 +37,7 @@
                 @if($i == $len) </a> @endif
             </li>
         @endfor
+        -->
     </ol>
     </div>
 @endif

+ 1 - 1
resources/views/distributor/dashboard/title.blade.php

@@ -29,7 +29,7 @@
         <div class="text-center ">
 
             <div class="text-center mb-1">
-                <h1 class="mb-3 mt-2 text-white">  Welcome to Mietubl </h1>
+                <h1 class="mb-3 mt-2 text-white">  Welcome to Mietubl Online Marketing System </h1>
 
             </div>
         </div>

+ 2 - 2
resources/views/welcome.blade.php

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Welcome to Mietubl</title>
+    <title>Welcome to Mietubl Online Marketing System</title>
     <style>
         /* 页面基础样式 */
         body {
@@ -53,7 +53,7 @@
 </head>
 <body>
 <div class="container">
-    <h1>Welcome to Mietubl</h1>
+    <h1>Welcome to Mietubl Online Marketing System</h1>
 </div>
 </body>
 </html>