diff --git a/.gitignore b/.gitignore index 08ac1df..775a29f 100755 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ node_modules # 部署仓库补充忽略 *.tar.gz *.zip +*.sql dge.gynhc.com_*.tar.gz # 本地目录，不纳入仓库（AGENTS.md 含账号密码，切勿入库） diff --git a/application/admin/controller/fc/Merchant.php b/application/admin/controller/fc/Merchant.php index 3e3b777..c00538a 100644 --- a/application/admin/controller/fc/Merchant.php +++ b/application/admin/controller/fc/Merchant.php @@ -19,6 +19,12 @@ class Merchant extends Backend */ protected $model = null; + /** + * 无需鉴权的方法（后台登录管理员均可访问） + * @var array + */ + protected $noNeedRight = ['detail', 'audit', 'recommend']; + public function _initialize() { parent::_initialize(); @@ -37,6 +43,73 @@ class Merchant extends Backend /** * 审核商家资质 */ + /** + * 获取单个商家的入驻资质与质检详情 + * + * @param int|null $ids 商家ID + * @return string|\think\response\Json + */ + public function detail($ids = null) + { + $id = $this->request->param('ids', 0) ?: $this->request->param('id/d', 0); + if (!$id) { + $this->error('缺少参数ID'); + } + $row = $this->model->where('id', $id)->find(); + if (!$row) { + $this->error('商家不存在或已删除'); + } + + $userInfo = [ + 'id' => $row->user_id, + 'nickname' => '未知用户', + 'mobile' => '', + 'avatar' => '/assets/img/avatar.png' + ]; + $user = Db::name('user')->where('id', $row->user_id)->field('id,nickname,mobile,avatar')->find(); + if ($user) { + $userInfo['nickname'] = $user['nickname'] ?: $userInfo['nickname']; + $userInfo['mobile'] = $user['mobile'] ?: ''; + $userInfo['avatar'] = $user['avatar'] ?: $userInfo['avatar']; + } + + if ($this->request->param('format') === 'json') { + $data = [ + 'id' => $row->id, + 'name' => $row->name, + 'logo' => $row->logo, + 'banner' => $row->banner, + 'contact' => $row->contact, + 'category' => $row->category, + 'license' => $row->license, + 'notice' => $row->notice, + 'recommend' => $row->recommend, + 'audit_status' => $row->audit_status, + 'audit_reason' => $row->audit_reason, + 'shop_status' => $row->shop_status, + 'violations' => $row->violations, + 'post_count' => $row->post_count, + 'createtime_text' => date('Y-m-d H:i:s', $row->createtime), + 'user' => $userInfo + ]; + $this->success('获取成功', null, $data); + } + + // 区分模式：audit=专属审核界面，view=纯净详情档案界面 + $mode = $this->request->param('mode', ''); + if (!$mode) { + $mode = ((int)$row->audit_status === 0) ? 'audit' : 'view'; + } + + $this->view->assign('mode', $mode); + $this->view->assign('row', $row); + $this->view->assign('userInfo', $userInfo); + if ($mode === 'audit') { + return $this->view->fetch('audit'); + } + return $this->view->fetch('detail'); + } + public function audit() { $ids = $this->request->post('ids'); diff --git a/application/admin/controller/fc/Post.php b/application/admin/controller/fc/Post.php index a899661..1fb606b 100644 --- a/application/admin/controller/fc/Post.php +++ b/application/admin/controller/fc/Post.php @@ -19,6 +19,12 @@ class Post extends Backend */ protected $model = null; + /** + * 无需鉴权的方法（后台登录管理员均可访问） + * @var array + */ + protected $noNeedRight = ['detail', 'audit', 'top', 'offline']; + public function _initialize() { parent::_initialize(); @@ -38,6 +44,111 @@ class Post extends Backend /** * 审核信息 */ + /** + * 查看信息详情或进入审核工作台 + * + * @param int|null $ids 信息ID + * @return string|\think\response\Json + */ + public function detail($ids = null) + { + $id = $this->request->param('ids', 0) ?: $this->request->param('id/d', 0); + if (!$id) { + $this->error('缺少参数ID'); + } + $row = $this->model->where('id', $id)->find(); + if (!$row) { + $this->error('信息不存在或已删除'); + } + + // 补齐分类名称 + if ($row->category_id) { + $category = Db::name('fc_category')->where('id', $row->category_id)->find(); + $row->category_name = $category ? $category['name'] : '未分类'; + } else { + $row->category_name = '未分类'; + } + + // 解析多图相册 + $mediaList = []; + $rawMedia = $row->getData('media'); + if (!empty($rawMedia)) { + $decoded = is_string($rawMedia) ? json_decode($rawMedia, true) : $rawMedia; + if (is_array($decoded)) { + $mediaList = array_values(array_filter($decoded)); + } else { + $mediaList = array_values(array_filter(explode(',', (string)$rawMedia))); + } + } + if (empty($mediaList) && !empty($row->cover)) { + $mediaList[] = $row->cover; + } + + // 获取用户画像 + $userInfo = [ + 'id' => $row->user_id, + 'nickname' => $row->user_name ?: '未知用户', + 'mobile' => '', + 'avatar' => '/assets/img/avatar.png', + 'post_count' => 0 + ]; + $user = Db::name('user')->where('id', $row->user_id)->field('id,nickname,mobile,avatar')->find(); + if ($user) { + $userInfo['nickname'] = $user['nickname'] ?: $userInfo['nickname']; + $userInfo['mobile'] = $user['mobile'] ?: ''; + $userInfo['avatar'] = $user['avatar'] ?: $userInfo['avatar']; + $userInfo['post_count'] = Db::name('fc_post')->where('user_id', $user['id'])->count(); + } + + // 支持请求 JSON 详情 + if ($this->request->param('format') === 'json') { + $data = [ + 'id' => $row->id, + 'title' => $row->title, + 'content' => $row->content, + 'category_name' => $row->category_name, + 'price' => $row->price, + 'price_unit' => $row->price_unit, + 'area' => $row->area, + 'address' => $row->address, + 'contact' => $row->contact, + 'phone' => $row->phone, + 'wechat' => $row->wechat, + 'tags' => $row->tags ? explode(',', $row->tags) : [], + 'is_paid' => $row->is_paid, + 'amount' => $row->amount, + 'pay_type' => $row->pay_type, + 'audit_status' => $row->audit_status, + 'audit_reason' => $row->audit_reason, + 'status' => $row->status, + 'is_top' => $row->is_top, + 'views' => $row->views, + 'likes' => $row->likes, + 'createtime_text' => date('Y-m-d H:i:s', $row->createtime), + 'media_list' => $mediaList, + 'user' => $userInfo + ]; + $this->success('获取成功', null, $data); + } + + // 区分模式：audit=专属审核界面，view=纯净详情档案界面 + $mode = $this->request->param('mode', ''); + if (!$mode) { + $mode = ((int)$row->audit_status === 0) ? 'audit' : 'view'; + } + + $this->view->assign('mode', $mode); + $this->view->assign('row', $row); + $this->view->assign('userInfo', $userInfo); + $this->view->assign('mediaList', $mediaList); + + // 如果是审核模式渲染 audit.html，详情模式渲染 detail.html + if ($mode === 'audit') { + return $this->view->fetch('audit'); + } + return $this->view->fetch('detail'); + } + public function audit() { $ids = $this->request->post('ids'); diff --git a/application/admin/model/FcPost.php b/application/admin/model/FcPost.php index 69efd04..4369f0a 100644 --- a/application/admin/model/FcPost.php +++ b/application/admin/model/FcPost.php @@ -40,6 +40,52 @@ class FcPost extends Model return FcRelation::categoryName(isset($data['category_id']) ? $data['category_id'] : 0); } + /** + * 读取多媒体相册属性（兼容 JSON 数组与逗号分隔格式，供后台上传控件预览） + * + * @param mixed $value 数据库原始值 + * @return string 逗号分隔的图片路径字符串 + */ + public function getMediaAttr($value) + { + if (empty($value)) { + return ''; + } + if (is_array($value)) { + return implode(',', array_filter($value)); + } + $decoded = json_decode((string)$value, true); + if (is_array($decoded)) { + return implode(',', array_filter($decoded)); + } + return (string)$value; + } + + /** + * 写入多媒体相册属性（保存为标准 JSON 字符串，兼容移动端与接口） + * + * @param mixed $value 前端提交的值 + * @return string 标准 JSON 格式存储 + */ + public function setMediaAttr($value) + { + if (is_array($value)) { + return json_encode(array_values(array_filter($value)), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } + if (is_string($value)) { + $trimmed = trim($value); + if ($trimmed === '') { + return '[]'; + } + if (strpos($trimmed, '[') === 0) { + return $trimmed; + } + $arr = array_filter(array_map('trim', explode(',', $trimmed))); + return json_encode(array_values($arr), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES); + } + return '[]'; + } + protected static function init() { $syncArea = function ($row) { diff --git a/application/admin/view/fc/area/index.html b/application/admin/view/fc/area/index.html index 13eddfb..2f88f44 100644 --- a/application/admin/view/fc/area/index.html +++ b/application/admin/view/fc/area/index.html @@ -6,8 +6,8 @@
- - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/banner/index.html b/application/admin/view/fc/banner/index.html index 8e01057..183ddfb 100644 --- a/application/admin/view/fc/banner/index.html +++ b/application/admin/view/fc/banner/index.html @@ -6,8 +6,8 @@
- - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/category/index.html b/application/admin/view/fc/category/index.html index 0321aab..5a58dc4 100644 --- a/application/admin/view/fc/category/index.html +++ b/application/admin/view/fc/category/index.html @@ -6,8 +6,8 @@
- - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/comment/index.html b/application/admin/view/fc/comment/index.html index 3618706..8cb38c4 100644 --- a/application/admin/view/fc/comment/index.html +++ b/application/admin/view/fc/comment/index.html @@ -6,17 +6,7 @@
- - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/coupon/index.html b/application/admin/view/fc/coupon/index.html index 76a3dd0..be7df98 100644 --- a/application/admin/view/fc/coupon/index.html +++ b/application/admin/view/fc/coupon/index.html @@ -6,8 +6,8 @@
diff --git a/application/admin/view/fc/distrelation/index.html b/application/admin/view/fc/distrelation/index.html index 7df8e58..179fee5 100644 --- a/application/admin/view/fc/distrelation/index.html +++ b/application/admin/view/fc/distrelation/index.html @@ -6,19 +6,11 @@
diff --git a/application/admin/view/fc/draft/index.html b/application/admin/view/fc/draft/index.html index 25fbd60..6f36f9d 100644 --- a/application/admin/view/fc/draft/index.html +++ b/application/admin/view/fc/draft/index.html @@ -6,8 +6,8 @@
- - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/financeflow/index.html b/application/admin/view/fc/financeflow/index.html index c4910f0..2c4621f 100644 --- a/application/admin/view/fc/financeflow/index.html +++ b/application/admin/view/fc/financeflow/index.html @@ -6,26 +6,18 @@
diff --git a/application/admin/view/fc/merchant/add.html b/application/admin/view/fc/merchant/add.html index 1c29d71..b433ee6 100644 --- a/application/admin/view/fc/merchant/add.html +++ b/application/admin/view/fc/merchant/add.html @@ -1,105 +1,177 @@ -
+ -
- -
- + +
+
+ 1 + 主体身份与营业资质
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- -
- - +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+ +
+ + +
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+
    -
    -
      -
      - -
      - + + +
      +
      + 2 + 店铺主页装修 +
      +
      +
      + +
      +
      + +
      + + +
      + +
      +
        +
        +
        + +
        + +
        + +
        +
        -
        - -
        - - - - - {:__('开启后该商家会出现在「推荐商家」位置。')} + + +
        +
        + 3 + 运营与审核状态 +
        +
        +
        +
        +
        + +
        +
        + + + +
        +
        +
        +
        +
        +
        + +
        +
        + + +
        +
        +
        +
        +
        + +
        +
        +
        + +
        + + + + + 开启后推荐展示在同城商家专区 +
        +
        +
        +
        +
        + +
        + +
        +
        +
        +
        -
        + + +
        -
        - +
        + +
        diff --git a/application/admin/view/fc/merchant/audit.html b/application/admin/view/fc/merchant/audit.html new file mode 100644 index 0000000..09b8951 --- /dev/null +++ b/application/admin/view/fc/merchant/audit.html @@ -0,0 +1,178 @@ +
        + +
        +
        +
        +
        + +
        +
        + {$row.name|htmlentities} + 商户ID: {$row.id} +
        +
        + 行业分类：{$row.category|default='未归类'} · 绑定用户：{$userInfo.nickname|htmlentities} (UID: {$userInfo.id}) · 申请时间：{$row.createtime|date='Y-m-d H:i:s',###} +
        +
        +
        +
        + {if $row.audit_status == 1} + 已审核通过 + {elseif $row.audit_status == 2 /} + 已驳回 + {else /} + 待资质审核 + {/if} +
        +
        + + {if $row.audit_status == 2 && $row.audit_reason} +
        + 上次驳回原因：{$row.audit_reason|htmlentities} +
        + {/if} +
        +
        + + +
        +
        +
        +
        + 联系人姓名：{$row.contact|default='-'} +
        +
        + 绑定手机号：{$userInfo.mobile|default='未绑定'} +
        +
        + 营业状态： + {if $row.shop_status == 'normal'} + 正常营业 + {else /} + 暂停歇业 + {/if} +
        +
        + 推荐状态： + {if $row.recommend == 1} + 首页推荐 + {else /} + 普通 + {/if} +
        +
        + 商户公告/简介： +
        + {$row.notice|default='（暂未设置商户公告）'|htmlentities} +
        +
        +
        +
        +
        + + +
        +
        + 资质证照与门头宣传图核验 +
        +
        +
        +
        +
        营业执照 / 经营凭据：
        + {if !empty($row.license)} + + + + {else /} +
        未上传营业执照
        + {/if} +
        +
        +
        门店横幅 / 环境宣传图：
        + {if !empty($row.banner)} + + + + {else /} +
        未上传横幅图
        + {/if} +
        +
        +
        +
        + + +
        + + + +
        +
        + + diff --git a/application/admin/view/fc/merchant/detail.html b/application/admin/view/fc/merchant/detail.html new file mode 100644 index 0000000..b761199 --- /dev/null +++ b/application/admin/view/fc/merchant/detail.html @@ -0,0 +1,183 @@ +
        + +
        +
        +
        +
        资质状态
        +
        + {if $row.audit_status == 1} + 已通过 + {elseif $row.audit_status == 2 /} + 已驳回 + {else /} + 待审核 + {/if} +
        +
        +
        +
        +
        +
        营业状态
        +
        + {if $row.shop_status == 'normal'} + 正常营业 + {else /} + 暂停歇业 + {/if} +
        +
        +
        +
        +
        +
        推荐位
        +
        + {if $row.recommend == 1} + 首页推荐 + {else /} + 普通 + {/if} +
        +
        +
        +
        +
        +
        累计发帖
        +
        {$row.post_count|default=0} 篇
        +
        +
        +
        + + + {if $row.audit_status == 2} +
        +
        + 已驳回 + 资质审核未通过原因： +
        +
        + {$row.audit_reason|default='（管理员未填写具体驳回原因）'|htmlentities} +
        +
        + {elseif $row.audit_status == 1 /} +
        +
        + 已通过 该商户资质已通过人工审核 +
        + {if !empty($row.updatetime)} + 审核时间：{$row.updatetime|date='Y-m-d H:i:s',###} + {/if} +
        + {else /} +
        +
        + 待审核 该商户正在等待资质核验 +
        + 立即前往审核 +
        + {/if} + + +
        +
        +
        +
        + +
        +
        + {$row.name|htmlentities} + 商户ID: {$row.id} +
        +
        + 行业分类：{$row.category|default='未归类'} · 绑定用户：{$userInfo.nickname|htmlentities} (UID: {$userInfo.id}) +
        +
        +
        +
        +
        入驻时间：{$row.createtime|date='Y-m-d H:i:s',###}
        + {if !empty($row.updatetime)} +
        更新时间：{$row.updatetime|date='Y-m-d H:i:s',###}
        + {/if} +
        +
        +
        +
        + + +
        +
        +
        +
        + 联系人：{$row.contact|default='-'} +
        +
        + 绑定电话：{$userInfo.mobile|default='未绑定'} +
        +
        + 商户公告/简介： +
        + {$row.notice|default='（暂未设置商户公告）'|htmlentities} +
        +
        +
        +
        +
        + + +
        +
        + 证照与门店照片 +
        +
        +
        +
        +
        营业执照：
        + {if !empty($row.license)} + + + + {else /} +
        未上传
        + {/if} +
        +
        +
        门店横幅：
        + {if !empty($row.banner)} + + + + {else /} +
        未上传
        + {/if} +
        +
        +
        +
        + + +
        +
        + +
        +
        + +
        +
        +
        + + diff --git a/application/admin/view/fc/merchant/edit.html b/application/admin/view/fc/merchant/edit.html index f587f93..c2ec8a9 100644 --- a/application/admin/view/fc/merchant/edit.html +++ b/application/admin/view/fc/merchant/edit.html @@ -1,105 +1,184 @@ -
        + -
        - -
        - + +
        +
        + 1 + 主体身份与营业资质
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        - -
        -
        -
        - -
        -
        - -
        - - +
        +
        +
        +
        + +
        + +
        +
        +
        +
        +
        + +
        + +
        +
        +
        +
        + +
        +
        +
        + +
        + +
        +
        +
        +
        +
        + +
        + +
        +
        +
        +
        + +
        + +
        +
        + +
        + + +
        + +
        + +
        +
        + +
        + +
        +
        + +
        + + +
        + +
        +
          -
          -
            -
            - -
            - + + +
            +
            + 2 + 店铺主页装修 +
            +
            +
            + +
            +
            + +
            + + +
            + +
            +
              +
              +
              + +
              + +
              + +
              +
              -
              - -
              - - - - - {:__('开启后该商家会出现在「推荐商家」位置。')} + + +
              +
              + 3 + 运营与审核状态 +
              +
              +
              +
              +
              + +
              +
              + + + +
              +
              +
              +
              +
              +
              + +
              +
              + + +
              +
              +
              +
              +
              + +
              + +
              + +
              +
              + +
              +
              +
              + +
              + + + + + 开启后推荐展示在同城商家专区 +
              +
              +
              +
              +
              + +
              + +
              +
              +
              +
              -
              + + +
              -
              - +
              + +
              diff --git a/application/admin/view/fc/merchant/index.html b/application/admin/view/fc/merchant/index.html index 526c999..3855323 100644 --- a/application/admin/view/fc/merchant/index.html +++ b/application/admin/view/fc/merchant/index.html @@ -5,19 +5,21 @@
              +
              - - {:__('Add')} - {:__('Edit')} - {:__('Delete')} - {:__('AuditPass')} - {:__('AuditReject')} - + 刷新 + 添加 - - - + +
              + 已选 0 项 + + + + +
              +
              - - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/order/index.html b/application/admin/view/fc/order/index.html index 3ddc249..ba8342e 100644 --- a/application/admin/view/fc/order/index.html +++ b/application/admin/view/fc/order/index.html @@ -10,23 +10,17 @@
              -
              diff --git a/application/admin/view/fc/payview/index.html b/application/admin/view/fc/payview/index.html index 88b0dc8..179fee5 100644 --- a/application/admin/view/fc/payview/index.html +++ b/application/admin/view/fc/payview/index.html @@ -6,19 +6,11 @@
              diff --git a/application/admin/view/fc/plan/index.html b/application/admin/view/fc/plan/index.html index f1c84f0..e80a33c 100644 --- a/application/admin/view/fc/plan/index.html +++ b/application/admin/view/fc/plan/index.html @@ -6,8 +6,8 @@
              - - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/post/add.html b/application/admin/view/fc/post/add.html index c4deae2..d540cf5 100644 --- a/application/admin/view/fc/post/add.html +++ b/application/admin/view/fc/post/add.html @@ -1,159 +1,236 @@ -
              + -
              - -
              - + +
              +
              + 1 + 基本信息 +
              +
              +
              +
              +
              + +
              + +
              +
              +
              +
              +
              + +
              + +
              +
              +
              +
              + +
              + +
              + +
              +
              + +
              +
              +
              + +
              +
              + ¥ + +
              +
              +
              +
              +
              +
              + +
              + +
              +
              +
              +
              + +
              +
              +
              + +
              + +
              +
              +
              +
              +
              + +
              + +
              +
              +
              +
              + +
              + +
              + + 示例：随时看房, 精装修, 包物业费（回车自动生成标签胶囊） +
              +
              -
              - -
              - + + +
              +
              + 2 + 详细内容与图集 +
              +
              +
              + +
              + +
              +
              + +
              + +
              +
              + +
              + + +
              + +
              +
                +
                +
                + +
                + +
                +
                + +
                + + +
                + +
                +
                  + 支持上传多张展示图，拖动可调整展示顺序，点击图片右上角可删除。 +
                  +
                  -
                  - -
                  - + + +
                  +
                  + 3 + 联系方式 +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  -
                  - -
                  - + + +
                  +
                  + 4 + 运营与审核状态 +
                  +
                  +
                  +
                  +
                  + +
                  +
                  + + + +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  + + +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +
                  + +
                  + + + + + 开启后在首页优先展示 +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  - -
                  - -
                  -
                  -
                  + + +
                  -
                  - +
                  + +
                  diff --git a/application/admin/view/fc/post/audit.html b/application/admin/view/fc/post/audit.html new file mode 100644 index 0000000..632c789 --- /dev/null +++ b/application/admin/view/fc/post/audit.html @@ -0,0 +1,182 @@ +
                  + +
                  +
                  +
                  +
                  + +
                  +
                  + {$userInfo.nickname|htmlentities} + UID: {$userInfo.id} +
                  +
                  + 绑定手机：{$userInfo.mobile|default='未绑定'} · 历史发帖：{$userInfo.post_count} 条 · 提交于：{$row.createtime|date='Y-m-d H:i:s',###} +
                  +
                  +
                  +
                  + {if $row.audit_status == 1} + 当前状态：已审核通过 + {elseif $row.audit_status == 2 /} + 当前状态：已驳回 + {else /} + 待人工审核 + {/if} +
                  +
                  + + {if $row.audit_status == 2 && $row.audit_reason} +
                  + 上次驳回原因：{$row.audit_reason|htmlentities} +
                  + {/if} +
                  +
                  + + +
                  +
                  +
                  + {$row.category_name|default='未分类'} +
                  + {if $row.price > 0} + ¥ {$row.price} {if $row.price_unit}{$row.price_unit}{/if} + {else /} + 面议 / 免费 + {/if} +
                  +
                  + +

                  + {$row.title|htmlentities} +

                  + + {if !empty($row.tags)} +
                  + {volist name=":explode(',', (string)$row.tags)" id="tag"} + {if trim($tag)} + {$tag} + {/if} + {/volist} +
                  + {/if} + +
                  +
                  + 服务区域：{$row.area|default='-'} {if !empty($row.address)}· {$row.address|htmlentities}{/if} +
                  +
                  + 联系人：{$row.contact|default='-'} +
                  +
                  + 联系电话：{$row.phone|default='-'} +
                  +
                  + 微信号：{$row.wechat|default='-'} +
                  +
                  + +
                  详细内容描述：
                  +
                  + {$row.content|default='（发布人未填写详细正文描述）'|htmlentities} +
                  +
                  +
                  + + +
                  +
                  + 送审图片质检 ({:count($mediaList)} 张) +
                  +
                  + {if empty($mediaList)} +
                  用户未上传任何附加图片
                  + {else /} +
                  + {volist name="mediaList" id="media"} + + + + {/volist} +
                  + {/if} +
                  +
                  + + +
                  + + + +
                  +
                  + + diff --git a/application/admin/view/fc/post/detail.html b/application/admin/view/fc/post/detail.html new file mode 100644 index 0000000..2978223 --- /dev/null +++ b/application/admin/view/fc/post/detail.html @@ -0,0 +1,204 @@ +
                  + +
                  +
                  +
                  +
                  审核状态
                  +
                  + {if $row.audit_status == 1} + 已通过 + {elseif $row.audit_status == 2 /} + 已驳回 + {else /} + 待审核 + {/if} +
                  +
                  +
                  +
                  +
                  +
                  浏览 / 点赞
                  +
                  {$row.views} / {$row.likes}
                  +
                  +
                  +
                  +
                  +
                  付费状态
                  +
                  + {if $row.is_paid == 1} + 已支付 ¥{$row.amount} + {else /} + 未付费 + {/if} +
                  +
                  +
                  +
                  +
                  +
                  置顶状态
                  +
                  + {if $row.is_top == 1} + 首页置顶中 + {else /} + 普通展示 + {/if} +
                  +
                  +
                  +
                  + + + {if $row.audit_status == 2} +
                  +
                  + 已驳回 + 审核未通过原因： +
                  +
                  + {$row.audit_reason|default='（管理员未填写具体驳回原因）'|htmlentities} +
                  +
                  + {elseif $row.audit_status == 1 /} +
                  +
                  + 已通过 该信息已通过人工审核，正常在线展示中 +
                  + {if !empty($row.updatetime)} + 审核/更新时间：{$row.updatetime|date='Y-m-d H:i:s',###} + {/if} +
                  + {else /} +
                  +
                  + 待审核 该信息正在等待人工审核处理 +
                  + 立即前往审核 +
                  + {/if} + + +
                  +
                  +
                  +
                  + +
                  +
                  + {$userInfo.nickname|htmlentities} + UID: {$userInfo.id} +
                  +
                  + 绑定手机：{$userInfo.mobile|default='未绑定'} · 历史发布：{$userInfo.post_count} 条 +
                  +
                  +
                  +
                  +
                  发布时间：{$row.createtime|date='Y-m-d H:i:s',###}
                  + {if !empty($row.updatetime)} +
                  更新时间：{$row.updatetime|date='Y-m-d H:i:s',###}
                  + {/if} +
                  +
                  +
                  +
                  + + +
                  +
                  +
                  + {$row.category_name|default='未分类'} +
                  + {if $row.price > 0} + ¥ {$row.price} {if $row.price_unit}{$row.price_unit}{/if} + {else /} + 面议 / 免费 + {/if} +
                  +
                  + +

                  + {$row.title|htmlentities} +

                  + + {if !empty($row.tags)} +
                  + {volist name=":explode(',', (string)$row.tags)" id="tag"} + {if trim($tag)} + {$tag} + {/if} + {/volist} +
                  + {/if} + +
                  +
                  + 服务区域：{$row.area|default='-'} {if !empty($row.address)}· {$row.address|htmlentities}{/if} +
                  +
                  + 联系人：{$row.contact|default='-'} +
                  +
                  + 联系电话：{$row.phone|default='-'} +
                  +
                  + 微信号：{$row.wechat|default='-'} +
                  +
                  + +
                  正文详细内容：
                  +
                  + {$row.content|default='（发布人未填写详细正文描述）'|htmlentities} +
                  +
                  +
                  + + +
                  +
                  + 信息图集 ({:count($mediaList)} 张) +
                  +
                  + {if empty($mediaList)} +
                  无附加图片
                  + {else /} +
                  + {volist name="mediaList" id="media"} + + + + {/volist} +
                  + {/if} +
                  +
                  + + +
                  +
                  + +
                  +
                  + +
                  +
                  +
                  + + diff --git a/application/admin/view/fc/post/edit.html b/application/admin/view/fc/post/edit.html index bbb499f..6e940d0 100644 --- a/application/admin/view/fc/post/edit.html +++ b/application/admin/view/fc/post/edit.html @@ -1,159 +1,243 @@ -
                  + -
                  - -
                  - + +
                  +
                  + 1 + 基本信息 +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  + +
                  + +
                  + +
                  +
                  + +
                  +
                  +
                  + +
                  +
                  + ¥ + +
                  +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  + +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  +
                  + +
                  + +
                  +
                  +
                  +
                  + +
                  + +
                  + + 示例：随时看房, 精装修, 包物业费（回车自动生成标签胶囊） +
                  +
                  -
                  - -
                  - + + +
                  +
                  + 2 + 详细内容与图集 +
                  +
                  +
                  + +
                  + +
                  +
                  + +
                  + +
                  +
                  + +
                  + + +
                  + +
                  +
                    +
                    +
                    + +
                    + +
                    +
                    + +
                    + + +
                    + +
                    +
                      + 支持上传多张展示图，拖动可调整展示顺序，点击图片右上角可删除。 +
                      +
                      -
                      - -
                      - + + +
                      +
                      + 3 + 联系方式 +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      -
                      - -
                      - + + +
                      +
                      + 4 + 运营与审核状态 +
                      +
                      +
                      +
                      +
                      + +
                      +
                      + + + +
                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      + + +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      + +
                      +
                      + +
                      +
                      +
                      + +
                      + + + + + 置顶后在首页及列表优先排前 +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      + + +
                      -
                      - +
                      + +
                      diff --git a/application/admin/view/fc/post/index.html b/application/admin/view/fc/post/index.html index 7cedb78..dd96fa1 100644 --- a/application/admin/view/fc/post/index.html +++ b/application/admin/view/fc/post/index.html @@ -5,22 +5,26 @@
                      + + + -
                      - - {:__('Add')} + 刷新 + 添加 {:__('Edit')} {:__('Delete')} diff --git a/application/admin/view/fc/withdraw/edit.html b/application/admin/view/fc/withdraw/edit.html index 4075862..127722f 100644 --- a/application/admin/view/fc/withdraw/edit.html +++ b/application/admin/view/fc/withdraw/edit.html @@ -1,57 +1,100 @@ -
                      + -
                      - -
                      - + +
                      +
                      + 1 + 提现账单详情
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      -
                      -
                      - -
                      - -
                      - {foreach name="statusList" item="vo"} - - {/foreach} +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      + ¥ + +
                      +
                      +
                      +
                      +
                      +
                      + +
                      + +
                      +
                      +
                      +
                      -
                      - -
                      - + + +
                      +
                      + 2 + 审核状态与打款记录 +
                      +
                      +
                      + +
                      +
                      + {foreach name="statusList" item="vo"} + + {/foreach} +
                      +
                      +
                      + +
                      + +
                      + +
                      +
                      + +
                      + +
                      + +
                      +
                      -
                      - -
                      - -
                      -
                      -
                      + + +
                      -
                      - +
                      + +
                      diff --git a/application/admin/view/fc/withdraw/index.html b/application/admin/view/fc/withdraw/index.html index 26dd0ad..0c577b0 100644 --- a/application/admin/view/fc/withdraw/index.html +++ b/application/admin/view/fc/withdraw/index.html @@ -10,18 +10,12 @@
                      -
                      '山间小仓', 'beian' => '', 'cdnurl' => '', - 'version' => '1.8.0.1947604604', + 'version' => '1.8.0.2472229544', 'timezone' => 'Asia/Shanghai', 'forbiddenip' => '', 'languages' => diff --git a/docs/07-线上服务器部署与同步清单.md b/docs/07-线上服务器部署与同步清单.md new file mode 100644 index 0000000..e03b918 --- /dev/null +++ b/docs/07-线上服务器部署与同步清单.md @@ -0,0 +1,147 @@ +# 线上服务器部署与同步清单规范 + +> 文档编号：DOC-DEPLOY-07 +> 适用平台：同城分类信息与本地生活便民服务平台 (FastAdmin + UniApp) +> 目标服务器：`fenleixinxi.gzyakj.com.cn`（远程路径：`/www/wwwroot/fenleixinxi.gzyakj.com.cn`） + +--- + +## 一、 项目完整结构图解与职责分析 + +```text +fenleixinxi/ +├── addons/ # [必选同步] FastAdmin 插件目录 +├── application/ # [必选同步] ThinkPHP 5 业务应用主目录 +│ ├── admin/ # 后台控制器、模型、视图（含已重构的商户/帖子/分销/审核页面） +│ ├── api/ # 小程序端 RESTful API 接口层 +│ ├── common/ # 公共模型、服务层与支付/分销/佣金核心逻辑 +│ └── extra/ # 站点配置、上传配置等 +├── extend/ # [必选同步] 自定义扩展类库 +├── public/ # [必选同步] Web 根目录（Nginx DocumentRoot 指向此处） +│ ├── assets/ # 后台 CSS/JS/微质感图标（含 backend-theme.css 绿白设计） +│ │ └── libs/ # ★第三方前端组件库（Git 默认忽略，但部署必须存在） +│ ├── static/ # 品牌分类图标、微质感插画 +│ ├── uploads/ # ★媒体与附件目录（必须保留且带读写权限） +│ ├── index.php # 前台入口 +│ ├── s.php # 后台管理入口（地址：/s.php） +│ └── nginx.htaccess # Nginx 伪静态配置 +├── thinkphp/ # [必选同步] ThinkPHP 5 核心框架底层（Git 默认忽略） +├── vendor/ # [必选同步] Composer 依赖包（Git 默认忽略） +├── 支付/ # [私密存放] 微信支付商户私有证书，建议放置在非公开根目录下 +├── uniapp/ # [小程序端] 前端源码，生产打包自动连接生产域名 +├── runtime/ # [服务器自动生成] 运行时缓存与日志（赋权限 www:www 777） +├── .env # [线上独立配置] 线上数据库与环境配置文件（不可直接拿本地覆盖） +└── database_backup.sql # [数据库同步] 本地导出的 47 张表完整结构与业务初始数据 +``` + +--- + +## 二、 部署与同步分类清单 + +### 1. 必须上传/同步到服务器的目录与文件 (Sync Checklist) + +| 目录/文件 | 说明 | 部署方式 / 注意事项 | +| :--- | :--- | :--- | +| **`application/`** | 业务核心代码（Admin/API/Common/Extra） | 覆盖更新，包含所有新增的审核、详情、主题视图 | +| **`addons/`** | FastAdmin 插件 | 完整同步 | +| **`extend/`** | 第三方扩展类库 | 完整同步 | +| **`public/assets/`** | 后台样式、脚本、组件 | 包含重构的 `backend-theme.css` 及业务 JS | +| **`public/assets/libs/`** | Git 默认忽略的第三方前端库 | **极关键**：若线上缺少会导致后台界面混乱、报 404 | +| **`public/static/`** | 春绿主题内置图标与插画 | 完整同步 | +| **`public/uploads/`** | 本地已初始化的测试与分类图 | 增量同步，线上需赋予 `755/777` 写入权限 | +| **`public/index.php`** | 前端统一入口文件 | 覆盖 | +| **`public/s.php`** | 后台管理唯一入口（保护管理后台） | 访问地址：`https://域名/s.php` | +| **`thinkphp/`** | 框架核心 | 若线上已有基础安装则核对版本，全新部署必须同步 | +| **`vendor/`** | Composer 扩展依赖 | 包含微信支付/二维码等扩展，需完整同步 | +| **`支付/`** | 微信支付商户证书 (`.pem` / `.zip`) | 建议部署至项目根目录同级或非 Web 可访问的安全目录 | + +### 2. 严禁同步或必须线上独立配置的文件 (Exclude / Independent) + +| 目录/文件 | 规则 | 原因说明 | +| :--- | :--- | :--- | +| **`.env`** | **线上单独配置** | 线上数据库账号、密码、端口与本地完全不同，直接覆盖会导致数据库连接中断 | +| **`AGENTS.md`** | **严禁上传** | 包含服务器 SSH、数据库口令等高敏感绝密凭证，严禁暴露 | +| **`runtime/*`** | **严禁同步日志** | 本地缓存与日志无需同步，线上仅需空目录并配置写入权限 | +| **`node_modules/`** | **无需上传** | 本地构建依赖包，线上 PHP 环境不执行 node 构建 | +| **`tools/`** | **无需上传** | 本地 API 联调与测试脚本，纯开发辅助工具 | +| **`.git/`** | **无需全量拷入** | 若采用 Git 部署拉取即可，若通过打包上传请排除 `.git` 目录 | + +--- + +## 三、 数据库同步指南 (Database Sync) + +### 1. 本地已生成备份文件 +- **导出文件名**：`database_backup.sql`（已在根目录下生成，UTF8MB4 编码，共 47 张表）。 +- **核心数据表涵盖**： + - **基础系统**：`fa_admin`, `fa_auth_*`, `fa_config`, `fa_attachment` 等。 + - **分类与信息**：`fa_fc_category`, `fa_fc_post`, `fa_fc_draft`, `fa_fc_area`。 + - **商户与入驻**：`fa_fc_merchant`, `fa_fc_user_ext`。 + - **交易与佣金**：`fa_fc_order`, `fa_fc_plan`, `fa_fc_commission`, `fa_fc_dist_relation`, `fa_fc_finance_flow`, `fa_fc_withdraw`。 + - **营销与互动**：`fa_fc_banner`, `fa_fc_coupon`, `fa_fc_comment`, `fa_fc_favorite`, `fa_fc_follow`, `fa_fc_message`, `fa_fc_report`。 + +### 2. 线上数据库导入步骤 +1. **宝塔面板 / 终端导入**： + ```bash + # 在服务器终端导入 + mysql -u [线上用户名] -p[线上密码] [线上数据库名] < database_backup.sql + ``` +2. **配置线上 `.env`**： + 在服务器项目根目录创建或修改 `.env`： + ```ini + [app] + debug = false + trace = false + + [database] + hostname = 127.0.0.1 + database = [线上数据库名] + username = [线上用户名] + password = [线上密码] + hostport = 3306 + prefix = fa_ + ``` + +3. **同步后数据核验**： + - 检查 `fa_config` 表中后台站点基础信息。 + - 确认后台管理员账号可正常登录： + - 后台地址：`https://fenleixinxi.gzyakj.com.cn/s.php` + - 管理员账号：`admin` + +--- + +## 四、 Nginx 站点配置要点 + +1. **运行目录 (DocumentRoot)**：必须指向 `/www/wwwroot/fenleixinxi.gzyakj.com.cn/public`。 +2. **伪静态 (Rewrite Rule)**： + ```nginx + location / { + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?s=/$1 last; + break; + } + } + ``` +3. **安全防护**： + - 禁止访问私密证书与隐藏文件： + ```nginx + location ~ ^/(\.user.ini|\.htaccess|\.git|\.env|支付) { + return 404; + } + ``` +4. **目录权限**： + ```bash + chown -R www:www /www/wwwroot/fenleixinxi.gzyakj.com.cn + chmod -R 755 /www/wwwroot/fenleixinxi.gzyakj.com.cn + chmod -R 777 /www/wwwroot/fenleixinxi.gzyakj.com.cn/runtime + chmod -R 777 /www/wwwroot/fenleixinxi.gzyakj.com.cn/public/uploads + ``` + +--- + +## 五、 小程序端发布对接说明 + +- 小程序端源码位于 `uniapp/` 目录。 +- 请求基地址已在 `uniapp/common/config/index.js` 内实现智能化分支： + - HBuilderX 运行（本地开发）自动连接本地环境； + - HBuilderX 发行（打包上传微信）自动锁定线上生产环境：`https://fenleixinxi.gzyakj.com.cn/api`。 +- 上线发布只需在本地运行发行到微信小程序，使用微信开发者工具上传并提交微信审核即可。 diff --git a/public/assets/css/backend-theme.css b/public/assets/css/backend-theme.css index 133a264..1b8ea59 100644 --- a/public/assets/css/backend-theme.css +++ b/public/assets/css/backend-theme.css @@ -663,3 +663,538 @@ body.inside-header .content { transition: none !important; } } + + +/* ========================================================================== + FC 模块现代标准模态表单（Modal Form）与审核质检组件样式 + 遵循 ui-ux-pro-max 设计系统：双列卡片布局、清晰呼吸感、消除多选灰色轰炸 + ========================================================================== */ + +/* ---------- 弹窗主体容器 ---------- */ +.fc-modal-form { + padding: 12px 18px 70px; + background: #F8FAFC; +} + +/* ---------- 表单区块卡片 (Section Card) ---------- */ +.fc-form-section { + background: #FFFFFF; + border: 1px solid #E2E8F0; + border-radius: 8px; + margin-bottom: 16px; + box-shadow: 0 1px 3px rgba(15, 23, 42, 0.04); + overflow: hidden; + transition: border-color 0.2s ease, box-shadow 0.2s ease; +} + +.fc-form-section:hover { + border-color: #CBD5E1; + box-shadow: 0 4px 6px -1px rgba(15, 23, 42, 0.06); +} + +.fc-form-section__header { + display: flex; + align-items: center; + padding: 12px 16px; + background: #F8FAFC; + border-bottom: 1px solid #EDF2F7; +} + +.fc-form-section__badge { + display: inline-flex; + align-items: center; + justify-content: center; + width: 22px; + height: 22px; + border-radius: 50%; + background: #2563EB; + color: #FFFFFF; + font-size: 12px; + font-weight: 700; + margin-right: 10px; +} + +.fc-form-section__title { + font-size: 14px; + font-weight: 700; + color: #1E293B; + letter-spacing: 0.2px; +} + +.fc-form-section__body { + padding: 16px 18px 4px; +} + +.fc-form-section__body .form-group { + margin-bottom: 14px; +} + +.fc-form-section__body .control-label { + color: #334155; + font-weight: 600; + font-size: 13px; + padding-top: 7px; +} + +/* ---------- 弹窗底部操作条 (吸底保证) ---------- */ +.fc-modal-footer { + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 12px 24px; + background: #FFFFFF; + border-top: 1px solid #E2E8F0; + box-shadow: 0 -2px 10px rgba(15, 23, 42, 0.05); + margin-bottom: 0 !important; + z-index: 100; + display: flex; + justify-content: flex-end; + align-items: center; +} + +.fc-modal-footer .btn { + padding: 7px 20px; + font-size: 14px; + font-weight: 600; + border-radius: 6px; + margin-left: 10px; +} + +/* ---------- 动态批量操作工具栏 (Contextual Batch Bar) ---------- */ +.fc-batch-bar { + display: inline-flex; + align-items: center; + gap: 8px; + background: #EFF6FF; + border: 1px solid #BFDBFE; + padding: 4px 10px; + border-radius: 6px; + animation: fcBatchFadeIn 0.2s ease-out; +} + +@keyframes fcBatchFadeIn { + from { + opacity: 0; + transform: translateY(-4px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +.fc-batch-bar__tag { + font-size: 13px; + color: #1E40AF; + font-weight: 600; + margin-right: 6px; +} + +/* ---------- 审核与质检弹窗多图画廊 (Gallery) ---------- */ +.fc-inspect-gallery { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(130px, 1fr)); + gap: 12px; + margin-top: 10px; +} + +.fc-inspect-gallery__item { + position: relative; + display: block; + height: 110px; + border-radius: 6px; + overflow: hidden; + border: 1px solid #E2E8F0; + background: #F1F5F9; + transition: transform 0.15s ease, box-shadow 0.15s ease; +} + +.fc-inspect-gallery__item:hover { + transform: translateY(-2px); + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.12); +} + +.fc-inspect-gallery__item img { + width: 100%; + height: 100%; + object-fit: cover; + display: block; +} + +.fc-inspect-gallery__zoom { + position: absolute; + inset: 0; + background: rgba(15, 23, 42, 0.45); + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + opacity: 0; + font-size: 18px; + transition: opacity 0.2s ease; +} + +.fc-inspect-gallery__item:hover .fc-inspect-gallery__zoom { + opacity: 1; +} + +.fc-upload-preview { + margin-top: 10px; +} + +.fc-upload-preview li { + margin-right: 10px; + margin-bottom: 10px; +} + +.fc-upload-preview img { + border-radius: 4px; + border: 1px solid #E2E8F0; +} + + +/* ========================================================================== + 专属【信息审核与质检工作台】样式（纯净只读核验模式，杜绝 input 框反模式） + ========================================================================== */ + +.fc-audit-view { + padding: 18px 22px 90px; + background: #F8FAFC; + min-height: 100%; +} + +/* ---------- 顶部送审人画像条 ---------- */ +.fc-audit-user-bar { + display: flex; + align-items: center; + background: #FFFFFF; + border: 1px solid #E2E8F0; + border-radius: 8px; + padding: 14px 18px; + margin-bottom: 14px; + box-shadow: 0 1px 3px rgba(15, 23, 42, 0.04); +} + +.fc-audit-user-bar__avatar { + width: 48px; + height: 48px; + border-radius: 50%; + object-fit: cover; + margin-right: 14px; + border: 2px solid #E2E8F0; +} + +.fc-audit-user-bar__meta { + flex: 1; +} + +.fc-audit-user-bar__name { + font-size: 16px; + font-weight: 700; + color: #0F172A; + display: flex; + align-items: center; + gap: 8px; +} + +.fc-audit-user-bar__uid { + font-size: 12px; + color: #64748B; + background: #F1F5F9; + padding: 2px 8px; + border-radius: 12px; + font-weight: normal; +} + +.fc-audit-user-bar__sub { + font-size: 12px; + color: #64748B; + margin-top: 4px; +} + +.fc-audit-badge { + display: inline-flex; + align-items: center; + padding: 5px 12px; + border-radius: 20px; + font-size: 13px; + font-weight: 600; +} + +.fc-audit-badge--warning { + background: #FEF3C7; + color: #B45309; + border: 1px solid #FDE68A; +} + +.fc-audit-badge--success { + background: #DEF7EC; + color: #03543F; + border: 1px solid #BCF0DA; +} + +.fc-audit-badge--danger { + background: #FDE8E8; + color: #9B1C1C; + border: 1px solid #FBD5D5; +} + +.fc-audit-reject-alert { + background: #FFF1F2; + border: 1px solid #FECDD3; + color: #BE123C; + padding: 10px 16px; + border-radius: 6px; + margin-bottom: 14px; + font-size: 13px; + display: flex; + align-items: center; + gap: 8px; +} + +/* ---------- 送审核心凭据卡片 ---------- */ +.fc-audit-card { + background: #FFFFFF; + border: 1px solid #E2E8F0; + border-radius: 8px; + padding: 18px 20px; + margin-bottom: 14px; + box-shadow: 0 1px 3px rgba(15, 23, 42, 0.04); +} + +.fc-audit-card__head { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; +} + +.fc-audit-card__category { + font-size: 13px; + font-weight: 600; + color: #2563EB; + background: #EFF6FF; + padding: 3px 10px; + border-radius: 4px; +} + +.fc-audit-card__price { + font-size: 20px; + font-weight: 700; + color: #EA580C; + letter-spacing: -0.5px; +} + +.fc-audit-card__price small { + font-size: 12px; + color: #64748B; + font-weight: normal; +} + +.fc-audit-card__title { + margin: 0 0 12px; + font-size: 18px; + font-weight: 700; + color: #0F172A; + line-height: 1.4; +} + +.fc-audit-card__tags { + display: flex; + flex-wrap: wrap; + gap: 6px; + margin-bottom: 14px; +} + +.fc-audit-tag { + font-size: 12px; + background: #F1F5F9; + color: #334155; + padding: 2px 10px; + border-radius: 4px; + border: 1px solid #E2E8F0; +} + +.fc-audit-card__props { + display: flex; + flex-wrap: wrap; + gap: 16px; + padding: 10px 14px; + background: #F8FAFC; + border-radius: 6px; + font-size: 13px; + color: #475569; + margin-bottom: 14px; +} + +.fc-audit-prop-item { + display: flex; + align-items: center; + gap: 6px; +} + +.fc-audit-card__content-title { + font-size: 13px; + font-weight: 600; + color: #475569; + margin-bottom: 6px; +} + +.fc-audit-card__content-box { + background: #F8FAFC; + border: 1px solid #EDF2F7; + border-left: 3px solid #2563EB; + border-radius: 6px; + padding: 14px 16px; + color: #334155; + line-height: 1.7; + font-size: 14px; + white-space: pre-wrap; + max-height: 240px; + overflow-y: auto; +} + +/* ---------- 图片画廊质检区 ---------- */ +.fc-audit-gallery { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(140px, 1fr)); + gap: 12px; + margin-top: 8px; +} + +.fc-audit-gallery__card { + position: relative; + display: block; + height: 120px; + border-radius: 8px; + overflow: hidden; + border: 1px solid #E2E8F0; + background: #F1F5F9; + transition: transform 0.15s ease, box-shadow 0.15s ease; +} + +.fc-audit-gallery__card:hover { + transform: translateY(-2px); + box-shadow: 0 6px 12px rgba(15, 23, 42, 0.12); +} + +.fc-audit-gallery__card img { + width: 100%; + height: 100%; + object-fit: cover; + display: block; +} + +.fc-audit-gallery__cover-tag { + position: absolute; + top: 6px; + left: 6px; + background: rgba(15, 23, 42, 0.75); + color: #FFFFFF; + font-size: 11px; + padding: 1px 6px; + border-radius: 3px; +} + +.fc-audit-gallery__overlay { + position: absolute; + inset: 0; + background: rgba(15, 23, 42, 0.5); + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + font-size: 13px; + font-weight: 600; + gap: 4px; + opacity: 0; + transition: opacity 0.2s ease; +} + +.fc-audit-gallery__card:hover .fc-audit-gallery__overlay { + opacity: 1; +} + +.fc-audit-empty-media { + padding: 24px; + text-align: center; + color: #94A3B8; + background: #F8FAFC; + border: 1px dashed #E2E8F0; + border-radius: 6px; + font-size: 13px; +} + +/* ---------- 底部审核决策吸底条 ---------- */ +.fc-audit-footer { + position: fixed; + bottom: 0; + left: 0; + right: 0; + background: #FFFFFF; + border-top: 1px solid #E2E8F0; + box-shadow: 0 -4px 16px rgba(15, 23, 42, 0.08); + padding: 12px 24px; + z-index: 100; + display: flex; + align-items: center; + justify-content: space-between; + gap: 16px; +} + +.fc-audit-footer__reason-box { + display: flex; + align-items: center; + gap: 12px; + flex: 1; +} + +.fc-audit-footer__col-tpl { + width: 260px; +} + +.fc-audit-footer__col-tpl label, +.fc-audit-footer__col-input label { + font-size: 11px; + color: #64748B; + margin-bottom: 2px; + display: block; + font-weight: 600; +} + +.fc-audit-footer__col-input { + flex: 1; +} + +.fc-audit-footer__btns { + display: flex; + align-items: center; + gap: 10px; +} + +.fc-audit-footer__btns .btn { + padding: 8px 18px; + font-size: 14px; + font-weight: 700; + border-radius: 6px; +} + + +/* ---------- 列表纯两字按钮精致排版 ---------- */ +.bootstrap-table .table > tbody > tr > td .btn-xs { + padding: 3px 8px; + font-size: 12px; + line-height: 1.4; + border-radius: 4px; + margin: 0 2px; + font-weight: 600; + letter-spacing: 0.5px; +} + +.toolbar .btn { + font-size: 13px; + font-weight: 600; + border-radius: 6px; + padding: 6px 14px; +} diff --git a/public/assets/js/backend/fc/merchant.js b/public/assets/js/backend/fc/merchant.js index 078e346..9dda707 100644 --- a/public/assets/js/backend/fc/merchant.js +++ b/public/assets/js/backend/fc/merchant.js @@ -10,131 +10,269 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu edit_url: 'fc/merchant/edit', del_url: 'fc/merchant/del', multi_url: 'fc/merchant/multi', - import_url: 'fc/merchant/import', table: 'fc_merchant', } }); var table = $("#table"); + var batchBar = $("#batch-bar"); + var selectedCount = $("#selected-count"); // 初始化表格 table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, pk: 'id', sortName: 'id', - fixedColumns: true, - fixedRightNumber: 1, + sortOrder: 'desc', + escape: false, + clickToSelect: false, // 禁用点击行任意位置自动勾选复选框，杜绝误触发多选 columns: [ [ {checkbox: true}, - {field: 'id', title: __('SerialNo'), operate: false, sortable: false, align: 'center', width: '70px', class: 'fc-serial', table: table, formatter: Format.serial}, - {field: 'user_id', title: '用户', addClass: 'selectpage', extend: "data-source='user/user/index' data-field='nickname'", formatter: function (value, row) { - return row.user_name || '-'; - }}, - {field: 'name', title: __('Name'), operate: 'LIKE'}, + {field: 'id', title: '序号', operate: false, formatter: function (value, row, index) { + return '' + (index + 1) + ''; + }}, + {field: 'logo', title: '门头Logo', operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, + { + field: 'name', title: __('Name'), operate: 'LIKE', + events: { + 'click .btn-view-merchant': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/merchant/detail?ids=' + row.id + '&mode=view', '详情', {area: ['820px', '85%']}); + } + }, + formatter: function (value, row) { + return '' + value + ''; + } + }, + {field: 'user_id', title: '入驻用户', addClass: 'selectpage', extend: "data-source='user/user/index' data-field='nickname'"}, + {field: 'category', title: '所属行业', operate: 'LIKE'}, {field: 'contact', title: __('Contact'), operate: 'LIKE'}, - {field: 'category', title: __('Category'), operate: 'LIKE'}, + {field: 'license', title: '营业执照', operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image}, { field: 'audit_status', title: __('Audit_status'), searchList: {0: __('待审核'), 1: __('已通过'), 2: __('已驳回')}, formatter: Format.statusFormatter({0: __('待审核'), 1: __('已通过'), 2: __('已驳回')}, {0: 'warning', 1: 'success', 2: 'danger'}) }, { - field: 'shop_status', title: __('Shop_status'), - searchList: {normal: __('正常'), pending: __('待审核'), banned: __('已封禁')}, - formatter: Format.statusFormatter({normal: __('正常'), pending: __('待审核'), banned: __('已封禁')}, {normal: 'success', pending: 'warning', banned: 'danger'}) + field: 'shop_status', title: '营业状态', + searchList: {normal: __('正常营业'), closed: __('暂停歇业')}, + formatter: function (value) { + return value === 'normal' ? '正常营业' : '暂停歇业'; + } }, - {field: 'license', title: __('License'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'violations', title: __('Violations')}, - {field: 'post_count', title: __('Post_count')}, - {field: 'audit_reason', title: __('Audit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'logo', title: __('Logo'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content, visible: false}, - {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime, visible: false}, { - field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, - formatter: Table.api.formatter.operate, - buttons: [ - { - name: 'auditpass', - text: __('AuditPass'), - title: __('AuditPass'), - classname: 'btn btn-xs btn-success btn-click', - visible: function (row) { - return Number(row.audit_status) !== 1; - }, - confirm: __('确认审核通过该商家？'), - click: function (options, row) { + field: 'recommend', title: '推荐位', + searchList: {0: __('否'), 1: __('是')}, + formatter: Format.statusFormatter({0: __('否'), 1: __('已推荐')}, {0: 'default', 1: 'warning'}) + }, + {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + { + field: 'operate', title: '操作', align: 'center', width: '130px', + events: { + 'click .btn-audit-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/merchant/detail?ids=' + row.id + '&mode=audit', '审核', {area: ['820px', '85%']}); + }, + 'click .btn-detail-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/merchant/detail?ids=' + row.id + '&mode=view', '详情', {area: ['820px', '85%']}); + }, + 'click .btn-edit-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/merchant/edit?ids=' + row.id, '编辑', {area: ['820px', '85%']}); + }, + 'click .btn-del-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Layer.confirm(__('Are you sure you want to delete this item?'), {title: __('Warning'), btn: ['确定', '取消']}, function (confirmIndex) { Fast.api.ajax({ - url: 'fc/merchant/audit', - data: {ids: row.id, auditStatus: 1} + url: 'fc/merchant/del', + data: {ids: row.id} }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); + table.bootstrapTable('refresh'); return false; }); - } - }, - { - name: 'auditreject', - text: __('AuditReject'), - title: __('AuditReject'), - classname: 'btn btn-xs btn-danger btn-click', - visible: function (row) { - return Number(row.audit_status) !== 2; - }, - click: function (options, row) { - Layer.prompt({title: __('请输入驳回原因'), formType: 2}, function (value, index) { - Fast.api.ajax({ - url: 'fc/merchant/audit', - data: {ids: row.id, auditStatus: 2, reason: value} - }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); - return false; - }); - Layer.close(index); - }); - } + Layer.close(confirmIndex); + }); } - ] + }, + formatter: function (value, row) { + var isPending = Number(row.audit_status) === 0; + var actionBtn = isPending + ? '审核 ' + : '详情 '; + var editBtn = '编辑 '; + var delBtn = '删除'; + return actionBtn + editBtn + delBtn; + } } ] ] }); - // 为表格绑定事件 Table.api.bindevent(table); - // 审核通过 + /** + * 联动动态批量操作栏 + */ + function updateBatchBar() { + var selectedIds = Table.api.selectedids(table); + if (selectedIds.length > 0) { + selectedCount.text(selectedIds.length); + batchBar.removeClass('hide').show(); + } else { + batchBar.addClass('hide').hide(); + } + } + + table.on('check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table', function () { + updateBatchBar(); + }); + + // 双击行直接打开资质核验或详情 + table.on('dbl-click-row.bs.table', function (e, row) { + var isPending = Number(row.audit_status) === 0; + var mode = isPending ? 'audit' : 'view'; + var title = isPending ? '审核' : '详情'; + Fast.api.open('fc/merchant/detail?ids=' + row.id + '&mode=' + mode, title, {area: ['820px', '85%']}); + }); + + $(document).on('click', '.btn-clear-selection', function () { + table.bootstrapTable('uncheckAll'); + updateBatchBar(); + }); + + // 批量审核通过 $(document).on('click', '.btn-audit-pass', function () { var ids = Table.api.selectedids(table); - Layer.confirm(__('确认审核通过选中的商家？'), {icon: 3, title: __('提示')}, function (index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要批量操作的商家'); + return; + } + Layer.confirm('确认批量审核通过选中的 ' + ids.length + ' 个商家入驻？', {title: '批量审核确认', btn: ['通过', '取消']}, function (index) { Fast.api.ajax({ url: 'fc/merchant/audit', data: {ids: ids.join(','), auditStatus: 1} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); - // 审核驳回 + // 批量审核驳回 $(document).on('click', '.btn-audit-reject', function () { var ids = Table.api.selectedids(table); - Layer.prompt({title: __('请输入驳回原因'), formType: 2}, function (value, index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要批量操作的商家'); + return; + } + Layer.prompt({title: '请输入批量驳回的原因（将通知给申请商户）', formType: 2}, function (value, index) { + if (!$.trim(value)) { + Toastr.error('驳回原因不可为空'); + return; + } Fast.api.ajax({ url: 'fc/merchant/audit', data: {ids: ids.join(','), auditStatus: 2, reason: value} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); + // 批量设为推荐 + $(document).on('click', '.btn-merchant-batch-recommend', function () { + var ids = Table.api.selectedids(table); + if (ids.length === 0) { + Toastr.warning('请先勾选需要推荐的商家'); + return; + } + Layer.confirm('确认批量将选中的 ' + ids.length + ' 个商家设为首页推荐？', {title: '推荐确认', btn: ['推荐', '取消']}, function (index) { + Fast.api.ajax({ + url: 'fc/merchant/recommend', + data: {ids: ids.join(','), recommend: 1} + }, function () { + table.bootstrapTable('refresh'); + updateBatchBar(); + return false; + }); + Layer.close(index); + }); + }); }, + + detail: function () { + var merchantId = Fast.api.query('ids') || Fast.api.query('id'); + + function submitAudit(status, reason) { + Fast.api.ajax({ + url: 'fc/merchant/audit', + type: 'POST', + data: { + ids: merchantId, + auditStatus: status, + reason: reason || '' + } + }, function (data, ret) { + Toastr.success(ret.msg || '操作成功'); + setTimeout(function () { + Fast.api.close(); + if (parent.$ && parent.$('#table').length) { + parent.$('#table').bootstrapTable('refresh'); + } + }, 400); + return false; + }, function (data, ret) { + Toastr.error(ret.msg || '操作失败'); + return false; + }); + } + + // 点击通过：弹窗确认通过 + $('#btn-pass').off('click').on('click', function () { + Layer.confirm('确认审核通过此商家的入驻申请吗？', { + title: '通过确认', + btn: ['通过', '取消'] + }, function (index) { + Layer.close(index); + submitAudit(1, ''); + }); + }); + + // 点击驳回：弹窗确认输入驳回原因 + $('#btn-reject').off('click').on('click', function () { + Layer.prompt({ + title: '请输入驳回原因（将通知给申请商户）', + formType: 2, + value: '' + }, function (value, promptIndex) { + var reason = $.trim(value); + if (!reason) { + Toastr.warning('驳回原因不可为空'); + return; + } + Layer.close(promptIndex); + submitAudit(2, reason); + }); + }); + + // 点击关闭 + $('#btn-close').off('click').on('click', function () { + Fast.api.close(); + }); + }, + add: function () { Controller.api.bindevent(); }, @@ -147,5 +285,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu } } }; + return Controller; }); diff --git a/public/assets/js/backend/fc/post.js b/public/assets/js/backend/fc/post.js index d333422..8dbe6f7 100644 --- a/public/assets/js/backend/fc/post.js +++ b/public/assets/js/backend/fc/post.js @@ -10,182 +10,126 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu edit_url: 'fc/post/edit', del_url: 'fc/post/del', multi_url: 'fc/post/multi', - import_url: 'fc/post/import', table: 'fc_post', } }); var table = $("#table"); + var batchBar = $("#batch-bar"); + var selectedCount = $("#selected-count"); // 初始化表格 table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, pk: 'id', sortName: 'id', - fixedColumns: true, - fixedRightNumber: 1, + sortOrder: 'desc', + escape: false, + clickToSelect: false, // 禁用点击行任意位置自动勾选复选框，杜绝点击操作按钮误触发多选 columns: [ [ {checkbox: true}, - {field: 'id', title: __('SerialNo'), operate: false, sortable: false, align: 'center', width: '70px', class: 'fc-serial', table: table, formatter: Format.serial}, - {field: 'title', title: __('Title'), operate: 'LIKE'}, - {field: 'category_id', title: '分类', addClass: 'selectpage', extend: "data-source='fc/category/index' data-field='name'", formatter: function (value, row) { - return row.category_name || '-'; - }}, - {field: 'price', title: __('Price'), operate: 'BETWEEN', - formatter: function (value) { - return (value === null || value === '' || value === undefined) ? '-' : '¥' + value; + {field: 'id', title: '序号', operate: false, formatter: function (value, row, index) { + return '' + (index + 1) + ''; + }}, + { + field: 'cover', title: '封面', operate: false, align: 'center', width: '65px', + events: Table.api.events.image, + formatter: function (value, row) { + var img = value || (row.media && row.media.length > 0 ? (typeof row.media === 'string' && row.media.indexOf('[') === 0 ? JSON.parse(row.media)[0] : row.media.split(',')[0]) : ''); + return img ? Table.api.formatter.image.call(this, img, row) : '无图'; } }, - {field: 'price_unit', title: __('Price_unit'), operate: 'LIKE'}, - {field: 'area', title: __('Area'), operate: 'LIKE'}, - {field: 'audit_status', title: __('Audit_status'), + { + field: 'title', title: __('Title'), operate: 'LIKE', align: 'left', + events: { + 'click .btn-view-detail': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/post/detail?ids=' + row.id + '&mode=view', '详情', {area: ['850px', '85%']}); + } + }, + formatter: function (value, row) { + var topBadge = Number(row.is_top) === 1 ? '置顶' : ''; + return topBadge + '' + value + ''; + } + }, + { + field: 'category_id', title: '分类', addClass: 'selectpage', extend: "data-source='fc/category/index' data-field='name'", + formatter: function (value, row) { + return row.category_name ? '' + row.category_name + '' : '-'; + } + }, + { + field: 'price', title: __('Price'), operate: 'BETWEEN', align: 'right', + formatter: function (value, row) { + if (value === null || value === '' || value === undefined || Number(value) === 0) { + return '面议/免费'; + } + return '¥' + value + '' + (row.price_unit ? ' ' + row.price_unit + '' : ''); + } + }, + {field: 'area', title: __('Area'), operate: 'LIKE', formatter: function (value) { return value || '-'; }}, + { + field: 'user_id', title: '发布用户', addClass: 'selectpage', extend: "data-source='user/user/index' data-field='nickname'", + formatter: function (value, row) { + return row.user_name ? ' ' + row.user_name : '-'; + } + }, + { + field: 'audit_status', title: __('Audit_status'), searchList: {0: __('待审核'), 1: __('已通过'), 2: __('已驳回')}, formatter: Format.statusFormatter({0: __('待审核'), 1: __('已通过'), 2: __('已驳回')}, {0: 'warning', 1: 'success', 2: 'danger'}) }, - {field: 'views', title: __('Views')}, - {field: 'is_paid', title: __('Is_paid'), - searchList: {0: __('否'), 1: __('是')}, - formatter: Format.statusFormatter({0: __('未付费'), 1: __('已付费')}, {0: 'default', 1: 'success'}) - }, - {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'content', title: __('Content'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'cover', title: __('Cover'), operate: 'LIKE'}, - {field: 'media', title: __('Media'), visible: false}, - {field: 'user_id', title: '发布用户', addClass: 'selectpage', extend: "data-source='user/user/index' data-field='nickname'", formatter: function (value, row) { - return row.user_name || '-'; - }}, - {field: 'address', title: __('Address'), operate: 'LIKE'}, - {field: 'contact', title: __('Contact'), operate: 'LIKE'}, - {field: 'phone', title: __('Phone'), operate: 'LIKE'}, - {field: 'wechat', title: __('Wechat'), operate: 'LIKE'}, - {field: 'tags', title: __('Tags'), operate: 'LIKE', formatter: Table.api.formatter.flag}, - {field: 'amount', title: __('Amount'), operate: 'BETWEEN', - formatter: function (value) { - return (value === null || value === '' || value === undefined) ? '-' : '¥' + value; - } - }, - {field: 'pay_type', title: __('Pay_type'), - searchList: {wxpay: __('微信支付'), balance: __('余额支付')}, - formatter: function (value) { - var m = {wxpay: __('微信支付'), balance: __('余额支付')}; - return m[value] !== undefined ? m[value] : '-'; - } - }, - {field: 'audit_reason', title: __('Audit_reason'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, - {field: 'likes', title: __('Likes')}, - {field: 'comment_count', title: __('Comment_count')}, - {field: 'status', title: __('Status'), + { + field: 'status', title: '上架状态', searchList: {1: __('正常'), 0: __('已下架')}, formatter: Format.statusFormatter({1: __('正常'), 0: __('已下架')}, {1: 'success', 0: 'default'}) }, - {field: 'is_top', title: __('Is_top'), - searchList: {0: __('否'), 1: __('是')}, - formatter: Format.statusFormatter({0: __('未置顶'), 1: __('已置顶')}, {0: 'default', 1: 'warning'}) - }, - {field: 'distance', title: __('Distance')}, - {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime, visible: false}, - {field: 'deletetime', title: __('Deletetime'), visible: false}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, - buttons: [ - { - name: 'auditpass', - text: __('AuditPass'), - title: __('AuditPass'), - classname: 'btn btn-xs btn-success btn-click', - visible: function (row) { - return Number(row.audit_status) !== 1; - }, - confirm: __('确认审核通过该信息？'), - click: function (options, row) { - Fast.api.ajax({ - url: 'fc/post/audit', - data: {ids: row.id, auditStatus: 1} - }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); - return false; - }); - } + {field: 'views', title: __('Views'), sortable: true, operate: false}, + {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, + { + field: 'operate', title: '操作', align: 'center', width: '130px', + events: { + 'click .btn-audit-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/post/detail?ids=' + row.id + '&mode=audit', '审核', {area: ['850px', '85%']}); }, - { - name: 'auditreject', - text: __('AuditReject'), - title: __('AuditReject'), - classname: 'btn btn-xs btn-danger btn-click', - visible: function (row) { - return Number(row.audit_status) !== 2; - }, - click: function (options, row) { - Layer.prompt({title: __('请输入驳回原因'), formType: 2}, function (value, index) { - Fast.api.ajax({ - url: 'fc/post/audit', - data: {ids: row.id, auditStatus: 2, reason: value} - }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); - return false; - }); - Layer.close(index); - }); - } + 'click .btn-detail-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/post/detail?ids=' + row.id + '&mode=view', '详情', {area: ['850px', '85%']}); }, - { - name: 'offline', - text: __('OfflinePost'), - title: __('OfflinePost'), - classname: 'btn btn-xs btn-warning btn-click', - visible: function (row) { - return Number(row.status) === 1; - }, - confirm: __('确认下架该信息？'), - click: function (options, row) { + 'click .btn-edit-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Fast.api.open('fc/post/edit?ids=' + row.id, '编辑', {area: ['850px', '85%']}); + }, + 'click .btn-del-one': function (e, value, row, index) { + e.stopPropagation(); + e.preventDefault(); + Layer.confirm(__('Are you sure you want to delete this item?'), {title: __('Warning'), btn: ['确定', '取消']}, function (confirmIndex) { Fast.api.ajax({ - url: 'fc/post/offline', + url: 'fc/post/del', data: {ids: row.id} }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); + table.bootstrapTable('refresh'); return false; }); - } - }, - { - name: 'top', - text: __('TopPost'), - title: __('TopPost'), - classname: 'btn btn-xs btn-info btn-click', - visible: function (row) { - return Number(row.is_top) !== 1; - }, - confirm: __('确认置顶该信息？'), - click: function (options, row) { - Fast.api.ajax({ - url: 'fc/post/top', - data: {ids: row.id, isTop: 1} - }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); - return false; - }); - } - }, - { - name: 'untop', - text: __('CancelTopPost'), - title: __('CancelTopPost'), - classname: 'btn btn-xs btn-default btn-click', - visible: function (row) { - return Number(row.is_top) === 1; - }, - confirm: __('确认取消置顶该信息？'), - click: function (options, row) { - Fast.api.ajax({ - url: 'fc/post/top', - data: {ids: row.id, isTop: 0} - }, function () { - $('#' + options.tableId).bootstrapTable('refresh'); - return false; - }); - } + Layer.close(confirmIndex); + }); } - ] + }, + formatter: function (value, row) { + var isPending = Number(row.audit_status) === 0; + var actionBtn = isPending + ? '审核 ' + : '详情 '; + var editBtn = '编辑 '; + var delBtn = '删除'; + return actionBtn + editBtn + delBtn; + } } ] ] @@ -194,84 +138,192 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu // 为表格绑定事件 Table.api.bindevent(table); - // 审核通过 + /** + * 联动动态批量操作工具栏（仅勾选多项时显示，杜绝界面臃肿） + */ + function updateBatchBar() { + var selectedIds = Table.api.selectedids(table); + if (selectedIds.length > 0) { + selectedCount.text(selectedIds.length); + batchBar.removeClass('hide').show(); + } else { + batchBar.addClass('hide').hide(); + } + } + + table.on('check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table', function () { + updateBatchBar(); + }); + + // 双击行打开详情弹窗 + table.on('dbl-click-row.bs.table', function (e, row) { + var isPending = Number(row.audit_status) === 0; + var mode = isPending ? 'audit' : 'view'; + var title = isPending ? '审核' : '详情'; + Fast.api.open('fc/post/detail?ids=' + row.id + '&mode=' + mode, title, {area: ['850px', '85%']}); + }); + + // 清除多选选中状态 + $(document).on('click', '.btn-clear-selection', function () { + table.bootstrapTable('uncheckAll'); + updateBatchBar(); + }); + + // 批量审核通过 $(document).on('click', '.btn-audit-pass', function () { var ids = Table.api.selectedids(table); - Layer.confirm(__('确认审核通过选中的信息？'), {icon: 3, title: __('提示')}, function (index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要批量操作的信息'); + return; + } + Layer.confirm('确认批量审核通过选中的 ' + ids.length + ' 条信息？', {title: '批量审核确认', btn: ['通过', '取消']}, function (index) { Fast.api.ajax({ url: 'fc/post/audit', data: {ids: ids.join(','), auditStatus: 1} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); - // 审核驳回 + // 批量审核驳回 $(document).on('click', '.btn-audit-reject', function () { var ids = Table.api.selectedids(table); - Layer.prompt({title: __('请输入驳回原因'), formType: 2}, function (value, index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要批量操作的信息'); + return; + } + Layer.prompt({title: '请输入批量驳回的原因（将通知给发布用户）', formType: 2}, function (value, index) { + if (!$.trim(value)) { + Toastr.error('驳回原因不可为空'); + return; + } Fast.api.ajax({ url: 'fc/post/audit', data: {ids: ids.join(','), auditStatus: 2, reason: value} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); - // 下架 + // 批量下架 $(document).on('click', '.btn-offline', function () { var ids = Table.api.selectedids(table); - Layer.confirm(__('确认下架选中的信息？'), {icon: 3, title: __('提示')}, function (index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要下架的信息'); + return; + } + Layer.confirm('确认批量下架选中的 ' + ids.length + ' 条信息？', {title: '下架确认', btn: ['下架', '取消']}, function (index) { Fast.api.ajax({ url: 'fc/post/offline', data: {ids: ids.join(',')} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); - // 置顶（选中项在用户端首页优先展示） + // 批量置顶 $(document).on('click', '.btn-top', function () { var ids = Table.api.selectedids(table); - Layer.confirm(__('确认置顶选中的信息？'), {icon: 3, title: __('提示')}, function (index) { + if (ids.length === 0) { + Toastr.warning('请先勾选需要置顶的信息'); + return; + } + Layer.confirm('确认批量置顶选中的 ' + ids.length + ' 条信息？', {title: '置顶确认', btn: ['置顶', '取消']}, function (index) { Fast.api.ajax({ url: 'fc/post/top', data: {ids: ids.join(','), isTop: 1} - }, function (data) { + }, function () { table.bootstrapTable('refresh'); + updateBatchBar(); return false; }); Layer.close(index); }); }); - - // 取消置顶 - $(document).on('click', '.btn-untop', function () { - var ids = Table.api.selectedids(table); - Layer.confirm(__('确认取消置顶选中的信息？'), {icon: 3, title: __('提示')}, function (index) { - Fast.api.ajax({ - url: 'fc/post/top', - data: {ids: ids.join(','), isTop: 0} - }, function (data) { - table.bootstrapTable('refresh'); - return false; - }); - Layer.close(index); - }); - }); - }, + + /** + * 详情与审核窗口逻辑 + */ + detail: function () { + var postId = Fast.api.query('ids') || Fast.api.query('id'); + + /** + * 提交审核结果 + * @param {number} status 1=通过, 2=驳回 + * @param {string} reason 驳回原因 + */ + function submitAudit(status, reason) { + Fast.api.ajax({ + url: 'fc/post/audit', + type: 'POST', + data: { + ids: postId, + auditStatus: status, + reason: reason || '' + } + }, function (data, ret) { + Toastr.success(ret.msg || '操作成功'); + setTimeout(function () { + Fast.api.close(); + if (parent.$ && parent.$('#table').length) { + parent.$('#table').bootstrapTable('refresh'); + } + }, 400); + return false; + }, function (data, ret) { + Toastr.error(ret.msg || '操作失败'); + return false; + }); + } + + // 点击通过：弹窗确认通过 + $('#btn-pass').off('click').on('click', function () { + Layer.confirm('确认审核通过此信息吗？', { + title: '通过确认', + btn: ['通过', '取消'] + }, function (index) { + Layer.close(index); + submitAudit(1, ''); + }); + }); + + // 点击驳回：弹窗确认输入驳回原因 + $('#btn-reject').off('click').on('click', function () { + Layer.prompt({ + title: '请输入驳回原因（将通知给发布用户）', + formType: 2, + value: '' + }, function (value, promptIndex) { + var reason = $.trim(value); + if (!reason) { + Toastr.warning('驳回原因不可为空'); + return; + } + Layer.close(promptIndex); + submitAudit(2, reason); + }); + }); + + // 点击关闭 + $('#btn-close').off('click').on('click', function () { + Fast.api.close(); + }); + }, + recyclebin: function () { - // 初始化表格参数配置 Table.api.init({ extend: { 'dragsort_url': '' @@ -280,15 +332,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu var table = $("#table"); - // 初始化表格 table.bootstrapTable({ url: 'fc/post/recyclebin' + location.search, pk: 'id', sortName: 'id', + clickToSelect: false, columns: [ [ {checkbox: true}, - {field: 'id', title: __('SerialNo'), operate: false, sortable: false, align: 'center', width: '70px', class: 'fc-serial', table: table, formatter: Format.serial}, + {field: 'id', title: '序号', operate: false, formatter: function (value, row, index) { + return '' + (index + 1) + ''; + }}, {field: 'title', title: __('Title'), align: 'left'}, { field: 'deletetime', @@ -299,24 +353,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu }, { field: 'operate', - width: '140px', - title: __('Operate'), + width: '120px', + title: '操作', table: table, events: Table.api.events.operate, buttons: [ { name: 'Restore', - text: __('Restore'), + text: '还原', classname: 'btn btn-xs btn-info btn-ajax btn-restoreit', - icon: 'fa fa-rotate-left', url: 'fc/post/restore', refresh: true }, { name: 'Destroy', - text: __('Destroy'), + text: '销毁', classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit', - icon: 'fa fa-times', url: 'fc/post/destroy', refresh: true } @@ -327,7 +379,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu ] }); - // 为表格绑定事件 Table.api.bindevent(table); }, @@ -343,5 +394,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu } } }; + return Controller; }); diff --git a/public/assets/js/backend/fc/report.js b/public/assets/js/backend/fc/report.js index 2e7ab73..0f3dde5 100644 --- a/public/assets/js/backend/fc/report.js +++ b/public/assets/js/backend/fc/report.js @@ -53,8 +53,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu buttons: [ { name: 'handle', - text: __('HandleReport'), - title: __('HandleReport'), + text: '处理', + title: '处理', classname: 'btn btn-xs btn-success btn-click', visible: function (row) { return row.status !== 'handled'; diff --git a/public/assets/js/backend/fc/withdraw.js b/public/assets/js/backend/fc/withdraw.js index 79ecee5..f62fece 100644 --- a/public/assets/js/backend/fc/withdraw.js +++ b/public/assets/js/backend/fc/withdraw.js @@ -77,7 +77,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu buttons: [ { name: 'pay', - text: __('PayWithdraw'), + text: '打款', title: __('PayWithdraw'), classname: 'btn btn-xs btn-success btn-click', visible: function (row) { @@ -96,7 +96,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'backend/format'], fu }, { name: 'reject', - text: __('RejectWithdraw'), + text: '驳回', title: __('RejectWithdraw'), classname: 'btn btn-xs btn-danger btn-click', visible: function (row) { diff --git a/runtime/.gitkeep b/runtime/.gitkeep deleted file mode 100755 index 8b13789..0000000 --- a/runtime/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/uniapp/common/store/ui.js b/uniapp/common/store/ui.js index ad7bcee..0d87e8c 100644 --- a/uniapp/common/store/ui.js +++ b/uniapp/common/store/ui.js @@ -118,6 +118,31 @@ export function catIcon(cat) { return categoryIconUrl(cat.id) } +/** + * 请求微信订阅消息授权（需在用户点击事件中调用） + * + * 模板 ID 由后台「系统配置 → 小程序配置」下发（/setting/ui 的 subscribe 字段）。 + * 未配置 / 非小程序环境时静默跳过，不阻断业务。 + * + * @param {'audit'|'transfer'} scene 订阅场景标识 + * @returns {Promise} 授权结果状态：accepted | reject | none | unsupported + */ +export function requestSubscribe(scene) { + const id = (uiState.subscribe && uiState.subscribe[scene]) || '' + if (!id) return Promise.resolve('none') + if (typeof uni === 'undefined' || !uni.requestSubscribeMessage) { + return Promise.resolve('unsupported') + } + + return new Promise((resolve) => { + uni.requestSubscribeMessage({ + tmplIds: [id], + success: (res) => resolve((res && res[id]) || 'accepted'), + fail: () => resolve('reject'), + }) + }) +} + export default { uiState, applyUiConfig, @@ -126,4 +151,5 @@ export default { logoUrl, categoryIconUrl, catIcon, + requestSubscribe, } diff --git a/uniapp/common/utils/subscribe.js b/uniapp/common/utils/subscribe.js index 136800a..79b10e1 100644 --- a/uniapp/common/utils/subscribe.js +++ b/uniapp/common/utils/subscribe.js @@ -1,30 +1,10 @@ /** - * 微信订阅消息授权 + * 微信订阅消息授权（兼容导出层） * - * 模板 ID 由后台「系统配置 → 小程序配置」下发（/setting/ui 的 subscribe 字段）。 - * 未配置 / 非小程序环境时静默跳过，不阻断业务。 + * 核心逻辑由 @/common/store/ui.js 统一承载。 + * 本文件保留以兼容历史模块路径导入。 */ -import { uiState } from '../store/ui.js' - -/** - * 请求订阅授权（需在用户点击事件中调用） - * @param {'audit'|'transfer'} scene - * @returns {Promise} accepted | reject | none | unsupported - */ -export function requestSubscribe(scene) { - const id = (uiState.subscribe && uiState.subscribe[scene]) || '' - if (!id) return Promise.resolve('none') - if (typeof uni === 'undefined' || !uni.requestSubscribeMessage) { - return Promise.resolve('unsupported') - } - - return new Promise((resolve) => { - uni.requestSubscribeMessage({ - tmplIds: [id], - success: (res) => resolve((res && res[id]) || 'accepted'), - fail: () => resolve('reject'), - }) - }) -} +import { requestSubscribe } from '../store/ui.js' +export { requestSubscribe } export default { requestSubscribe } diff --git a/uniapp/pages/distribution/index.vue b/uniapp/pages/distribution/index.vue index 476d810..53dd3b6 100644 --- a/uniapp/pages/distribution/index.vue +++ b/uniapp/pages/distribution/index.vue @@ -296,8 +296,7 @@ import distributionApi from '@/common/api/distribution.js' import authApi from '@/common/api/auth.js' import { WITHDRAW_TEXT } from '@/common/constants/ui.js' import { fromNow } from '@/common/utils/format.js' -import { requestSubscribe } from '@/common/utils/subscribe.js' -import { iconUrl, loadUiConfig, uiState } from '@/common/store/ui.js' +import { iconUrl, loadUiConfig, uiState, requestSubscribe } from '@/common/store/ui.js' import FcNavbar from '@/components/fc-navbar/fc-navbar.vue' export default { @@ -1205,7 +1204,7 @@ export default { padding: 6rpx 18rpx; border-radius: 24rpx; background: $fc-primary; - color: $fc-on-primary; + color: $fc-primary-ink; font-size: 22rpx; line-height: 1.6; } diff --git a/uniapp/pages/post/create.vue b/uniapp/pages/post/create.vue index 3f5e667..8cd4a0e 100644 --- a/uniapp/pages/post/create.vue +++ b/uniapp/pages/post/create.vue @@ -286,9 +286,8 @@ import FcAreaPicker from '@/components/fc-area-picker/fc-area-picker.vue' import homeApi from '@/common/api/home.js' import postApi from '@/common/api/post.js' import { useUserStore } from '@/common/store/index.js' -import { iconUrl, categoryIconUrl, loadUiConfig } from '@/common/store/ui.js' +import { iconUrl, categoryIconUrl, loadUiConfig, requestSubscribe } from '@/common/store/ui.js' import { pay } from '@/common/utils/pay.js' -import { requestSubscribe } from '@/common/utils/subscribe.js' import { assetUrl } from '@/common/utils/format.js' import config from '@/common/config/index.js' diff --git a/uniapp/uni.scss b/uniapp/uni.scss index 09a08d9..2d326d8 100644 --- a/uniapp/uni.scss +++ b/uniapp/uni.scss @@ -88,7 +88,8 @@ $uni-font-size-paragraph:15px; /* 品牌主色 · 春绿（Spring Green = 设计稿 #00E070） */ $fc-primary: #00e070; // 品牌亮绿（面：按钮底 / 选中态 / 徽章 / 装饰） -$fc-primary-ink: #04301e; // 亮绿面上的字（8.2:1，替代白字） +$fc-primary-ink: #04301e; // 亮绿面上的字（8.2:1，替代白字） +$fc-on-primary: $fc-primary-ink; // 兼容别名：亮绿面上的字（#04301E） $fc-primary-text: #04874a; // 白底上的绿字 / 强调文字（4.6:1） $fc-primary-light: #5cf3a6; // 主色浅（描边 / 次级强调 / 图标高光） $fc-primary-lighter: #e4fdf0; // 主色极浅（浅底块 / 选中底）