From 291c30cfedf31715b3528d61adc507e052efbc4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Sat, 30 May 2020 15:18:24 +0800
Subject: [PATCH 1/3] Update README-zh_CN.md

---
 README-zh_CN.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README-zh_CN.md b/README-zh_CN.md
index 4aed1e93..fec49384 100644
--- a/README-zh_CN.md
+++ b/README-zh_CN.md
@@ -258,3 +258,7 @@ swag init
 ## 9. 捐赠
 
 如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink:
+
+## 10. 商用注意事项
+
+如果您将此项目用于商业用途，请遵守apatch2.0协议并保留作者技术支持声明。

From f237557b99ca96298c9767850f4c7447cde4d5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Sat, 30 May 2020 15:32:21 +0800
Subject: [PATCH 2/3] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 63b7c30b..5e021961 100644
--- a/README.md
+++ b/README.md
@@ -263,3 +263,6 @@ backend code file: model\dnModel\api.go
 
 If you find this project useful, you can buy author a glass of juice :tropical_drink:
 
+## 10. Commercial considerations
+
+If you use this project for commercial purposes, please comply with the apatch2.0 agreement and retain the author's technical support statement.

From bb64ea839b1bdff3177d6ecf2ad4e128dca2a84a Mon Sep 17 00:00:00 2001
From: yangtaihua <957651480@qq.com>
Date: Sun, 7 Jun 2020 07:46:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/template/fe/table.vue.tpl       |  2 +-
 web/src/view/example/customer/customer.vue      |  2 +-
 web/src/view/superAdmin/api/api.vue             |  4 ++--
 web/src/view/superAdmin/authority/authority.vue | 10 +++++-----
 web/src/view/superAdmin/menu/menu.vue           |  6 +++---
 web/src/view/superAdmin/user/user.vue           |  2 +-
 web/src/view/systemTools/autoCode/index.vue     |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/fe/table.vue.tpl
index 9d6f5c27..f3da79e9 100644
--- a/server/resource/template/fe/table.vue.tpl
+++ b/server/resource/template/fe/table.vue.tpl
@@ -32,7 +32,7 @@
               <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
               <el-button type="primary" size="mini" @click="delete{{.StructName}}(scope.row)">确定</el-button>
             </div>
-            <el-button type="text" size="mini" slot="reference">删除</el-button>
+            <el-button type="danger" icon="el-icon-delete" size="mini" slot="reference">删除</el-button>
           </el-popover>
         </template>
       </el-table-column>
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index 4bbd5746..66e08ac3 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -31,7 +31,7 @@
               <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
               <el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">确定</el-button>
             </div>
-            <el-button type="text" size="mini" slot="reference">删除</el-button>
+            <el-button type="danger" icon="el-icon-delete" size="mini" slot="reference">删除</el-button>
           </el-popover>
         </template>
       </el-table-column>
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index 29ebc6f8..858849b7 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -51,8 +51,8 @@
 
       <el-table-column fixed="right" label="操作" width="200">
         <template slot-scope="scope">
-          <el-button @click="editApi(scope.row)" size="small" type="text">编辑</el-button>
-          <el-button @click="deleteApi(scope.row)" size="small" type="text">删除</el-button>
+          <el-button @click="editApi(scope.row)" size="small" type="primary" icon="el-icon-edit">编辑</el-button>
+          <el-button @click="deleteApi(scope.row)" size="small" type="danger" icon="el-icon-delete">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index 2c95dc5f..d9babe58 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -15,11 +15,11 @@
       <el-table-column label="角色名称" min-width="180" prop="authorityName"></el-table-column>
       <el-table-column fixed="right" label="操作" width="460">
         <template slot-scope="scope">
-          <el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
-          <el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>
-          <el-button @click="copyAuthority(scope.row)" size="small" type="text">拷贝角色</el-button>
-          <el-button @click="editAuthority(scope.row)" size="small" type="text">编辑角色</el-button>
-          <el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
+          <el-button @click="opdendrawer(scope.row)" size="small" type="primary">设置权限</el-button>
+          <el-button @click="addAuthority(scope.row.authorityId)" size="small" type="primary" icon="el-icon-plus">新增子角色</el-button>
+          <el-button @click="copyAuthority(scope.row)" size="small" type="primary" icon="el-icon-copy-document" >拷贝</el-button>
+          <el-button @click="editAuthority(scope.row)" size="small" type="primary" icon="el-icon-edit">编辑</el-button>
+          <el-button @click="deleteAuth(scope.row)" size="small" type="danger" icon="el-icon-delete">删除</el-button>
 
         </template>
       </el-table-column>
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index bf639651..e7471d3d 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -30,9 +30,9 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="300">
         <template slot-scope="scope">
-          <el-button @click="deleteMenu(scope.row.ID)" size="small" type="text">删除菜单</el-button>
-          <el-button @click="editMenu(scope.row.ID)" size="small" type="text">编辑菜单</el-button>
-          <el-button @click="addMenu(scope.row.ID)" size="small" type="text">添加子菜单</el-button>
+          <el-button @click="addMenu(scope.row.ID)" size="small" type="primary" icon="el-icon-edit">添加子菜单</el-button>
+          <el-button @click="editMenu(scope.row.ID)" size="small" type="primary" icon="el-icon-edit" >编辑</el-button>
+          <el-button @click="deleteMenu(scope.row.ID)" size="small" type="danger" icon="el-icon-delete" >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index aed6b038..b67ed4d8 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -34,7 +34,7 @@
               <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
               <el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
             </div>
-            <el-button type="text" size="small" slot="reference">删除</el-button>
+            <el-button type="danger" icon="el-icon-delete" size="small" slot="reference">删除</el-button>
           </el-popover>
         </template>
       </el-table-column>
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 07cfe301..a96db57c 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -32,7 +32,7 @@
       </el-table-column>
       <el-table-column label="操作" width="250">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="editAndAddField(scope.row)">编辑</el-button>
+          <el-button size="mini" type="primary" icon="el-icon-edit" @click="editAndAddField(scope.row)">编辑</el-button>
           <el-button size="mini" type="text" :disabled="scope.$index == 0" @click="moveUpField(scope.$index)">上移</el-button>
           <el-button size="mini" type="text" :disabled="(scope.$index + 1) == form.fields.length" @click="moveDownField(scope.$index)">下移</el-button>
           <el-popover placement="top" v-model="scope.row.visible">
@@ -41,7 +41,7 @@
               <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
               <el-button type="primary" size="mini" @click="deleteField(scope.$index)">确定</el-button>
             </div>
-            <el-button size="mini" type="text" slot="reference">删除</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete" slot="reference">删除</el-button>
           </el-popover>
         </template>
       </el-table-column>