From 03cb678009e7cf9bb966ab165213df3d23f25d73 Mon Sep 17 00:00:00 2001 From: From-wh Date: Wed, 14 Oct 2026 14:58:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80=E6=96=87=E6=A1=88):=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E3=80=8C=E6=A8=A1=E7=89=88=E3=80=8D=E9=94=99?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E4=B8=BA=E3=80=8C=E6=A8=A1=E6=9D=BF=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/product/CenterProductController.php | 2 +- backend/app/adminapi/route/notify.php | 2 +- backend/app/adminapi/route/order.php | 2 +- .../app/dao/shipping/ShippingTemplatesFreeDao.php | 2 +- backend/app/lang/en_us.php | 6 +++--- backend/app/lang/zh_cn.php | 6 +++--- .../shipping/ShippingTemplatesFreeServices.php | 2 +- .../services/easywechat/Open3rd/ProgramOpen3rd.php | 4 ++-- backend/driver/express/Yihaotong/Driver.php | 2 +- backend/driver/logistics/Yihaotong/Driver.php | 4 ++-- backend/driver/sms/Yihaotong/Driver.php | 4 ++-- backend/modules/channel/wechat_mini/Installer.php | 6 +++--- .../modules/channel/wechat_mini/route/admin.php | 2 +- .../channel/wechat_mini/sdk/MiniProgramService.php | 14 +++++++------- backend/public/install/crmeb_table.sql | 6 +++--- backend/public/install/data/lang_code_data.sql | 12 ++++++------ .../install/data/shipping_templates_data.sql | 2 +- backend/public/install/data/system_menus_data.sql | 12 ++++++------ frontend/admin/src/api/app.js | 2 +- .../admin/src/components/freightTemplate/index.vue | 2 +- frontend/admin/src/diy/pages/devise/diyIndex.vue | 6 +++--- frontend/admin/src/diy/pages/devise/list.vue | 2 +- frontend/admin/src/diy/store/mobildConfig.js | 2 +- .../src/pages/freight/shippingTemplates/index.vue | 2 +- .../plugin/normal/add/components/SpecStock.vue | 2 +- .../product/productAdd/components/SpecStock.vue | 2 +- .../src/pages/product/productAttr/addAttr.vue | 4 ++-- .../admin/src/pages/product/productAttr/index.vue | 2 +- .../src/pages/setting/notification/member.vue | 2 +- .../setting/notification/notificationEdit.vue | 10 +++++----- 30 files changed, 64 insertions(+), 64 deletions(-) diff --git a/backend/app/adminapi/controller/product/CenterProductController.php b/backend/app/adminapi/controller/product/CenterProductController.php index 448d9f823..9085d4a67 100644 --- a/backend/app/adminapi/controller/product/CenterProductController.php +++ b/backend/app/adminapi/controller/product/CenterProductController.php @@ -234,7 +234,7 @@ class CenterProductController extends AuthController ['logistics', []],//物流方式 ['freight', 1],//运费设置 ['postage', 0],//邮费 - ['temp_id', 0],//运费模版id + ['temp_id', 0],//运费模板id ['give_integral', 0],//赠送积分 ['presale', 0],//预售商品开关 ['presale_time', 0],//预售时间 diff --git a/backend/app/adminapi/route/notify.php b/backend/app/adminapi/route/notify.php index 73775c22d..cd102d600 100644 --- a/backend/app/adminapi/route/notify.php +++ b/backend/app/adminapi/route/notify.php @@ -11,7 +11,7 @@ use think\facade\Route; /** - * 消息通知管理、模版消息（列表，通知，添加，编辑）相关路由 + * 消息通知管理、模板消息（列表，通知，添加，编辑）相关路由 * * 注意：旧版短信接口（公共短信模板/剩余条数/购买套餐/支付码）已随 v8 驱动化架构下线， * 短信管理统一走 driver 短信驱动中心（/adminapi/sms_driver/*）。 diff --git a/backend/app/adminapi/route/order.php b/backend/app/adminapi/route/order.php index d4fe54e30..e524bf80e 100644 --- a/backend/app/adminapi/route/order.php +++ b/backend/app/adminapi/route/order.php @@ -50,7 +50,7 @@ Route::group('order', function () { // Route::get('refund/:id', [\app\adminapi\controller\order\OrderCenterController::class, 'refund']); //订单退款 → modules/product/normal/OrderController::processRefund // Route::put('refund/:id', [\app\adminapi\controller\order\OrderCenterController::class, 'updateRefund']); - //获取电子面单模版 → modules/product/normal/OrderController::getExpressTemp + //获取电子面单模板 → modules/product/normal/OrderController::getExpressTemp // Route::get('express/temp', [\app\adminapi\controller\order\OrderCenterController::class, 'expressTemp']); //获取物流信息 → modules/product/normal/OrderController::getExpress // Route::get('express/:id', [\app\adminapi\controller\order\OrderCenterController::class, 'getExpress']); diff --git a/backend/app/dao/shipping/ShippingTemplatesFreeDao.php b/backend/app/dao/shipping/ShippingTemplatesFreeDao.php index 07dd8785d..429c6fdd0 100644 --- a/backend/app/dao/shipping/ShippingTemplatesFreeDao.php +++ b/backend/app/dao/shipping/ShippingTemplatesFreeDao.php @@ -73,7 +73,7 @@ class ShippingTemplatesFreeDao extends BaseDao } /** - * 是否包邮模版数据列表 + * 是否包邮模板数据列表 * @param $tempId * @param $cityid * @param int $price diff --git a/backend/app/lang/en_us.php b/backend/app/lang/en_us.php index b5f2352a2..8346a83a6 100644 --- a/backend/app/lang/en_us.php +++ b/backend/app/lang/en_us.php @@ -329,7 +329,7 @@ return [ '正文不能为空' => 'Body cannot be empty', '摘要不能为空' => 'Abstract cannot be empty', '请先配置微信公众号appid、appSecret等参数' => 'Please configure the applet appid, appSecret and other parameters first', - '模版消息一键设置成功' => 'One-click setting of template message is successful', + '模板消息一键设置成功' => 'One-click setting of template message is successful', '请选择用户' => 'Please select a user', '该用户没有绑定手机号，请手动填写' => 'The user is not bound with a mobile phone number, please fill in manually', '手机号格式错误' => 'Malformed phone number', @@ -800,7 +800,7 @@ return [ '商品数量缺失' => 'Item quantity is missing', '获取access_token获取失败' => 'Failed to obtain access_token', '手机号不能为空' => 'Mobile phone number cannot be empty', - '模版ID不存在' => 'Template ID does not exist', + '模板ID不存在' => 'Template ID does not exist', '请先配置accessKey和secretKey' => 'Please configure accessKey and secretKey first', '请先配置水印图片' => 'Please configure the watermark image first', '请先配置水印文字' => 'Please configure the watermark text first', @@ -1258,6 +1258,6 @@ return [ 40002 => 'Illegal voucher type', 40001 => 'Get access_ Appsecret error in token, or access_ The token is invalid. Please carefully compare the correctness of appsecret or check whether the interface is being called for the appropriate wechat', '此账号已被封禁，无法操作' => "This account has been banned and cannot be operated", - '个人模版数已达上限，上限25个' => "The number of personal templates has reached the upper limit, the upper limit is 25", + '个人模板数已达上限，上限25个' => "The number of personal templates has reached the upper limit, the upper limit is 25", '请检查小程序所属类目' => "Please check the category of the applet", ]; diff --git a/backend/app/lang/zh_cn.php b/backend/app/lang/zh_cn.php index fea7b2364..66fd48468 100644 --- a/backend/app/lang/zh_cn.php +++ b/backend/app/lang/zh_cn.php @@ -329,7 +329,7 @@ return [ '正文不能为空' => '正文不能为空', '摘要不能为空' => '摘要不能为空', '请先配置微信公众号appid、appSecret等参数' => '请先配置微信公众号appid、appSecret等参数', - '模版消息一键设置成功' => '模版消息一键设置成功', + '模板消息一键设置成功' => '模板消息一键设置成功', '请选择用户' => '请选择用户', '该用户没有绑定手机号，请手动填写' => '该用户没有绑定手机号，请手动填写', '手机号格式错误' => '手机号格式错误', @@ -800,7 +800,7 @@ return [ '商品数量缺失' => '商品数量缺失', '获取access_token获取失败' => '获取access_token获取失败', '手机号不能为空' => '手机号不能为空', - '模版ID不存在' => '模版ID不存在', + '模板ID不存在' => '模板ID不存在', '请先配置accessKey和secretKey' => '请先配置accessKey和secretKey', '请先配置水印图片' => '请先配置水印图片', '请先配置水印文字' => '请先配置水印文字', @@ -1258,6 +1258,6 @@ return [ 40002 => '不合法的凭证类型', 40001 => '获取 access_token 时 AppSecret 错误，或者 access_token 无效。请开发者认真比对 AppSecret 的正确性，或查看是否正在为恰当的公众号调用接口', '此账号已被封禁，无法操作' => '此账号已被封禁，无法操作', - '个人模版数已达上限，上限25个' => '个人模版数已达上限，上限25个', + '个人模板数已达上限，上限25个' => '个人模板数已达上限，上限25个', '请检查小程序所属类目' => '请检查小程序所属类目', ]; diff --git a/backend/app/services/shipping/ShippingTemplatesFreeServices.php b/backend/app/services/shipping/ShippingTemplatesFreeServices.php index 7c4bf454c..24e03ce6c 100644 --- a/backend/app/services/shipping/ShippingTemplatesFreeServices.php +++ b/backend/app/services/shipping/ShippingTemplatesFreeServices.php @@ -23,7 +23,7 @@ use crmeb\exceptions\AdminException; * @package app\services\shipping * @method delete($id, ?string $key = null) 删除数据 * @method isFree($tempId, $cityid, $number, $price) 是否可以满足包邮 - * @method isFreeList($tempId, $cityid, $price = 0, string $field = '*', string $key = '') 是否包邮模版数据列表 + * @method isFreeList($tempId, $cityid, $price = 0, string $field = '*', string $key = '') 是否包邮模板数据列表 */ class ShippingTemplatesFreeServices extends BaseService { diff --git a/backend/crmeb/services/easywechat/Open3rd/ProgramOpen3rd.php b/backend/crmeb/services/easywechat/Open3rd/ProgramOpen3rd.php index 1d29e8057..e197176fc 100644 --- a/backend/crmeb/services/easywechat/Open3rd/ProgramOpen3rd.php +++ b/backend/crmeb/services/easywechat/Open3rd/ProgramOpen3rd.php @@ -149,7 +149,7 @@ class ProgramOpen3rd } /** - * 获取代码模版列表 + * 获取代码模板列表 * @return array */ public function getTemplateList(): array @@ -158,7 +158,7 @@ class ProgramOpen3rd } /** - * 删除指定代码模版 + * 删除指定代码模板 * @param int $template_id * @return array */ diff --git a/backend/driver/express/Yihaotong/Driver.php b/backend/driver/express/Yihaotong/Driver.php index 788b4da72..0b559b9e3 100644 --- a/backend/driver/express/Yihaotong/Driver.php +++ b/backend/driver/express/Yihaotong/Driver.php @@ -50,7 +50,7 @@ class Driver extends BaseExpress } /** - * 获取电子面单模版 + * 获取电子面单模板 * @param string $com 快递公司编号 * @return bool|mixed */ diff --git a/backend/driver/logistics/Yihaotong/Driver.php b/backend/driver/logistics/Yihaotong/Driver.php index fbdb25f54..ce1a537f0 100644 --- a/backend/driver/logistics/Yihaotong/Driver.php +++ b/backend/driver/logistics/Yihaotong/Driver.php @@ -128,7 +128,7 @@ class Driver extends BaseExpress $item['value'] = $item['label']; $num = 1; foreach ($item['list'] as &$value) { - $value['title'] = $item['label'] . '模版' . $num; + $value['title'] = $item['label'] . '模板' . $num; $num++; } } @@ -232,7 +232,7 @@ class Driver extends BaseExpress } /** - * 获取电子面单模版 + * 获取电子面单模板 * @param $com 快递公司编号 * @param int $page * @param int $limit diff --git a/backend/driver/sms/Yihaotong/Driver.php b/backend/driver/sms/Yihaotong/Driver.php index 3309c649c..d8f3f7fc7 100644 --- a/backend/driver/sms/Yihaotong/Driver.php +++ b/backend/driver/sms/Yihaotong/Driver.php @@ -161,7 +161,7 @@ class Driver extends BaseSms } /** - * 申请模版 + * 申请模板 * @param $title * @param $content * @param $type @@ -212,7 +212,7 @@ class Driver extends BaseSms ]; $param['temp_id'] = $templateId; if (is_null($param['temp_id'])) { - throw new AdminException('模版ID不存在'); + throw new AdminException('模板ID不存在'); } $param['param'] = json_encode($data); return $this->accessToken->httpRequest(self::SMS_SEND, $param, 'post'); diff --git a/backend/modules/channel/wechat_mini/Installer.php b/backend/modules/channel/wechat_mini/Installer.php index 50c113d1a..b541818e8 100644 --- a/backend/modules/channel/wechat_mini/Installer.php +++ b/backend/modules/channel/wechat_mini/Installer.php @@ -625,7 +625,7 @@ class Installer extends BaseModuleInstaller * ├── 小程序配置 (auth=1, menu_path=/setting/system_config/{routine_tab_id}, 系统配置页) * ├── 小程序下载 (auth=1, menu_path=/app/routine/download, 默认页) * │ ├── 查看小程序信息 (auth=3, GET app/routine/info) - * │ ├── 下载小程序模版 (auth=3, POST app/routine/download) + * │ ├── 下载小程序模板 (auth=3, POST app/routine/download) * │ └── 一键同步订阅消息 (auth=3, GET app/routine/syncSubscribe) * ├── 小程序上传 (auth=1, menu_path=/app/routine/ci_upload, CI自动化上传) * │ ├── 获取运行环境 (auth=3, GET app/routine/ci/environment) @@ -697,7 +697,7 @@ class Installer extends BaseModuleInstaller ], [ 'pid' => '@小程序下载', - 'menu_name' => '下载小程序模版', + 'menu_name' => '下载小程序模板', 'api_url' => 'app/routine/download', 'methods' => 'POST', 'sort' => 0, @@ -705,7 +705,7 @@ class Installer extends BaseModuleInstaller 'access' => 1, 'auth_type' => 3, 'unique_auth' => 'app-routine-download', - 'mark' => '下载小程序模版', + 'mark' => '下载小程序模板', ], [ 'pid' => '@小程序下载', diff --git a/backend/modules/channel/wechat_mini/route/admin.php b/backend/modules/channel/wechat_mini/route/admin.php index c878307d6..abe131cb6 100644 --- a/backend/modules/channel/wechat_mini/route/admin.php +++ b/backend/modules/channel/wechat_mini/route/admin.php @@ -19,7 +19,7 @@ Route::group('app', function () { Route::group(function () { Route::get('routine/syncSubscribe', [\modules\channel\wechat_mini\controller\admin\RoutineTemplateController::class, 'syncSubscribe'])->name('syncSubscribe')->option(['real_name' => '一键同步订阅消息']); Route::get('routine/info', [\modules\channel\wechat_mini\controller\admin\RoutineTemplateController::class, 'getDownloadInfo'])->option(['real_name' => '下载小程序页面数据']); - Route::post('routine/download', [\modules\channel\wechat_mini\controller\admin\RoutineTemplateController::class, 'downloadTemp'])->option(['real_name' => '下载小程序模版']); + Route::post('routine/download', [\modules\channel\wechat_mini\controller\admin\RoutineTemplateController::class, 'downloadTemp'])->option(['real_name' => '下载小程序模板']); Route::get('routine/ci/environment', [\modules\channel\wechat_mini\controller\admin\RoutineCIController::class, 'environment'])->option(['real_name' => '获取小程序CI运行环境']); Route::get('routine/ci/guide', [\modules\channel\wechat_mini\controller\admin\RoutineCIController::class, 'installGuide'])->option(['real_name' => '获取环境安装指南']); diff --git a/backend/modules/channel/wechat_mini/sdk/MiniProgramService.php b/backend/modules/channel/wechat_mini/sdk/MiniProgramService.php index 704cde326..bfe8c2285 100644 --- a/backend/modules/channel/wechat_mini/sdk/MiniProgramService.php +++ b/backend/modules/channel/wechat_mini/sdk/MiniProgramService.php @@ -273,7 +273,7 @@ class MiniProgramService } /** - * 添加订阅消息模版 + * 添加订阅消息模板 * @param string $tid * @param array $kidList * @param string $sceneDesc @@ -286,16 +286,16 @@ class MiniProgramService if (isset($res['priTmplId'])) { return $res['priTmplId']; } else { - Log::error('添加订阅消息模版失败：' . json_encode($res, JSON_UNESCAPED_UNICODE)); + Log::error('添加订阅消息模板失败：' . json_encode($res, JSON_UNESCAPED_UNICODE)); } } catch (\Throwable $e) { - Log::error('添加订阅消息模版失败：' . $e->getMessage()); + Log::error('添加订阅消息模板失败：' . $e->getMessage()); } return false; } /** - * 删除订阅消息模版 + * 删除订阅消息模板 * @param string $priTmplId * @return mixed */ @@ -306,17 +306,17 @@ class MiniProgramService if (isset($res['errcode']) && $res['errcode'] == 0) { return true; } else { - Log::error('删除订阅消息模版失败：' . $res['errmsg']); + Log::error('删除订阅消息模板失败：' . $res['errmsg']); } } catch (\Throwable $e) { - Log::error('删除订阅消息模版失败：' . $e->getMessage()); + Log::error('删除订阅消息模板失败：' . $e->getMessage()); } return true; } /** - * 获取模版标题的关键词列表 + * 获取模板标题的关键词列表 * @param string $tid * @return mixed */ diff --git a/backend/public/install/crmeb_table.sql b/backend/public/install/crmeb_table.sql index e5d38d411..46e8f8436 100755 --- a/backend/public/install/crmeb_table.sql +++ b/backend/public/install/crmeb_table.sql @@ -260,7 +260,7 @@ CREATE TABLE IF NOT EXISTS `eb_diy` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', `version` varchar(255) NOT NULL DEFAULT '' COMMENT '版本号', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '页面名称', - `template_name` varchar(255) NOT NULL DEFAULT '' COMMENT '模版名称', + `template_name` varchar(255) NOT NULL DEFAULT '' COMMENT '模板名称', `value` longtext COMMENT '页面数据', `default_value` longtext COMMENT '默认页面数据', `add_time` int NOT NULL DEFAULT '0' COMMENT '添加时间', @@ -1994,8 +1994,8 @@ CREATE TABLE IF NOT EXISTS `eb_theme` ( -- eb_theme_download：主题下载记录表 CREATE TABLE IF NOT EXISTS `eb_theme_download` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', - `title` varchar(255) NOT NULL DEFAULT '' COMMENT '模版名称', - `tid` int NOT NULL DEFAULT '0' COMMENT '模版ID', + `title` varchar(255) NOT NULL DEFAULT '' COMMENT '模板名称', + `tid` int NOT NULL DEFAULT '0' COMMENT '模板ID', `download_time` int NOT NULL DEFAULT '0' COMMENT '下载时间', `download_url` varchar(500) NOT NULL DEFAULT '' COMMENT '下载地址', PRIMARY KEY (`id`) diff --git a/backend/public/install/data/lang_code_data.sql b/backend/public/install/data/lang_code_data.sql index 7f793f212..099d651c0 100755 --- a/backend/public/install/data/lang_code_data.sql +++ b/backend/public/install/data/lang_code_data.sql @@ -316,7 +316,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (313, 1, '400246', '正文不能为空', '正文不能为空', 1), (314, 1, '400247', '摘要不能为空', '摘要不能为空', 1), (315, 1, '400248', '请先配置微信公众号appid、appSecret等参数', '请先配置微信公众号appid、appSecret等参数', 1), -(316, 1, '400249', '模版消息一键设置成功', '模版消息一键设置成功', 1), +(316, 1, '400249', '模板消息一键设置成功', '模板消息一键设置成功', 1), (317, 1, '400250', '请选择用户', '请选择用户', 1), (318, 1, '400251', '该用户没有绑定手机号，请手动填写', '该用户没有绑定手机号，请手动填写', 1), (319, 1, '400252', '手机号格式错误', '手机号格式错误', 1), @@ -790,7 +790,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (784, 1, '400717', '商品数量缺失', '商品数量缺失', 1), (785, 1, '400718', '获取access_token获取失败', '获取access_token获取失败', 1), (786, 1, '400719', '手机号不能为空', '手机号不能为空', 1), -(787, 1, '400720', '模版ID不存在', '模版ID不存在', 1), +(787, 1, '400720', '模板ID不存在', '模板ID不存在', 1), (788, 1, '400721', '请先配置accessKey和secretKey', '请先配置accessKey和secretKey', 1), (789, 1, '400722', '请先配置水印图片', '请先配置水印图片', 1), (790, 1, '400723', '请先配置水印文字', '请先配置水印文字', 1), @@ -1248,7 +1248,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (1239, 1, '40002', '不合法的凭证类型', '不合法的凭证类型', 1), (1240, 1, '40001', '获取 access_token 时 AppSecret 错误，或者 access_token 无效。请开发者认真比对 AppSecret 的正确性，或查看是否正在为恰当的公众号调用接口', '获取 access_token 时 AppSecret 错误，或者 access_token 无效。请开发者认真比对 AppSecret 的正确性，或查看是否正在为恰当的公众号调用接口', 1), (1241, 1, '200011', '此账号已被封禁，无法操作', '此账号已被封禁，无法操作', 1), -(1242, 1, '200012', '个人模版数已达上限，上限25个', '个人模版数已达上限，上限25个', 1), +(1242, 1, '200012', '个人模板数已达上限，上限25个', '个人模板数已达上限，上限25个', 1), (1243, 1, '200014', '请检查小程序所属类目', '请检查小程序所属类目', 1), (1244, 2, '100000', '保存成功', 'Saved succeeded', 1), (1245, 2, '100001', '修改成功', 'Modification successful', 1), @@ -1568,7 +1568,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (1556, 2, '400246', '正文不能为空', 'Body cannot be empty', 1), (1557, 2, '400247', '摘要不能为空', 'Abstract cannot be empty', 1), (1558, 2, '400248', '请先配置微信公众号appid、appSecret等参数', 'Please configure the applet appid, appSecret and other parameters first', 1), -(1559, 2, '400249', '模版消息一键设置成功', 'One-click setting of template message is successful', 1), +(1559, 2, '400249', '模板消息一键设置成功', 'One-click setting of template message is successful', 1), (1560, 2, '400250', '请选择用户', 'Please select a user', 1), (1561, 2, '400251', '该用户没有绑定手机号，请手动填写', 'The user is not bound with a mobile phone number, please fill in manually', 1), (1562, 2, '400252', '手机号格式错误', 'Malformed phone number', 1), @@ -2042,7 +2042,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (2027, 2, '400717', '商品数量缺失', 'Item quantity is missing', 1), (2028, 2, '400718', '获取access_token获取失败', 'Failed to obtain access_token', 1), (2029, 2, '400719', '手机号不能为空', 'Mobile phone number cannot be empty', 1), -(2030, 2, '400720', '模版ID不存在', 'Template ID does not exist', 1), +(2030, 2, '400720', '模板ID不存在', 'Template ID does not exist', 1), (2031, 2, '400721', '请先配置accessKey和secretKey', 'Please configure accessKey and secretKey first', 1), (2032, 2, '400722', '请先配置水印图片', 'Please configure the watermark image first', 1), (2033, 2, '400723', '请先配置水印文字', 'Please configure the watermark text first', 1), @@ -2497,7 +2497,7 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`, (2482, 2, '40002', '不合法的凭证类型', 'Illegal voucher type', 1), (2483, 2, '40001', '获取 access_token 时 AppSecret 错误，或者 access_token 无效。请开发者认真比对 AppSecret 的正确性，或查看是否正在为恰当的公众号调用接口', 'Get access_ Appsecret error in token, or access_ The token is invalid. Please carefully compare the correctness of appsecret or check whether the interface is being called for the appropriate wechat', 1), (2484, 2, '200011', '此账号已被封禁，无法操作', 'This account has been banned and cannot be operated', 1), -(2485, 2, '200012', '个人模版数已达上限，上限25个', 'The number of personal templates has reached the upper limit, the upper limit is 25', 1), +(2485, 2, '200012', '个人模板数已达上限，上限25个', 'The number of personal templates has reached the upper limit, the upper limit is 25', 1), (2486, 2, '200014', '请检查小程序所属类目', 'Please check the category of the applet', 1), (12431, 1, '选择地址', '选择地址', '选择地址', 0), (12432, 1, '选择其它地址', '选择其它地址', '选择其它地址', 0), diff --git a/backend/public/install/data/shipping_templates_data.sql b/backend/public/install/data/shipping_templates_data.sql index e43bb8de1..68ffecc0d 100755 --- a/backend/public/install/data/shipping_templates_data.sql +++ b/backend/public/install/data/shipping_templates_data.sql @@ -1,4 +1,4 @@ -- eb_shipping_templates default data INSERT INTO `eb_shipping_templates` (`id`, `name`, `type`, `appoint`, `no_delivery`, `sort`, `add_time`) VALUES -(1, '默认模版', 1, 0, 0, 0, 1658394592); \ No newline at end of file +(1, '默认模板', 1, 0, 0, 0, 1658394592); \ No newline at end of file diff --git a/backend/public/install/data/system_menus_data.sql b/backend/public/install/data/system_menus_data.sql index 759ebe6fa..165229d69 100755 --- a/backend/public/install/data/system_menus_data.sql +++ b/backend/public/install/data/system_menus_data.sql @@ -312,7 +312,7 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (3118, 898, '', '同步消息', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/898', 3, '', 0, 'notification-sync', '', 0, '同步消息'), (3119, 898, '', '设置消息', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/898', 3, '', 0, 'notification-setting', '', 0, '设置消息'), (3120, 898, '', '消息状态', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/898', 3, '', 0, 'notification-status', '', 0, '消息状态'), -(3122, 3118, '', '一键同步模版消息', '', '', '', 'app/wechat/syncSubscribe', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'app-wechat-syncSubscribe', '', 0, '一键同步模版消息'), +(3122, 3118, '', '一键同步模板消息', '', '', '', 'app/wechat/syncSubscribe', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'app-wechat-syncSubscribe', '', 0, '一键同步模板消息'), (3123, 3119, '', '系统通知列表', '', '', '', 'setting/notification/index', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-notification-index', '', 0, '系统通知列表'), (3124, 3119, '', '保存通知设置', '', '', '', 'setting/notification/save', 'POST', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-notification-save', '', 0, '保存通知设置'), (3125, 3119, '', '获取单条通知数据', '', '', '', 'setting/notification/info', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-notification-info', '', 0, '获取单条通知数据'), @@ -395,15 +395,15 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont (3202, 3191, '', '删除店员', '', '', '', 'merchant/store_staff/del/', 'DELETE', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'merchant-store_staff-del', '', 0, '删除店员'), (3203, 3192, '', '修改店员状态', '', '', '', 'merchant/store_staff/set_show//', 'PUT', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'merchant-store_staff-set_show', '', 0, '修改店员状态'), (3204, 3192, '', '获取门店店员列表', '', '', '', 'merchant/store_staff', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'merchant-store_staff-646a23d9d7e44', '', 0, '获取门店店员列表'), -(3205, 230, '', '添加运费模版', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-add', '', 0, '添加运费模版'), -(3206, 230, '', '修改运费模版', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-edit', '', 0, '修改运费模版'), -(3207, 230, '', '删除运费模版', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-delete', '', 0, '删除运费模版'), +(3205, 230, '', '添加运费模板', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-add', '', 0, '添加运费模板'), +(3206, 230, '', '修改运费模板', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-edit', '', 0, '修改运费模板'), +(3207, 230, '', '删除运费模板', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/', '12/303/230', 3, '', 0, 'shipping-temp-delete', '', 0, '删除运费模板'), (3208, 3205, '', '运费模板列表', '', '', '', 'setting/shipping_templates/list', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-list', '', 0, '运费模板列表'), -(3209, 3205, '', '新增或修改运费模版', '', '', '', 'setting/shipping_templates/save/', 'POST', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-save', '', 0, '新增或修改运费模版'), +(3209, 3205, '', '新增或修改运费模板', '', '', '', 'setting/shipping_templates/save/', 'POST', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-save', '', 0, '新增或修改运费模板'), (3210, 3205, '', '城市数据接口', '', '', '', 'setting/shipping_templates/city_list', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-city_list', '', 0, '城市数据接口'), (3211, 3206, '', '运费模板列表', '', '', '', 'setting/shipping_templates/list', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-list-646a24602a752', '', 0, '运费模板列表'), (3212, 3206, '', '修改运费模板数据', '', '', '', 'setting/shipping_templates//edit', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-edit', '', 0, '修改运费模板数据'), -(3213, 3206, '', '新增或修改运费模版', '', '', '', 'setting/shipping_templates/save/', 'POST', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-save-646a24602a763', '', 0, '新增或修改运费模版'), +(3213, 3206, '', '新增或修改运费模板', '', '', '', 'setting/shipping_templates/save/', 'POST', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-save-646a24602a763', '', 0, '新增或修改运费模板'), (3214, 3206, '', '城市数据接口', '', '', '', 'setting/shipping_templates/city_list', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-city_list-646a24602a769', '', 0, '城市数据接口'), (3215, 3207, '', '删除运费模板', '', '', '', 'setting/shipping_templates/del/', 'DELETE', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-del', '', 0, '删除运费模板'), (3216, 3207, '', '运费模板列表', '', '', '', 'setting/shipping_templates/list', 'GET', '[]', 1, 1, 1, 1, '', '', 2, '', 0, 'setting-shipping_templates-list-646a246c229e8', '', 0, '运费模板列表'), diff --git a/frontend/admin/src/api/app.js b/frontend/admin/src/api/app.js index 7ee2da297..c5c4a2417 100644 --- a/frontend/admin/src/api/app.js +++ b/frontend/admin/src/api/app.js @@ -33,7 +33,7 @@ export function routineSyncTemplate() { } /** - * @description 同步微信模版消息 + * @description 同步微信模板消息 */ export function wechatSyncTemplate() { return request({ diff --git a/frontend/admin/src/components/freightTemplate/index.vue b/frontend/admin/src/components/freightTemplate/index.vue index f5850f517..bc7e0cb40 100644 --- a/frontend/admin/src/components/freightTemplate/index.vue +++ b/frontend/admin/src/components/freightTemplate/index.vue @@ -1,6 +1,6 @@