mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商户调整

Browse Source
This commit is contained in:
liuxiaoquan 2023-03-16 18:15:03 +08:00
parent 1aa66250e9
commit a6ac4a34e2
3 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/admin/controller/merchant/system/merchant/Merchant.php
View File

@ -9,8 +9,14 @@
namespace app\admin\controller\merchant\system\merchant;
use think\App;
use think\facade\View;
use think\exception\ValidateException;
use app\admin\BaseController;
use app\common\model\merchant\system\merchant\Merchant as MerchantModel;
use app\common\model\merchant\system\merchant\MerchantCategory;
use app\common\model\merchant\system\merchant\MerchantType;
class Merchant extends BaseController{
@ -24,13 +30,23 @@ class Merchant extends BaseController{
'mark' => 'merchant/system/merchant/merchant/mark'
];
public function __construct(App $app)
public function __construct(App $app, MerchantModel $model)
{
parent::__construct($app);
$this->model = $model;
}
public function index()
public function index(MerchantCategory $category, MerchantType $type)
{
// 商户分类
$category = $category->select();
// 店铺类弄
$type = $type->select();
View::assign('category',$category);
View::assign('type',$type);
return View($this->path['index']);
}
@ -39,15 +55,20 @@ class Merchant extends BaseController{
*/
public function lst()
{
[$page, $limit] = $this->getPage();
$where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']);
return app('json')->success($this->repository->lst($where, $page, $limit));
$page = empty($params['page'])?1:$params['page'];
$limit = empty($params['limit'])?10:$params['limit'];
$where = get_params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']);
$data = $this->model->lst($where, $page, $limit);
return to_assign(0, '', $data);
}
public function count()
{
$where = $this->request->params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']);
return app('json')->success($this->repository->count($where));
$where = get_params(['keyword', 'date', 'status', 'statusTag', 'is_trader', 'category_id', 'type_id']);
return app('json')->success($this->model->count($where));
}
}

1
app/admin/controller/merchant/system/merchant/MerchantIntention.php
View File

@ -47,7 +47,6 @@ class MerchantIntention extends BaseController
// 商户分类
$category = $category->select();
//审核
// 店铺类弄
$type = $type->select();
// search

19
app/admin/view/merchant/system/merchant/merchant/lst.html
View File

@ -167,8 +167,8 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li lay-id="11" class="layui-this tag-switch" data-type="tabChange">缴存保证金</li>
<li lay-id="22" class="tag-switch" data-type="tabChange">退回保证金</li>
<li lay-id="11" class="layui-this tag-switch" data-type="tabChange">正常开启的商户</li>
<li lay-id="22" class="tag-switch" data-type="tabChange">已关闭商户</li>
</ul>
<div class="layui-tab-content" style="height: 100px;">
@ -198,8 +198,10 @@
<script type="text/html" id="toolbarDemo"></script>
<script type="text/html" id="barDemo">
<div class="layui-btn-group">
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduct">保证金扣费</a>
<a class="layui-btn layui-btn-xs" lay-event="record">扣费记录</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduct">登录</a>
<a class="layui-btn layui-btn-xs" lay-event="record">编辑</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduct">修改管理员密码</a>
<a class="layui-btn layui-btn-xs" lay-event="record">设置第三方平台商品复制次数</a>
</div>
</script>
@ -207,9 +209,8 @@
<script type="text/html" id="refundToolbar"></script>
<script type="text/html" id="refundBar">
<div class="layui-btn-group">
<a class="layui-btn layui-btn-xs" lay-event="mark">备注</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="status">审核</a>
<a class="layui-btn layui-btn-xs" lay-event="record">扣费记录</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="mark">编辑</a>
<a class="layui-btn layui-btn-xs" lay-event="record">删除</a>
</div>
</script>
@ -225,7 +226,7 @@
layui.payTable = table.render({
elem: '#pay_list',
title: '保证金列表',
title: '正常开启的商户',
toolbar: '#toolbarDemo',
url: '/admin/margin/lst',
page: true,
@ -295,7 +296,7 @@
field: 'right',
title: '操作',
toolbar: '#barDemo',
width: 190,
width: 200,
align: 'center'
}
]