From 7cd0ba27c69d5db7ce97141d55c801d3df51539d Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Fri, 5 May 2017 18:03:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B2=89?=
 =?UTF-8?q?=E4=B8=9D=E9=BB=91=E5=90=8D=E5=8D=95=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Fans.php  | 23 +++++++++++++++++
 application/wechat/view/fans.index.html | 34 ++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/application/wechat/controller/Fans.php b/application/wechat/controller/Fans.php
index 91ef40dc1..76b847e69 100644
--- a/application/wechat/controller/Fans.php
+++ b/application/wechat/controller/Fans.php
@@ -51,6 +51,29 @@ class Fans extends BasicAdmin {
         return parent::_list($db);
     }
 
+    /**
+     * 列表数据处理
+     * @param type $list
+     */
+    protected function _data_filter(&$list) {
+        $tags = Db::name('WechatFansTags')->column('id,name');
+        foreach ($list as &$vo) {
+            $vo['tags_list'] = [];
+            foreach (explode(',', $vo['tagid_list']) as $tag) {
+                if ($tag !== '' && isset($tags[$tag])) {
+                    $vo['tags_list'][$tag] = $tags[$tag];
+                } elseif ($tag !== '') {
+                    $vo['tags_list'][$tag] = $tag;
+                }
+            }
+        }
+        $this->assign('alert', [
+            'type'    => 'success',
+            'title'   => '开发中',
+            'content' => '请稍候...'
+        ]);
+    }
+
     /**
      * 黑名单列表
      */
diff --git a/application/wechat/view/fans.index.html b/application/wechat/view/fans.index.html
index 55dcf109f..269439a6d 100644
--- a/application/wechat/view/fans.index.html
+++ b/application/wechat/view/fans.index.html
@@ -80,8 +80,9 @@
                     <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
                 </th>
                 <th class='text-left'>用户昵称</th>
-                <th class='text-center'>性别</th>
-                <th class='text-center'>区域</th>
+                <th class='text-left'>性别</th>
+                <th class='text-center'>标签</th>
+                <th class='text-left'>区域</th>
                 <th class='text-center'>关注时间</th>
             </tr>
         </thead>
@@ -95,8 +96,33 @@
                     <img style="width:25px;height:25px;border-radius:50%;margin-right:10px" data-tips-image src="{$vo.headimgurl}"/>
                     {$vo.nickname|default="<span style='color:#999'>未设置微信昵称</span>"}
                 </td>
-                <td class='text-center'>{$vo.sex==1?'男':($vo.sex==2?'女':'未知')}</td>
-                <td class='text-center'>{$vo.country|default='<span style="color:#999">未设置区域信息</span>'}{$vo.province}{$vo.city}</td>
+                <td class='text-left'>{$vo.sex==1?'男':($vo.sex==2?'女':'未知')}</td>
+                <td>
+                    {if count($vo.tags_list) < 3}
+                    <span>
+                        <a data-add-tag='{$vo.id}' data-used-ids='{:join(",",array_keys($vo.tags_list))}' data-tips-text='添加标签'
+                           href='javascript:void(0)' style='font-size:12px;font-weight:400;border-radius:50%' class='label label-default'>+</a>
+                    </span>
+                    {else}
+                    <span>
+                        <a  data-tips-text='最多添加三个标签' href='javascript:void(0)' 
+                            style='font-size:12px;font-weight:400;border-radius:50%;background:#ccc' class='label label-default'>+</a>
+                    </span>
+                    {/if}
+
+                    {if empty($vo.tags_list)}
+                    <span style='color:#999'>尚未设置标签</span>
+                    {else}
+                    {foreach $vo.tags_list as $k=>$tag}
+                    <span>
+                        <a href='javascript:void(0)' style='font-size:12px;font-weight:400' class='label label-default'
+                           data-remove-tag='{$vo.id}' data-tag-id='{$k}' data-tips-text='移除' >{$tag}</a>
+                    </span>
+                    {/foreach}
+                    {/if}
+
+                </td>
+                <td class='text-left'>{$vo.country|default='<span style="color:#999">未设置区域信息</span>'}{$vo.province}{$vo.city}</td>
                 <td class='text-center'>{$vo.subscribe_at}</td>
             </tr>
             {/foreach}