From 4e0e36178d82ed486d8cec2c8f52ca96d715cc12 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 30 Oct 2025 19:16:05 +0800
Subject: [PATCH] 1、活动增加促销商品（完成后端） 2、修复小程序端活动相册下载不了的问题； 3、修复小程序端活动详情定位问题； 4、修复小程序端报名时免费的也弹出支付弹窗的问题； 5、修复分会后台活动核销码下载问题。
---
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