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

src/pages/login/index.vue

@@ -71,7 +71,7 @@ export default {
           duration: 1000
         })
         setTimeout(() => {
-          this.$router.push({ name: 'system' })
+          this.$router.push({ name: 'userManager' })
         }, 1000)
       }).catch(msg => {
 

src/pages/system/channelManager/channelList/add.vue

@@ -3,24 +3,27 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>渠道名：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入渠道名"
-                v-model="postData.channelName"
-                clearable>
-              </el-input>
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>渠道code：</span>
+          <span>渠道名：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入渠道code"
-                v-model="postData.channelCode"
+                placeholder="请输入渠道名"
+                v-model="postData.ChannelName"
                 clearable>
               </el-input>
             </div>
@@ -36,26 +39,62 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        channelName: '',
-        channelCode: ''
+        ChannelId: '', // 渠道id
+        ChannelName: '', // 渠道名称
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
+      }
+    }
+  },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
       }
     }
   },
   components: {},
   methods: {
-    submit () {
-      console.log(this.postData)
+    submit () { // 提交数据
+      if (this.postData.ChannelName === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道名称不能为空'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.channelManager.addChannel.url, {
+        method: this.$api.channelManager.addChannel.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'channelList' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'channelList' })
     }
   },
-  mounted () {}
+  mounted () { }
 }
 </script>
 

src/pages/system/channelManager/channelList/edit.vue

@@ -3,24 +3,27 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>渠道名：</span>
+          <span>选择案场：</span>
           <div class="flex-item">
             <div style="width:50%">
-              <el-input
-                placeholder="请输入渠道名"
-                v-model="postData.channelName"
-                clearable>
-              </el-input>
+              <el-select v-model="CaseId" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>渠道code：</span>
+          <span>渠道名：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入渠道code"
-                v-model="postData.channelCode"
+                placeholder="请输入渠道名"
+                v-model="postData.ChannelName"
                 clearable>
               </el-input>
             </div>
@@ -36,26 +39,73 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: '',
   data () {
     return {
       postData: {
-        channelName: '',
-        channelCode: ''
+        ChannelId: '', // 渠道id
+        ChannelName: '', // 渠道名称
+        CaseId: '', // 案场id
+        OrgId: '', // 机构id
       }
     }
   },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      OrgId: x => x.app.user.OrgId,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.CaseId === '' ? this.defaultCaseId || '' : this.postData.CaseId
+      },
+      set (val) {
+        this.postData.CaseId = val
+      }
+    }
+  },
+  created () {
+    this.getChannelInfo()
+  },
   components: {},
   methods: {
-    submit () {
-      console.log(this.postData)
+    getChannelInfo () {
+      this.$ajax(this.$api.channelManager.getChannelInfo.url, {
+        method: this.$api.channelManager.getChannelInfo.method,
+        urlData: { channelId: this.$route.query.id }
+      }).then(res => {
+        this.postData = res
+      })
+    },
+    submit () { // 提交数据
+      if (this.postData.ChannelName === '') {
+        this.$message({
+          type: 'error',
+          message: '渠道名称不能为空'
+        })
+        return false
+      }
+      this.postData.OrgId = this.OrgId
+      if (this.postData.CaseId === '') this.postData.CaseId = this.CaseId
+      this.$ajax(this.$api.channelManager.editChannel.url, {
+        method: this.$api.channelManager.editChannel.method,
+        data: this.postData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.$router.push({ name: 'channelList' })
+      })
     },
     cancel () {
-      this.$router.go(-1)
+      this.$router.push({ name: 'channelList' })
     }
   },
-  mounted () {}
+  mounted () { }
 }
 </script>
 

src/pages/system/channelManager/channelList/index.vue

@@ -26,16 +26,16 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="channelName"
-          label="渠道名">
+          prop="CaseName"
+          label="案场">
         </el-table-column>
         <el-table-column
-          prop="channelCode"
-          label="渠道code">
+          prop="ChannelName"
+          label="渠道名称">
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -70,7 +70,7 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        CaseId: '', // 案场id
+        caseid: '', // 案场id
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
@@ -87,10 +87,10 @@ export default {
     }),
     CaseId: {
       get () {
-        return this.postData.CaseId || this.defaultCaseId
+        return this.postData.caseid || this.defaultCaseId
       },
       set (val) {
-        this.postData.CaseId = val
+        this.postData.caseid = val
       }
     }
   },
