From 036b6a466e0151bccc2f9ff010b9bed218c688d9 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 16 Aug 2022 14:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E5=92=8C=E5=9B=9E=E6=94=B6=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/pages/admin_users/index.blade.php      |  2 +-
 .../beike/admin/views/pages/products/index.blade.php   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/beike/admin/views/pages/admin_users/index.blade.php b/resources/beike/admin/views/pages/admin_users/index.blade.php
index 10901d64..62215193 100644
--- a/resources/beike/admin/views/pages/admin_users/index.blade.php
+++ b/resources/beike/admin/views/pages/admin_users/index.blade.php
@@ -35,7 +35,7 @@
             <td>@{{ tax.name }}</td>
             <td>@{{ tax.email }}</td>
             <td>
-              <span v-for="role, role_index in tax.roles" :key="role_index">
+              <span v-for="role, role_index in tax.roles_name" :key="role_index">
                 @{{ role }}
               </span>
             </td>
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index f5834ece..589c3dc2 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -109,11 +109,13 @@
               <td>@{{ item.position }}</td>
               <td>@{{ item.active ? '上架' : '下架' }}</td>
               <td width="140" class="text-end">
-                <a :href="item.url_edit" class="btn btn-outline-dark btn-sm">编辑</a>
-                <template>
-                  <a v-if="item.deleted_at == ''" href="javascript:void(0)" class="btn btn-outline-danger btn-sm"
+                <template v-if="item.deleted_at == ''">
+                  <a :href="item.url_edit" class="btn btn-outline-secondary btn-sm">编辑</a>
+                  <a href="javascript:void(0)" class="btn btn-outline-danger btn-sm"
                     @click.prevent="deleteProduct(index)">删除</a>
-                  <a v-else href="javascript:void(0)" class="btn btn-outline-secondary btn-sm"
+                </template>
+                <template v-else>
+                  <a href="javascript:void(0)" class="btn btn-outline-secondary btn-sm"
                     @click.prevent="restoreProduct(index)">恢复</a>
                 </template>
               </td>