From 72e30ef1c2b80c82eb656ace26bda7fe41c94934 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 9 Feb 2023 09:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Admin.php | 2 +- app/admin/controller/nk/Merchant.php | 19 ++++-- app/admin/view/admin/index.html | 6 +- app/admin/view/nk/merchant/index.html | 87 ++++++++++++--------------- app/admin/view/nk/merchant/read.html | 52 ++++++++++++++++ app/admin/view/nk/user/index.html | 1 - app/admin/view/nk/user/read.html | 2 - app/admin/view/nk/village/add.html | 4 +- app/admin/view/nk/village/edit.html | 4 +- app/admin/view/nk/village/read.html | 2 +- app/home/BaseController.php | 4 +- 11 files changed, 118 insertions(+), 65 deletions(-) create mode 100644 app/admin/view/nk/merchant/read.html diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index dbe47e5..a6e0291 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -30,7 +30,7 @@ class Admin extends BaseController $where[] = ['status','>=',0]; $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; $admin = AdminList::where($where) - ->order('create_time asc') + ->order('id desc') ->paginate($rows, false, ['query' => $param]) ->each(function ($item, $key) { $groupId = Db::name('AdminGroupAccess')->where(['uid' => $item->id])->column('group_id'); diff --git a/app/admin/controller/nk/Merchant.php b/app/admin/controller/nk/Merchant.php index 7d076b6..ea30cc4 100644 --- a/app/admin/controller/nk/Merchant.php +++ b/app/admin/controller/nk/Merchant.php @@ -19,6 +19,7 @@ class Merchant extends BaseController $this->adminInfo = get_login_admin(); $this->url=[ '/admin/nk.merchant/index', + '/admin/nk.merchant/read', ]; } /** @@ -44,13 +45,11 @@ class Merchant extends BaseController foreach ($merchant_id as $k=>$v){ $arr[]=$v['mer_id']; } - $list=Db::connect('shop')->name('merchant')->where('mer_id','in',$arr)->select(); + $list=Db::connect('shop')->name('merchant')->where('mer_id','in',$arr)->field('mer_id,mer_name,real_name,mark,create_time')->select(); } $result = ['total' => $total, 'data' => $list]; return table_assign(0, '', $result); } - View::assign('brokerage_price', $brokerage_price); - return view('',['url'=>$this->url]); } /** @@ -59,8 +58,18 @@ class Merchant extends BaseController public function read() { $params = get_params(); - - return view('',['url'=>$this->url]); + $find=Db::connect('shop')->name('merchant')->where('mer_id',$params['id']) + ->withAttr('is_trader',function ($value,$data){ + return $value==1?'自营':'非自营'; + }) + ->withAttr('category_id',function ($value,$data){ + return Db::connect('shop')->name('merchant_category')->where('merchant_category_id ',$value)->value('category_name'); + }) + ->withAttr('type_id',function ($value,$data){ + return Db::connect('shop')->name('merchant_type')->where('mer_type_id ',$value)->value('type_name'); + }) + ->find(); + return view('',['url'=>$this->url,'read'=>$find]); } diff --git a/app/admin/view/admin/index.html b/app/admin/view/admin/index.html index a63e18c..a9aa763 100644 --- a/app/admin/view/admin/index.html +++ b/app/admin/view/admin/index.html @@ -49,7 +49,11 @@ title: 'ID号', align: 'center', width: 80 - }, { + },{ + field: 'user_id', + title: '登录账号', + width: 120 + }, { field: 'username', title: '登录账号', width: 120 diff --git a/app/admin/view/nk/merchant/index.html b/app/admin/view/nk/merchant/index.html index e9c45cd..9ccd509 100644 --- a/app/admin/view/nk/merchant/index.html +++ b/app/admin/view/nk/merchant/index.html @@ -1,51 +1,22 @@ {extend name="common/base"/} {block name="body"} - {/block} @@ -59,7 +30,7 @@ var table = layui.table,tool = layui.tool, form = layui.form; layui.pageTable = table.render({ elem: '#article', - title: '文章表列表', + title: '列表', toolbar: '#toolbarDemo', url: '{$url[0]}', page: true, @@ -69,20 +40,40 @@ [ { fixed: 'left', - field: 'id', + field: 'mer_id', title: '编号', align: 'center', },{ - field: 'order_sn', - title: '订单号', - },{ - field: 'commission_rate', - title: '订单手机费', + field: 'mer_name', + title: '商户名称', align: 'center', + },{ + field: 'real_name', + title: '商户姓名', + align: 'center', + },{ + field: 'create_time', + title: '添加时间', + align: 'center', + },{ + fixed: 'right', + field: 'right', + title: '操作', + toolbar: '#barDemo', + align: 'center' } ] ] }); + //监听表格行工具事件 + table.on('tool(article)', function(obj) { + var data = obj.data; + if (obj.event === 'read') { + tool.side('{$url[1]}?id='+obj.data.mer_id); + } + return false; + }); + } diff --git a/app/admin/view/nk/merchant/read.html b/app/admin/view/nk/merchant/read.html new file mode 100644 index 0000000..3c7b292 --- /dev/null +++ b/app/admin/view/nk/merchant/read.html @@ -0,0 +1,52 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

用户信息

+
+
+
+ + + + + + + + + + + + + + + + + + + +
商户名称{$read.mer_name}店铺类型 + {$read.type_id} +
商户分类 + {$read.category_id|default='无'} + 商户类别 + {$read.is_trader} +
商户负责人姓名{$read.real_name}商户负责人手机号 + {$read.mer_phone} +
+
+
+
+
+{/block} + \ No newline at end of file diff --git a/app/admin/view/nk/user/index.html b/app/admin/view/nk/user/index.html index b738358..fba54e0 100644 --- a/app/admin/view/nk/user/index.html +++ b/app/admin/view/nk/user/index.html @@ -137,7 +137,6 @@ url: '{$url[0]}', page: true, limit: 20, - cellMinWidth: 300, cols: [ [ { diff --git a/app/admin/view/nk/user/read.html b/app/admin/view/nk/user/read.html index 23971bd..6007a87 100644 --- a/app/admin/view/nk/user/read.html +++ b/app/admin/view/nk/user/read.html @@ -160,8 +160,6 @@ 养殖物 {$vo.name} - 数量 - {$vo.num} 面积 {$vo.mianji} diff --git a/app/admin/view/nk/village/add.html b/app/admin/view/nk/village/add.html index 02fbd11..a48aa88 100644 --- a/app/admin/view/nk/village/add.html +++ b/app/admin/view/nk/village/add.html @@ -41,10 +41,10 @@
+ style="width: 428px; height:270px; overflow: hidden;"> diff --git a/app/admin/view/nk/village/edit.html b/app/admin/view/nk/village/edit.html index 10cd56c..d3887ae 100644 --- a/app/admin/view/nk/village/edit.html +++ b/app/admin/view/nk/village/edit.html @@ -41,10 +41,10 @@
+ style="width: 428px; height:270px; overflow: hidden;"> diff --git a/app/admin/view/nk/village/read.html b/app/admin/view/nk/village/read.html index 7054e71..ed57d0c 100644 --- a/app/admin/view/nk/village/read.html +++ b/app/admin/view/nk/village/read.html @@ -33,7 +33,7 @@
+ style="width: 428px; height:270px; overflow: hidden;">
diff --git a/app/home/BaseController.php b/app/home/BaseController.php index 9500b1b..86d7a2a 100644 --- a/app/home/BaseController.php +++ b/app/home/BaseController.php @@ -52,8 +52,8 @@ abstract class BaseController $this->app = $app; $this->request = $this->app->request; // 控制器初始化 - return redirect('/admin'); - $this->initialize(); + return $this->redirectTo('/admin'); +// $this->initialize(); } // 初始化