From a0fca119e61dad3f1055a339c827d13f40da320b Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 20 Apr 2023 16:24:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?pc=E6=A8=A1=E7=89=88=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/app/WechatService.php | 8 +------- template/admin/src/setting.js | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php index 24fad4bbc..76a24c935 100644 --- a/crmeb/crmeb/services/app/WechatService.php +++ b/crmeb/crmeb/services/app/WechatService.php @@ -57,13 +57,7 @@ class WechatService $appId = isset($wechat['wechat_app_appid']) ? trim($wechat['wechat_app_appid']) : ''; $appsecret = isset($wechat['wechat_app_appsecret']) ? trim($wechat['wechat_app_appsecret']) : ''; } else { - $appId = null; - if (request()->isPc()) { - $appId = sys_config('wechat_open_app_id'); - } - if (!$appId) { - $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : ''; - } + $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : ''; $appsecret = isset($wechat['wechat_appsecret']) ? trim($wechat['wechat_appsecret']) : ''; } $config = [ diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js index 84a509ef8..3b51eaa25 100644 --- a/template/admin/src/setting.js +++ b/template/admin/src/setting.js @@ -1,5 +1,5 @@ // 请求接口地址 如果没有配置自动获取当前网址路径 -const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; +const VUE_APP_API_URL = `https://v5.wuht.net/adminapi`||process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; const Setting = { // 路由前缀 From 0d1c1b61cb2598f04bf1ed5e7322f209835ca088 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 20 Apr 2023 16:41:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/crmeb/services/crud/stubs/route/create.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/delete.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/edit.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/index.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/save.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/update.stub | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crmeb/crmeb/services/crud/stubs/route/create.stub b/crmeb/crmeb/services/crud/stubs/route/create.stub index f5a6d6b51..006c0ba7f 100644 --- a/crmeb/crmeb/services/crud/stubs/route/create.stub +++ b/crmeb/crmeb/services/crud/stubs/route/create.stub @@ -1 +1 @@ -Route::get('{%route%}/create', 'crud.{%routePath%}{%controller%}/create')->name('{%menus%}获取创建表单接口'); +Route::get('{%route%}/create', 'crud.{%routePath%}{%controller%}/create')->option(['real_name' => '{%menus%}获取创建表单接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/delete.stub b/crmeb/crmeb/services/crud/stubs/route/delete.stub index 2557266fd..a38392a27 100644 --- a/crmeb/crmeb/services/crud/stubs/route/delete.stub +++ b/crmeb/crmeb/services/crud/stubs/route/delete.stub @@ -1 +1 @@ -Route::delete('{%route%}/:id', 'crud.{%routePath%}{%controller%}/delete')->name('{%menus%}删除数据接口'); +Route::delete('{%route%}/:id', 'crud.{%routePath%}{%controller%}/delete')->option(['real_name' => '{%menus%}删除数据接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/edit.stub b/crmeb/crmeb/services/crud/stubs/route/edit.stub index 65b3cb6bd..894ee7ed6 100644 --- a/crmeb/crmeb/services/crud/stubs/route/edit.stub +++ b/crmeb/crmeb/services/crud/stubs/route/edit.stub @@ -1 +1 @@ -Route::get('{%route%}/:id/edit', 'crud.{%routePath%}{%controller%}/edit')->name('{%menus%}获取修改表单接口'); +Route::get('{%route%}/:id/edit', 'crud.{%routePath%}{%controller%}/edit')->option(['real_name' => '{%menus%}获取修改表单接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/index.stub b/crmeb/crmeb/services/crud/stubs/route/index.stub index f43da710b..0b3589bc3 100644 --- a/crmeb/crmeb/services/crud/stubs/route/index.stub +++ b/crmeb/crmeb/services/crud/stubs/route/index.stub @@ -1 +1 @@ -Route::get('{%route%}', 'crud.{%routePath%}{%controller%}/index')->name('{%menus%}列表接口'); +Route::get('{%route%}', 'crud.{%routePath%}{%controller%}/index')->option(['real_name' => '{%menus%}列表接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/save.stub b/crmeb/crmeb/services/crud/stubs/route/save.stub index 10d990844..b950a91d8 100644 --- a/crmeb/crmeb/services/crud/stubs/route/save.stub +++ b/crmeb/crmeb/services/crud/stubs/route/save.stub @@ -1 +1 @@ -Route::post('{%route%}', 'crud.{%routePath%}{%controller%}/save')->name('{%menus%}保存数据接口'); +Route::post('{%route%}', 'crud.{%routePath%}{%controller%}/save')->option(['real_name' => '{%menus%}保存数据接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/update.stub b/crmeb/crmeb/services/crud/stubs/route/update.stub index 7e7578198..d982677d3 100644 --- a/crmeb/crmeb/services/crud/stubs/route/update.stub +++ b/crmeb/crmeb/services/crud/stubs/route/update.stub @@ -1 +1 @@ -Route::put('{%route%}/:id', 'crud.{%routePath%}{%controller%}/update')->name('{%menus%}修改数据接口'); +Route::put('{%route%}/:id', 'crud.{%routePath%}{%controller%}/update')->option(['real_name' => '{%menus%}修改数据接口']); From 97db6107f5c496922a24d236a9f6707f5f3ddfd4 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 20 Apr 2023 16:50:10 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9crud=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/codeGeneration/components/FoundationFor.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue index f197e748e..05cc0f296 100644 --- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue +++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue @@ -4,10 +4,11 @@ crud生成说明
From 50a2a00557da886633a341c2ecb7250535738608 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Thu, 20 Apr 2023 17:54:21 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/kefuapi/controller/Order.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crmeb/app/kefuapi/controller/Order.php b/crmeb/app/kefuapi/controller/Order.php index ce4c491af..a38fe5cf3 100644 --- a/crmeb/app/kefuapi/controller/Order.php +++ b/crmeb/app/kefuapi/controller/Order.php @@ -67,7 +67,15 @@ class Order extends AuthController if (!$services->count(['to_uid' => $uid])) { return app('json')->fail(410092); } - return app('json')->success($this->services->getOrderApiList($where)); + if ($where['status'] == -1) { + unset($where['status']); + $where['is_cancel'] = 0; + $refundServices = app()->make(StoreOrderRefundServices::class); + $data = $refundServices->refundList($where)['list']; + } else { + $data = $this->services->getOrderApiList($where); + } + return app('json')->success($data); } /** From e9162d657ccd04f753c80446dedfdee3a11c7b64 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Thu, 20 Apr 2023 18:03:43 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/setting/SystemCrud.php | 43 +++++++++++++++++++ crmeb/app/adminapi/route/system.php | 1 + .../services/system/SystemCrudServices.php | 2 +- .../crud/stubs/view/router/modules/crud.stub | 4 +- .../components/FoundationFor.vue | 2 +- 5 files changed, 48 insertions(+), 4 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index d25dcebef..358d25612 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -367,6 +367,49 @@ class SystemCrud extends AuthController return app('json')->success(['download_url' => sys_config('site_url') . '/adminapi/download/' . $key]); } + /** + * 获取权限路由 + * @param $tableName + * @return Response + * @author 等风来 + * @email 136327134@qq.com + * @date 2023/4/20 + */ + public function getRouteList($tableName) + { + $info = $this->services->get(['table_name' => $tableName]); + if (!$info) { + return app('json')->fail('crud详情查询失败'); + } + + $routeList = app()->make(SystemMenusServices::class)->getColumn([ + ['id', 'in', $info->menu_ids], + ['auth_type', '=', 2] + ], 'methods,api_url'); + + $column = $this->services->getColumnNamesList($info->table_name); + $key = 'id'; + foreach ($column as $value) { + if ($value['primaryKey']) { + $key = $value['name']; + break; + } + } + + $columns = []; + foreach ((array)$info->field['tableField'] as $item) { + if (isset($item['from_type']) && $item['from_type']) { + $columns[] = [ + 'title' => $item['table_name'], + 'key' => $item['field'], + 'from_type' => $item['from_type'], + ]; + } + } + + return app('json')->success(compact('key', 'routeList', 'columns')); + } + /** * @return string * @author 等风来 diff --git a/crmeb/app/adminapi/route/system.php b/crmeb/app/adminapi/route/system.php index 9be1bfd3b..4ffaf3ac5 100644 --- a/crmeb/app/adminapi/route/system.php +++ b/crmeb/app/adminapi/route/system.php @@ -133,6 +133,7 @@ Route::group('system', function () { 'delete' => '删除路由分类' ], ]); + Route::get('crud/config/:tableName', 'v1.setting.SystemCrud/getRouteList')->option(['real_name' => '获取CRUD配置']); //下载生成的文件 Route::get('crud/download/:id', 'v1.setting.SystemCrud/download')->option(['real_name' => '下载生成的文件']); //获取CRUD列表 diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index cafc3f743..ce16467eb 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -283,7 +283,7 @@ class SystemCrudServices extends BaseServices $dataMenu = [ 'pid' => $data['pid'], 'menu_name' => $data['menuName'], - 'menu_path' => '/' . $routeName . '/list', + 'menu_path' => '/' . $routeName , 'auth_type' => 1, 'is_show' => 1, 'is_del' => 0, diff --git a/crmeb/crmeb/services/crud/stubs/view/router/modules/crud.stub b/crmeb/crmeb/services/crud/stubs/view/router/modules/crud.stub index 5a3a5e33a..3df7b57f6 100644 --- a/crmeb/crmeb/services/crud/stubs/view/router/modules/crud.stub +++ b/crmeb/crmeb/services/crud/stubs/view/router/modules/crud.stub @@ -20,14 +20,14 @@ const meta = { const pre = '{%name%}_' export default { - path: `${routePre}/{%route%}`, + path: `${routePre}`, name: 'crud_{%name%}', header: '{%nameHeader%}', meta, component: LayoutMain, children: [ { - path: 'list', + path: '{%route%}', name: `${pre}list`, meta: { auth: ['{%name%}-crud-list-index'], diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue index 05cc0f296..c494bf82d 100644 --- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue +++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue @@ -72,7 +72,7 @@ >