Merge branch 'refs/heads/master' into stable

.env.dev

@@ -89,4 +89,4 @@ MAIL_CC_ADDRESS=""
 #相册系统RPC调用配置
 ALBUM_RPC_URL=https://album-prime-control.mietubl.com.cn/rpc
 ALBUM_RPC_SECRET=MtbSecretVBUC
-
+ALBUM_OSS_URL=https://mietublcom.oss-cn-hongkong.aliyuncs.com

app/Admin/Controllers/ImportProductController.php

@@ -74,7 +74,7 @@ class ImportProductController extends AdminController
                 $images = json_decode($images);
                 // 限制最多显示2个缩略图
                 $dataImages = array_slice($images, 0, 1);
-                return CommonHelper::displayImage($dataImages,100);
+                return CommonHelper::displayImage($dataImages,100,1024,2);
             });
             if ($lang == 'en') {
                 $grid->column('title_en');
@@ -162,14 +162,14 @@ class ImportProductController extends AdminController
             })->unescape();
             $show->field('cover')->as(function ($images) {
                 $images = json_decode($images);
-                return CommonHelper::displayImage($images,150);
+                return CommonHelper::displayImage($images,150,1024,2);
             })->unescape();
 
             $show->field('en_detail')->as(function ($images) {
                 $images = json_decode($images);
                 $html = '<div style="text-align: center">';
                 foreach ($images as $key => $image) {
-                    $url = CommonHelper::ossUrl($image);
+                    $url = CommonHelper::albumUrl($image);
                     $html .= '<img src="' . $url . '" style="max-width:90%;margin-bottom:10px">';
                 }
                 $html .= '</div>';
@@ -180,7 +180,7 @@ class ImportProductController extends AdminController
                 $images = json_decode($images);
                 $html = '<div style="text-align: center">';
                 foreach ($images as $key => $image) {
-                    $url = CommonHelper::ossUrl($image);
+                    $url = CommonHelper::albumUrl($image);
                     $html .= '<img src="' . $url . '" style="max-width:90%;margin-bottom:10px">';
                 }
                 $html .= '</div>';
@@ -189,22 +189,22 @@ class ImportProductController extends AdminController
 
             $show->field('video')->as(function ($items) {
                 $items = json_decode($items);
-                return CommonHelper::displayVideo($items,'cover','video_src','150');
+                return CommonHelper::displayVideo($items,'cover','video_src','150',2);
             })->unescape();
 
             $show->field('poster')->as(function ($images) {
                 $images = json_decode($images);
-                return CommonHelper::displayImage($images,150);
+                return CommonHelper::displayImage($images,150,1024,2);
             })->unescape();
 
             $show->field('cert')->as(function ($images) {
                 $images = json_decode($images);
-                return CommonHelper::displayImage($images,150);
+                return CommonHelper::displayImage($images,150,1024,2);
             })->unescape();
 
             $show->field('cert')->as(function ($images) {
                 $images = json_decode($images);
-                return CommonHelper::displayImage($images,150);
+                return CommonHelper::displayImage($images,150,1024,2);
             })->unescape();
 
             $show->field('pdf')->as(function ($items) {
@@ -216,7 +216,7 @@ class ImportProductController extends AdminController
                     foreach ($items as $item) {
                         $table .= '<tr>';
                         $table .= '<td style="vertical-align: middle !important;width: 20%">' . $item->pdf_title . '</td>';    // 商品名称
-                        $table .= '<td style="vertical-align: middle !important;"><a target="_blank" href="' . CommonHelper::ossUrl($item->pdf_src). '">查看</a></td>'; // 数量
+                        $table .= '<td style="vertical-align: middle !important;"><a target="_blank" href="' . CommonHelper::albumUrl($item->pdf_src). '">查看</a></td>'; // 数量
                         $table .= '</tr>';
                     }
                     $table .= '</table>';

app/Distributor/Controllers/SiteAlbumController.php

@@ -72,7 +72,7 @@ class SiteAlbumController extends AdminController
                 $images = json_decode($images);
                 // 限制最多显示2个缩略图
                 $dataImages = array_slice($images, 0, 1);
-                return CommonHelper::displayImage($dataImages,100);
+                return CommonHelper::displayImage($dataImages,100,1024,2);
             });
             if ($lang == 'en') {
                 $grid->column('title_en');
@@ -149,7 +149,7 @@ class SiteAlbumController extends AdminController
             if (empty($show->model()->cover) == false && $show->model()->cover!= '[]') {
                 $show->field('cover')->as(function ($images) {
                     $images = json_decode($images);
-                    return CommonHelper::displayImage($images,150);
+                    return CommonHelper::displayImage($images,150,1024,2);
                 })->unescape();
             }
             //详情
@@ -158,7 +158,7 @@ class SiteAlbumController extends AdminController
                     $images = json_decode($images);
                     $html = '<div style="text-align: center">';
                     foreach ($images as $key => $image) {
-                        $url = CommonHelper::ossUrl($image);
+                        $url = CommonHelper::albumUrl($image);
                         $html .= '<img src="' . $url . '" style="max-width:90%;margin-bottom:10px">';
                     }
                     $html .= '</div>';
@@ -171,21 +171,21 @@ class SiteAlbumController extends AdminController
                     $items = json_decode($items);
                     //倒序
                     $items = array_reverse($items);
-                    return CommonHelper::displayVideo($items,'cover','video_src','150');
+                    return CommonHelper::displayVideo($items,'cover','video_src','150',2);
                 })->unescape();
             }
             //海报
             if (empty($show->model()->poster) == false && $show->model()->poster!= '[]') {
                 $show->field('poster')->as(function ($images) {
                     $images = json_decode($images);
-                    return CommonHelper::displayImage($images,150);
+                    return CommonHelper::displayImage($images,150,1024,2);
                 })->unescape();
             }
             //证书
             if (empty($show->model()->cert) == false && $show->model()->cert != '[]') {
                 $show->field('cert')->as(function ($images) {
                     $images = json_decode($images);
-                    return CommonHelper::displayImage($images,150);
+                    return CommonHelper::displayImage($images,150,1024,2);
                 })->unescape();
             }
             //PDF
