From 9938e6665832ef4d726410012fcda32f86dfb89d Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 30 Aug 2022 17:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/admin_roles/edit.blade.php    | 14 ++++++-------
 .../views/pages/admin_roles/index.blade.php   | 20 +++++++++----------
 .../views/pages/products/index.blade.php      |  4 ++--
 resources/lang/en/admin/admin_roles.php       |  3 +++
 resources/lang/en/common.php                  |  1 +
 resources/lang/zh_cn/admin/admin_roles.php    |  3 +++
 resources/lang/zh_cn/common.php               |  1 +
 7 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/resources/beike/admin/views/pages/admin_roles/edit.blade.php b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
index cf10ad08..f7c52968 100644
--- a/resources/beike/admin/views/pages/admin_roles/edit.blade.php
+++ b/resources/beike/admin/views/pages/admin_roles/edit.blade.php
@@ -1,16 +1,16 @@
 @extends('admin::layouts.master')
 
-@section('title', '角色管理')
+@section('title', __('admin/admin_roles.role_management'))
 
 @section('content')
   <div id="app" class="card" v-cloak>
     <div class="card-body h-min-600">
       <el-form ref="form" :rules="rules" :model="form" label-width="100px">
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" placeholder="角色名称" class="w-auto"></el-input>
+        <el-form-item label="{{ __('admin/admin_roles.role_name') }}" prop="name">
+          <el-input v-model="form.name" placeholder="{{ __('admin/admin_roles.role_name') }}" class="w-auto"></el-input>
         </el-form-item>
 
-        <el-form-item label="权限" prop="roles">
+        <el-form-item label="{{ __('admin/admin_roles.permission') }}" prop="roles">
           <div class="roles-wrap border w-max-900">
             <div class="header-wrap bg-dark p-2 text-dark bg-opacity-10 px-2">
               <el-button size="small" @click="updateAllState(true)">@lang('admin/admin_roles.select_all')</el-button>
@@ -19,7 +19,7 @@
             <div v-for="role, index in form.permissions" :key="index">
               <div class="bg-light px-2 d-flex">
                 @{{ role.title }}
-                <div class="row-update ms-2 link-secondary">[<span @click="updateState(true, index)">全选</span> / <span @click="updateState(false, index)">取消</span>]</div>
+                <div class="row-update ms-2 link-secondary">[<span @click="updateState(true, index)">{{ __('common.select_all') }}</span> / <span @click="updateState(false, index)">{{ __('common.cancel') }}</span>]</div>
               </div>
               <div class="role-methods">
                 <div class="d-flex flex-wrap px-3">
@@ -33,8 +33,8 @@
         </el-form-item>
 
         <el-form-item class="mt-5">
-          <el-button type="primary" @click="addFormSubmit('form')">保存</el-button>
-          <el-button @click="closeCustomersDialog('form')">取消</el-button>
+          <el-button type="primary" @click="addFormSubmit('form')">{{ __('common.save') }}</el-button>
+          <el-button @click="closeCustomersDialog('form')">{{ __('common.cancel') }}</el-button>
         </el-form-item>
       </el-form>
     </div>
diff --git a/resources/beike/admin/views/pages/admin_roles/index.blade.php b/resources/beike/admin/views/pages/admin_roles/index.blade.php
index 95369b13..52da4836 100644
--- a/resources/beike/admin/views/pages/admin_roles/index.blade.php
+++ b/resources/beike/admin/views/pages/admin_roles/index.blade.php
@@ -1,30 +1,30 @@
 @extends('admin::layouts.master')
 
-@section('title', '后台用户')
+@section('title', __('admin/common.admin_user'))
 
 @section('content')
   <ul class="nav-bordered nav nav-tabs mb-3">
     <li class="nav-item">
-      <a class="nav-link" href="{{ admin_route('admin_users.index') }}">后台用户</a>
+      <a class="nav-link" href="{{ admin_route('admin_users.index') }}">{{ __('admin/common.admin_user') }}</a>
     </li>
     <li class="nav-item">
