From bb83fce1990d84a3ae19fd8da8b6a46a7e905cc8 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Wed, 31 Aug 2022 17:55:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8E=9F=E5=9B=A0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/RmaReasonController.php  |  4 +++
 .../views/pages/rma_reasons/index.blade.php   | 29 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/beike/Admin/Http/Controllers/RmaReasonController.php b/beike/Admin/Http/Controllers/RmaReasonController.php
index f932b277..83d6df3c 100644
--- a/beike/Admin/Http/Controllers/RmaReasonController.php
+++ b/beike/Admin/Http/Controllers/RmaReasonController.php
@@ -28,6 +28,10 @@ class RmaReasonController extends Controller
             'rmaReasons' => RmaReasonDetail::collection($rmaReasons)->jsonSerialize(),
         ];
 
+        if ($request->expectsJson()) {
+            return json_success(trans('common.success'), $data);
+        }
+
         return view('admin::pages.rma_reasons.index', $data);
     }
 
diff --git a/resources/beike/admin/views/pages/rma_reasons/index.blade.php b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
index 1e5ed4a4..53740164 100644
--- a/resources/beike/admin/views/pages/rma_reasons/index.blade.php
+++ b/resources/beike/admin/views/pages/rma_reasons/index.blade.php
@@ -58,10 +58,6 @@
           <tr v-for="language, index in rmaReasons" :key="index">
             <td>@{{ language.id }}</td>
             <td>@{{ language.name }}</td>
-            <td>
-              <span v-if="language.status" class="text-success">{{ __('common.enable') }}</span>
-              <span v-else class="text-secondary">{{ __('common.disable') }}</span>
-            </td>
             <td class="text-end">
               <button class="btn btn-outline-secondary btn-sm" @click="checkedCreate('edit', index)">{{ __('common.edit') }}</button>
               <button class="btn btn-outline-danger btn-sm ml-1" type="button" @click="deleteCustomer(language.id, index)">{{ __('common.delete') }}</button>
@@ -69,8 +65,6 @@
           </tr>
         </tbody>
       </table>
-
-      {{-- {{ $languages->links('admin::vendor/pagination/bootstrap-4') }} --}}
     </div>
 
     <el-dialog title="{{ __('admin/common.rma_reasons_index') }}" :visible.sync="dialog.show" width="500px"
@@ -140,11 +134,17 @@
 
             this.dialog.form = {
               id: tax.id,
-              name: tax.name,
+              name: tax.names,
             }
           }
         },
 
+        loadData() {
+          $http.get(`rma_reasons?page=${this.page}`).then((res) => {
+            this.rmaReasons = res.data.rmaReasons;
+          })
+        },
+
         statusChange(e, index) {
           const id = this.rmaReasons[index].id;
 
@@ -160,17 +160,13 @@
 
           this.$refs[form].validate((valid) => {
             if (!valid) {
-              this.$message.error('请检查表单是否填写正确');
+              this.$message.error('{{ __('common.error_form') }}');
               return;
             }
 
             $http[type](url, this.dialog.form).then((res) => {
               this.$message.success(res.message);
-              if (this.dialog.type == 'add') {
-                this.rmaReasons.push(res.data)
-              } else {
-                this.rmaReasons[this.dialog.index] = res.data
-              }
+              this.loadData();
 
               this.dialog.show = false
             })
@@ -179,9 +175,9 @@
 
         deleteCustomer(id, index) {
           const self = this;
-          this.$confirm('确定要删除语言吗？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          this.$confirm('{{ __('common.confirm_delete') }}', '{{ __('common.text_hint') }}', {
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete('rmaReasons/' + id).then((res) => {
@@ -194,6 +190,7 @@
         closeCustomersDialog(form) {
           this.$refs[form].resetFields();
           Object.keys(this.dialog.form).forEach(key => this.dialog.form[key] = '')
+          this.dialog.form.name = {};
           this.dialog.show = false
         }
       }