优化：文本内容修改

beike/Shop/Http/Controllers/ProductController.php

@@ -189,9 +189,10 @@ class ProductController extends Controller
         $time = time();
         foreach($data['list'] as &$logisticsItem){
             // 预计到达时间处理
-            $startTime =  date('Y-m-d',strtotime("+{$logisticsItem['day_min']} day", $time));
-            $endTime =  date('Y-m-d',strtotime("+{$logisticsItem['day_max']} day", $time));
-            $logisticsItem['estimated_time'] = trans('order.expected_arrival',['start_time'=>$startTime,'end_time'=>$endTime]);
+            // $startTime =  date('Y-m-d',strtotime("+{$logisticsItem['day_min']} day", $time));
+            // $endTime =  date('Y-m-d',strtotime("+{$logisticsItem['day_max']} day", $time));
+            // $logisticsItem['estimated_time'] = trans('order.expected_arrival',['start_time'=>$startTime,'end_time'=>$endTime]);
+            $logisticsItem['estimated_time'] = trans('order.work_days',['start_day'=>$logisticsItem['day_min'],'end_day'=>$logisticsItem['day_max']]);
             // 判断：如果存在商品  计算物流运费信息
             if(count($goodsList) > 0){
                 $request->list = $request->goods_list;

beike/Shop/Http/Controllers/ZoneController.php

@@ -10,6 +10,7 @@
 
 namespace Beike\Shop\Http\Controllers;
 
+use Beike\Models\Region;
 use Beike\Repositories\CountryRepo;
 use Beike\Repositories\ZoneRepo;
 use Illuminate\Http\Request;
@@ -36,7 +37,17 @@ class ZoneController extends Controller{
 
         return json_success(trans('common.get_success'), $brands);
     }
+    /**
+     * Common: 获取全部的区域分组
+     * Author: wu-hui
+     * Time: 2023/08/31 9:25
+     * @return array
+     */
+    public function regionsAll(){
+        $list = Region::query()->select(['id','name'])->get();
 
+        return json_success(trans('common.get_success'), $list);
+    }
 
 
 

beike/Shop/Routes/shop.php

@@ -45,6 +45,9 @@ Route::prefix('/')
         Route::get('countries/{id}/zones', [ZoneController::class, 'index'])->name('countries.zones.index');
         Route::get('countries/autocomplete', [ZoneController::class, 'countries'])->name('countries.zones.countries');
 
+        Route::get('regions/get_all', [ZoneController::class, 'regionsAll'])->name('regions.regions_all');
+
+
         Route::get('currency/{currency}', [CurrencyController::class, 'index'])->name('currency.switch');
 
         Route::post('files', [FileController::class, 'store'])->name('file.store');

resources/lang/en/admin/logistics.php

@@ -75,5 +75,5 @@ return [
     'unit'                       => 'unit：:unit',
     'default_countries'          => 'Default display country for the front desk',
     'choose_logistics'         => 'Select Shipping Service',
-    'estimated_time'         => 'Estimated delivery time',
+    'estimated_time'         => 'Shipping Time',
 ];

resources/lang/en/order.php

@@ -24,6 +24,8 @@ return [
     'express_number'     => 'Express Number',
     'express_company'    => 'Express Company',
     'expected_arrival'     => 'Expected to arrive between :start_time and :end_time',
+    'work_days'     => '【:start_day】-【:end_day】work days',
+
     'order_shipments'    => 'shipment information',
 
     'address_info'       => 'Address Information',

resources/lang/en/shop/carts.php

@@ -14,7 +14,7 @@ return [
     'commodity'         => 'Product',
     'quantity'          => 'Quantity',
     'subtotal'          => 'Subtotal',
-    'product_total'     => 'Quantity total',// Product Total
+    'product_total'     => 'Product Total',// Product Total
     'customer_discount' => 'Customer Discount',
     'order_total'       => 'Order Total',
     'shipping_fee'      => 'Shipping Fee',

resources/lang/zh_cn/admin/logistics.php

@@ -80,7 +80,7 @@ return [
     'unit'                       => '单位：:unit',
     'default_countries'          => '前台默认展示国家',
     'choose_logistics'         => '选择运输服务',
-    'estimated_time'         => '预计送达时间',
+    'estimated_time'         => '运送时间',
 
 
 

resources/lang/zh_cn/order.php

@@ -24,6 +24,7 @@ return [
     'express_number'     => '快递单号',
     'express_company'    => '快递公司',
     'expected_arrival'     => '预计在:start_time 至 :end_time到达',
+    'work_days'     => '【:start_day】-【:end_day】个工作日',
     'order_shipments'    => '发货信息',
 
     'address_info'       => '地址信息',