-      <a class="nav-link active" href="{{ admin_route('admin_roles.index') }}">用户角色</a>
+      <a class="nav-link active" href="{{ admin_route('admin_roles.index') }}">{{ __('admin/common.admin_role') }}</a>
     </li>
   </ul>
 
   <div id="tax-classes-app" class="card">
     <div class="card-body h-min-600">
       <div class="d-flex justify-content-between mb-4">
-        <a href="{{ admin_route('admin_roles.create') }}" class="btn btn-primary">创建角色</a>
+        <a href="{{ admin_route('admin_roles.create') }}" class="btn btn-primary">{{ __('admin/role.admin_roles_create') }}</a>
       </div>
       <table class="table">
         <thead>
           <tr>
             <th>ID</th>
-            <th>名称</th>
-            <th>创建时间</th>
-            <th>修改时间</th>
-            <th class="text-end">操作</th>
+            <th>{{ __('common.name') }}</th>
+            <th>{{ __('common.created_at') }}</th>
+            <th>{{ __('common.updated_at') }}</th>
+            <th class="text-end">{{ __('common.action') }}</th>
           </tr>
         </thead>
         <tbody>
@@ -35,8 +35,8 @@
             <td>{{ $role->created_at }}</td>
             <td>{{ $role->updated_at }}</td>
             <td class="text-end">
-              <a href="{{ admin_route('admin_roles.edit', [$role->id]) }}" class="btn btn-outline-secondary btn-sm">编辑</a>
-              <button class="btn btn-outline-danger btn-sm ml-1 delete-role" data-id="{{ $role->id }}" type="button">删除</button>
+              <a href="{{ admin_route('admin_roles.edit', [$role->id]) }}" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a>
+              <button class="btn btn-outline-danger btn-sm ml-1 delete-role" data-id="{{ $role->id }}" type="button">{{ __('common.delete') }}</button>
             </td>
           </tr>
           @endforeach
diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php
index 2725702e..45dbdb33 100644
--- a/resources/beike/admin/views/pages/products/index.blade.php
+++ b/resources/beike/admin/views/pages/products/index.blade.php
@@ -12,8 +12,8 @@
     <x-admin-alert type="danger" msg="{{ $errors->first('error') }}" class="mt-4" />
   @endif
 
-  @if (session()->has('message'))
-    <x-admin-alert type="success" msg="{{ session('message') }}" class="mt-4" />
+  @if (session()->has('success'))
+    <x-admin-alert type="success" msg="{{ session('success') }}" class="mt-4" />
   @endif
 
   <div id="product-app">
diff --git a/resources/lang/en/admin/admin_roles.php b/resources/lang/en/admin/admin_roles.php
index be109741..becfa3c3 100644
--- a/resources/lang/en/admin/admin_roles.php
+++ b/resources/lang/en/admin/admin_roles.php
@@ -12,4 +12,7 @@
 return [
     'select_all' => 'Select All',
     'unselect_all' => 'Unselect All',
+    'role_name' => 'Role Name',
+    'role_management' => 'Role Management',
+    'permission' => 'Permission',
 ];
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index f3348338..f03d7893 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -62,6 +62,7 @@ return [
     'exit' => 'Exit',
     'return' => 'Return',
     'language' => 'Language',
+    'select_all' => 'Select All',
 
     'id' => 'ID',
     'created_at' => 'Created At',
diff --git a/resources/lang/zh_cn/admin/admin_roles.php b/resources/lang/zh_cn/admin/admin_roles.php
index 3412a8d3..17b56b9c 100644
--- a/resources/lang/zh_cn/admin/admin_roles.php
+++ b/resources/lang/zh_cn/admin/admin_roles.php
@@ -12,4 +12,7 @@
 return [
     'select_all' => '选中所有',
     'unselect_all' => '取消选中',
+    'role_name' => '角色名称',
+    'role_management' => '角色管理',
+    'permission' => '权限',
 ];
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index 126b2165..bed2bf2e 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -61,6 +61,7 @@ return [
     'exit' => '退出',
     'return' => '返回',
     'language' => '语言',
+    'select_all' => '全选',
 
     'id' => 'ID',
     'created_at' => '创建时间',