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/model/file/UploadFile.php | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/admin/app/common/model/file/UploadFile.php b/admin/app/common/model/file/UploadFile.php
index d8bd4a6..5a391cf 100644
--- a/admin/app/common/model/file/UploadFile.php
+++ b/admin/app/common/model/file/UploadFile.php
@@ -13,7 +13,7 @@
protected $name = 'upload_file';
protected $updateTime = false;
protected $deleteTime = false;
- protected $append = ['file_path'];
+ protected $append = ['file_path', 'original_path'];
/**
* 关联文件库分组表
@@ -34,7 +34,22 @@
if ($data['storage'] === 'local') {
return self::$base_url . 'uploads/' . $data['save_name'];
}
- return $data['file_url'] . '/' . $data['file_name'];
+ return $data['file_url'] . '/' . $data['save_name'];
+ }
+
+ /**
+ * 获取原始图片完整路径 by lyzflash
+ * @param $value
+ * @param $data
+ * @return string
+ */
+ public function getOriginalPathAttr($value, $data)
+ {
+ if ($data['storage'] === 'local') {
+ return $data['is_original'] ? self::$base_url . 'uploads/' . $data['original_name'] : '';
+ }
+ // 网盘暂不处理
+ return '';
}
/**
@@ -72,7 +87,7 @@
/**
* 获取列表记录
*/
- public function getList($groupId = 0, $fileType = '', $pageSize = 30, $isRecycle = -1, $shop_supplier_id = 0)
+ public function getList($groupId = 0, $fileType = '', $pageSize = 30, $isRecycle = -1, $shop_supplier_id = 0, $branch_id = 0)
{
$model = $this;
// 文件分组
@@ -87,6 +102,7 @@
return $model->with(['upload_group'])
->where(['is_user' => 0, 'is_delete' => 0])
->where('shop_supplier_id', '=', $shop_supplier_id)
+ ->where('branch_id', '=', $branch_id)
->order(['file_id' => 'desc'])
->paginate($pageSize);
}
--
Gitblit v1.9.2