From 537887ededdf2fe314a883901172a45108c01da1 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Mon, 22 Apr 2019 00:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/plugins/petscms/Admin.php | 2 +- application/plugins/share/Admin.php | 13 +---- application/plugins/share/Hook.php | 2 +- .../plugins/view/petscms/pets/detail.html | 2 +- .../plugins/view/share/admin/index.html | 55 +++++++++++++++--- .../plugins/view/share/admin/saveinfo.html | 43 ++++++++++---- .../plugins/view/share/index/content.html | 11 +++- .../plugins/css/petscms/pets.detail.css | 15 ++--- public/static/plugins/css/share/admin.css | 9 +++ public/static/plugins/css/share/iconfont.css | 14 ++--- public/static/plugins/css/share/style.css | 28 +++++++-- .../plugins/images/share/default-images.jpg | Bin 0 -> 13755 bytes public/static/plugins/js/share/style.js | 40 ++++++++++--- 13 files changed, 171 insertions(+), 63 deletions(-) create mode 100644 public/static/plugins/images/share/default-images.jpg diff --git a/application/plugins/petscms/Admin.php b/application/plugins/petscms/Admin.php index 056ea9e46..1a014051c 100755 --- a/application/plugins/petscms/Admin.php +++ b/application/plugins/petscms/Admin.php @@ -96,7 +96,7 @@ class Admin extends Controller */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'petscms', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'petscms', 'data'=>$params], ['logo', 'pets_default_images', 'alipay_qrcode_images', 'weixin_qrcode_images']); } } ?> \ No newline at end of file diff --git a/application/plugins/share/Admin.php b/application/plugins/share/Admin.php index d8466ada8..0177341d3 100755 --- a/application/plugins/share/Admin.php +++ b/application/plugins/share/Admin.php @@ -32,7 +32,7 @@ class Admin extends Controller */ public function index($params = []) { - $ret = PluginsService::PluginsData('share'); + $ret = PluginsService::PluginsData('share', ['pic']); if($ret['code'] == 0) { $this->assign('data', $ret['data']); @@ -52,16 +52,9 @@ class Admin extends Controller */ public function saveinfo($params = []) { - $ret = PluginsService::PluginsData('share'); + $ret = PluginsService::PluginsData('share', ['pic']); if($ret['code'] == 0) { - // 是否 - $is_whether_list = [ - 0 => array('id' => 0, 'name' => '否', 'checked' => true), - 1 => array('id' => 1, 'name' => '是'), - ]; - - $this->assign('is_whether_list', $is_whether_list); $this->assign('data', $ret['data']); return $this->fetch('../../../plugins/view/share/admin/saveinfo'); } else { @@ -79,7 +72,7 @@ class Admin extends Controller */ public function save($params = []) { - return PluginsService::PluginsDataSave(['plugins'=>'share', 'data'=>$params]); + return PluginsService::PluginsDataSave(['plugins'=>'share', 'data'=>$params], ['pic']); } } ?> \ No newline at end of file diff --git a/application/plugins/share/Hook.php b/application/plugins/share/Hook.php index 60d7c26ba..0d241b58d 100755 --- a/application/plugins/share/Hook.php +++ b/application/plugins/share/Hook.php @@ -67,7 +67,7 @@ class Hook extends Controller public function html($params = []) { // 获取应用数据 - $ret = PluginsService::PluginsData('share'); + $ret = PluginsService::PluginsData('share', ['pic']); if($ret['code'] == 0) { $this->assign('data', $ret['data']); diff --git a/application/plugins/view/petscms/pets/detail.html b/application/plugins/view/petscms/pets/detail.html index b8b781b60..625e855fc 100644 --- a/application/plugins/view/petscms/pets/detail.html +++ b/application/plugins/view/petscms/pets/detail.html @@ -146,7 +146,7 @@
-
+
diff --git a/application/plugins/view/share/admin/index.html b/application/plugins/view/share/admin/index.html index 0b4a5cefc..011c0b327 100755 --- a/application/plugins/view/share/admin/index.html +++ b/application/plugins/view/share/admin/index.html @@ -8,27 +8,68 @@ 返回 +
+ +

+ 建议不要设置默认内容，采用自动获取页面相应的内容
+ 内容优先级： 1元素配置默认 -> 2插件配置默认 -> 3页面对应内容 +

+
+ +
+ 分享类型
+        QQ[qq] , QQ空间[qzone] , 微信[weixin] , 新浪微博[sian] , 复制[url] + +

+ 元素配置规则
+        类型：data-share="自定义分享类型，以英文逗号分割，默认全部分享类型，自定义分享如: qq,weixin "
+        标题：data-title="分享标题"
+        描述：data-desc="分享描述内容"
+        网址：data-url="分享url地址"
+        图片：data-pic="图片地址" + +

+ 使用插件
+        标签上添加类即可自动初始化 [plugins-share-view] +
+
- +
- {{if !empty($data['content'])}} - {{$data.content}} + {{if !empty($data['title'])}} + {{$data.title}} {{else /}} 无 {{/if}}
- +
- {{if isset($data['is_overall']) and $data['is_overall'] eq 1}} - 是 + {{if !empty($data['url'])}} + {{$data.url}} {{else /}} - 否 + 无 {{/if}}
+
+ +
+ {{if !empty($data['desc'])}} + {{$data.desc}} + {{else /}} + 无 + {{/if}} +
+
+
+ +
+ +
+
编辑
diff --git a/application/plugins/view/share/admin/saveinfo.html b/application/plugins/view/share/admin/saveinfo.html index bdb9da667..9f4cefbd0 100755 --- a/application/plugins/view/share/admin/saveinfo.html +++ b/application/plugins/view/share/admin/saveinfo.html @@ -10,20 +10,41 @@ 返回 -
- - +
+ +

+ 建议不要设置默认内容，采用自动获取页面相应的内容
+ 内容优先级： 1元素配置默认 -> 2插件配置默认 -> 3页面对应内容 +

- -
- {{foreach $is_whether_list as $v}} - - {{/foreach}} -
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+上传图片
diff --git a/application/plugins/view/share/index/content.html b/application/plugins/view/share/index/content.html index f94e2bf7e..bb46cc722 100755 --- a/application/plugins/view/share/index/content.html +++ b/application/plugins/view/share/index/content.html @@ -1,12 +1,17 @@ -
+
    -