diff --git a/app/Admin/Controllers/SupplierController.php b/app/Admin/Controllers/SupplierController.php index 098ba48..c12a717 100644 --- a/app/Admin/Controllers/SupplierController.php +++ b/app/Admin/Controllers/SupplierController.php @@ -124,7 +124,7 @@ class SupplierController extends AdminController } else if ($form->isEditing()) { $form->display('username'); - $form->text('password')->customFormat(fn() => ''); + $form->text('password')->minLength(6)->customFormat(fn() => ''); } $form->text('name')->required(); $form->select('status', '状态') @@ -132,10 +132,10 @@ class SupplierController extends AdminController ->default(UserStatus::NORMAL) ->help('如果禁用供应商,其下的所有产品都会跟着下架,包括代理商在售的产品') ->required(); - $form->text('company_name'); + $form->text('company_name')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); $form->image('logo')->removable(false)->uniqueName(); - $form->text('address'); + $form->text('address')->required(); $form->image('license_pic')->removable(false)->uniqueName(); $form->text('director'); $form->mobile('contact_phone'); diff --git a/app/Admin/Extensions/Grid/MiniProgramAuditStatus.php b/app/Admin/Extensions/Grid/MiniProgramAuditStatus.php index 48cabe2..54b88b9 100644 --- a/app/Admin/Extensions/Grid/MiniProgramAuditStatus.php +++ b/app/Admin/Extensions/Grid/MiniProgramAuditStatus.php @@ -74,11 +74,24 @@ class MiniProgramAuditStatus extends RowAction $res = $code->getAuditStatus($log->audit_id); if (isset($res['errcode'], $res['errmsg'], $res['status']) && $res['errcode'] == 0 && $res['errmsg'] == 'ok') { - $statusArr = [0 => '审核成功', 1 => '审核被拒绝', 2 => '审核中', 3 => '已撤回', 4 => '审核延后']; //保存审核状态 $log->is_success = $res['status']; $log->save(); - if (isset($statusArr[$res['status']])) { + + $statusArr = [0 => '审核成功', 1 => '审核被拒绝', 2 => '审核中', 3 => '已撤回', 4 => '审核延后']; + if ($res['status'] === 0) { //如果审核成功则发布 + $res_release = $code->release(); + + //发布结果处理 + $releaseArr = [-1 => '系统繁忙', 85019 => '没有审核版本', 85020 => '审核状态未满足发布']; + if (isset($res_release['errcode'], $res_release['errmsg']) && $res_release['errcode'] == 0 && $res_release['errmsg'] == 'ok') { + return $this->response()->success('审核成功且已发布')->refresh(); + } else if (isset($releaseArr[$res_release['errcode']])) { + return $this->response()->success('审核成功,发布结果为:' . $releaseArr[$res_release['errcode']])->refresh(); + } else { + return $this->response()->success('审核成功,失败出错:' . join(',', $res_release))->refresh(); + } + } else if (isset($statusArr[$res['status']])) { return $this->response()->success($statusArr[$res['status']])->refresh(); } else { return $this->response()->error($res['reason'] ?? join(',', $res)); diff --git a/app/AdminSettled/Controllers/SupplierController.php b/app/AdminSettled/Controllers/SupplierController.php index e5a07b6..e3cfd31 100644 --- a/app/AdminSettled/Controllers/SupplierController.php +++ b/app/AdminSettled/Controllers/SupplierController.php @@ -56,7 +56,7 @@ class SupplierController extends AdminController $form->disableEditingCheck(); $form->disableDeleteButton(); $form->text('username')->required(); - $form->password('password')->required(); + $form->password('password')->minLength(6)->required(); $form->text('name')->required(); $form->text('company_name')->required(); $form->distpicker(['province_id', 'city_id', 'area_id'], '请选择区域')->required(); diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index c642f6d..014c440 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -130,6 +130,7 @@ class ProductController extends AdminController admin_trans('product.options.publish_type'), array_flip(Admin::user()->publish_type) ); + $form->radio('type', '产品类型') ->options($publish_type) ->default(current(Admin::user()->publish_type)) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 74ff3be..ae32b86 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -26,9 +26,6 @@ class Controller extends BaseController } $this->agent_id = Cache::get($appid, 0); - if ($this->agent_id == 3) { - $this->agent_id = 1; - } } protected function success($data = [], $msg = 'success', $code = 0, $status = 200)