From 30b36727c262cfc938fc9a04e34f424662ab0162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Tue, 24 Aug 2021 14:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E7=B2=89?= =?UTF-8?q?=E4=B8=9D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/config/storage-alioss.html | 4 +- app/wechat/controller/Fans.php | 86 +++++------- app/wechat/view/config/options_form_api.html | 22 ++-- app/wechat/view/config/options_form_thr.html | 23 ++-- app/wechat/view/fans/index.html | 132 +++++++++---------- 5 files changed, 120 insertions(+), 147 deletions(-) diff --git a/app/admin/view/config/storage-alioss.html b/app/admin/view/config/storage-alioss.html index a819600af..29da187f2 100644 --- a/app/admin/view/config/storage-alioss.html +++ b/app/admin/view/config/storage-alioss.html @@ -50,7 +50,7 @@
-

填写阿里云OSS存储空间名称，如：think-admin-oss（需要是全区唯一的值，不存在时会自动创建）

+

填写阿里云OSS存储空间名称，如：think-admin-oss

@@ -92,7 +92,7 @@ - + \ No newline at end of file diff --git a/app/wechat/controller/Fans.php b/app/wechat/controller/Fans.php index 94a7298b7..bad1d0633 100644 --- a/app/wechat/controller/Fans.php +++ b/app/wechat/controller/Fans.php @@ -18,6 +18,7 @@ namespace app\wechat\controller; use app\wechat\service\WechatService; use think\admin\Controller; +use think\admin\helper\QueryHelper; use think\exception\HttpResponseException; /** @@ -37,17 +38,18 @@ class Fans extends Controller * 微信用户管理 * @auth true * @menu true - * @throws \think\admin\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ public function index() { - $this->title = '微信用户管理'; - $this->where = ['appid' => WechatService::instance()->getAppid()]; - $query = $this->_query($this->table)->like('nickname')->equal('subscribe,is_black'); - $query->dateBetween('subscribe_at')->where($this->where)->order('subscribe_time desc')->page(); + $this->_query($this->table)->layTable(function () { + $this->title = '微信用户管理'; + }, function (QueryHelper $query) { + $query->where(['appid' => WechatService::instance()->getAppid()]); + $query->like('nickname')->equal('subscribe,is_black')->dateBetween('subscribe_at'); + }); } /** @@ -56,13 +58,7 @@ class Fans extends Controller */ protected function _index_page_filter(array &$data) { - $tags = $this->app->db->name('WechatFansTags')->column('name', 'id'); - foreach ($data as &$vo) { - $vo['tags'] = []; - foreach (explode(',', $vo['tagid_list']) as $tagid) { - if (isset($tags[$tagid])) $vo['tags'][] = $tags[$tagid]; - } - } + foreach ($data as &$vo) $vo['subscribe_at'] = format_datetime($vo['subscribe_at']); } /** @@ -76,19 +72,34 @@ class Fans extends Controller } /** - * 清空用户数据 + * 黑名单列表操作 * @auth true */ - public function truncate() + public function black() { + $data = $this->_vali([ + 'openid.require' => '操作用户不能为空！', + 'black.require' => '操作类型不能为空！', + ]); try { - $this->_query('WechatFans')->empty(); - $this->_query('WechatFansTags')->empty(); - $this->success('清空用户数据成功！'); - } catch (\think\exception\HttpResponseException $exception) { + foreach (array_chunk(explode(',', $data['openid']), 20) as $openids) { + if ($data['black']) { + WechatService::WeChatUser()->batchBlackList($openids); + $this->app->db->name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => 1]); + } else { + WechatService::WeChatUser()->batchUnblackList($openids); + $this->app->db->name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => 0]); + } + } + if (empty($data['black'])) { + $this->success('移出黑名单成功！'); + } else { + $this->success('拉入黑名单成功！'); + } + } catch (HttpResponseException $exception) { throw $exception; } catch (\Exception $exception) { - $this->error("清空用户数据失败，{$exception->getMessage()}"); + $this->error("黑名单操作失败，请稍候再试！
{$exception->getMessage()}"); } } @@ -99,48 +110,23 @@ class Fans extends Controller */ public function remove() { - $this->_applyFormToken(); $this->_delete($this->table); } /** - * 用户拉入黑名单 + * 清空用户数据 * @auth true */ - public function blackAdd() + public function truncate() { try { - $this->_applyFormToken(); - foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) { - WechatService::WeChatUser()->batchBlackList($openids); - $this->app->db->name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => '1']); - } - $this->success('拉入黑名单成功！'); + $this->_query('WechatFans')->empty(); + $this->_query('WechatFansTags')->empty(); + $this->success('清空用户数据成功！'); } catch (HttpResponseException $exception) { throw $exception; } catch (\Exception $exception) { - $this->error("拉入黑名单失败，请稍候再试！
{$exception->getMessage()}"); + $this->error("清空用户数据失败，{$exception->getMessage()}"); } } - - /** - * 用户移出黑名单 - * @auth true - */ - public function blackDel() - { - try { - $this->_applyFormToken(); - foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) { - WechatService::WeChatUser()->batchUnblackList($openids); - $this->app->db->name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => '0']); - } - $this->success('移出黑名单成功！'); - } catch (HttpResponseException $exception) { - throw $exception; - } catch (\Exception $exception) { - $this->error("移出黑名单失败，请稍候再试！
{$exception->getMessage()}"); - } - } - } diff --git a/app/wechat/view/config/options_form_api.html b/app/wechat/view/config/options_form_api.html index adff7da78..775e4af34 100644 --- a/app/wechat/view/config/options_form_api.html +++ b/app/wechat/view/config/options_form_api.html @@ -43,24 +43,24 @@
-
+
-
+ + +
+ +

公众号服务平台消息推送接口及服务器授权IP地址，需在公众号接口开发处配置。

-
- + -
- -
+
+ +
+
\ No newline at end of file diff --git a/app/wechat/view/config/options_form_thr.html b/app/wechat/view/config/options_form_thr.html index 28a442ee9..edc185a57 100644 --- a/app/wechat/view/config/options_form_thr.html +++ b/app/wechat/view/config/options_form_thr.html @@ -46,28 +46,29 @@
- -

公众号服务平台接口密钥, 通过微信第三方授权自动获取, 若没有值请进行微信第三方授权。

+
-
+
+ +

公众号绑定服务平台接口通知 URL, 公众号消息接收与回复等。

+ -
- - -
- -
+
+ +
+
\ No newline at end of file diff --git a/app/wechat/view/fans/index.html b/app/wechat/view/fans/index.html index 27a4c81d3..f79b5f6a3 100644 --- a/app/wechat/view/fans/index.html +++ b/app/wechat/view/fans/index.html @@ -1,12 +1,9 @@ -{extend name="../../admin/view/main"} +{extend name="../../admin/view/table"} {block name="button"} - - - - - - + + + @@ -14,77 +11,66 @@ - + {/block} {block name="content"}
{include file='fans/index_search'} - - {notempty name='list'} - - - - - - - - - - - - {/notempty} - - {foreach $list as $key=>$vo} - - - - - - - - - - {/foreach} - -
- - 微信昵称性别语言订阅时间
- - -
-
-

昵称：{$vo.nickname|default='--'}

-

区域：{$vo.country|default='--'} {$vo.province|default=''} {$vo.city|default=''}

-
- 		-
{foreach $vo.tags as $t}

{$t|default='--'}

{/foreach}
- 		- 性别：{switch name='vo.sex'}{case value='1'}男{/case}{case value='2'}女{/case}{default}未知{/switch}
- 语言：{$vo.language|raw} - 		- 日期：{$vo.subscribe_at|format_datetime|str_replace=' ','
时间：',###|raw} - 		-
- {eq name='vo.subscribe' value='0'}未订阅{else}已订阅{/eq} - {eq name='vo.is_black' value='0'}未拉黑{else}已拉黑{/eq} -
- 		- - - 加入黑名单 - - 移出黑名单 - - - - 删 除 - - -
- - {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} - +
{/block} + +{block name='script'} + + + + + + +{/block} \ No newline at end of file