From abc7edc3c8ad59ff213c85413d0d6a10d7a0b6f7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 17 Dec 2025 18:03:09 +0800
Subject: [PATCH] 1.	发布供需消耗连盟币,连盟币数量在后台独立设置 2.	小程序供需个人中心可自由切换身份 3.	增加私信系统 4.	增加评论系统,用户可在发布者详情页进行评论操作,评论获得的连盟币可在后台设置 5.	增加发布者的等级,以好评个数为条件进行升级,小程序端会显示该等级的图标,如没有等级则不会显示图标 6.	增加设置消耗连盟币可以解锁、查看发布的信息,费用可在后台设置 7.	小程序供需大厅界面优化,以及增加了推荐栏目,该栏目按发布的分类相似进行匹配,比如A用户发布了 互联网 分类的需求,则会优先推荐匹配互联网分类的供应需求给他。

---
 admin/app/branch/controller/activity/Activity.php |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/admin/app/branch/controller/activity/Activity.php b/admin/app/branch/controller/activity/Activity.php
index 0c5d10d..7ebae95 100644
--- a/admin/app/branch/controller/activity/Activity.php
+++ b/admin/app/branch/controller/activity/Activity.php
@@ -7,6 +7,7 @@
 use app\branch\model\category\Category as CategoryModel;
 use app\shop\model\user\User as UserModel;
 use app\common\service\qrcode\BranchActivityService;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
 
 /**
  * 活动控制器
@@ -35,7 +36,7 @@
         }
         $model = new ActivityModel;
         //Vue要添加的数据
-        $data = $this->postData();
+        $data = json_decode($this->request->post('formData', '', null), true);
         if(empty($data['reg_date'])){
             return $this->renderError('请选择报名时间');
         }
@@ -58,8 +59,9 @@
      */
     public function detail($activity_id)
     {
-        $model = new ActivityModel;
-        return $this->renderSuccess('', $model->detail($activity_id));
+        $model = (new ActivityModel)->detail($activity_id);
+        $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+        return $this->renderSuccess('', $model);
     }
 
     /**
@@ -81,17 +83,22 @@
             $model['act_date'] = $tem_act_date;
             $model['coordinate'] = $model['latitude'] . ',' . $model['longitude'];
             // 获取核销人员数据
-            $model['verify_user'] = [];
-            if ($model['verify_user_ids']) {
-                $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
+            // $model['verify_user'] = [];
+            // if ($model['verify_user_ids']) {
+            //     $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
+            // }
+            $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+            $product_ids = [];
+            if(!empty($model['product_list'])){
+                $product_ids = array_column($model['product_list'], 'product_id');
             }
 
-            return $this->renderSuccess('', compact('catgory', 'model'));
+            return $this->renderSuccess('', compact('catgory', 'model', 'product_ids'));
         }
         // 活动详情
         $model = ActivityModel::detail($activity_id);
         //Vue要添加的数据
-        $data = $this->postData();
+        $data = json_decode($this->request->post('formData', '', null), true);
         if(empty($data['reg_date'])){
             return $this->renderError('请选择报名时间');
         }
@@ -103,7 +110,7 @@
             return $this->renderError('请在地图点击选择坐标');
         }
         // 更新记录
-        if ($model->edit($this->postData())) {
+        if ($model->edit($data)) {
             return $this->renderSuccess('更新成功');
         }
         return $this->renderError($model->getError() ?: '更新失败');
@@ -142,7 +149,13 @@
     {
         $detail = ActivityModel::detail($activity_id);
         $Qrcode = new BranchActivityService($detail, [], $source);
-        return $Qrcode->getVerifyImage();
+        $fullPath = $Qrcode->getVerifyImage();
+
+        header('Content-Type: image/png');
+        header('Content-disposition: attachment; filename='. $detail['name'] .'_.png');
+        readfile($fullPath);
+        header('Content-Length: ' .filesize($fullPath));
+        
     }
 
 

--
Gitblit v1.9.2