正在显示
3 个修改的文件
包含
32 行增加
和
11 行删除
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace app\admin\controller\litestore; | 3 | namespace app\admin\controller\litestore; |
| 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,17 +30,16 @@ class Litestoregoods extends Backend | @@ -29,17 +30,16 @@ class Litestoregoods extends Backend | ||
| 29 | */ | 30 | */ |
| 30 | protected $model = null; | 31 | protected $model = null; |
| 31 | protected $spec_model = null; | 32 | protected $spec_model = null; |
| 32 | - | ||
| 33 | -// protected $searchFields = 'category.name'; | 33 | + protected $activity = null; |
| 34 | 34 | ||
| 35 | public function _initialize() | 35 | public function _initialize() |
| 36 | { | 36 | { |
| 37 | parent::_initialize(); | 37 | parent::_initialize(); |
| 38 | $this->SpecModel = new SpecModel; | 38 | $this->SpecModel = new SpecModel; |
| 39 | $this->SpecValueModel = new SpecValueModel; | 39 | $this->SpecValueModel = new SpecValueModel; |
| 40 | - | ||
| 41 | - $this->model = new \app\admin\model\litestore\Litestoregoods; | ||
| 42 | - $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); | 40 | + $this->activity = new Activity(); |
| 41 | + $this->model = new \app\admin\model\litestore\Litestoregoods; | ||
| 42 | + $this->spec_model = new \app\admin\model\litestore\Litestoregoodsspec(); | ||
| 43 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); | 43 | $this->view->assign("specTypeList", $this->model->getSpecTypeList()); |
| 44 | $this->view->assign("deductStockTypeList", $this->model->getDeductStockTypeList()); | 44 | $this->view->assign("deductStockTypeList", $this->model->getDeductStockTypeList()); |
| 45 | $this->view->assign("goodsStatusList", $this->model->getGoodsStatusList()); | 45 | $this->view->assign("goodsStatusList", $this->model->getGoodsStatusList()); |
| @@ -98,7 +98,16 @@ class Litestoregoods extends Backend | @@ -98,7 +98,16 @@ class Litestoregoods extends Backend | ||
| 98 | 98 | ||
| 99 | return json($result); | 99 | return json($result); |
| 100 | } | 100 | } |
| 101 | + $category_name1 = $this->activity | ||
| 102 | + ->where('id', 1)->value('name'); | ||
| 103 | + $category_name2 = $this->activity | ||
| 104 | + ->where('id', 2)->value('name'); | ||
| 105 | + $category_name3 = $this->activity | ||
| 106 | + ->where('id', 3)->value('name'); | ||
| 101 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); | 107 | $this->assign('template', $this->request->domain() . '/static/template/商品导入模板.xlsx'); |
| 108 | + $this->assign('name1', $category_name1); | ||
| 109 | + $this->assign('name2', $category_name2); | ||
| 110 | + $this->assign('name3', $category_name3); | ||
| 102 | 111 | ||
| 103 | return $this->view->fetch(); | 112 | return $this->view->fetch(); |
| 104 | } | 113 | } |
| @@ -35,9 +35,9 @@ | @@ -35,9 +35,9 @@ | ||
| 35 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> | 35 | <div class="dropdown btn-group {:$auth->check('litestore/litestoregoods/multi')?'':'hide'}"> |
| 36 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> | 36 | <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-check-square-o"></i> {:__('批量添加活动商品')}</a> |
| 37 | <ul class="dropdown-menu text-left" role="menu"> | 37 | <ul class="dropdown-menu text-left" role="menu"> |
| 38 | - <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> | ||
| 39 | - <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> | ||
| 40 | - <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> | 38 | + <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> |
| 39 | + <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> | ||
| 40 | + <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> | ||
| 41 | <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> | 41 | <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> |
| 42 | </ul> | 42 | </ul> |
| 43 | </div> | 43 | </div> |
| @@ -18,7 +18,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor | @@ -18,7 +18,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor | ||
| 18 | }); | 18 | }); |
| 19 | 19 | ||
| 20 | var table = $("#table"); | 20 | var table = $("#table"); |
| 21 | - | 21 | + table.on('post-common-search.bs.table', function (event, table) { |
| 22 | + var form = $("form", table.$commonsearch); | ||
| 23 | + $("input[name='category_id']", form).addClass("selectpage").data("source", "litestore/litestorecategory/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id desc").data("pageSize",1); | ||
| 24 | + Form.events.cxselect(form); | ||
| 25 | + Form.events.selectpage(form); | ||
| 26 | + }); | ||
| 27 | + table.on('post-common-search.bs.table', function (event, table) { | ||
| 28 | + var form = $("form", table.$commonsearch); | ||
| 29 | + $("input[name='activity_id']", form).addClass("selectpage").data("source", "activity/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id desc").data("pageSize",1); | ||
| 30 | + Form.events.cxselect(form); | ||
| 31 | + Form.events.selectpage(form); | ||
| 32 | + }); | ||
| 22 | // 初始化表格 | 33 | // 初始化表格 |
| 23 | table.bootstrapTable({ | 34 | table.bootstrapTable({ |
| 24 | url: $.fn.bootstrapTable.defaults.extend.index_url, | 35 | url: $.fn.bootstrapTable.defaults.extend.index_url, |
| @@ -33,9 +44,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor | @@ -33,9 +44,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'litestor | ||
| 33 | {field: 'goods_id', title: __('Goods_id')}, | 44 | {field: 'goods_id', title: __('Goods_id')}, |
| 34 | {field: 'goods_name', title: __('Goods_name'), operate: 'LIKE'}, | 45 | {field: 'goods_name', title: __('Goods_name'), operate: 'LIKE'}, |
| 35 | {field: 'keywords', title: __('Keywords'), operate: 'LIKE'}, | 46 | {field: 'keywords', title: __('Keywords'), operate: 'LIKE'}, |
| 36 | - {field: 'category.name', title: __('Category.name'), operate: 'LIKE'}, | 47 | + {field: 'category.name', title: __('Category.name'), operate: false}, |
| 37 | {field: 'activity.name', title: __('Activity.name'), operate: 'LIKE'}, | 48 | {field: 'activity.name', title: __('Activity.name'), operate: 'LIKE'}, |
| 38 | - // {field: 'category_id', visible: false, title: __('Category_id')}, | 49 | + {field: 'category_id', visible: false, title: __('Category_id'),operate: 'LIKE %...%'}, |
| 50 | + {field: 'activity_id', visible: false, title: __('Activity_id'),operate: 'LIKE %...%'}, | ||
| 39 | {field: 'image', title: __('Image'), formatter: Table.api.formatter.image}, | 51 | {field: 'image', title: __('Image'), formatter: Table.api.formatter.image}, |
| 40 | {field: 'images', title: __('Images'), formatter: Table.api.formatter.images}, | 52 | {field: 'images', title: __('Images'), formatter: Table.api.formatter.images}, |
| 41 | { | 53 | { |
-
请 注册 或 登录 后发表评论