From dc244c7982caa1c3b3142567e0b30debb4b418a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 16 Oct 2021 15:18:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.Interface/IUserService.cs     |  2 +-
 Yi.Vue/src/components/Links.vue                | 18 +++++++-----------
 Yi.Vue/src/components/ccCombobox.vue           |  2 +-
 Yi.Vue/src/components/ccTable.vue              |  4 ++--
 Yi.Vue/src/components/ccTreeview.vue           | 13 ++++++++-----
 Yi.Vue/src/layouts/default/AppBar.vue          |  2 +-
 Yi.Vue/src/layouts/default/Drawer.vue          |  2 +-
 .../layouts/default/widgets/DrawerHeader.vue   |  4 ++--
 Yi.Vue/src/layouts/default/widgets/Search.vue  |  4 ++--
 Yi.Vue/src/views/AdmRoleMenu.vue               |  2 +-
 Yi.Vue/src/views/AdmUser.vue                   |  2 --
 11 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.Interface/IUserService.cs b/Yi.Framework/Yi.Framework.Interface/IUserService.cs
index 73de2f0e..6f70905f 100644
--- a/Yi.Framework/Yi.Framework.Interface/IUserService.cs
+++ b/Yi.Framework/Yi.Framework.Interface/IUserService.cs
@@ -16,7 +16,7 @@ namespace Yi.Framework.Interface
         /// 登录,传入_user需包含用户名与密码
         /// </summary>
         /// <returns></returns>
-        Task<bool> Login(user _user);
+        //Task<user> Login(user _user);
 
         /// <summary>
         /// 注册，需要检测是否用户名重复
diff --git a/Yi.Vue/src/components/Links.vue b/Yi.Vue/src/components/Links.vue
index e30c4182..b00cd06e 100644
--- a/Yi.Vue/src/components/Links.vue
+++ b/Yi.Vue/src/components/Links.vue
@@ -26,9 +26,9 @@
         <div class="text-body-1 font-weight-light pt-6 pt-md-0 text-center">
           &copy; {{ (new Date()).getFullYear() }}, Made by <v-icon>mdi-vuetify</v-icon>
           <a
-            href="https://vuetifyjs.com/en/about/meet-the-team/#company"
+            href="https://ccnetcore"
             class="text-decoration-none"
-          >Vuetify</a>
+          >ccnetcore</a>
         </div>
       </v-col>
     </v-row>
@@ -42,21 +42,17 @@
     data: () => ({
       links: [
         {
-          href: 'https://vuetifyjs.com/',
-          text: 'Vuetify Docs',
+          href: '#',
+          text: 'YiFramework文档',
         },
         {
           href: '#',
-          text: 'About Us',
+          text: 'GitHub',
         },
         {
           href: '#',
-          text: 'Blog',
-        },
-        {
-          href: '#',
-          text: 'Licenses',
-        },
+          text: '论坛',
+        }
       ],
     }),
   }
diff --git a/Yi.Vue/src/components/ccCombobox.vue b/Yi.Vue/src/components/ccCombobox.vue
index 623fab60..78f07eb1 100644
--- a/Yi.Vue/src/components/ccCombobox.vue
+++ b/Yi.Vue/src/components/ccCombobox.vue
@@ -1,7 +1,7 @@
 <template>
   <v-dialog v-model="dialog" persistent max-width="600px">
     <template v-slot:activator="{ on, attrs }">
-      <v-btn color="primary" dark v-bind="attrs" v-on="on">
+      <v-btn class="ma-2" color="primary" dark v-bind="attrs" v-on="on">
         {{ headers }}
       </v-btn>
     </template>
diff --git a/Yi.Vue/src/components/ccTable.vue b/Yi.Vue/src/components/ccTable.vue
index 5b7c3392..eff8c6e5 100644
--- a/Yi.Vue/src/components/ccTable.vue
+++ b/Yi.Vue/src/components/ccTable.vue
@@ -74,8 +74,8 @@
 
           <v-btn
             v-if="axiosUrls.hasOwnProperty('del')"
-            color="red"
-            dark
+          color="secondary"
+           
             class="mb-2"
             @click="deleteItem(null)"
           >
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 956ecd08..a40727d3 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -1,9 +1,10 @@
 <template>
   <div>
-    <app-btn dark class="mb-2 mx-2" @click="dialog = true"> 添加新项 </app-btn>
-    <app-btn dark class="mb-2 mx-2" @click="deleteItem(null)">
+    <app-btn  dark class="ma-2" @click="dialog = true"> 添加新项 </app-btn>
+    <app-btn dark class="ma-2"  color="secondary" @click="deleteItem(null)">
       删除所选
     </app-btn>
