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/settings/Setting.php | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/admin/app/common/model/settings/Setting.php b/admin/app/common/model/settings/Setting.php
index c30a34b..ec0c607 100644
--- a/admin/app/common/model/settings/Setting.php
+++ b/admin/app/common/model/settings/Setting.php
@@ -37,9 +37,17 @@
/**
* 获取指定项设置
*/
- public static function getItem($key, $app_id = null)
+ public static function getItem($key, $app_id = null,$shop_supplier_id=0)
{
$data = self::getAll($app_id);
+ if (!isset($data[$key])&&strpos($key, 'nav_')!==false){
+ if ($shop_supplier_id!=0){
+ return [];
+ }else{
+ $key = 'nav';
+ }
+
+ }
$data_key = $data[$key];
if(isset($data_key)){
$data_key = $data[$key]['values'];
@@ -371,6 +379,7 @@
'is_shopping_gift' => '0', // 是否开启购物送消费券
'gift_ratio' => '100', // 是否开启购物送消费券
'is_shopping_discount' => '0', // 是否允许下单使用消费券抵扣
+ 'give_away'=> 0,//直推赠送
'is_trans_balance' => '0', // 是否允许转换余额
'discount' => [ // 消费券抵扣
'discount_ratio' => '0.01', // 消费券抵扣比例
--
Gitblit v1.9.2