diff --git a/app/admin/controller/merchant/system/merchant/MerchantMargin.php b/app/admin/controller/merchant/system/merchant/MerchantMargin.php index 1502840..acff038 100644 --- a/app/admin/controller/merchant/system/merchant/MerchantMargin.php +++ b/app/admin/controller/merchant/system/merchant/MerchantMargin.php @@ -10,13 +10,15 @@ declare (strict_types = 1); namespace app\admin\controller\merchant\system\merchant; +use think\facade\View; +use think\exception\ValidateException; +use think\facade\Request; use app\admin\BaseController; use app\common\model\merchant\system\serve\ServeOrder as ServeOrderModel; use app\common\model\merchant\user\UserBill as UserBillModel; use app\common\model\merchant\system\merchant\Merchant as MerchantModel; -use think\facade\View; -use think\exception\ValidateException; -use think\facade\Request; +use app\common\model\merchant\system\merchant\MerchantType; +use app\common\model\merchant\system\merchant\MerchantCategory; /** * 店铺保证金管理类 @@ -37,8 +39,19 @@ class MerchantMargin extends BaseController ]; } - public function Index() + public function index(MerchantCategory $category, MerchantType $type) { + // 商户分类 + $category = $category->select(); + + //审核 + // 店铺类弄 + $type = $type->select(); + // search + + View::assign('category',$category); + View::assign('type',$type); + return View($this->path['index']); } @@ -47,7 +60,7 @@ class MerchantMargin extends BaseController * * @return \think\Response */ - public function Lst(ServeOrderModel $order) + public function lst(ServeOrderModel $order) { $params = get_params(); $page = empty($params['page'])? 1 : (int)$params['page']; diff --git a/app/admin/controller/merchant/system/merchant/MerchantType.php b/app/admin/controller/merchant/system/merchant/MerchantType.php index cafe1de..b0eea59 100644 --- a/app/admin/controller/merchant/system/merchant/MerchantType.php +++ b/app/admin/controller/merchant/system/merchant/MerchantType.php @@ -26,17 +26,18 @@ use app\validate\merchant\admin\MerchantTypeValidate; class MerchantType extends BaseController { protected $merchant; - protected $path; + protected $path = [ + 'index' => 'merchant/system/merchant/type/index', + 'read' => 'merchant/system/merchant/type/read', + 'add' => 'merchant/system/merchant/type/add', + 'edit' => 'merchant/system/merchant/type/edit', + 'descr'=>'merchant/system/merchant/descr/index', + 'mark' => 'merchant/system/merchant/type/mark' + ]; public function __construct(MerchantTypeModel $merchant) { $this->merchant = $merchant; - $this->path = [ - 'index' => 'merchant/system/merchant/type/index', - 'read' => 'merchant/system/merchant/type/read', - 'add' => 'merchant/system/merchant/type/add', - 'edit' => 'merchant/system/merchant/type/edit' - ]; } /** @@ -50,46 +51,28 @@ class MerchantType extends BaseController /** * 添加/编辑 表单页 */ - public function Form(MenuModel $menu, FormatList $format) + public function form(MenuModel $menu, FormatList $format) { - $param = get_params(); - $id = isset($param['id']) ? (int)$param['id'] : 0; - + $id = (int)get_params('id'); if (!empty($id)) { // 进入编辑页,显示店铺数据 - $detail = $this->merchant->Find($id); + $detail = $this->merchant->get($id); View::assign('id', $id); - - } - if (empty($detail)) { - $detail = [ - "create_time" => '', - "description" => '', - "id" => '', - "margin" => 0, - "is_margin" => 0, - "type_info" => '', - "description" => '', - "type_name" => '', - "update_time" => '' - ]; + View::assign('detail', $detail); } // 查出商户所有菜单数据权限 tree $data = $menu->getList([],1); - $checked_list = []; if (!empty($id) && $id>0) { // 获取已有菜单权限 - $checked_list = $this->merchant->getList(['mer_type_id'=>$id]); + $detail = $this->merchant->getDetail($id); // 给菜单权限附加选中状态 foreach($data['list'] as $k=>$item) { - foreach ($checked_list['list'] as $auth) { - if (in_array($item['id'], $auth['auth_ids'])) { - $data['list'][$k]['checked'] = true; - $data['list'][$k]['spread'] = true; - } + if (in_array($item['id'], $detail['auth_ids'])) { + $data['list'][$k]['checked'] = true; + $data['list'][$k]['spread'] = true; } } } @@ -98,7 +81,6 @@ class MerchantType extends BaseController $treelist = $format->FormatCategory($data['list']); View::assign('dataTree', $treelist); - View::assign('detail', $detail); $path = empty($id)?'add':'edit'; @@ -110,7 +92,7 @@ class MerchantType extends BaseController * * @return \think\Response */ - public function Lst() + public function lst() { $param = get_params(); $page = empty($param['page']) ? 1 : (int)$param['page']; @@ -128,23 +110,14 @@ class MerchantType extends BaseController * * @return \think\Response */ - public function Add() + public function add() { - $params = get_params(); + $data = get_params(['type_name','description','is_margin','margin','type_info','auth']); + $data['auth'] = explode(',', $data['auth']); - $batch['type_name'] = $params['type_name']; - $batch['description'] = $params['description']; - $batch['is_margin'] = $params['is_margin']; - $batch['margin'] = $params['margin']; - $batch['type_info'] = $params['type_info']; - $menu_ids = $params['auth']; + $res = $this->merchant->add($this->getValidParams($data)); - // 更新权限 - // $this->menu->update($menu_ids); - - $rows = $this->merchant->Add($batch); - - return $rows>0?to_assign(0, '操作成功'):to_assign(1, '操作失败'); + return $res['code']==0?to_assign(0, '操作成功'):to_assign(1, '操作失败'); } /** @@ -152,31 +125,27 @@ class MerchantType extends BaseController * * @return \think\Response */ - public function Read() + public function read() { $param = get_params(); $id = isset($param['id']) ? (int)$param['id'] : 0; + // 获取店铺详情 $detail = $this->merchant->getDetail($id); - + if (!empty($detail)) { // 查出商户所有菜单数据权限 tree $menu = app()->make(MenuModel::class); $data = $menu->getList([],1); - - // 获取已有权限 - $checked_list = $this->merchant->getList(['mer_type_id'=>$id]); // 给菜单权限附加选中状态 $list = []; foreach($data['list'] as $k=>$item) { - foreach ($checked_list['list'] as $auth) { - if (in_array($item['id'], $auth['auth_ids'])) { - if ($item['pid']>0 && $item['title']!='权限') - $data['list'][$k]['checked'] = true; - $data['list'][$k]['spread'] = true; - array_push($list, $data['list'][$k]); - } + if (in_array($item['id'], $detail['auth_ids'])) { + if ($item['pid']>0 && $item['title']!='权限') + $data['list'][$k]['checked'] = true; + $data['list'][$k]['spread'] = true; + array_push($list, $data['list'][$k]); } } @@ -196,14 +165,14 @@ class MerchantType extends BaseController * @param int $id * @return \think\Response */ - public function Edit() + public function edit() { $id = (int)get_params('id'); $data = get_params(['type_name', 'type_info', 'is_margin', 'margin', 'auth','description']); $data['auth'] = explode(',',$data['auth']); // 检查id是否存在 - if (!$this->merchant->exist($id)) { + if (!$this->merchant->isExist($id)) { return to_assign(1,'数据不存在'); } @@ -234,7 +203,7 @@ class MerchantType extends BaseController * @param int $id * @return \think\Response */ - public function Del() + public function del() { $param = get_params(); if (empty($param['id'])) { @@ -242,7 +211,7 @@ class MerchantType extends BaseController } $id = (int)$param['id']; - if (!$this->merchant->exist($id)) { + if (!$this->merchant->isExist($id)) { return to_assign(1, '数据不存在'); } @@ -255,18 +224,28 @@ class MerchantType extends BaseController /** * 店铺类型备注 */ - public function Mark() + public function mark($id='') { - $params = get_params(); - return to_assign(0, ''); + if (request()->isAjax()) { + $id = (int)get_params('id'); + $data = get_params(['mark']); + try{ + $b = $this->merchant->mark($id, $data); + return to_assign(0, '操作成功'); + }catch(ValidateException $e){ + return to_assign(1, $e->getMessage()); + } + } + $info = $this->merchant->get($id); + + return View($this->path['mark'], ['id'=>$id,'mark'=>$info['mark']]); } /** - * 店铺类型说明 + * 店铺类型说明页 */ - public function Description() + public function description() { - View::assign('detail', []); - return View('merchant/system/merchant/descr/index', ['id' => 1]); + return View($this->path['descr'], ['id' => 1]); } } diff --git a/app/admin/route/merchant.php b/app/admin/route/merchant.php index d7400eb..f0c5915 100644 --- a/app/admin/route/merchant.php +++ b/app/admin/route/merchant.php @@ -102,7 +102,7 @@ Route::group(function(){ Route::delete('del', '/del')->name('systemMerchantTypeDelete')->option([ '_alias' => '删除', ]); - Route::get('mark/:id', '/markForm')->name('systemMerchantTypeMarkForm')->option([ + Route::get('mark/:id', '/mark')->name('systemMerchantTypeMarkForm')->option([ '_alias' => '备注', '_auth' => false, '_form' => 'systemMerchantTypeMark', diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html index 1a8661f..52bba0f 100644 --- a/app/admin/view/merchant/system/merchant/intention/lst.html +++ b/app/admin/view/merchant/system/merchant/intention/lst.html @@ -280,6 +280,7 @@ // 日期范围 layui.use(['laydate','table','element', 'jquery'], function () { var laydate = layui.laydate; + //日期范围 laydate.render({ elem: '#range_date' diff --git a/app/admin/view/merchant/system/merchant/margin/list.html b/app/admin/view/merchant/system/merchant/margin/list.html index 2e94988..6919f65 100644 --- a/app/admin/view/merchant/system/merchant/margin/list.html +++ b/app/admin/view/merchant/system/merchant/margin/list.html @@ -15,29 +15,29 @@
-
- - - - - - - +
+ + + + + + + + +
-
+
- +
-
- +
@@ -46,14 +46,14 @@
-
+
-
- + - +
@@ -75,33 +75,29 @@
-
+
- - - - - - + {volist name="category" key="k" id="vo"} + + {/volist}
-
+
- - - - - - + {volist name="type" key="k" id="vo"} + + {/volist}
@@ -116,13 +112,10 @@
- - - - - - + +
@@ -134,19 +127,18 @@