修改图片上传及显示问题

app/Admin/Controllers/AgentController.php

@@ -34,9 +34,9 @@ class AgentController extends AdminController
             $grid->column('name');
             $grid->column('type')->using(AgentType::array());
             $grid->column('company_name');
-            $grid->column('logo')->image(60, 60);
+            $grid->column('logo')->image('', 60, 60);
             $grid->column('address');
-            $grid->column('license_pic')->image(60, 60);
+            $grid->column('license_pic')->image('', 60, 60);
             $grid->column('director');
             $grid->column('contact_phone');
 			$grid->column('created_at');
@@ -90,9 +90,9 @@ class AgentController extends AdminController
             $show->field('status')->using(UserStatus::array());
 			$show->field('type')->using(AgentType::array());
             $show->field('company_name');
-            $show->field('logo')->image(120, 120);
+            $show->field('logo')->image('', 80, 80);
             $show->field('address');
-            $show->field('license_pic')->image(120, 120);
+            $show->field('license_pic')->image('', 80, 80);
             $show->field('director');
             $show->field('contact_phone');
 			$show->field('agentInfo.about', '关于我们')
@@ -149,9 +149,9 @@ class AgentController extends AdminController
 				->default(AgentType::OPERATOR)
 				->required();
             $form->text('company_name');
-            $form->image('logo');
+            $form->image('logo')->removable(false)->uniqueName();
             $form->text('address');
-            $form->image('license_pic');
+            $form->image('license_pic')->removable(false)->uniqueName();
             $form->text('director');
             $form->text('contact_phone');
 			$form->editor('agentInfo.about', '关于我们');// 隐藏菜单用：->options(['menubar' => false]);

app/Admin/Controllers/GuideController.php

@@ -30,8 +30,8 @@ class GuideController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('username');
             $grid->column('name');
-            $grid->column('photo')->image(60, 60);
-            $grid->column('license_pic')->image(60, 60);
+            $grid->column('photo')->image('', 60, 60);
+            $grid->column('license_pic')->image('', 60, 60);
             $grid->column('contact_phone');
             $grid->column('created_at');
             $grid->column('updated_at');
@@ -78,8 +78,8 @@ class GuideController extends AdminController
             $show->field('username');
             $show->field('name');
             $show->field('status')->using(UserStatus::array());
-            $show->field('photo')->image();
-            $show->field('license_pic')->image();
+            $show->field('photo')->image('', 80, 80);
+            $show->field('license_pic')->image('', 80, 80);
             $show->field('contact_phone');
             $show->field('created_at');
             $show->field('updated_at');
@@ -109,8 +109,8 @@ class GuideController extends AdminController
 			}
 			$form->select('status')->options(UserStatus::array())->default(UserStatus::NORMAL);
             $form->text('name');
