From 25d03521d6e02fd9c7817429106c91316553d7af Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 28 Feb 2019 17:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=99=84=E4=BB=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/commongobacktop/Admin.php |  2 +-
 .../plugins/commonrightnavigation/Admin.php   |  2 +-
 .../plugins/commontopmaxpicture/Admin.php     |  2 +-
 .../view/commongobacktop/admin/index.html     |  2 +-
 .../view/commontopmaxpicture/admin/index.html |  2 +-
 application/service/PluginsService.php        | 29 ++++++++++++++-----
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/application/plugins/commongobacktop/Admin.php b/application/plugins/commongobacktop/Admin.php
index a67f10f14..e428721f4 100755
--- a/application/plugins/commongobacktop/Admin.php
+++ b/application/plugins/commongobacktop/Admin.php
@@ -79,7 +79,7 @@ class Admin extends Controller
      */
     public function save($params = [])
     {
-        return PluginsService::PluginsDataSave(['plugins'=>'commongobacktop', 'data'=>$params]);
+        return PluginsService::PluginsDataSave(['plugins'=>'commongobacktop', 'data'=>$params], ['images']);
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/plugins/commonrightnavigation/Admin.php b/application/plugins/commonrightnavigation/Admin.php
index be883b2d4..92132f8bf 100755
--- a/application/plugins/commonrightnavigation/Admin.php
+++ b/application/plugins/commonrightnavigation/Admin.php
@@ -79,7 +79,7 @@ class Admin extends Controller
      */
     public function save($params = [])
     {
-        return PluginsService::PluginsDataSave(['plugins'=>'commonrightnavigation', 'data'=>$params]);
+        return PluginsService::PluginsDataSave(['plugins'=>'commonrightnavigation', 'data'=>$params], ['alipay_mini_qrcode_images', 'alipay_fuwu_qrcode_images', 'weixin_mini_qrcode_images', 'weixin_fuwu_qrcode_images']);
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/plugins/commontopmaxpicture/Admin.php b/application/plugins/commontopmaxpicture/Admin.php
index fd70b9eb6..59446be6e 100755
--- a/application/plugins/commontopmaxpicture/Admin.php
+++ b/application/plugins/commontopmaxpicture/Admin.php
@@ -79,7 +79,7 @@ class Admin extends Controller
      */
     public function save($params = [])
     {
-        return PluginsService::PluginsDataSave(['plugins'=>'commontopmaxpicture', 'data'=>$params]);
+        return PluginsService::PluginsDataSave(['plugins'=>'commontopmaxpicture', 'data'=>$params], ['images']);
     }
 }
 ?>
\ No newline at end of file
diff --git a/application/plugins/view/commongobacktop/admin/index.html b/application/plugins/view/commongobacktop/admin/index.html
index bf1462ea9..d359840e8 100755
--- a/application/plugins/view/commongobacktop/admin/index.html
+++ b/application/plugins/view/commongobacktop/admin/index.html
@@ -12,7 +12,7 @@
             <div class="items">
                 <label>图片</label>
                 <div class="immages-tag">
-                    <img src="{{if !empty($data['images_old'])}}{{$data.images_old}}{{else /}}{{$attachment_host}}/static/plugins/images/commongobacktop/default-images.png{{/if}}" />
+                    <img src="{{if !empty($data['images'])}}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commongobacktop/default-images.png{{/if}}" />
                 </div>
             </div>
             <div class="items">
diff --git a/application/plugins/view/commontopmaxpicture/admin/index.html b/application/plugins/view/commontopmaxpicture/admin/index.html
index 42d34f94c..679cee556 100755
--- a/application/plugins/view/commontopmaxpicture/admin/index.html
+++ b/application/plugins/view/commontopmaxpicture/admin/index.html
@@ -12,7 +12,7 @@
             <div class="items">
                 <label>图片</label>
                 <div class="immages-tag">
-                    <img src="{{if !empty($data['images_old'])}}{{$data.images_old}}{{else /}}{{$attachment_host}}/static/plugins/images/commontopmaxpicture/default-images.png{{/if}}" />
+                    <img src="{{if !empty($data['images'])}}{{$data.images}}{{else /}}{{$attachment_host}}/static/plugins/images/commontopmaxpicture/default-images.png{{/if}}" />
                 </div>
             </div>
             <div class="items">
diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php
index 72cbc1e3d..b57e2a5cd 100644
--- a/application/service/PluginsService.php
+++ b/application/service/PluginsService.php
@@ -29,10 +29,10 @@ class PluginsService
      * @version 1.0.0
      * @date    2018-09-29
      * @desc    description
-     * @param   [string]          $plugins      [应用标记]
-     * @param   [array]           $images_field [图片字段]
+     * @param   [string]          $plugins          [应用标记]
+     * @param   [array]           $attachment_field [附件字段]
      */
-    public static function PluginsData($plugins, $images_field = [])
+    public static function PluginsData($plugins, $attachment_field = [])
     {
         // 获取数据
         $data = Db::name('Plugins')->where(['plugins'=>$plugins])->value('data');
@@ -41,9 +41,9 @@ class PluginsService
             $data = json_decode($data, true);
 
             // 是否有图片需要处理
-            if(!empty($images_field) && is_array($images_field))
+            if(!empty($attachment_field) && is_array($attachment_field))
             {
-                foreach($images_field as $field)
+                foreach($attachment_field as $field)
                 {
                     if(isset($data[$field]))
                     {
@@ -63,9 +63,10 @@ class PluginsService
      * @version 1.0.0
      * @date    2018-09-29
      * @desc    description
-     * @param   [string]          $plugins [应用标记]
+     * @param   [string]          $plugins          [应用标记]
+     * @param   [array]           $attachment_field [附件字段]
      */
-    public static function PluginsDataSave($params = [])
+    public static function PluginsDataSave($params = [], $attachment_field = [])
     {
         // 请求参数
         $p = [
@@ -86,6 +87,20 @@ class PluginsService
             return DataReturn($ret, -1);
         }
 
+        // 附件处理
+        $attachment = ResourcesService::AttachmentParams($params['data'], $attachment_field);
+        if($attachment['code'] != 0)
+        {
+            return $attachment;
+        }
+        if(!empty($attachment['data']))
+        {
+            foreach($attachment['data'] as $field=>$value)
+            {
+                $params['data'][$field] = $value;
+            }
+        }
+
         // 数据更新
         if(Db::name('Plugins')->where(['plugins'=>$params['plugins']])->update(['data'=>json_encode($params['data']), 'upd_time'=>time()]))
         {
-- 
GitLab