Selaa lähdekoodia

feat: http2https

xiansin 2 vuotta sitten
vanhempi
commit
803a85b69b

+ 2 - 2
server/app/Admin/Controllers/Program/BannerController.php

xqd xqd
@@ -20,7 +20,7 @@ class BannerController extends AdminController
     {
         return Grid::make(new Banner(), function (Grid $grid) {
             $grid->column('id')->sortable();
-            $grid->column('name')->editable();
+//            $grid->column('name')->editable();
             $grid->column('image')->image();
             $grid->column('sort')->editable()->sortable();
             $grid->column('status')->switch('',true);
@@ -58,7 +58,7 @@ class BannerController extends AdminController
     {
         return Form::make(new Banner(), function (Form $form) {
             $form->display('id');
-            $form->text('name');
+//            $form->text('name');
             $form->image('image')
                 ->saveFullUrl()
                 ->uniqueName()->autoUpload()

+ 1 - 1
server/app/Admin/Controllers/Program/HomeColumnController.php

xqd
@@ -46,7 +46,7 @@ class HomeColumnController extends AdminController
 //                ->removable(false)
 //                ->width(4);
             $form->number('sort');
-            $form->switch('status', true);
+            $form->switch('status');
 
 
             $form->disableDeleteButton();

+ 1 - 1
server/app/Admin/Controllers/Program/NavBarController.php

xqd
@@ -47,7 +47,7 @@ class NavBarController extends AdminController
                 ->removable(false)
                 ->width(4)->required();;
             $form->number('sort');
-            $form->switch('status', true);
+            $form->switch('status');
 
             $form->disableDeleteButton();
             $form->disableViewButton();

+ 3 - 1
server/app/Admin/Controllers/Setting/SettingController.php

xqd xqd xqd
@@ -40,6 +40,7 @@ class SettingController extends AdminController
                 $grid->column('name');
                 $grid->column('logo')->image('',150);
                 $grid->column('contact')->editable();
+                $grid->column('is_review')->switch();
             }elseif($this->type == self::TYPE_TIPS){
                 $grid->column('tips')->editable();
             }elseif($this->type == self::TYPE_GOLD){
@@ -107,6 +108,7 @@ class SettingController extends AdminController
                     ->removable(false)
                     ->width(4);
                 $form->text('contact')->minLength(11)->maxLength(11);
+                $form->radio('is_review')->options(config('global.bool_status'))->default(0);
             }elseif($this->type == self::TYPE_TIPS){
                 $form->text('tips');
             }elseif($this->type == self::TYPE_GOLD){
@@ -118,7 +120,7 @@ class SettingController extends AdminController
                 $form->text('recharge_button_txt')->maxLength(10);
                 $form->textarea('recharge_desc');
             } elseif($this->type == self::TYPE_ROLE){
-                $form->radio('vip_role',config('global.vip_role'));;
+                $form->radio('vip_role')->options(config('global.vip_role'))->default(1);
             }
 
             $form->disableViewButton();

+ 6 - 1
server/app/Models/Banner.php

xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Casts\HttpToHttps;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
@@ -37,4 +38,8 @@ class Banner extends Model
 {
 	use HasDateTimeFormatter;
     use SoftDeletes;
-    }
+
+    protected $casts = [
+        'image' => HttpToHttps::class
+    ];
+}

+ 6 - 1
server/app/Models/NavBar.php

xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Casts\HttpToHttps;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
@@ -41,5 +42,9 @@ class NavBar extends Model
     use SoftDeletes;
 
     protected $table = 'nav_bars';
-    
+
+    protected $casts = [
+        'icon' => HttpToHttps::class
+    ];
+
 }

+ 5 - 0
server/app/Models/Setting.php

xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Casts\HttpToHttps;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -44,4 +45,8 @@ use Illuminate\Database\Eloquent\Model;
 class Setting extends Model
 {
     use HasFactory;
+
+    protected $casts = [
+        'recharge_bg_img' => HttpToHttps::class
+    ];
 }

+ 8 - 1
server/app/Models/Tabbar.php

xqd xqd xqd
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Casts\HttpToHttps;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
@@ -12,6 +13,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property int $id
  * @property string $name 名称
  * @property string $icon 图标
+ * @property string $selected_icon 选中图标
  * @property int $sort 排序
  * @property int $type 类型
  * @property int $status 是否启用
@@ -39,4 +41,9 @@ class Tabbar extends Model
 {
 	use HasDateTimeFormatter;
     use SoftDeletes;
-    }
+
+    protected $casts = [
+        'icon' => HttpToHttps::class,
+        'selected_icon' => HttpToHttps::class,
+    ];
+}

+ 1 - 1
server/resources/lang/zh/banner.php

xqd
@@ -7,7 +7,7 @@ return [
     ],
     'fields' => [
         'name' => '名称',
-        'image' => '图',
+        'image' => '轮播图',
         'sort' => '排序',
         'status' => '是否启用',
     ],

+ 1 - 0
server/resources/lang/zh/setting.php

xqd
@@ -20,6 +20,7 @@ return [
         'recharge_button_txt' => '充值按钮文字',
         'recharge_desc' => '充值说明',
         'is_open_sign' => '签到设置',
+        'is_review' => '审核模式',
     ],
     'options' => [
     ],