diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php
index 28a94ed..892503a 100644
--- a/app/Admin/Controllers/v3/StoreController.php
+++ b/app/Admin/Controllers/v3/StoreController.php
@@ -58,16 +58,16 @@ class StoreController extends AdminController
$id = $this->id;
$oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg';
$path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg;
- $img = "
";
+ $img = "
";
return $img;
});
// ->image('',50);
$grid->cash_code_img->display(function($appletImg){
$id = $this->id;
- $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg';
+ $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize');
$path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg;
- $img = "
";
+ $img = "
";
return $img;
});
@@ -114,10 +114,6 @@ class StoreController extends AdminController
$item = MarketModel::getMarketInfo($marketId,'name');
return empty($item) ? '' : $item->name;
});
- $show->width(6)->category_id->as(function ($categoryId){
- $item = CategoryModel::getInfo($categoryId,'title');
- return empty($item) ? '' : $item->title;
- });
$show->width(6)->name;
$show->width(6)->logo->image();
$show->width(6)->user_id->as(function ($userId){
@@ -131,6 +127,13 @@ class StoreController extends AdminController
$show->width(6)->business_license->image();
$show->width(6)->zm_img->image();
$show->width(6)->fm_img->image();
+
+ $show->store_applet_img->width(6)->image();
+ $show->cash_code_img->width(6)->image();
+ $show->width(6)->category_id->as(function ($categoryId){
+ $item = CategoryModel::getInfo($categoryId,'title');
+ return empty($item) ? '' : $item->title;
+ });
$show->width(6)->tel;
$show->width(6)->link_name;
$show->width(6)->link_tel;
@@ -277,10 +280,10 @@ class StoreController extends AdminController
// 保存图片
$store->store_applet_img = $sRes['status'] ? $sRes['path'] : '';
- $store->cash_code_img = $pRes['status'] ? $pRes['path'] : '';
+ $cashImg = $pRes['status'] ? $pRes['path'] : '';
+ // 保存剪裁图片
+ $store->cash_code_img = $cashImg.config('filesystems.disks.oss.store_image_resize');
$store->save();
- // 剪裁图片
- // $form->image('cash_code_img')->crop(270, 270, [5, 5])->uniqueName();
//店长账号
$storeUsersInfo = StoreUsersModel::where('store_id',$id)->where('user_category',1)->first();
diff --git a/config/filesystems.php b/config/filesystems.php
index 1f00391..ae8a732 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -73,6 +73,7 @@ return [
'buckets'=>[
],
'img_host' => env('OSS_IMG_HOST'),
+ 'store_image_resize' => '?x-oss-process=image/crop,x_5,y_5,w_270,h_270'
],
's3' => [
diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php
index 1b47620..c414316 100644
--- a/resources/lang/zh-CN/store.php
+++ b/resources/lang/zh-CN/store.php
@@ -9,7 +9,7 @@ return [
'market_name' => '所属市场',
'name' => '商家名称',
'address' => '商家地址',
- 'time' => '营业时间',
+ 'time1' => '营业时间',
'time2' => '营业时间',
'time3' => '营业时间',
'time4' => '营业时间',