-            $form->image('photo');
-            $form->image('license_pic');
+            $form->image('photo')->removable(false)->uniqueName();
+            $form->image('license_pic')->removable(false)->uniqueName();
             $form->text('contact_phone');
         })->saving(function (Form $form) {
         	//判断账号是否唯一

app/Admin/Controllers/OrderController.php

@@ -99,7 +99,7 @@ class OrderController extends AdminController
             $show->field('paid_money');
             $show->field('pay_type')->using(PayType::array());
 			$show->field('title');
-			$show->field('picture')->image(80, 80);
+			$show->field('picture')->image('', 80, 80);
             $show->field('price');
             $show->field('product_id');
 			$show->field('status')->using(OrderStatus::array());

app/Admin/Controllers/ProductController.php

@@ -32,7 +32,7 @@ class ProductController extends AdminController
 
 			$grid->column('id')->sortable();
 			$grid->column('category.name', '分类');
-            $grid->column('picture')->image(60, 60);
+            $grid->column('picture')->image('', 60, 60);
 			$grid->column('title');
 			$grid->column('original_price');
             $grid->column('price');
@@ -80,7 +80,7 @@ class ProductController extends AdminController
             $show->field('id');
             $show->field('category.name', '所属分类');
 			$show->field('title');
-			$show->field('pictures')->image(80, 80);
+			$show->field('pictures')->image('', 80, 80);
             $show->field('original_price');
             $show->field('price');
             $show->field('sale');

app/Admin/Controllers/SupplierController.php

@@ -34,9 +34,9 @@ class SupplierController extends AdminController
             $grid->column('username');
             $grid->column('name');
             $grid->column('company_name');
-            $grid->column('logo')->image(60, 60);
+            $grid->column('logo')->image('', 60, 60);
             $grid->column('address');
-            $grid->column('license_pic')->image(60,60);
+            $grid->column('license_pic')->image('', 60,60);
             $grid->column('director');
             $grid->column('contact_phone');
             $grid->column('created_at');
@@ -84,9 +84,9 @@ class SupplierController extends AdminController
             $show->field('username');
             $show->field('name');
             $show->field('company_name');
-            $show->field('logo')->image(60, 60);
+            $show->field('logo')->image('', 60, 60);
             $show->field('address');
-            $show->field('license_pic')->image(60, 60);
+            $show->field('license_pic')->image('', 60, 60);
             $show->field('director');
             $show->field('contact_phone');
             $show->field('created_at');
@@ -121,9 +121,9 @@ class SupplierController extends AdminController
 				->help('如果禁用供应商将同时<span style="color:#f00;">下架供应商的所有产品</span>，需要供应商手动上架后才能销售，请谨慎！')
 				->required();
             $form->text('company_name');
-            $form->image('logo');
+            $form->image('logo')->removable(false)->uniqueName();
             $form->text('address');
-            $form->image('license_pic');
+            $form->image('license_pic')->removable(false)->uniqueName();
             $form->text('director');
             $form->mobile('contact_phone');
         })->editing(function (Form $form) {

app/Admin/Controllers/UserController.php

@@ -25,7 +25,7 @@ class UserController extends AdminController
 
             $grid->column('id')->sortable();
             $grid->column('agent.name', '所属代理商');
-            $grid->column('avatar')->image(60, 60);
+            $grid->column('avatar')->image('', 60, 60);
             $grid->column('mobile');
             $grid->column('nickname');
             $grid->column('status')->bool();
@@ -55,7 +55,7 @@ class UserController extends AdminController
 
             $show->field('id');
             $show->field('agent.name', '代理商');
-            $show->field('avatar')->image(80, 80);
+            $show->field('avatar')->image('', 80, 80);
             $show->field('mobile');
             $show->field('nickname');
             $show->field('status')->bool();

app/AdminAgent/Controllers/ArticleController.php

@@ -83,7 +83,7 @@ class ArticleController extends AdminController
 			$form->display('id');
             $form->text('author')->default(Admin::user()->name);
             $form->text('title')->required();
-            $form->image('image')->required();
+            $form->image('image')->required()->removable(false)->uniqueName();
             $form->editor('content')->required();
             $form->text('sort')->default(255);
             $form->select('type')->options(['普通列表', '大图显示'])->default(0)->required();

app/AdminAgent/Controllers/OrderController.php

@@ -139,7 +139,7 @@ class OrderController extends AdminController
             $show->field('name');
             $show->field('mobile');
             $show->field('title');
-            $show->field('picture')->image(80, 80);
+            $show->field('picture')->image('', 80, 80);
             $show->field('status')->using(OrderStatus::array());
             $show->field('pay_type')->using(PayType::array());
             $show->field('created_at');

app/AdminAgent/Controllers/UserController.php

@@ -34,7 +34,7 @@ class UserController extends AdminController
 			$grid->model()->where('agent_id', Admin::user()->id);
 
             $grid->column('id')->sortable();
-            $grid->column('avatar')->image(60, 60);
+            $grid->column('avatar')->image('', 60, 60);
             $grid->column('mobile');
             $grid->column('nickname');
             $grid->column('status')->switch()->help('禁用后用户将无法登录');
@@ -68,7 +68,7 @@ class UserController extends AdminController
 			}
 
 			$show->field('id');
-            $show->field('avatar')->image(80, 80);
+            $show->field('avatar')->image('', 80, 80);
             $show->field('mobile');
             $show->field('nickname');
             $show->field('status')->bool();

app/AdminSettled/Controllers/AgentController.php

@@ -68,9 +68,9 @@ class AgentController extends AdminController
 				->default(AgentType::OPERATOR)
 				->required();
             $form->text('company_name')->required();
-            $form->image('logo')->required();
+            $form->image('logo')->required()->removable(false)->uniqueName();
             $form->text('address')->required();
-            $form->image('license_pic')->required();
+            $form->image('license_pic')->required()->removable(false)->uniqueName();
             $form->text('director')->required();
             $form->text('contact_phone')->required();
         })->saving(function (Form $form) {

app/AdminSettled/Controllers/GuideController.php

@@ -58,8 +58,8 @@ class GuideController extends AdminController
 			$form->text('username')->required();
 			$form->text('password')->required();
             $form->text('name')->required();
-            $form->image('photo')->required();
-            $form->image('license_pic')->required();
+            $form->image('photo')->required()->removable(false)->uniqueName();
+            $form->image('license_pic')->required()->removable(false)->uniqueName();
             $form->text('contact_phone')->required();
         })->saving(function (Form $form) {
         	//判断账号是否唯一

app/AdminSettled/Controllers/SupplierController.php

@@ -59,9 +59,9 @@ class SupplierController extends AdminController
 			$form->text('password')->required();
             $form->text('name')->required();
             $form->text('company_name')->required();
-            $form->image('logo');
+            $form->image('logo')->removable(false)->uniqueName();
             $form->text('address')->required();
-            $form->image('license_pic')->required();
+            $form->image('license_pic')->required()->removable(false)->uniqueName();
             $form->text('director')->required();
             $form->text('contact_phone')->required();
         })->saving(function (Form $form) {

app/AdminSupplier/Controllers/AgentController.php

@@ -42,8 +42,8 @@ class AgentController extends AdminController
             $grid->column('address');
 			$grid->column('director');
 			$grid->column('contact_phone');
-			$grid->column('logo')->image(60, 60);
-            $grid->column('license_pic')->image(60, 60);
+			$grid->column('logo')->image('', 60, 60);
+            $grid->column('license_pic')->image('', 60, 60);
             $grid->column('status')->using(UserStatus::array());
             $grid->column('created_at', '注册时间');
 

app/AdminSupplier/Controllers/OrderController.php

@@ -41,7 +41,7 @@ class OrderController extends AdminController
 			$grid->column('id')->sortable();
 			$grid->column('agent.name', '代理商');
 			$grid->column('title');
-			$grid->column('picture')->image(60, 60);
+			$grid->column('picture')->image('', 60, 60);
 			$grid->column('product', '订单信息')
 				->display('查看')
 				->modal('订单信息', function ($modal) {
@@ -111,7 +111,7 @@ class OrderController extends AdminController
 			$show->field('paid_money');
 			$show->field('pay_type')->using(PayType::array());
 			$show->field('title');
-			$show->field('picture')->image(80, 80);
+			$show->field('picture')->image('', 80, 80);
 			$show->field('price');
 			$show->field('product_id');
 			$show->field('status')->using(OrderStatus::array());

app/AdminSupplier/Controllers/ProductController.php

@@ -61,7 +61,7 @@ class ProductController extends AdminController
             $show->field('title');
             $show->field('price');
             $show->field('original_price');
-            $show->field('pictures')->image(80, 80);
+            $show->field('pictures')->image('', 80, 80);
             $show->field('stock');
             $show->field('sale');
             $show->field('status');

app/Http/Controllers/Api/ChannelController.php

@@ -5,6 +5,7 @@ use App\Http\Controllers\Controller;
 use App\Models\AgentProduct;
 use App\Models\Channel;
 use App\Models\UserChannel;
+use Illuminate\Support\Facades\Storage;
 
 /**
  * 频道列表
@@ -21,6 +22,10 @@ class ChannelController extends Controller
 			->orderBy('sort')
 			->orderBy('id')
 			->get(['id', 'pid', 'name', 'icon']);
+		$prefix = Storage::disk('public')->url('');
+		foreach ($list as $k => &$v) {
+			$v->icon = $prefix . $v->icon;
+		}
         return $this->success($list);
     }