+    
     <v-dialog v-model="dialog" max-width="500px">
       <v-card>
         <v-card-title>
@@ -63,15 +64,17 @@
             >
           </template>
         </ccCombobox>
-        <app-btn class="mx-2" @click="editItem(item)">编辑</app-btn>
-        <app-btn class="mr-2" @click="deleteItem(item)">删除</app-btn>
-        <app-btn
+         <app-btn
           @click="
             parentId = item.id;
             dialog = true;
           "
           >添加子菜单</app-btn
         >
+        <app-btn class="mx-2" @click="editItem(item)">编辑</app-btn>
+        
+        <app-btn color="secondary" class="mr-2" @click="deleteItem(item)">删除</app-btn>
+       
       </template>
     </v-treeview>
   </div>
diff --git a/Yi.Vue/src/layouts/default/AppBar.vue b/Yi.Vue/src/layouts/default/AppBar.vue
index 9c70b1f6..b6d3651d 100644
--- a/Yi.Vue/src/layouts/default/AppBar.vue
+++ b/Yi.Vue/src/layouts/default/AppBar.vue
@@ -41,7 +41,7 @@
   export default {
     data:()=>({
       drawer:true,
-      name:"测试系统"
+      name:"系统"
     }),
     name: 'DefaultBar',
 
diff --git a/Yi.Vue/src/layouts/default/Drawer.vue b/Yi.Vue/src/layouts/default/Drawer.vue
index cb20e7b0..688a0f6b 100644
--- a/Yi.Vue/src/layouts/default/Drawer.vue
+++ b/Yi.Vue/src/layouts/default/Drawer.vue
@@ -51,7 +51,7 @@
             mdi-package-up
           </v-icon>
 
-          Upgrade to Pro
+          退出
         </app-btn>
       </div>
     </template>
diff --git a/Yi.Vue/src/layouts/default/widgets/DrawerHeader.vue b/Yi.Vue/src/layouts/default/widgets/DrawerHeader.vue
index 11c58559..104474f1 100644
--- a/Yi.Vue/src/layouts/default/widgets/DrawerHeader.vue
+++ b/Yi.Vue/src/layouts/default/widgets/DrawerHeader.vue
@@ -9,9 +9,9 @@
 
     <v-list-item-content class="pl-2">
       <v-list-item-title class="text-h3">
-        <strong class="mr-1 font-weight-black">VMD</strong>
+        <strong class="mr-1 font-weight-black">Yi</strong>
 
-        <span class="primary--text">FREE</span>
+        <span class="primary--text">Framework</span>
       </v-list-item-title>
     </v-list-item-content>
   </v-list-item>
diff --git a/Yi.Vue/src/layouts/default/widgets/Search.vue b/Yi.Vue/src/layouts/default/widgets/Search.vue
index a90982aa..8c6e3368 100644
--- a/Yi.Vue/src/layouts/default/widgets/Search.vue
+++ b/Yi.Vue/src/layouts/default/widgets/Search.vue
@@ -1,10 +1,10 @@
 <template>
   <v-text-field
-    placeholder="Search"
+    placeholder="全站搜索"
     class="mr-16"
     color="secondary"
     hide-details
-    style="max-width: 220px"
+    style="max-width: 400px"
   >
     <template
       v-if="$vuetify.breakpoint.mdAndUp"
diff --git a/Yi.Vue/src/views/AdmRoleMenu.vue b/Yi.Vue/src/views/AdmRoleMenu.vue
index 0f44ba33..c88afd7d 100644
--- a/Yi.Vue/src/views/AdmRoleMenu.vue
+++ b/Yi.Vue/src/views/AdmRoleMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <v-row>
     <v-col cols="12">
- <v-card class="mx-auto" width="100%"><app-btn  @click="setMenu">确定分配</app-btn></v-card>
+ <v-card class="mx-auto" width="100%"><app-btn  class="ma-2" @click="setMenu">确定分配</app-btn></v-card>
     </v-col>
     <v-col cols="12" md="4" lg="4">
       <v-card class="mx-auto" width="100%">
diff --git a/Yi.Vue/src/views/AdmUser.vue b/Yi.Vue/src/views/AdmUser.vue
index d69a1527..cd20ae04 100644
--- a/Yi.Vue/src/views/AdmUser.vue
+++ b/Yi.Vue/src/views/AdmUser.vue
@@ -1,7 +1,5 @@
 <template>
   <v-card class="mx-auto" width="100%">
-    {{ select }}
-    {{ TableSelect }}
     <ccCombobox
       headers="设置角色"
       :items="roleItems"