From b0264d204dcc989fe8ccd43fd69ad1ab8ef0bac6 Mon Sep 17 00:00:00 2001
From: SHW\戥岁。。 <2873657140@qq.com>
Date: Mon, 25 Apr 2022 10:58:46 +0800
Subject: [PATCH] 活动商品页
---
application/admin/controller/activity_goods/ImportGoods.php | 15 ++++++++++++---
application/admin/controller/activity_goods/NewGoods.php | 15 ++++++++++++---
application/admin/controller/activity_goods/SeckillGoods.php | 15 ++++++++++++---
application/admin/view/activity_goods/import_goods/index.html | 6 +++---
application/admin/view/activity_goods/new_goods/index.html | 6 +++---
application/admin/view/activity_goods/seckill_goods/index.html | 6 +++---
6 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/application/admin/controller/activity_goods/ImportGoods.php b/application/admin/controller/activity_goods/ImportGoods.php
index ee3b38c..2d22390 100644
--- a/application/admin/controller/activity_goods/ImportGoods.php
+++ b/application/admin/controller/activity_goods/ImportGoods.php
@@ -2,6 +2,7 @@
namespace app\admin\controller\activity_goods;
+use app\admin\model\Activity;
use app\admin\model\litestore\Litestoregoodsspec;
use app\common\controller\Backend;
use app\admin\model\litestore\Litestorespec as SpecModel;
@@ -29,14 +30,14 @@ class ImportGoods extends Backend
*/
protected $model = null;
protected $spec_model = null;
-// protected $searchFields = 'category.name';
+ protected $activity = null;
public function _initialize()
{
parent::_initialize();
$this->SpecModel = new SpecModel;
$this->SpecValueModel = new SpecValueModel;
-
+ $this->activity = new Activity();
$this->model = new \app\admin\model\litestore\Litestoregoods;
$this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec();
$this->view->assign("specTypeList", $this->model->getSpecTypeList());
@@ -99,8 +100,16 @@ class ImportGoods extends Backend
return json($result);
}
+ $category_name1 = $this->activity
+ ->where('id', 1)->value('name');
+ $category_name2 = $this->activity
+ ->where('id', 2)->value('name');
+ $category_name3 = $this->activity
+ ->where('id', 3)->value('name');
$this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx');
-
+ $this->assign('name1', $category_name1);
+ $this->assign('name2', $category_name2);
+ $this->assign('name3', $category_name3);
return $this->view->fetch();
}
diff --git a/application/admin/controller/activity_goods/NewGoods.php b/application/admin/controller/activity_goods/NewGoods.php
index f8179ad..8662550 100644
--- a/application/admin/controller/activity_goods/NewGoods.php
+++ b/application/admin/controller/activity_goods/NewGoods.php
@@ -2,6 +2,7 @@
namespace app\admin\controller\activity_goods;
+use app\admin\model\Activity;
use app\admin\model\litestore\Litestoregoodsspec;
use app\common\controller\Backend;
use app\admin\model\litestore\Litestorespec as SpecModel;
@@ -29,14 +30,14 @@ class NewGoods extends Backend
*/
protected $model = null;
protected $spec_model = null;
-// protected $searchFields = 'category.name';
+ protected $activity = null;
public function _initialize()
{
parent::_initialize();
$this->SpecModel = new SpecModel;
$this->SpecValueModel = new SpecValueModel;
-
+ $this->activity = new Activity();
$this->model = new \app\admin\model\litestore\Litestoregoods;
$this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec();
$this->view->assign("specTypeList", $this->model->getSpecTypeList());
@@ -99,8 +100,16 @@ class NewGoods extends Backend
return json($result);
}
+ $category_name1 = $this->activity
+ ->where('id', 1)->value('name');
+ $category_name2 = $this->activity
+ ->where('id', 2)->value('name');
+ $category_name3 = $this->activity
+ ->where('id', 3)->value('name');
$this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx');
-
+ $this->assign('name1', $category_name1);
+ $this->assign('name2', $category_name2);
+ $this->assign('name3', $category_name3);
return $this->view->fetch();
}
diff --git a/application/admin/controller/activity_goods/SeckillGoods.php b/application/admin/controller/activity_goods/SeckillGoods.php
index babfc4f..0f72212 100644
--- a/application/admin/controller/activity_goods/SeckillGoods.php
+++ b/application/admin/controller/activity_goods/SeckillGoods.php
@@ -2,6 +2,7 @@
namespace app\admin\controller\activity_goods;
+use app\admin\model\Activity;
use app\admin\model\litestore\Litestoregoodsspec;
use app\common\controller\Backend;
use app\admin\model\litestore\Litestorespec as SpecModel;
@@ -30,14 +31,14 @@ class SeckillGoods extends Backend
protected $model = null;
protected $spec_model = null;
-// protected $searchFields = 'category.name';
+ protected $activity = null;
public function _initialize()
{
parent::_initialize();
$this->SpecModel = new SpecModel;
$this->SpecValueModel = new SpecValueModel;
-
+ $this->activity = new Activity();
$this->model = new \app\admin\model\litestore\Litestoregoods;
$this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec();
$this->view->assign("specTypeList", $this->model->getSpecTypeList());
@@ -100,8 +101,16 @@ class SeckillGoods extends Backend
return json($result);
}
+ $category_name1 = $this->activity
+ ->where('id', 1)->value('name');
+ $category_name2 = $this->activity
+ ->where('id', 2)->value('name');
+ $category_name3 = $this->activity
+ ->where('id', 3)->value('name');
$this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx');
-
+ $this->assign('name1', $category_name1);
+ $this->assign('name2', $category_name2);
+ $this->assign('name3', $category_name3);
return $this->view->fetch();
}
diff --git a/application/admin/view/activity_goods/import_goods/index.html b/application/admin/view/activity_goods/import_goods/index.html
index acdde7c..6858e5d 100644
--- a/application/admin/view/activity_goods/import_goods/index.html
+++ b/application/admin/view/activity_goods/import_goods/index.html
@@ -20,9 +20,9 @@
<div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a>
<ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {:__('新人用户')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {:__('限时秒杀')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {:__('进口商品')}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {$name1}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {$name2}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {$name3}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=0"><i class="fa fa-eye-slash"></i> {:__('不参与活动')}</a></li>
</ul>
</div>
diff --git a/application/admin/view/activity_goods/new_goods/index.html b/application/admin/view/activity_goods/new_goods/index.html
index acdde7c..6858e5d 100644
--- a/application/admin/view/activity_goods/new_goods/index.html
+++ b/application/admin/view/activity_goods/new_goods/index.html
@@ -20,9 +20,9 @@
<div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a>
<ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {:__('新人用户')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {:__('限时秒杀')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {:__('进口商品')}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {$name1}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {$name2}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {$name3}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=0"><i class="fa fa-eye-slash"></i> {:__('不参与活动')}</a></li>
</ul>
</div>
diff --git a/application/admin/view/activity_goods/seckill_goods/index.html b/application/admin/view/activity_goods/seckill_goods/index.html
index acdde7c..6858e5d 100644
--- a/application/admin/view/activity_goods/seckill_goods/index.html
+++ b/application/admin/view/activity_goods/seckill_goods/index.html
@@ -20,9 +20,9 @@
<div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a>
<ul class="dropdown-menu text-left" role="menu">
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {:__('新人用户')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {:__('限时秒杀')}</a></li>
- <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {:__('进口商品')}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=1"><i class="fa fa-free-code-camp"></i> {$name1}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=2"><i class="fa fa-clock-o"></i> {$name2}</a></li>
+ <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=3"><i class="fa fa-location-arrow"></i> {$name3}</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="activity_id=0"><i class="fa fa-eye-slash"></i> {:__('不参与活动')}</a></li>
</ul>
</div>
--
libgit2 0.24.0