diff --git a/beike/Admin/Http/Controllers/BrandController.php b/beike/Admin/Http/Controllers/BrandController.php index a7c2214e..2fd14ea3 100644 --- a/beike/Admin/Http/Controllers/BrandController.php +++ b/beike/Admin/Http/Controllers/BrandController.php @@ -91,7 +91,7 @@ class BrandController extends Controller /** - * 根据产品ID批量获取产品名称 + * 根据商品ID批量获取商品名称 * * @param Request $request * @return array diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index 351a83d7..5562828c 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -131,7 +131,7 @@ class ProductController extends Controller /** - * 根据产品ID批量获取产品名称 + * 根据商品ID批量获取商品名称 * * @param Request $request * @return array diff --git a/beike/Admin/Repositories/DashboardRepo.php b/beike/Admin/Repositories/DashboardRepo.php index 00c64ef5..a7c20e20 100644 --- a/beike/Admin/Repositories/DashboardRepo.php +++ b/beike/Admin/Repositories/DashboardRepo.php @@ -18,7 +18,7 @@ use Beike\Repositories\CustomerRepo; class DashboardRepo { /** - * 获取产品总数 + * 获取商品总数 * * @return array */ diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 53908dc9..816c0445 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -136,7 +136,7 @@ Route::prefix($adminName) Route::middleware('can:pages_delete')->delete('pages/{page}', [Controllers\PagesController::class, 'destroy'])->name('pages.destroy'); - // 产品 + // 商品 Route::middleware('can:products_restore')->put('products/restore', [Controllers\ProductController::class, 'restore']); Route::middleware('can:products_trashed')->get('products/trashed', [Controllers\ProductController::class, 'trashed'])->name('products.trashed'); Route::middleware('can:products_show')->get('products/{id}/name', [Controllers\ProductController::class, 'name'])->name('products.name'); diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index 8def94d8..dfb40c03 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -118,7 +118,7 @@ class Sidebar extends Component /** - * 获取产品子页面路由 + * 获取商品子页面路由 */ private function getProductSubRoutes() { @@ -133,7 +133,7 @@ class Sidebar extends Component /** - * 获取产品子页面路由 + * 获取商品子页面路由 */ private function getCustomerSubRoutes() { diff --git a/beike/Repositories/BrandRepo.php b/beike/Repositories/BrandRepo.php index 95c9c0d8..824853be 100644 --- a/beike/Repositories/BrandRepo.php +++ b/beike/Repositories/BrandRepo.php @@ -100,7 +100,7 @@ class BrandRepo /** - * 获取产品品牌筛选builder + * 获取商品品牌筛选builder * @param array $filters * @return Builder */ @@ -162,7 +162,7 @@ class BrandRepo } /** - * 通过产品ID获取产品列表 + * 通过商品ID获取商品列表 * @return array|Builder[]|Collection */ public static function getListByIds($ids) diff --git a/beike/Repositories/CategoryRepo.php b/beike/Repositories/CategoryRepo.php index fb845e29..9218b539 100644 --- a/beike/Repositories/CategoryRepo.php +++ b/beike/Repositories/CategoryRepo.php @@ -53,7 +53,7 @@ class CategoryRepo /** - * 获取产品分类列表 + * 获取商品分类列表 * * @param array $filters * @return Builder[]|Collection @@ -121,7 +121,7 @@ class CategoryRepo /** - * 删除产品分类 + * 删除商品分类 * @throws \Exception */ public static function delete($category) @@ -139,7 +139,7 @@ class CategoryRepo /** - * 通过分类ID获取产品名称 + * 通过分类ID获取商品名称 * @param $category * @return mixed|string */ diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php index 0ae67b08..cf881016 100644 --- a/beike/Repositories/ProductRepo.php +++ b/beike/Repositories/ProductRepo.php @@ -27,7 +27,7 @@ class ProductRepo /** - * 获取产品详情 + * 获取商品详情 */ public static function getProductDetail($product) { @@ -40,7 +40,7 @@ class ProductRepo /** - * 通过单个或多个产品分类获取产品列表 + * 通过单个或多个商品分类获取商品列表 * * @param $categoryId * @return AnonymousResourceCollection @@ -54,7 +54,7 @@ class ProductRepo /** - * 通过产品ID获取产品列表 + * 通过商品ID获取商品列表 * @param $productIds * @return AnonymousResourceCollection */ @@ -67,7 +67,7 @@ class ProductRepo /** - * 获取产品筛选对象 + * 获取商品筛选对象 * * @param array $data * @return Builder @@ -171,7 +171,7 @@ class ProductRepo /** - * 通过产品ID获取商品名称 + * 通过商品ID获取商品名称 * @param $id * @return mixed|string */ @@ -222,7 +222,7 @@ class ProductRepo /** - * 通过产品ID获取产品列表 + * 通过商品ID获取商品列表 * @return array|Builder[]|Collection */ public static function getListByProductIds($productIds) diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php index 9e3d9d14..7a45dfc5 100644 --- a/beike/Shop/Http/Controllers/ProductController.php +++ b/beike/Shop/Http/Controllers/ProductController.php @@ -12,7 +12,7 @@ use Illuminate\Http\Resources\Json\AnonymousResourceCollection; class ProductController extends Controller { /** - * 产品详情页 + * 商品详情页 * @param Request $request * @param Product $product * @return mixed @@ -31,7 +31,7 @@ class ProductController extends Controller /** - * 通过关键字搜索产品 + * 通过关键字搜索商品 * * @param Request $request * @return mixed diff --git a/beike/Shop/View/Components/Breadcrumb.php b/beike/Shop/View/Components/Breadcrumb.php index bfcd4ef2..e68a404a 100644 --- a/beike/Shop/View/Components/Breadcrumb.php +++ b/beike/Shop/View/Components/Breadcrumb.php @@ -81,7 +81,7 @@ class Breadcrumb extends Component } /** - * 获取产品以及分类路径 + * 获取商品以及分类路径 * * @param $value * @return array diff --git a/public/fonts/design/iconfont.json b/public/fonts/design/iconfont.json index 978a4c1f..3f2d8395 100644 --- a/public/fonts/design/iconfont.json +++ b/public/fonts/design/iconfont.json @@ -42,14 +42,14 @@ }, { "icon_id": "15954666", - "name": "产品", + "name": "商品", "font_class": "chanpin", "unicode": "e606", "unicode_decimal": 58886 }, { "icon_id": "17907876", - "name": "产品 (1)", + "name": "商品 (1)", "font_class": "chanpin1", "unicode": "e607", "unicode_decimal": 58887 @@ -350,7 +350,7 @@ }, { "icon_id": "680974", - "name": "产品2", + "name": "商品2", "font_class": "chanpin2", "unicode": "e71a", "unicode_decimal": 59162 diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index c8fa5fa5..8e09d77f 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -53,10 +53,10 @@ return [ 'pages_index' => '信息页面', 'design_footer_index' => '页尾装修', 'design_menu_index' => '导航配置', - 'categories_index' => '产品分类', + 'categories_index' => '商品分类', 'products_index' => '商品管理', 'products_trashed' => '回收站', - 'brands_index' => '产品品牌', + 'brands_index' => '商品品牌', 'orders_index' => '订单列表', 'rmas_index' => '售后管理', 'customers_index' => '客户列表', diff --git a/resources/lang/zh_cn/admin/product.php b/resources/lang/zh_cn/admin/product.php index e6087a6a..9c4747de 100644 --- a/resources/lang/zh_cn/admin/product.php +++ b/resources/lang/zh_cn/admin/product.php @@ -10,11 +10,11 @@ */ return [ - 'products_index' => '产品列表', - 'products_create' => '创建产品', - 'products_show' => '产品详情', - 'products_update' => '更新产品', - 'products_delete' => '删除产品', + 'products_index' => '商品列表', + 'products_create' => '创建商品', + 'products_show' => '商品详情', + 'products_update' => '更新商品', + 'products_delete' => '删除商品', 'products_trashed' => '回收站', 'products_restore' => '恢复回收站', diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index 4d332d3e..50089aaa 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -43,7 +43,7 @@ return [ 'wishlist' => [ 'index' => '我的收藏', - 'product' => '产品', + 'product' => '商品', 'price' => '价格', 'check_details' => '查看详情', ],