Merge branches 'develop' and 'plug' of https://github.com/piexlmax/QMPlus into plug

Author: pixel

server/resource/template/fe/table.vue.tpl

@@ -41,7 +41,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>

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>

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>

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>

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>

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>

web/src/view/systemTools/autoCode/index.vue

@@ -41,7 +41,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">
@@ -50,7 +50,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>