Merge branch 'ysx-供应商详情优化-20250825' into ysx-masterBack-20250826

app/Http/Controllers/SupplierController.php

@@ -156,6 +156,7 @@ class SupplierController extends Controller
                 'value' => $key,
             ];
         }
+        $this->data['nation'] = NationModel::where('nation_id', $supplier['nation_id'])->first();
         $this->data['sku_optional_batch_for_xm_select'] = $skuOptionalBatchXmSelect;
 
         return $this->view('供应商详情');

resources/views/web/SupplierDetail.blade.php

@@ -161,10 +161,13 @@
                                 <div class="layui-col-md2">
                                     <span class="required_field">*</span> 所在区域 ：{{$supplier['region_name']}}
                                 </div>
-                                <div class="layui-col-md3">
-                                    @if ($supplier['region']==2)
+                                @if ($supplier['region']==2)
+                                    <div class="layui-col-md3">
                                         所属省市 ：{{$province_city}}
-                                    @endif
+                                    </div>
+                                @endif
+                                <div class="layui-col-md3">
+                                    所在国家/地区 ：{{!empty($nation['name_cn'])?$nation['name_cn'].'('.$nation['international_code'].')':'未设置'}}
                                 </div>
                             </div>
                             <div class="layui-row">
@@ -509,7 +512,16 @@
                             </div>
                         </div>
                     </div>
-
+                    <div style="display: flex;align-items: center;">
+                        <div style="width: 130px">
+                            <label class="layui-form-label">SKU上架有效期 : </label>
+                        </div>
+                        <div style="display: flex;flex-direction: column;">
+                            <div>现货 : {{$supplier['cp_time_day'] == -1 ? '无限制' : $supplier['cp_time_day']}}天</div>
+                            <div>期货 : {{$supplier['futures_cp_time_day'] == -1 ? '无限制' : $supplier['futures_cp_time_day']}}天</div>
+                        </div>
+                    </div>
+                    <br>
                     <div class="layui-inline">
                            @inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
                            {!! $multiSelectorPresenter->render('sku_optional_batch','SKU可选批次 : ',!empty($supplier)?$supplier['sku_optional_batch']:'',$sku_optional_batch_for_xm_select,['width'=>'350px','required'=>true,'disable'=>true]) !!}