Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Admin/Extensions/Grid/MiniProgramReg.php

@@ -22,8 +22,8 @@ class MiniProgramReg extends RowAction
 	public function __construct($title = null, $action = 1)
 	{
 		parent::__construct($title);
-		$this->action = $action; //$action：1=注册小程序；2=上传小程序
-		$this->title = $action == 1 ? '注册小程序' : '查询状态';
+		$this->action = $action;
+		$this->title = $action == 1 ? '注册小程序' : '注册状态';
 	}
 
 	protected function html()
@@ -120,7 +120,9 @@ class MiniProgramReg extends RowAction
 
 	public function confirm()
 	{
-		return ["确定要{$this->title}吗？", ''];
+		if ($this->action == 1) {
+			return ["确定要{$this->title}吗？", ''];
+		}
 	}
 
 	public function parameters()

app/Admin/Extensions/Grid/MiniProgramUpload.php

@@ -93,6 +93,7 @@ class MiniProgramUpload extends RowAction
 			//提交审核，文档：https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/code/submit_audit.html
 			$res = $code->submitAudit([]);
 
+			$audit_err_code = $this->auditErrorCode();
 			if (isset($res['errcode'], $res['errmsg']) && $res['errcode'] == 0 && $res['errmsg'] == 'ok') {
 				//保存上传记录
 				MiniProgramUploadLog::insert([
@@ -104,6 +105,8 @@ class MiniProgramUpload extends RowAction
 					'created_at' => now(),
 				]);
 				return $this->response()->success("上传成功，并已提交审核")->refresh();
+			} else if (isset($audit_err_code[$res['errcode']])) {
+				throw new \Exception($audit_err_code[$res['errcode']]);
 			} else {
 				throw new \Exception($res['errmsg'] ?? join(',', $res));
 			}
@@ -132,5 +135,34 @@ class MiniProgramUpload extends RowAction
 		return ['action' => $this->action];
 	}
 
-
+	private function auditErrorCode(): array
+	{
+		return [
+			-1 => '系统繁忙',
+			86000 => '不是由第三方代小程序进行调用',
+			86001 => '不存在第三方的已经提交的代码',
+			85006 => '标签格式错误',
+			85007 => '页面路径错误',
+			85008 => '当前小程序没有已经审核通过的类目，请添加类目成功后重试',
+			85009 => '已经有正在审核的版本',
+			85010 => 'item_list 有项目为空',
+			85011 => '标题填写错误',
+			85023 => '审核列表填写的项目数不在 1-5 以内',
+			85077 => '小程序类目信息失效（类目中含有官方下架的类目，请重新选择类目）',
+			86002 => '小程序还未设置昵称、头像、简介。请先设置完后再重新提交',
+			85085 => '小程序提审数量已达本月上限，请点击查看《临时quota申请流程》',
+			85086 => '提交代码审核之前需提前上传代码',
+			85087 => '小程序已使用 api navigateToMiniProgram，请声明跳转 appid 列表后再次提交',
+			87006 => '小游戏不能提交',
+			86007 => '小程序禁止提交',
+			85051 => 'version_desc或者preview_info超限',
+			85092 => 'preview_info格式错误',
+			85093 => 'preview_info 视频或者图片个数超限',
+			85094 => '需提供审核机制说明信息',
+			86009 => '服务商新增小程序代码提审能力被限制',
+			86010 => '服务商迭代小程序代码提审能力被限制',
+			9400001 => '该开发小程序已开通小程序直播权限，不支持发布版本。如需发版，请解绑开发小程序后再操作。',
+			9402202 => '请勿频繁提交，待上一次操作完成后再提交',
+		];
+	}
 }

app/Http/Controllers/Api/MiniProgramController.php

@@ -71,7 +71,7 @@ class MiniProgramController extends Controller
 
 		//接收事件
 		$server->push(function ($message) {
-			if (isset($message['Event'])) {
+			if (isset($message['MsgType'], $message['Event']) && $message['MsgType'] == 'event') {
 
 			}
 		});