正在显示
6 个修改的文件
包含
45 行增加
和
18 行删除
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace app\admin\controller\activity_goods; | 3 | namespace app\admin\controller\activity_goods; |
| 4 | 4 | ||
| 5 | +use app\admin\model\Activity; | ||
| 5 | use app\admin\model\litestore\Litestoregoodsspec; | 6 | use app\admin\model\litestore\Litestoregoodsspec; |
| 6 | use app\common\controller\Backend; | 7 | use app\common\controller\Backend; |
| 7 | use app\admin\model\litestore\Litestorespec as SpecModel; | 8 | use app\admin\model\litestore\Litestorespec as SpecModel; |
| @@ -29,14 +30,14 @@ class ImportGoods extends Backend | @@ -29,14 +30,14 @@ class ImportGoods extends Backend | ||
| 29 | */ | 30 | */ |
| 30 | protected $model = null; | 31 | protected $model = null; |
| 31 | protected $spec_model = null; | 32 | protected $spec_model = null; |
| 32 | -// protected $searchFields = 'category.name'; | 33 | + protected $activity = null; |
| 33 | 34 | ||
| 34 | public function _initialize() | 35 | public function _initialize() |
| 35 | { | 36 | { |
| 36 | parent::_initialize(); | 37 | parent::_initialize(); |
| 37 | $this->SpecModel = new SpecModel; | 38 | $this->SpecModel = new SpecModel; |
| 38 | $this->SpecValueModel = new SpecValueModel; | 39 | $this->SpecValueModel = new SpecValueModel; |
| 39 | - | 40 | + $this->activity = new Activity(); |
| 40 | $this->model = new \app\admin\model\litestore\Litestoregoods; | 41 | $this->model = new \app\admin\model\litestore\Litestoregoods; |
| 41 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); | 42 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); |
| 42 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); | 43 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); |
| @@ -99,8 +100,16 @@ class ImportGoods extends Backend | @@ -99,8 +100,16 @@ class ImportGoods extends Backend | ||
| 99 | 100 | ||
| 100 | return json($result); | 101 | return json($result); |
| 101 | } | 102 | } |
| 103 | + $category_name1 = $this->activity | ||
| 104 | + ->where('id', 1)->value('name'); | ||
| 105 | + $category_name2 = $this->activity | ||
| 106 | + ->where('id', 2)->value('name'); | ||
| 107 | + $category_name3 = $this->activity | ||
| 108 | + ->where('id', 3)->value('name'); | ||
| 102 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); | 109 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); |
| 103 | - | 110 | + $this->assign('name1', $category_name1); |
| 111 | + $this->assign('name2', $category_name2); | ||
| 112 | + $this->assign('name3', $category_name3); | ||
| 104 | return $this->view->fetch(); | 113 | return $this->view->fetch(); |
| 105 | } | 114 | } |
| 106 | 115 |
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace app\admin\controller\activity_goods; | 3 | namespace app\admin\controller\activity_goods; |
| 4 | 4 | ||
| 5 | +use app\admin\model\Activity; | ||
| 5 | use app\admin\model\litestore\Litestoregoodsspec; | 6 | use app\admin\model\litestore\Litestoregoodsspec; |
| 6 | use app\common\controller\Backend; | 7 | use app\common\controller\Backend; |
| 7 | use app\admin\model\litestore\Litestorespec as SpecModel; | 8 | use app\admin\model\litestore\Litestorespec as SpecModel; |
| @@ -29,14 +30,14 @@ class NewGoods extends Backend | @@ -29,14 +30,14 @@ class NewGoods extends Backend | ||
| 29 | */ | 30 | */ |
| 30 | protected $model = null; | 31 | protected $model = null; |
| 31 | protected $spec_model = null; | 32 | protected $spec_model = null; |
| 32 | -// protected $searchFields = 'category.name'; | 33 | + protected $activity = null; |
| 33 | 34 | ||
| 34 | public function _initialize() | 35 | public function _initialize() |
| 35 | { | 36 | { |
| 36 | parent::_initialize(); | 37 | parent::_initialize(); |
| 37 | $this->SpecModel = new SpecModel; | 38 | $this->SpecModel = new SpecModel; |
| 38 | $this->SpecValueModel = new SpecValueModel; | 39 | $this->SpecValueModel = new SpecValueModel; |
| 39 | - | 40 | + $this->activity = new Activity(); |
| 40 | $this->model = new \app\admin\model\litestore\Litestoregoods; | 41 | $this->model = new \app\admin\model\litestore\Litestoregoods; |
| 41 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); | 42 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); |
| 42 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); | 43 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); |
| @@ -99,8 +100,16 @@ class NewGoods extends Backend | @@ -99,8 +100,16 @@ class NewGoods extends Backend | ||
| 99 | 100 | ||
| 100 | return json($result); | 101 | return json($result); |
| 101 | } | 102 | } |
| 103 | + $category_name1 = $this->activity | ||
| 104 | + ->where('id', 1)->value('name'); | ||
| 105 | + $category_name2 = $this->activity | ||
| 106 | + ->where('id', 2)->value('name'); | ||
| 107 | + $category_name3 = $this->activity | ||
| 108 | + ->where('id', 3)->value('name'); | ||
| 102 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); | 109 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); |
| 103 | - | 110 | + $this->assign('name1', $category_name1); |
| 111 | + $this->assign('name2', $category_name2); | ||
| 112 | + $this->assign('name3', $category_name3); | ||
| 104 | return $this->view->fetch(); | 113 | return $this->view->fetch(); |
| 105 | } | 114 | } |
| 106 | 115 |
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace app\admin\controller\activity_goods; | 3 | namespace app\admin\controller\activity_goods; |
| 4 | 4 | ||
| 5 | +use app\admin\model\Activity; | ||
| 5 | use app\admin\model\litestore\Litestoregoodsspec; | 6 | use app\admin\model\litestore\Litestoregoodsspec; |
| 6 | use app\common\controller\Backend; | 7 | use app\common\controller\Backend; |
| 7 | use app\admin\model\litestore\Litestorespec as SpecModel; | 8 | use app\admin\model\litestore\Litestorespec as SpecModel; |
| @@ -30,14 +31,14 @@ class SeckillGoods extends Backend | @@ -30,14 +31,14 @@ class SeckillGoods extends Backend | ||
| 30 | protected $model = null; | 31 | protected $model = null; |
| 31 | protected $spec_model = null; | 32 | protected $spec_model = null; |
| 32 | 33 | ||
| 33 | -// protected $searchFields = 'category.name'; | 34 | + protected $activity = null; |
| 34 | 35 | ||
| 35 | public function _initialize() | 36 | public function _initialize() |
| 36 | { | 37 | { |
| 37 | parent::_initialize(); | 38 | parent::_initialize(); |
| 38 | $this->SpecModel = new SpecModel; | 39 | $this->SpecModel = new SpecModel; |
| 39 | $this->SpecValueModel = new SpecValueModel; | 40 | $this->SpecValueModel = new SpecValueModel; |
| 40 | - | 41 | + $this->activity = new Activity(); |
| 41 | $this->model = new \app\admin\model\litestore\Litestoregoods; | 42 | $this->model = new \app\admin\model\litestore\Litestoregoods; |
| 42 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); | 43 | $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); |
| 43 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); | 44 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); |
| @@ -100,8 +101,16 @@ class SeckillGoods extends Backend | @@ -100,8 +101,16 @@ class SeckillGoods extends Backend | ||
| 100 | 101 | ||
| 101 | return json($result); | 102 | return json($result); |
| 102 | } | 103 | } |
| 104 | + $category_name1 = $this->activity | ||
| 105 | + ->where('id', 1)->value('name'); | ||
| 106 | + $category_name2 = $this->activity | ||
| 107 | + ->where('id', 2)->value('name'); | ||
| 108 | + $category_name3 = $this->activity | ||
| 109 | + ->where('id', 3)->value('name'); | ||
| 103 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); | 110 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); |
| 104 | - | 111 | + $this->assign('name1', $category_name1); |
| 112 | + $this->assign('name2', $category_name2); | ||
| 113 | + $this->assign('name3', $category_name3); | ||
| 105 | return $this->view->fetch(); | 114 | return $this->view->fetch(); |
| 106 | } | 115 | } |
| 107 | 116 |
| @@ -20,9 +20,9 @@ | @@ -20,9 +20,9 @@ | ||
| 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> | 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> |
| 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> | 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> |
| 22 | <ul class="dropdown-menu text-left" role="menu"> | 22 | <ul class="dropdown-menu text-left" role="menu"> |
| 23 | - <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> | ||
| 24 | - <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> | ||
| 25 | - <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> | 23 | + <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> |
| 24 | + <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> | ||
| 25 | + <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> | ||
| 26 | <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> | 26 | <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> |
| 27 | </ul> | 27 | </ul> |
| 28 | </div> | 28 | </div> |
| @@ -20,9 +20,9 @@ | @@ -20,9 +20,9 @@ | ||
| 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> | 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> |
| 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> | 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> |
| 22 | <ul class="dropdown-menu text-left" role="menu"> | 22 | <ul class="dropdown-menu text-left" role="menu"> |
| 23 | - <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> | ||
| 24 | - <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> | ||
| 25 | - <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> | 23 | + <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> |
| 24 | + <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> | ||
| 25 | + <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> | ||
| 26 | <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> | 26 | <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> |
| 27 | </ul> | 27 | </ul> |
| 28 | </div> | 28 | </div> |
| @@ -20,9 +20,9 @@ | @@ -20,9 +20,9 @@ | ||
| 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> | 20 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> |
| 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> | 21 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> |
| 22 | <ul class="dropdown-menu text-left" role="menu"> | 22 | <ul class="dropdown-menu text-left" role="menu"> |
| 23 | - <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> | ||
| 24 | - <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> | ||
| 25 | - <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> | 23 | + <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> |
| 24 | + <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> | ||
| 25 | + <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> | ||
| 26 | <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> | 26 | <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> |
| 27 | </ul> | 27 | </ul> |
| 28 | </div> | 28 | </div> |
-
请 注册 或 登录 后发表评论