diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index a6e0291..b722e22 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -146,6 +146,8 @@ class Admin extends BaseController View::assign('department', $department); View::assign('position', $position); View::assign('id', $id); + $team = Db::table('fa_supply_team')->select(); + View::assign('team', $team); return view(); } } diff --git a/app/admin/controller/SupplyAccount.php b/app/admin/controller/SupplyAccount.php index a0f0620..15f9b05 100644 --- a/app/admin/controller/SupplyAccount.php +++ b/app/admin/controller/SupplyAccount.php @@ -133,7 +133,7 @@ class SupplyAccount extends BaseController { $param = get_params(); $id = isset($param['id']) ? $param['id'] : 0; - $type = isset($param['type']) ? $param['type'] : 0; + $type = 1; $this->model->delSupplyAccountById($id,$type); } diff --git a/app/admin/controller/SupplyBrokerage.php b/app/admin/controller/SupplyBrokerage.php index 42ae18f..c1ea4d1 100644 --- a/app/admin/controller/SupplyBrokerage.php +++ b/app/admin/controller/SupplyBrokerage.php @@ -40,13 +40,14 @@ class SupplyBrokerage extends BaseController foreach ($list as $k =>$v){ $list[$k]['fa_supply_chain_id'] = Db::table('fa_supply_team')->where('id',$v['fa_supply_chain_id'])->value('name'); $list[$k]['mer_id'] = Db::connect('shop')->table('eb_merchant')->where('mer_id',$v['mer_id'])->value('mer_name'); -// $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); + $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); if($v['status'] == 1){ $list[$k]['status'] = '成功'; }else{ $list[$k]['status'] = '待分佣'; } $list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name'); + $list[$k]['supply_userId'] = Db::table('cms_admin')->where('id',$v['supply_userId'])->value('nickname'); } return table_assign(0, '', $list); @@ -136,7 +137,7 @@ class SupplyBrokerage extends BaseController { $param = get_params(); $id = isset($param['id']) ? $param['id'] : 0; - $type = isset($param['type']) ? $param['type'] : 0; + $type = 1; $this->model->delSupplyBrokerageById($id,$type); } diff --git a/app/admin/controller/SupplyLevel.php b/app/admin/controller/SupplyLevel.php index a930a5b..3c6f0e1 100644 --- a/app/admin/controller/SupplyLevel.php +++ b/app/admin/controller/SupplyLevel.php @@ -124,7 +124,7 @@ class SupplyLevel extends BaseController { $param = get_params(); $id = isset($param['id']) ? $param['id'] : 0; - $type = isset($param['type']) ? $param['type'] : 0; + $type = 1; $this->model->delSupplyLevelById($id,$type); } diff --git a/app/admin/controller/SupplyTeam.php b/app/admin/controller/SupplyTeam.php index eaecc8d..7f84ab0 100644 --- a/app/admin/controller/SupplyTeam.php +++ b/app/admin/controller/SupplyTeam.php @@ -150,7 +150,7 @@ class SupplyTeam extends BaseController { $param = get_params(); $id = isset($param['id']) ? $param['id'] : 0; - $type = isset($param['type']) ? $param['type'] : 0; + $type = 1; $this->model->delSupplyTeamById($id,$type); } diff --git a/app/admin/route/merchant.php b/app/admin/route/merchant.php index b1d61e3..9a13da9 100644 --- a/app/admin/route/merchant.php +++ b/app/admin/route/merchant.php @@ -53,7 +53,7 @@ Route::group(function(){ Route::get('lst', '/lst')->name('systemMerchantIntentionLst')->option([ '_alias' => '列表', ]); - Route::get('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([ + Route::post('status', '/switchStatus')->name('systemMerchantIntentionStatus')->option([ '_alias' => '审核', ]); Route::delete('delete', '/delete')->name('systemMerchantIntentionDelete')->option([ diff --git a/app/admin/validate/AdminCheck.php b/app/admin/validate/AdminCheck.php index e7f59de..4a6bb6e 100644 --- a/app/admin/validate/AdminCheck.php +++ b/app/admin/validate/AdminCheck.php @@ -14,7 +14,7 @@ class AdminCheck extends Validate protected $regex = [ 'checkUser' => '/^[A-Za-z]{1}[A-Za-z0-9_-]{4,19}$/']; protected $rule = [ - 'username' => 'require|regex:checkUser|unique:admin', + 'username' => 'require|unique:admin', 'pwd' => 'require|min:6|confirm', 'edit_pwd' => 'min:6|confirm', 'mobile' => 'require|mobile', @@ -27,7 +27,7 @@ class AdminCheck extends Validate protected $message = [ 'username.require' => '登录账号不能为空', - 'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，5到20位', +// 'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，5到20位', 'username.unique' => '同样的登录账号已经存在', 'pwd.require' => '密码不能为空', 'pwd.min' => '密码至少要6个字符', @@ -48,7 +48,7 @@ class AdminCheck extends Validate protected $scene = [ 'add' => ['mobile', 'nickname', 'group_id', 'pwd', 'username', 'status'], - 'edit' => ['mobile', 'nickname', 'group_id', 'edit_pwd','id', 'username', 'status'], + 'edit' => ['mobile', 'nickname', 'group_id', 'edit_pwd','id', 'status'], 'editPersonal' => ['mobile', 'nickname'], 'editpwd' => ['old_pwd', 'pwd'], ]; diff --git a/app/admin/view/admin/add.html b/app/admin/view/admin/add.html index 42e4356..1c1aca9 100644 --- a/app/admin/view/admin/add.html +++ b/app/admin/view/admin/add.html @@ -81,6 +81,18 @@ {/volist} + + 供应链团队* + + + + + 备注 @@ -169,6 +181,18 @@ {/volist} + + 供应链团队* + + + + + 备注 @@ -183,60 +207,60 @@ -
- -
-
- - -
-
-
带搜索的选择框
-
layer
-
form
-
layim
-
element
-
laytpl
-
upload
-
laydate
-
laypage
-
flow
-
util
-
code
-
tree
-
layedit
-
nav
-
tab
-
table
-
select
-
checkbox
-
switch
-
radio
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/block} diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html index f89cc4d..e950bcb 100644 --- a/app/admin/view/merchant/system/merchant/intention/lst.html +++ b/app/admin/view/merchant/system/merchant/intention/lst.html @@ -1,7 +1,12 @@ {extend name="common/base"/} {block name="body"} +
@@ -18,14 +23,15 @@
- - + + + - - - - + + + +
@@ -34,13 +40,11 @@
- +
-
- +
@@ -48,22 +52,22 @@
-
+
- - - - - + + + + +
-
+
@@ -83,8 +87,7 @@
- -
+
@@ -98,10 +101,10 @@
-
+
-
+