@@ -205,7 +205,7 @@ class SiteAlbumController extends AdminController
                             }
                             $table .= '<tr>';
                             $table .= '<td style="vertical-align: middle !important;width: 20%">' . $pdf_title . '</td>';    // 商品名称
-                            $table .= '<td style="vertical-align: middle !important;"><a target="_blank" href="' . CommonHelper::ossUrl($item->pdf_src). '">查看</a></td>'; // 数量
+                            $table .= '<td style="vertical-align: middle !important;"><a target="_blank" href="' . CommonHelper::albumUrl($item->pdf_src). '">查看</a></td>'; // 数量
                             $table .= '</tr>';
                         }
                         $table .= '</table>';

app/Libraries/CommonHelper.php

@@ -10,9 +10,10 @@ class CommonHelper
 
     /*
      * $images 格式：['image.jpg','image2.jpg']
+     * $ossSource 1:本地 2:相册
      * 返回显示的HTML显示图片
      */
-    public static function displayImage($images,$boxSize=60,$imgSize=1024)
+    public static function displayImage($images,$boxSize=60,$imgSize=1024,$ossSource=1)
     {
         if (empty($images) || empty($images[0])) {
             $html = "";
@@ -20,8 +21,12 @@ class CommonHelper
 
 
             // 默认显示 100x100 的图片
-            $thumbnailImages = array_map(function ($imageUrl) use ($boxSize) {
-                $imageUrl= CommonHelper::ossUrl($imageUrl);
+            $thumbnailImages = array_map(function ($imageUrl) use ($boxSize,$ossSource) {
+                if ($ossSource == 1) {
+                    $imageUrl= CommonHelper::ossUrl($imageUrl);
+                } else {
+                    $imageUrl= CommonHelper::albumUrl($imageUrl);
+                }
                 $extension = pathinfo($imageUrl, PATHINFO_EXTENSION);
                 if ($extension == 'svg') {
                     return $imageUrl;
@@ -32,8 +37,12 @@ class CommonHelper
             }, $images);
 
             // 生成点击查看大图的链接
-            $largeImages = array_map(function ($imageUrl) use ($imgSize) {
-                $imageUrl= CommonHelper::ossUrl($imageUrl);
+            $largeImages = array_map(function ($imageUrl) use ($imgSize,$ossSource) {
+                if ($ossSource == 1) {
+                    $imageUrl= CommonHelper::ossUrl($imageUrl);
+                } else {
+                    $imageUrl= CommonHelper::albumUrl($imageUrl);
+                }
                 $extension = pathinfo($imageUrl, PATHINFO_EXTENSION);
                 if ($extension == 'svg') {
                     return $imageUrl;
@@ -69,12 +78,24 @@ class CommonHelper
         return "http://".env('OSS_BUCKET').'.'.env('OSS_ENDPOINT').'/'.$imageUrl;
     }
 
+    /*
+     * 图库图片URL
+     */
+    public static function albumUrl($imageUrl)
+    {
+        if (strpos($imageUrl, 'http:') === 0 || strpos($imageUrl, 'https:') === 0) {
+            return  $imageUrl;
+        }
+
+        return env('ALBUM_OSS_URL').'/'.$imageUrl;
+    }
+
 
 
     /*
      * 显示视频
      */
-    public static function displayVideo($items,$videoCover,$videoSrc,$boxSize=150)
+    public static function displayVideo($items,$videoCover,$videoSrc,$boxSize=150,$ossSource=1)
     {
         $html = '';
         if (is_array($items)) {
@@ -82,8 +103,16 @@ class CommonHelper
                 $item = (array) $item;
                 $cover = $item[$videoCover];
                 $src = $item[$videoSrc];
-                $videoUrl = CommonHelper::ossUrl($src);
-                $thumbnailUrl = CommonHelper::ossUrl($cover) ."?x-oss-process=image/resize,m_pad,h_{$boxSize},w_{$boxSize},color_ffffff";;
+                if ($ossSource == 1) {
+                    $videoUrl = CommonHelper::ossUrl($src);
+                } else {
+                    $videoUrl = CommonHelper::albumUrl($src);
+                }
+                if ($ossSource == 1) {
+                    $thumbnailUrl = CommonHelper::ossUrl($cover) . "?x-oss-process=image/resize,m_pad,h_{$boxSize},w_{$boxSize},color_ffffff";
+                } else {
+                    $thumbnailUrl = CommonHelper::albumUrl($cover) . "?x-oss-process=image/resize,m_pad,h_{$boxSize},w_{$boxSize},color_ffffff";
+                }
                 $html .= '<div class="video-container"><a href="#" class="playVideo" videoUrl="'.$videoUrl.'")"><img src="'.$thumbnailUrl.'" alt="Video Thumbnail"><div class="play-button"></div></a></div>';
             }
             $html .= '<div class="video-popup" id="videoPopup"><span class="close-btn">&times;</span> <iframe src="" frameborder="0" allowfullscreen></iframe></div>';