From a685c14e234c659469664cb838cfba4afeb0bf01 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 12 May 2020 15:09:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 119 ++++++++++-------- Application/Admin/View/Tool/transfer_set.html | 79 ++++++++++++ 2 files changed, 143 insertions(+), 55 deletions(-) create mode 100644 Application/Admin/View/Tool/transfer_set.html diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 7fda82955..3f5a5d168 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -63,62 +63,71 @@ class ToolController extends ThinkController { } } + + /** + * 打款配置 + */ + public function transfer_set() + { + $this->BaseConfig("transfer_set"); + $this->meta_title = '支付宝打款设置'; + $this->display(); + } - - /** - * 给图片添加水印 - * @author 鹿文学 - * @date 2018-05-03 - */ - public function addWatermarkOnPic() { - // watermark - $tool = M('tool',"tab_")->field('config,status')->where(['name'=>'watermark'])->find(); - - if(empty($tool)){$this->error('没有此设置');} - - if($tool['status']==0) {$this->error('添加水印已关闭');exit;} - - $piclist = M('picture')->field('path,url,water')->where(['status'=>1,'water'=>array('neq','')])->select(); - - if (!is_array($piclist)) {$this->error('没有图片需要添加');exit;} - - $water = json_decode($tool['config'],true); - - $temp = explode(',',$water['position']); - $position = 3*$temp[0]+$temp[1]+1; - - - $image = new \Think\Image(); - - if ($water['types']==1) { // 文字 - - $offset = array( - $water['hoffset']?$water['hoffset']:0, - $water['voffset']?$water['voffset']:0 - ); - - foreach ($piclist as $k => $v) { - - $image->open(ROOTTT.$v['path'])->text($water['font_text'],FONTS.$water['font'],$water['font_size'],$water['font_color'],$position,$offset)->save(ROOTTT.$v['water'],$image->type(),$water['quality']); - - } - - } else { // 图片 - - foreach ($piclist as $k => $v) { - - - $img_url=M('picture')->find($water['icon']); - $img_url=$img_url['path']; - $image->open(ROOTTT.$v['path'])->water(ROOTTT.$img_url,$position,$water['transparency'])->save(ROOTTT.$v['water'],$image->type(),$water['quality']); - - } - - } - - $this->success('水印添加成功'); - - } + /** + * 给图片添加水印 + * @author 鹿文学 + * @date 2018-05-03 + */ + public function addWatermarkOnPic() { + // watermark + $tool = M('tool',"tab_")->field('config,status')->where(['name'=>'watermark'])->find(); + + if(empty($tool)){$this->error('没有此设置');} + + if($tool['status']==0) {$this->error('添加水印已关闭');exit;} + + $piclist = M('picture')->field('path,url,water')->where(['status'=>1,'water'=>array('neq','')])->select(); + + if (!is_array($piclist)) {$this->error('没有图片需要添加');exit;} + + $water = json_decode($tool['config'],true); + + $temp = explode(',',$water['position']); + $position = 3*$temp[0]+$temp[1]+1; + + + $image = new \Think\Image(); + + if ($water['types']==1) { // 文字 + + $offset = array( + $water['hoffset']?$water['hoffset']:0, + $water['voffset']?$water['voffset']:0 + ); + + foreach ($piclist as $k => $v) { + + $image->open(ROOTTT.$v['path'])->text($water['font_text'],FONTS.$water['font'],$water['font_size'],$water['font_color'],$position,$offset)->save(ROOTTT.$v['water'],$image->type(),$water['quality']); + + } + + } else { // 图片 + + foreach ($piclist as $k => $v) { + + + $img_url=M('picture')->find($water['icon']); + $img_url=$img_url['path']; + $image->open(ROOTTT.$v['path'])->water(ROOTTT.$img_url,$position,$water['transparency'])->save(ROOTTT.$v['water'],$image->type(),$water['quality']); + + } + + } + + $this->success('水印添加成功'); + + } public function save($config){ $name = $_POST['name']; diff --git a/Application/Admin/View/Tool/transfer_set.html b/Application/Admin/View/Tool/transfer_set.html new file mode 100644 index 000000000..81a317815 --- /dev/null +++ b/Application/Admin/View/Tool/transfer_set.html @@ -0,0 +1,79 @@ + + + + +
+

{$meta_title}

+

+
+ +
+ +
+

说明①：畅言为----软件接入第三方留言功能

+

说明②：使用该功能，需到畅言官网创建账户，并配置到本后台此处

+
+ +
+
+
+ + + + + + + + + + + + + + + +
商户号 + + +
密钥 + + +
启用状态 + + + + 是否启用畅言设置 +
+ +
+
+ +
+
+
+
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + From bb995ab3556825b2ff49c1b9adac632e5145e0ca Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 12 May 2020 15:24:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 26 ------------ api.php | 42 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 Application/Api/Controller/PartnerController.class.php delete mode 100644 api.php diff --git a/Application/Api/Controller/PartnerController.class.php b/Application/Api/Controller/PartnerController.class.php deleted file mode 100644 index 1fd2c63d7..000000000 --- a/Application/Api/Controller/PartnerController.class.php +++ /dev/null @@ -1,26 +0,0 @@ -field("id,partner name")->select(); - - header('Content-Type:application/json; charset=utf-8'); - exit(json_encode($data)); - - } - -} - diff --git a/api.php b/api.php deleted file mode 100644 index a3de6e2b3..000000000 --- a/api.php +++ /dev/null @@ -1,42 +0,0 @@ - -// +---------------------------------------------------------------------- - -if(version_compare(PHP_VERSION,'5.3.0','<')) die('require PHP > 5.3.0 !'); - -/** - * 系统调试设置 - * 项目正式部署后请设置为false - */ -define('APP_DEBUG', true ); -define('BIND_MODULE','Api'); -define('ROOTTT',dirname(__FILE__).'/'); -define('ROOTTTTT',dirname(__FILE__)); -define('FONTS',dirname(__FILE__).'/Public/Admin/fonts/'); -/** - * 应用目录设置 - * 安全期间，建议安装调试完成后移动到非WEB目录 - */ -define ( 'APP_PATH', './Application/' ); - -if(!is_file(APP_PATH . 'User/Conf/config.php')){ - header('Location: ./install.php'); - exit; -} - -/** - * 缓存目录设置 - * 此目录必须可写，建议移动到非WEB目录 - */ -define ( 'RUNTIME_PATH', './Runtime/' ); - -/** - * 引入核心入口 - * ThinkPHP亦可移动到WEB以外的目录 - */ -require './ThinkPHP/ThinkPHP.php'; \ No newline at end of file From 8746d68493aedf37316f67e0333e29139838ad3c Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 12 May 2020 15:32:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?cp=E4=B8=8B=E6=B8=B8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 26 ++++++++++++ api.php | 42 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 Application/Api/Controller/PartnerController.class.php create mode 100644 api.php diff --git a/Application/Api/Controller/PartnerController.class.php b/Application/Api/Controller/PartnerController.class.php new file mode 100644 index 000000000..1fd2c63d7 --- /dev/null +++ b/Application/Api/Controller/PartnerController.class.php @@ -0,0 +1,26 @@ +field("id,partner name")->select(); + + header('Content-Type:application/json; charset=utf-8'); + exit(json_encode($data)); + + } + +} + diff --git a/api.php b/api.php new file mode 100644 index 000000000..a3de6e2b3 --- /dev/null +++ b/api.php @@ -0,0 +1,42 @@ + +// +---------------------------------------------------------------------- + +if(version_compare(PHP_VERSION,'5.3.0','<')) die('require PHP > 5.3.0 !'); + +/** + * 系统调试设置 + * 项目正式部署后请设置为false + */ +define('APP_DEBUG', true ); +define('BIND_MODULE','Api'); +define('ROOTTT',dirname(__FILE__).'/'); +define('ROOTTTTT',dirname(__FILE__)); +define('FONTS',dirname(__FILE__).'/Public/Admin/fonts/'); +/** + * 应用目录设置 + * 安全期间，建议安装调试完成后移动到非WEB目录 + */ +define ( 'APP_PATH', './Application/' ); + +if(!is_file(APP_PATH . 'User/Conf/config.php')){ + header('Location: ./install.php'); + exit; +} + +/** + * 缓存目录设置 + * 此目录必须可写，建议移动到非WEB目录 + */ +define ( 'RUNTIME_PATH', './Runtime/' ); + +/** + * 引入核心入口 + * ThinkPHP亦可移动到WEB以外的目录 + */ +require './ThinkPHP/ThinkPHP.php'; \ No newline at end of file From 42a17754e43f52e9d4eaf5ee72c82b87d3098b76 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 12 May 2020 15:37:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Partner/show.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index 5725ea516..29632193e 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -30,14 +30,14 @@ - + - + @@ -52,14 +52,14 @@ - + - + @@ -68,7 +68,7 @@ - + - + - + - + - + @@ -158,7 +158,7 @@ - +
*合同合作方名称：合同合作方名称：
对应平台(简称)：对应平台(简称)：
渠道费率：渠道费率： %
开票税点：开票税点： %
*是否签署合同：是否签署合同：
*结算方式：结算方式：
*是否有游戏资质:是否有游戏资质:
*联系人：联系人：
*联系电话：联系电话：
*显示状态：显示状态：