Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/page.js

@@ -163,8 +163,8 @@ export default {
           name: 'frontEndUserList',
           component: frontEndUserList,
           children: []
-        }],
-      }],
+        }]
+      }]
     },
   ],
 }

src/pages/system/systemSet/characterManger/index.vue

@@ -2,86 +2,35 @@
   <div class="subPage">
     <div class="system-table-search">
       <div class="flex-h">
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success">新增角色</el-button>
+        </div>
+        <tableSearch value='分配权限' @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
     <div class="system-table-box">
-      <el-table
-        :data="tableData"
-        stripe
-        style="width: 100%">
-        <el-table-column
-          prop="customerName"
-          label="角色标识"
-          width="150">
+      <el-table :data="tableData" stripe style="width: 100%">
+        <el-table-column fixed='left' prop="role" label="角色标识" width="150">
         </el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="手机号"
-          width="120">
+        <el-table-column prop="roleName" label="角色名" width="150">
         </el-table-column>
-        <el-table-column
-          prop="nickName"
-          label="微信昵称"
-          width="150">
+        <el-table-column prop="disable" label="是否禁用角色" width="150">
         </el-table-column>
-        <el-table-column
-          prop="userType"
-          label="用户类型"
-          width="100">
+        <el-table-column prop="permission" label="数据权限">
         </el-table-column>
-        <el-table-column
-          prop="recommend"
-          label="推荐人"
-          width="100">
+        <el-table-column prop="createTime" label="创建时间" width="200">
         </el-table-column>
-        <el-table-column
-          prop="customerLevel"
-          label="会员等级"
-          width="100">
-        </el-table-column>
-        <el-table-column
-          prop="customerPoint"
-          label="会员积分"
-          width="100">
-        </el-table-column>
-        <el-table-column
-          prop="openId"
-          label="openId"
-          width="250">
-        </el-table-column>
-        <el-table-column
-          prop="gold"
-          label="金币"
-          width="100">
-        </el-table-column>
-        <el-table-column
-          prop="silver"
-          label="银币"
-          width="100">
-        </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column fixed='right' label="操作" width="300">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="warning"
-              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            <el-button size="mini" type="warning" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            <el-button size="mini" type="success" @click="handlePermission(scope.$index, scope.row)">分配权限</el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
-      layout="prev, pager, next, jumper"
-      :total="100">
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-size="10" layout="prev, pager, next, jumper" :total="100">
     </el-pagination>
   </div>
 </template>
@@ -94,25 +43,65 @@ export default {
   data () {
     return {
       currentPage: 0, // 当前页码
-      tableSearch: { // 表格搜索条件
-        key: '111', // 搜索关键字
+      tableSearch: {
+        // 表格搜索条件
+        key: '111' // 搜索关键字
       },
-      tableData: [{
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }]
+      tableData: [
+        {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }, {
+          role: '赵日天',
+          roleName: '赵日天',
+          disable: '赵日地',
+          permission: '赵日天',
+          createTime: '赵爸爸'
+        }
+      ]
     }
   },
   components: {
-    tableSearch,
+    tableSearch
   },
   methods: {
     handleSizeChange (val) {
@@ -121,28 +110,36 @@ export default {
     handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
     },
-    handleEdit (index, row) { // 编辑
+    handleEdit (index, row) {
+      // 编辑
       console.log(index, row)
     },
-    handleDelete (index, row) { // 删除
+    handleDelete (index, row) {
+      // 删除
       console.log(index, row)
       this.$confirm('确认删除此用户?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
+      })
+        .then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      })
     },
-    searchList (key) { // 搜索列表
+    handlePermission (index, row) {
+      console.log(index)
+    },
+    searchList (key) {
+      // 搜索列表
       console.log(key)
     }
   }

src/pages/system/systemSet/userManger/index.vue

@@ -2,7 +2,10 @@
   <div class="subPage">
     <div class="system-table-search">
       <div class="flex-h">
-        <tableSearch @exportSearchKey="searchList"></tableSearch>
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success">新增用户</el-button>
+        </div>
+        <tableSearch value='请输入用户名' @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -12,56 +15,47 @@
         stripe
         style="width: 100%">
         <el-table-column
-          prop="customerName"
-          label="姓名"
+          fixed
+          prop="userName"
+          label="用户名"
           width="150">
         </el-table-column>
         <el-table-column
-          prop="mobile"
-          label="手机号"
+          prop="realName"
+          label="真实姓名"
           width="120">
         </el-table-column>
         <el-table-column
-          prop="nickName"
-          label="微信昵称"
+          prop="email"
+          label="邮箱"
           width="150">
         </el-table-column>
         <el-table-column
-          prop="userType"
-          label="用户类型"
-          width="100">
+          prop="workNum"
+          label="工号"
+          width="200">
         </el-table-column>
         <el-table-column
-          prop="recommend"
-          label="推荐人"
-          width="100">
-        </el-table-column>
-        <el-table-column
-          prop="customerLevel"
-          label="会员等级"
+          prop="mobile"
+          label="手机号"
           width="100">
         </el-table-column>
         <el-table-column
-          prop="customerPoint"
-          label="会员积分"
+          prop="userType"
+          label="用户类型"
           width="100">
         </el-table-column>
         <el-table-column
-          prop="openId"
-          label="openId"
-          width="250">
-        </el-table-column>
-        <el-table-column
-          prop="gold"
-          label="金币"
+          prop="lock"
+          label="是否锁定"
           width="100">
         </el-table-column>
         <el-table-column
-          prop="silver"
-          label="银币"
-          width="100">
+          prop="creatTime"
+          label="创建时间"
+          width="200">
         </el-table-column>
-        <el-table-column label="操作" width="200">
+        <el-table-column label="操作" fixed='right' width="300">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -71,6 +65,10 @@
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              <el-button
+              size="mini"
+              type="success"
+              @click="handleDelete(scope.$index, scope.row)">绑定角色</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -98,71 +96,14 @@ export default {
         key: '111', // 搜索关键字
       },
       tableData: [{
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }, {
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }, {
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }, {
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }, {
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
-        userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
-      }, {
-        customerName: '赵日天',
-        mobile: '13446666666',
-        nickName: '赵日地',
+        userName: '赵日天',
+        realName: '13446666666',
+        email: '赵日地',
+        workNum: '赵爸爸',
+        mobile: '1376975175',
         userType: '1',
-        recommend: '赵爸爸',
-        customerLevel: '10000',
-        customerPoint: '200',
-        openId: 'jhfjkdshkdfgs22123',
-        gold: '2333',
-        silver: '3332'
+        lock: true,
+        creatTime: '2018-08-08 10:00:00'
       }]
     }
   },
@@ -206,5 +147,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
-@import "page.scss"
+@import "page.scss";
 </style>