From b67260cc71606e051104395ec2150b3aacf805df Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Tue, 15 Sep 2020 17:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E8=A3=81=E5=89=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/StoreController.php | 36 ++++----------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php
index 8f1917c..6ed6431 100644
--- a/app/Admin/Controllers/v3/StoreController.php
+++ b/app/Admin/Controllers/v3/StoreController.php
@@ -49,7 +49,7 @@ 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 src='$path' style='width:50px;' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
+                $img = "<img src='$path' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
 
                 return $img;
             });
@@ -58,7 +58,7 @@ class StoreController extends AdminController
                 $id = $this->id;
                 $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 src='$path' style='width:50px;' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
+                $img = "<img src='$path' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
 
                 return $img;
             });
@@ -105,10 +105,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){
@@ -123,30 +119,12 @@ class StoreController extends AdminController
                 $show->width(6)->zm_img->image();
                 $show->width(6)->fm_img->image();
 
-                $id = 380;
-                $storeAppletImg = '380';
-                $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg';
-                $path = empty($storeAppletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/';
-                // $img = "<img src='$path' style='width:50px;' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
-                $show->store_applet_img->image($path);
-                // ->as(function($appletImg){
-                //     $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 src='$path' style='width:50px;' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
-    
-                //     return $img;
-                // });
-                $cashCodeImg = '';
-                $show->cash_code_img->as(function($appletImg){
-                    $id = $this->id;
-                    $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 src='$path' style='width:50px;' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
-    
-                    return $img;
+                $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;