companyProjecet.git

summary
reflog
commits
tree
docs
forks
compare

1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是...

quanwei

2025-11-24 599abed702db9fa5dec90b5660ff039acb6eace7

 admin/app/api/controller/branch/Activity.php

@@ -39,7 +39,8 @@
    {
        $model = new ActivityModel;
        $list = $model->getList($category_id, $this->postData(), $this->getUser());
        return $this->renderSuccess('', compact('list'));
        $words = BranchSettingModel::getItem('words');
        return $this->renderSuccess('', compact('list', 'words'));
    }

    /**

			@@ -39,7 +39,8 @@
			{
			$model = new ActivityModel;
			$list = $model->getList($category_id, $this->postData(), $this->getUser());
			return $this->renderSuccess('', compact('list'));
			$words = BranchSettingModel::getItem('words');
			return $this->renderSuccess('', compact('list', 'words'));
			}

			/**