From 64fea5c8b372d1973e5625489ccd7b8126096372 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 31 Aug 2023 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20-=20=E7=BB=AD=E9=87=8D=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=85=E4=BD=BF=E7=94=A8=E4=B8=80=E4=B8=AA=E3=80=82=E7=BB=AD?=
 =?UTF-8?q?=E9=87=8D=E8=8C=83=E5=9B=B4=E4=BD=BF=E7=94=A8=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=80=BC=E5=90=8C=E6=AD=A5=E9=A6=96=E9=87=8D=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82=E7=89=A9=E6=B5=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=B0=83=E6=95=B4=E5=92=8C=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E7=89=A9=E6=B5=81=E4=B8=80=E8=87=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/logistics/form/form.blade.php | 71 +++++++++++++------
 .../views/pages/logistics/index.blade.php     |  4 +-
 2 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/resources/beike/admin/views/pages/logistics/form/form.blade.php b/resources/beike/admin/views/pages/logistics/form/form.blade.php
index d4e10579..611a4cb3 100644
--- a/resources/beike/admin/views/pages/logistics/form/form.blade.php
+++ b/resources/beike/admin/views/pages/logistics/form/form.blade.php
@@ -144,9 +144,25 @@
             </x-admin::form.row>
             <span v-if="form.type !== 'free'">
               <span v-if="form.type === 'weight'">
-                <x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_weight')" :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required>
+
+
+                <x-admin::form.row :title="__('admin/logistics.first_weight')">
+                  <div class="d-flex mb-2 wp-400">
+                    <input type="number"
+                           name="first_weight"
+                           @input="firstChange"
+                           value="{{old('first_weight', $logistics->first_weight ?? '')}}"
+                           class="form-control"  step="any" required />
+                    <div style="width: 40px;line-height: 34px;text-align:center"> {{ __('product.g') }} </div>
+                  </div>
+                </x-admin::form.row>
+
+
+
+
+                {{--<x-admin-form-input name="first_weight" type="number" :title="__('admin/logistics.first_weight')" :value="old('first_weight', $logistics->first_weight ?? '')" step="any" required>
                   {{ __('admin/logistics.unit',['unit'=>__('product.g')]) }}
-                </x-admin-form-input>
+                </x-admin-form-input>--}}
             <x-admin-form-input name="first_weight_fee" type="number" :title="__('admin/logistics.first_weight_fee')"
                                 :value="old('first_weight_fee', $logistics->first_weight_fee ?? '')" step="any"
                                 required> {{ __('admin/logistics.unit',['unit'=>'USD']) }}</x-admin-form-input>
@@ -159,34 +175,34 @@
             </x-admin-form-input>
                 {{-- 续重范围 START --------------------------------------------------------}}
                 <x-admin::form.row :title="__('admin/logistics.continuation_weight_max')">
-                  {{--续重范围列表--}}
-                  <div class="d-flex mb-2 wp-600" v-for="(cwItem,cwIndex) in continuation_weight_list" :key="cwIndex">
+                  {{--续重范围列表     v-for="(cwItem,cwIndex) in continuation_weight_list" :key="cwIndex"    --}}
+                  <div class="d-flex mb-2 wp-600" >
                     <input type="number"
-                           :name="'continuation_weight_list[' + cwIndex +'][min]'"
-                           @input="continuationWeightChange($event,'min',cwIndex)"
-                           :value="cwItem['min'] ?? 0"
+                           :name="'continuation_weight_list[0][min]'"
+                           @input="continuationWeightChange($event,'min',0)"
+                           :value="continuation_weight_list[0] ? continuation_weight_list[0]['min'] : 0"
                            precision="2"
                            step="0.01"
-                           class="form-control" style="flex: 0 0 130px" />
+                           class="form-control" style="flex: 0 0 130px" readonly/>
                     <div style="width: 40px;line-height: 34px;text-align:center"> - </div>
                     <input type="number"
