diff --git a/crmeb/app/Request.php b/crmeb/app/Request.php index 5374a6846..f1eec3bc9 100644 --- a/crmeb/app/Request.php +++ b/crmeb/app/Request.php @@ -33,7 +33,7 @@ class Request extends \think\Request * 不过滤变量名 * @var array */ - protected $except = ['menu_path', 'api_url', 'unique_auth', 'description', 'custom_form']; + protected $except = ['menu_path', 'api_url', 'unique_auth', 'description', 'custom_form', 'content']; /** * 获取请求的数据 diff --git a/crmeb/app/adminapi/route/setting.php b/crmeb/app/adminapi/route/setting.php index a82698534..b9f3c0611 100644 --- a/crmeb/app/adminapi/route/setting.php +++ b/crmeb/app/adminapi/route/setting.php @@ -166,6 +166,29 @@ Route::group('setting', function () { //删除账号 Route::delete('system_out_account/:id', 'v1.setting.SystemOutAccount/delete')->option(['real_name' => '删除账号']); + /** 多语言 */ + //语言国家列表 + Route::get('lang_country/list', 'v1.setting.LangCountry/langCountryList')->option(['real_name' => '语言国家列表']); + //设置国家语言类型表单 + Route::get('lang_country/type_form/:id', 'v1.setting.LangCountry/langCountryTypeForm')->option(['real_name' => '设置国家语言类型表单']); + //语言类型列表 + Route::post('lang_country/save/:id', 'v1.setting.LangCountry/langCountrySave')->option(['real_name' => '语言国家修改']); + //语言类型列表 + Route::get('lang_type/list', 'v1.setting.LangType/langTypeList')->option(['real_name' => '语言类型列表']); + //新增修改语言类型表单 + Route::get('lang_type/form/:id', 'v1.setting.LangType/langTypeForm')->option(['real_name' => '新增修改语言类型表单']); + //保存新增修改语言 + Route::post('lang_type/save/:id', 'v1.setting.LangType/langTypeSave')->option(['real_name' => '保存新增修改语言']); + //删除语言 + Route::delete('lang_type/del/:id', 'v1.setting.LangType/langTypeDel')->option(['real_name' => '删除语言']); + //获取语言列表 + Route::get('lang_code/list', 'v1.setting.LangCode/langCodeList')->option(['real_name' => '语言列表']); + //获取语言信息 + Route::get('lang_code/info', 'v1.setting.LangCode/langCodeInfo')->option(['real_name' => '语言详情']); + //保存修改语言 + Route::post('lang_code/save', 'v1.setting.LangCode/langCodeSave')->option(['real_name' => '保存修改语言']); + //删除语言 + Route::delete('lang_code/del/:id', 'v1.setting.LangCode/langCodeDel')->option(['real_name' => '删除语言']); })->middleware([ \app\http\middleware\AllowOriginMiddleware::class, \app\adminapi\middleware\AdminAuthTokenMiddleware::class, diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index ad0e1c459..fd9cfe6d8 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -24,6 +24,9 @@ use app\services\shipping\SystemCityServices; use app\services\system\AppVersionServices; use app\services\system\attachment\SystemAttachmentServices; use app\services\system\config\SystemConfigServices; +use app\services\system\lang\LangCodeServices; +use app\services\system\lang\LangCountryServices; +use app\services\system\lang\LangTypeServices; use app\services\system\store\SystemStoreServices; use app\services\system\store\SystemStoreStaffServices; use app\services\user\UserBillServices; diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index c2b47467f..3ccb59e08 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -375,6 +375,11 @@ Route::group(function () { //获取用户协议 Route::get('user_agreement', 'v1.PublicController/getUserAgreement')->name('getUserAgreement'); Route::get('get_agreement/:type', 'v1.PublicController/getAgreement')->name('getAgreement'); + + //获取多语言类型列表 + Route::get('get_lang_type_list', 'v1.PublicController/getLangTypeList')->name('getLangTypeList'); + //获取当前语言json + Route::get('get_lang_json', 'v1.PublicController/getLangJson')->name('getLangJson'); })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\api\middleware\StationOpenMiddleware::class)->middleware(\app\api\middleware\AuthTokenMiddleware::class, false); Route::miss(function () { diff --git a/crmeb/app/services/shipping/ShippingTemplatesFreeServices.php b/crmeb/app/services/shipping/ShippingTemplatesFreeServices.php index e8ded57b4..1b2377fbe 100644 --- a/crmeb/app/services/shipping/ShippingTemplatesFreeServices.php +++ b/crmeb/app/services/shipping/ShippingTemplatesFreeServices.php @@ -122,7 +122,7 @@ class ShippingTemplatesFreeServices extends BaseServices $childrenData[] = [ 'city_id' => $item['province_id'], 'name' => $item['name'] ?? '全国', - 'children' => $this->getCityTemp($uniqid, $provinceId) + 'children' => $this->getCityTemp($uniqid, $item['province_id']) ]; } return $childrenData;