From 17cac83ada716e0b3cea1e0b5ccfa757ca4283dc Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 29 Aug 2022 19:10:19 +0800
Subject: [PATCH] wip

---
 beike/Admin/View/Components/Sidebar.php           |  2 +-
 .../admin/views/pages/country/index.blade.php     | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php
index 598e8cf2..6646a15a 100644
--- a/beike/Admin/View/Components/Sidebar.php
+++ b/beike/Admin/View/Components/Sidebar.php
@@ -61,7 +61,7 @@ class Sidebar extends Component
             foreach ($routes as $route) {
                 $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false));
             }
-        } elseif (Str::startsWith($routeName, ['settings.', 'admin_users.', 'admin_roles.', 'plugins.', 'tax_classes', 'tax_rates', 'regions', 'currencies', 'languages', 'design_menu'])) {
+        } elseif (Str::startsWith($routeName, ['settings.', 'admin_users.', 'admin_roles.', 'plugins.', 'tax_classes', 'tax_rates', 'regions', 'currencies', 'languages', 'design_menu', 'countries', 'zones'])) {
             $routes = $this->getSettingSubRoutes();
             foreach ($routes as $route) {
                 $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false));
diff --git a/resources/beike/admin/views/pages/country/index.blade.php b/resources/beike/admin/views/pages/country/index.blade.php
index 682c1f01..b4462ceb 100644
--- a/resources/beike/admin/views/pages/country/index.blade.php
+++ b/resources/beike/admin/views/pages/country/index.blade.php
@@ -13,6 +13,7 @@
           <tr>
             <th>ID</th>
             <th>名称</th>
+            <th>编码</th>
             <th>创建时间</th>
             <th>修改时间</th>
             <th>排序</th>
@@ -24,6 +25,7 @@
           <tr v-for="country, index in country.data" :key="index">
             <td>@{{ country.id }}</td>
             <td>@{{ country.name }}</td>
+            <td>@{{ country.code }}</td>
             <td>@{{ country.created_at }}</td>
             <td>@{{ country.updated_at }}</td>
             <td>@{{ country.sort_order }}</td>
@@ -55,6 +57,10 @@
           <el-input v-model="dialog.form.sort_order" placeholder="排序"></el-input>
         </el-form-item>
 
+        <el-form-item label="编码">
+          <el-input v-model="dialog.form.code" placeholder="编码"></el-input>
+        </el-form-item>
+
         <el-form-item label=" 状态">
           <el-switch v-model="dialog.form.status" :active-value="1" :inactive-value="0"></el-switch>
         </el-form-item>
@@ -86,6 +92,7 @@
           form: {
             id: null,
             name: '',
+            code: '',
             sort_order: '',
             status: 1,
           },
@@ -141,9 +148,9 @@
             $http[type](url, this.dialog.form).then((res) => {
               this.$message.success(res.message);
               if (this.dialog.type == 'add') {
-                this.languages.push(res.data)
+                this.country.data.push(res.data)
               } else {
-                this.languages[this.dialog.index] = res.data
+                this.country.data[this.dialog.index] = res.data
               }
 
               this.dialog.show = false
@@ -158,9 +165,9 @@
             cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
-            $http.delete('languages/' + id).then((res) => {
+            $http.delete('countries/' + id).then((res) => {
               this.$message.success(res.message);
-              self.languages.splice(index, 1)
+              self.country.data.splice(index, 1)
             })
           }).catch(()=>{})
         },