|
@@ -31,6 +31,7 @@ class SystemStore extends AuthController
|
|
|
['limit', 20],
|
|
['limit', 20],
|
|
|
['name', ''],
|
|
['name', ''],
|
|
|
['excel', 0],
|
|
['excel', 0],
|
|
|
|
|
+ ['cid', ''],
|
|
|
['type', $this->request->param('type')]
|
|
['type', $this->request->param('type')]
|
|
|
]);
|
|
]);
|
|
|
return JsonService::successlayui(SystemStoreModel::getStoreList($where));
|
|
return JsonService::successlayui(SystemStoreModel::getStoreList($where));
|
|
@@ -68,6 +69,7 @@ class SystemStore extends AuthController
|
|
|
$admin_id = $this->adminId;
|
|
$admin_id = $this->adminId;
|
|
|
$company = SystemAdmin::where('level', bcadd($admininfo->level, 1, 0))->where('type', 1)->field('id,real_name')->select();
|
|
$company = SystemAdmin::where('level', bcadd($admininfo->level, 1, 0))->where('type', 1)->field('id,real_name')->select();
|
|
|
$users = User::field('uid,nickname,phone')->select();
|
|
$users = User::field('uid,nickname,phone')->select();
|
|
|
|
|
+ $category = \app\admin\model\system\SystemStoreCategory::getTierList(null, 0);
|
|
|
$this->assign(compact('store', 'type', 'company', 'admin_id', 'users'));
|
|
$this->assign(compact('store', 'type', 'company', 'admin_id', 'users'));
|
|
|
return $this->fetch();
|
|
return $this->fetch();
|
|
|
}
|
|
}
|
|
@@ -148,7 +150,7 @@ class SystemStore extends AuthController
|
|
|
['commission', 0],
|
|
['commission', 0],
|
|
|
['commission_order', 0],
|
|
['commission_order', 0],
|
|
|
['spread_uid', 0],
|
|
['spread_uid', 0],
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
]);
|
|
]);
|
|
|
SystemStoreModel::beginTrans();
|
|
SystemStoreModel::beginTrans();
|
|
|
try {
|
|
try {
|