From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/common/service/qrcode/BranchActivityService.php | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/admin/app/common/service/qrcode/BranchActivityService.php b/admin/app/common/service/qrcode/BranchActivityService.php
index 71ddcb3..dc79e25 100644
--- a/admin/app/common/service/qrcode/BranchActivityService.php
+++ b/admin/app/common/service/qrcode/BranchActivityService.php
@@ -54,23 +54,25 @@
// mkdir($savePath, 0755, true);
if ($this->source == 'wx') {
// 下载小程序码
- $scene = "activity_id:{$this->activity['activity_id']}";
- $fullPath = $this->saveBranchActivityQrcodeToDir($this->activity['app_id'], 'pages/branch/activity/detail/detail', $savePath, $scene);
+ $scene = "activity_id:{$this->activity['activity_id']},user_verify:1";
+ $fileName = $this->saveBranchActivityQrcodeToDir($this->activity['app_id'], 'pages/branch/activity/detail/detail', $savePath, $scene);
} else if ($this->source == 'mp' || $this->source == 'h5'){
- $fullPath = $this->saveBranchActivityVerifyMpQrcodeToDir('h5/pages/branch/activity/detail/detail',$savePath, $this->activity['activity_id'], $this->activity['app_id']);
+ $fileName = $this->saveBranchActivityVerifyMpQrcodeToDir('h5/pages/branch/activity/detail/detail',$savePath, $this->activity['activity_id'], $this->activity['app_id']);
}
- if (!$fullPath) {
+ if (!$fileName) {
throw new BaseException(['msg' => '下载失败, 文件不存在']);
}
+ return $this->getVerifyUrl($fileName);
- header('Content-Type: image/png');
- header('Content-disposition: attachment; filename='. $this->activity['name'] .'_'. $this->source . '.png');
- readfile($fullPath);
- header('Content-Length: ' .filesize($fullPath));
+ // header('Content-Type: image/png');
+ // header('Content-disposition: attachment; filename='. $this->activity['name'] .'_'. $this->source . '.png');
+ // readfile($fullPath);
+ // header('Content-Length: ' .filesize($fullPath));
}
/**
+ * 分享海报
* @return mixed
*/
public function getImage()
@@ -215,6 +217,15 @@
}
/**
+ * 核销码url
+ */
+ private function getVerifyUrl($fileName)
+ {
+ $path = "branch/activity_verify_{$this->activity['activity_id']}/";
+ return \base_url() . 'temp/' . $this->activity['app_id'] . '/' .$path . $this->source . '/' . $fileName . '?t=' . time();
+ }
+
+ /**
* 生成圆形图片
*/
private function circular($imgpath, $saveName = '')
--
Gitblit v1.9.2