@@ -101,13 +101,10 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      this.$ajax(this.$api.goodsManager.getGoodsTypeList.url, {
-        method: this.$api.goodsManager.getGoodsTypeList.method,
-        data: { ...this.postData, CaseId: this.CaseId }
+      this.$ajax(this.$api.channelManager.getChannelList.url, {
+        method: this.$api.channelManager.getChannelList.method,
+        queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
-        for (var n = 0; n < res.list.length; n++) {
-          res.list[n].CaseName = this.cases.filter(x => x.CaseId === res.list[n].CaseId)[0].CaseName
-        }
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum
@@ -117,7 +114,7 @@ export default {
       this.getList()
     },
     handleEdit (index, row) { // 编辑
-      this.$router.push({ name: 'editGoodsType', query: { id: row.TypeId } })
+      this.$router.push({ name: 'editChannel', query: { id: row.ChannelId } })
     },
     handleDelete (index, row) { // 删除
       let name = '确认删除规格“' + row.TypeName + '”?'

src/pages/system/dataStatistics/frontEndUserList/index.vue

@@ -3,147 +3,91 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h"></div>
-        <tableSearch value="请输入用户名称" @exportSearchKey="searchList"></tableSearch>
+        <tableSearch value="请输入用户手机号" @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
     <div class="system-table-box">
       <el-table
-        :data="tableData"
+        :data="currentList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="name"
+          prop="Name"
           label="姓名">
         </el-table-column>
         <el-table-column
-          prop="phone"
+          prop="Phone"
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="nickName"
+          prop="CustomerName"
           label="微信昵称">
         </el-table-column>
         <el-table-column
-          prop="recommendName"
+          prop="RecommendName"
           label="推荐人">
         </el-table-column>
         <el-table-column
-          prop="integral"
+          prop="Points"
           label="积分">
-          <template slot-scope="scope">
-            -
-          </template>
         </el-table-column>
         <el-table-column
-          prop="openId"
+          prop="OpenId"
           label="openId">
         </el-table-column>
-        <el-table-column
-          prop="creatTime"
-          label="创建时间">
-        </el-table-column>
       </el-table>
     </div>
     <el-pagination
-      @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      :page-size="10"
+      :current-page.sync="postData.page"
+      :page-size="postData.pagesize"
       layout="prev, pager, next, jumper"
-      :total="100">
+      :total="total">
     </el-pagination>
   </div>
 </template>
 
 <script>
 import tableSearch from '@/components/tableSearch/index'
-import { createNamespacedHelpers } from 'vuex'
-
-const { mapState: mapCaseState } = createNamespacedHelpers('case')
 
 export default {
   name: '',
   data () {
     return {
-      currentPage: 0, // 当前页码
-      tableSearch: { // 表格搜索条件
-        key: '', // 搜索关键字
-        caseId: '', // 案场id
+      total: 0,
+      postData: { // 表格搜索条件
+        phone: '', // 手机号
+        page: 1, // 当前页码
+        pagesize: 10, // 请求数据量
       },
-      tableData: [{
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }, {
-        name: 'xxx',
-        phone: 'xxx',
-        nickName: 'xxx',
-        recommendName: 'xxx',
-        integral: 'xxx',
-        openId: 'xxx',
-        creatTime: 'xxx'
-      }]
+      currentList: [],
     }
   },
-  computed: {
-    ...mapCaseState({
-      caseList: x => x.caseList,
-    })
-  },
   components: {
     tableSearch,
   },
+  created () {
+    this.getList()
+  },
   methods: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-    },
     handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
+      this.getList()
     },
-    handleEdit (index, row) { // 编辑
-      console.log(index, row)
+    searchList (key) { // 搜索列表
+      this.postData.phone = key
+      this.postData.page = 1
+      this.getList()
     },
-    handleDelete (index, row) { // 删除
-      console.log(index, row)
-      this.$confirm('确认删除此渠道?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
+    getList () {
+      this.$ajax(this.$api.dataStatistics.getCustomerList.url, {
+        method: this.$api.dataStatistics.getCustomerList.method,
+        queryData: this.postData
+      }).then(res => {
+        this.currentList = res.list
+        this.postData.page = res.page
+        this.total = res.pagenum
       })
-    },
-    searchList (key) { // 搜索列表
-      console.log(key)
     }
   }
 }

src/pages/system/index.vue

@@ -3,10 +3,18 @@
     <div class="system-header flex-h">
       <i class="iconfont icon-yinchenglogo"></i>
       <span>银城-城的空间</span>
-      <div class="flex-item flex-h">
+      <div class="flex-item flex-h" style="overflow: visible;">
         <div class="flex-item"></div>
-        <span class="characterMark">用户角色</span>
-        <a class="userIcon"></a>
+        <span class="characterMark">{{user.UserName}}</span>
+        <div class="userIconBox">
+          <a class="userIcon">
+            <img :src="user.Headimgurl" class="centerLabel cover" alt="">
+          </a>
+          <ul class="userSet">
+            <li @click="signout">登出</li>
+            <li @click="editPassword">修改密码</li>
+          </ul>
+        </div>
       </div>
     </div>
     <div class="flex-item flex-h">
@@ -24,6 +32,22 @@
         </div>
       </div>
     </div>
+    <el-dialog title="修改密码" :visible.sync="dialogFormVisible">
+      <el-input
+        placeholder="请输入旧密码"
+        v-model="postData.oriPasswd"
+        clearable>
+      </el-input>
+      <el-input style="margin-top:20px;"
+        placeholder="请输入新密码"
+        v-model="postData.newPasswd"
+        clearable>
+      </el-input>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitPasswd">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -36,12 +60,18 @@ export default {
   name: '',
   data () {
     return {
+      dialogFormVisible: false,
+      postData: {
+        oriPasswd: '', // 旧密码
+        newPasswd: '', // 新密码
+      },
     }
   },
   computed: {
     ...mapState({
       breadCrumb: x => x.app.breadcrumb,
       pageMenu: x => x.app.menus,
+      user: x => x.app.user,
     })
   },
   components: {
@@ -53,6 +83,38 @@ export default {
     this.updateBread({ routerData, Url: this.$route.name })
   },
   methods: {
+    submitPasswd () { // 修改密码
+      var aData = {
+        oriPasswd: this.md5(this.postData.oriPasswd),
+        newPasswd: this.md5(this.postData.newPasswd)
+      }
+      this.$ajax(this.$api.system.editPassword.url, {
+        method: this.$api.system.editPassword.method,
+        urlData: { id: this.user.UserId },
+        data: aData
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功!'
+        })
+        this.$cookie.set('accountInfo', null)
+        this.$router.push({ name: 'login' })
+      })
+    },
+    editPassword () { // 修改密码
+      this.dialogFormVisible = true
+    },
+    signout () { // 登出
+      this.$ajax(this.$api.system.signout.url, {
+        method: this.$api.system.signout.method,
+      }).then(res => {
+        this.$message({
+          type: 'success',
+          message: '操作成功!'
+        })
+        this.$router.push({ name: 'login' })
+      })
+    },
     ...mapMutations([
       'updateBread'
     ]),

src/pages/system/page.scss

@@ -58,6 +58,49 @@
     border-radius: 100%;
     background: #eee;
     margin: 0 20px 0 10px;
+    display: block;
+  }
+
+  .userIconBox{
+    position: relative;
+    overflow: visible;
+    .userSet{
+      display: none;
+      position: absolute;
+      right: 30px;
+      top: 40px;
+      background: #fff;
+      padding: 5px 0;
+      box-shadow: 0 0 20px 2px rgba(0, 0, 0, .1);
+      li{
+        display: block;
+        line-height: 30px;
+        white-space: nowrap;
+        color: #666;
+        font-size: 13px;
+        padding: 0 15px;
+        &:hover{
+          cursor: pointer;
+          background: #eee;
+        }
+      }
+      &::after{
+        content: '';
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-style: dashed dashed solid dashed;
+        border-width: 8px;
+        border-color: transparent transparent #fff transparent;
+        right: 0;
+        top: -14px;
+      }
+    }
+    &:hover{
+      &>.userSet{
+        display: inline-block;
+      }
+    }
   }
 
 }

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

@@ -3,7 +3,7 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='editRole'>新增角色</el-button>
+          <el-button size="mini" type="success" @click='addRole'>新增角色</el-button>
         </div>
         <tableSearch value='角色名称' @exportSearchKey="searchList"></tableSearch>
       </div>
@@ -35,24 +35,26 @@
     layout="prev, pager, next, jumper"
     :total="roles.pagenum">
     </el-pagination>
-    <!-- <el-dialog title="请选择机构" :visible.sync="dialogTableVisible">
+    <el-dialog title="请选择菜单" :visible.sync="dialogTableVisible">
       <el-tree
+        v-if="dialogTableVisible"
         class="flxe-h"
-        :data="treeData"
+        :data="menus"
+        node-key="id"
         :default-expand-all="true"
-        :expand-on-click-node="false"
+        :default-checked-keys="defaultChecked"
         ref="tree"
         show-checkbox
         @node-click="handleNodeClick"></el-tree>
         <div class="flex-h" style="justify-content: flex-end;margin-top: 1rem">
           <el-button type='success' @click="getCheckedNodes">确定</el-button>
         </div>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
 
 const { mapState: mapRoleState, mapActions: mapRoleActions } = createNamespacedHelpers('role')
@@ -62,17 +64,26 @@ export default {
   data () {
     return {
       currentPage: 0, // 当前页码
-      tableSearch: {
-        // 表格搜索条件
-        key: '111' // 搜索关键字
-      },
+      key: '',
+      selid: '',
       dialogTableVisible: false,
     }
   },
   computed: {
     ...mapRoleState({
       roles: x => x.roleList,
+      roleMenus: x => x.roleMenus,
+    }),
+    ...mapState({
+      menus: x => x.app.menus
     }),
+    defaultChecked: {
+      get () {
+        const sels = (this.roleMenus || []).map(x => x.MenuId)
+        console.log(sels)
+        return sels
+      },
+    },
   },
   components: {
     tableSearch
@@ -80,6 +91,9 @@ export default {
   methods: {
     ...mapRoleActions([
       'GetRolesList',
+      'DelRole',
+      'SaveRoleMenus',
+      'GetRoleMenu',
     ]),
     FormatDate (date) {
       console.log()
@@ -98,16 +112,13 @@ export default {
     handleDelete (index, row) {
       // 删除
       console.log(index, row)
-      this.$confirm('确认删除此用户?', '提示', {
+      this.$confirm('确认删除此角色?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
+          this.DelRole({id: row.RoleId, callback: this.delCallBack})
         })
         .catch(() => {
           this.$message({
@@ -116,22 +127,44 @@ export default {
           })
         })
     },
+    delCallBack () {
+      this.$message({
+        type: 'success',
+        message: '删除成功!'
+      })
+      this.GetRolesList({name: this.key})
+    },
     handlePermission (index, row) {
+      this.selid = row.RoleId
+      this.GetRoleMenu({id: this.selid})
       this.dialogTableVisible = true
-      console.log(index)
     },
     handleNodeClick (node) {
       console.log(node)
     },
     searchList (key) {
-      this.GetRolesList({name: key})
+      this.key = key
+      this.GetRolesList({name: this.key})
     },
     addRole () {
-      this.$router.push({ name: 'addRole' })
+      this.$router.push({ name: 'editRole' })
     },
     getCheckedNodes () { // 获取选中的节点
-      console.log(this.$refs.tree.getCheckedNodes())
-    }
+      const menuids = this.$refs.tree.getCheckedNodes().map(x => x.id).join(',')
+      console.log(menuids)
+      this.SaveRoleMenus({
+        id: this.selid,
+        menuids: menuids,
+        callback: this.hideDialog,
+      })
+    },
+    hideDialog () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.dialogTableVisible = false
+    },
   },
   beforeMount () {
     this.GetRolesList()

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

@@ -65,7 +65,7 @@
           label="创建时间"
           width="200">
         </el-table-column>
-        <el-table-column label="操作" fixed='right' width="300">
+        <el-table-column label="操作" fixed='right' width="350">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -75,10 +75,14 @@
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-              <el-button
-              size="mini"
-              type="success"
-              @click="handleBind(scope.$index, scope.row)">绑定角色</el-button>
+            <el-button
+            size="mini"
+            type="success"
+            @click="handleBind(scope.$index, scope.row)">绑定角色</el-button>
+            <el-button
+            size="mini"
+            type="primary"
+            @click="resetPasswd(scope.$index, scope.row)">重置密码</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -185,6 +189,28 @@ export default {
     this.getList()
   },
   methods: {
+    resetPasswd (index, row) { // 重置密码
+      this.$confirm('确认重置此用户密码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$ajax(this.$api.systemSet.resetPassword.url, {
+          method: this.$api.systemSet.resetPassword.method,
+          data: {userid: row.UserId}
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '操作成功'
+          })
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消重置'
+        })
+      })
+    },
     bindRoles () { // 绑定角色
       this.$ajax(this.$api.systemSet.bindRoles.url, {
         method: this.$api.systemSet.bindRoles.method,
@@ -271,6 +297,7 @@ export default {
       }).then(res => {
         if (res !== null) this.tags = res
         this.currentEditItem = row
+        this.getRole()
         this.dialogTableVisible = true
       })
     },
@@ -291,7 +318,7 @@ export default {
     getRole () { // 绑定角色搜索事件，发送请求搜索角色列表
       this.$ajax(this.$api.caseManager.getRolesList.url, {
         method: this.$api.caseManager.getRolesList.method,
-        data: this.postData
+        queryData: this.postData
       }).then(res => {
         this.searchTagList = res.list
       })

src/store/app.js

@@ -20,6 +20,12 @@ function packChildren (data) {
   let cp = data.slice()
   const res = []
 
+  cp.map(x => {
+    x.id = x.MenuId
+    x.label = x.MenuName
+    return x
+  })
+
   data.forEach((it, inx) => {
     let found = false
     for (let i = 0; i < cp.length; i += 1) {
@@ -32,7 +38,7 @@ function packChildren (data) {
       }
     }
 
-    if (!found) {
+    if (!found && cp[inx].IsShow === 1) {
       res.push(cp[inx])
     }
   })

src/store/system/role.js

@@ -6,6 +6,7 @@ export default {
   state: {
     roleList: [],
     roleInfo: {},
+    roleMenus: [],
   },
   mutations: {
     updateList (state, payload) {
@@ -14,6 +15,9 @@ export default {
     updateInfo (state, payload) {
       state.roleInfo = payload || {}
     },
+    updateRoleMenus (state, payload) {
+      state.roleMenus = payload || {}
+    },
   },
   actions: {
     GetRolesList ({ commit }, payload) {
@@ -55,17 +59,41 @@ export default {
       }).then(res => {
       })
     },
-    DelRole ({ commit }, payload) {
+    DelRole ({ commit }, { id, callback }) {
       ajax(api.role.delete.url, {
         method: api.role.delete.method,
-        data: {
-          ...payload
+        urlData: {
+          id: id,
         }
       }).then(res => {
+        callback()
       })
     },
     SetRoleNull ({ commit }) {
       commit('updateInfo', {})
-    }
+    },
+    GetRoleMenu ({ commit }, payload) {
+      ajax(api.role.getmenus.url, {
+        method: api.role.getmenus.method,
+        urlData: {
+          id: payload.id,
+        },
+      }).then(res => {
+        commit('updateRoleMenus', res)
+      })
+    },
+    SaveRoleMenus ({ commit }, payload) {
+      ajax(api.role.savemenu.url, {
+        method: api.role.savemenu.method,
+        urlData: {
+          id: payload.id,
+        },
+        data: {
+          menuids: payload.menuids
+        }
+      }).then(res => {
+        payload.callback()
+      })
+    },
   }
 }

src/util/api.js

@@ -13,7 +13,15 @@ const $api = {
     init: { // 初始化菜单
       method: 'get',
       url: `${baseUrl}${common}/system/init`
-    }
+    },
+    signout: { // 登出
+      method: 'post',
+      url: `${baseUrl}${common}/signout`
+    },
+    editPassword: { // 修改密码
+      method: 'put',
+      url: `${baseUrl}${common}/user/:id/password`
+    },
   },
   systemSet: {
     getUserList: { // 获取用户列表
@@ -36,6 +44,10 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}/common/user/:id`
     },
+    resetPassword: { // 重置用户密码
+      method: 'put',
+      url: `${baseUrl}/common/user/password/reset`
+    },
     bindRoles: { // 绑定角色
       method: 'put',
       url: `${baseUrl}/common/userrole`
@@ -48,7 +60,19 @@ const $api = {
   channelManager: {
     getChannelList: { // 渠道列表
       method: 'get',
-      url: `${baseUrl}${common}/`
+      url: `${baseUrl}${common}/channel`
+    },
+    getChannelInfo: { // 获取渠道信息
+      method: 'get',
+      url: `${baseUrl}${common}/channel/:channelId`
+    },
+    addChannel: { // 新增渠道
+      method: 'post',
+      url: `${baseUrl}${common}/channel`
+    },
+    editChannel: { // 更新渠道
+      method: 'put',
+      url: `${baseUrl}${common}/channel`
     },
   },
   caseManager: {
@@ -344,6 +368,20 @@ const $api = {
       method: 'delete',
       url: `${baseUrl}${common}/role/:id`
     },
+    getmenus: {
+      method: 'get',
+      url: `${baseUrl}${common}/rolemenu/:id`
+    },
+    savemenu: {
+      method: 'put',
+      url: `${baseUrl}${common}/rolemenu/:id`
+    },
+  },
+  dataStatistics: {
+    getCustomerList: { // 获取会员列表
+      method: 'get',
+      url: `${baseUrl}${common}/customer`
+    }
   },
 }
 export default $api