-                           :name="'continuation_weight_list[' + cwIndex +'][max]'"
-                           @input="continuationWeightChange($event,'max',cwIndex)"
-                           :value="cwItem['max'] ?? 0"
+                           :name="'continuation_weight_list[0][max]'"
+                           @input="continuationWeightChange($event,'max',0)"
+                           :value="continuation_weight_list[0] ? continuation_weight_list[0]['max'] : 0"
                            precision="2"
                            step="0.01"
                            class="form-control" style="flex: 0 0 130px" />
                     <div style="width: 40px;line-height: 34px;text-align:center"> {{ __('product.g') }} </div>
-                    <div style="width: 40px;line-height: 34px;text-align:center">
-                      <button type="button" class="btn btn-danger" @click="continuationWeightRemove(cwIndex)" style="margin-left: 10px;">
-                        <i class="bi bi-trash-fill"></i>
-                      </button>
-                    </div>
+                    {{--<div style="width: 40px;line-height: 34px;text-align:center">--}}
+                    {{--  <button type="button" class="btn btn-danger" @click="continuationWeightRemove(cwIndex)" style="margin-left: 10px;">--}}
+                    {{--    <i class="bi bi-trash-fill"></i>--}}
+                    {{--  </button>--}}
+                    {{--</div>--}}
                   </div>
                   {{--续重范围添加--}}
-                  <button type="button" class=" btn btn-primary" @click="continuationWeightAdd">
-                      <i class="bi bi-plus"></i>
-                  </button>
+                  {{--<button type="button" class=" btn btn-primary" @click="continuationWeightAdd">--}}
+                  {{--    <i class="bi bi-plus"></i>--}}
+                  {{--</button>--}}
                 </x-admin::form.row>
                 {{-- 续重范围 END --------------------------------------------------------}}
 
@@ -351,7 +367,9 @@
           }
         }
       },
-      created() {},
+      created() {
+        console.log(this.continuation_weight_list);
+      },
       methods: {
         dev() {
           console.log(1);
@@ -735,7 +753,12 @@
         // 续重范围 - 续重范围改变
         continuationWeightChange(e,field = 'min',cwIndex = 0){
           let value = e.currentTarget.value || e.target.value;
-          this.continuation_weight_list[cwIndex][field] = value || 0;
+          let info = this.continuation_weight_list[cwIndex] || {};
+          info[field] = parseFloat(value) || 0;
+
+          this.continuation_weight_list[cwIndex] = info;
+          console.log(this.continuation_weight_list);
+
         },
         // 续重范围 - 删除续重范围
         continuationWeightRemove(cwIndex){
@@ -744,6 +767,12 @@
           delete weightList[cwIndex];
 
           _this.continuation_weight_list = Object.values(weightList);
+        },
+        // 首重改变
+        firstChange(event){
+          // let value = event.currentTarget.value || event.target.value;
+          this.continuationWeightChange(event,'min',0)
+          this.$forceUpdate();
         }
 
 
diff --git a/resources/beike/admin/views/pages/logistics/index.blade.php b/resources/beike/admin/views/pages/logistics/index.blade.php
index ff353467..e16880b3 100644
--- a/resources/beike/admin/views/pages/logistics/index.blade.php
+++ b/resources/beike/admin/views/pages/logistics/index.blade.php
@@ -120,7 +120,7 @@
                     <div class="fcm-top">
                       <div class="fcm-top-box">
                         <div class="title">{{ __('admin/logistics.first_weight') }}</div>
-                        <div class="num">{{ $logistic['first_weight'] }}KG</div>
+                        <div class="num">{{ $logistic['first_weight'] }}{{ __('product.g') }}</div>
                       </div>
                       <div class="fcm-top-box">
                         <div class="title">{{ __('admin/logistics.first_weight_fee') }}</div>
@@ -130,7 +130,7 @@
                     <div class="fcm-top">
                       <div class="fcm-top-box">
                         <div class="title">{{ __('admin/logistics.add_weight') }}</div>
-                        <div class="num">{{ $logistic['add_weight'] }}KG</div>
+                        <div class="num">{{ $logistic['add_weight'] }}{{ __('product.g') }}</div>
                       </div>
                       <div class="fcm-top-box">
                         <div class="title">{{ __('admin/logistics.continuation_weight_fee') }}</div>