From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/branch/model/activity/Activity.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/app/branch/model/activity/Activity.php b/admin/app/branch/model/activity/Activity.php
index 67123b5..67740e5 100644
--- a/admin/app/branch/model/activity/Activity.php
+++ b/admin/app/branch/model/activity/Activity.php
@@ -3,7 +3,7 @@
namespace app\branch\model\activity;
use app\common\model\branch\Activity as ActivityModel;
-use app\common\model\branch\ActivityProduct as ActivityProductModel;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
/**
* 活动模型
@@ -29,7 +29,7 @@
public function add($data, $branch_id)
{
$model = new ActivityModel();
- $product = new ActivityProductModel();
+ $product = new ActivityProductPriceModel();
$data['app_id'] = self::$app_id;
$data['branch_id'] = $branch_id;
//报名时间
@@ -83,7 +83,7 @@
public function edit($data)
{
$model = new ActivityModel();
- $product = new ActivityProductModel();
+ $product = new ActivityProductPriceModel();
//报名时间
$data['register_start_time'] = strtotime($data['reg_date'][0]);
$data['register_end_time'] = strtotime($data['reg_date'][1]);
--
Gitblit v1.9.2