Bläddra i källkod

洗车运营 与 卡券中心 接口地址更换

chenrui 4 år sedan
förälder
incheckning
829ad177ca

+ 23 - 18
src/api/card-voucher-role.js

@@ -1,8 +1,8 @@
 import { axios } from '@/utils/request'
 
-// 分页查询角色
+// 获取列表数据
 export const getPowerRoleList = params => {
-  const url = `role/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `yyrole/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -11,41 +11,46 @@ export const getPowerRoleList = params => {
     method: 'POST'
   })
 }
-// 保存角色
-export const saveRolePower = params => {
-  return axios({
-    url: 'role/save',
-    data: params,
-    method: 'POST'
-  })
-}
-// flag 0:禁用 1:启用  启禁用角色
+
+// 改变权限状态接口 flag 0:禁用 1:启用
 export const updateEnableStatus = params => {
   return axios({
-    url: `role/enable/${params.id}/${params.flag}`,
+    url: `yyrole/enable/${params.id}/${params.flag}`,
     data: {},
     method: 'get'
   })
 }
-// 删除角色
+
+// 删除用户接口
 export const delectRolePower = params => {
   return axios({
-    url: `role/delete/${params.id}`,
+    url: `yyrole/delete/${params.id}`,
     data: {},
     method: 'get'
   })
 }
-// 查询可用所有菜单
+
+// 新增/编辑保存接口
+export const saveRolePower = params => {
+  return axios({
+    url: 'yyrole/save',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 获取菜单树数据
 export const getMenuList = params => {
-  const url = `role/findAllMenu/${params.id}`
+  const url = `yyrole/findAllMenu/${params.id}`
   return axios({
     url: url,
     method: 'get'
   })
 }
-// 保存角色菜单关系
+
+// 保存权限分配
 export const addMenuPower = params => {
-  const url = `role/saveRoleMenu`
+  const url = `yyrole/saveRoleMenu`
   return axios({
     url: url,
     data: params,

+ 23 - 18
src/api/card-voucher-user.js

@@ -3,22 +3,15 @@ import { axios } from '@/utils/request'
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: 'user/resetPwd',
+    url: 'yyuser/resetPwd',
     data: params,
     method: 'POST'
   })
 }
-// 启用禁用
-export const updateEnableStatus = params => {
-  return axios({
-    url: `user/enable/${params.id}/${params.flag}`,
-    data: {},
-    method: 'get'
-  })
-}
-// 分页查询用户
+
+// 获取列表数据
 export const getPowerUserList = params => {
-  const url = `user/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `yyuser/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -27,26 +20,38 @@ export const getPowerUserList = params => {
     method: 'POST'
   })
 }
+
+// 改变权限状态接口
+export const updateEnableStatus = params => {
+  return axios({
+    url: `yyuser/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+
 // 删除用户接口
 export const delectUserPower = params => {
   return axios({
-    url: `user/delete/${params.id}`,
+    url: `yyuser/delete/${params.id}`,
     data: {},
     method: 'get'
   })
 }
-// 查询所有角色
-export const getRoleList = params => {
+
+// 新增/编辑保存接口
+export const saveUserPower = params => {
   return axios({
-    url: 'role/findAll',
+    url: 'yyuser/save',
     data: params,
     method: 'POST'
   })
 }
-// 保存用户
-export const saveUserPower = params => {
+
+// 获取角色列表接口
+export const getRoleList = params => {
   return axios({
-    url: 'user/save',
+    url: 'yyrole/findAll',
     data: params,
     method: 'POST'
   })

+ 1 - 1
src/api/login.js

@@ -4,7 +4,7 @@ import { axios } from '@/utils/request'
 export function login ({ username, password }) {
   return axios({
     url: 'login',
-    headers: { 'content-type': 'application/x-www-form-urlencoded' },
+    headers: { 'content-type': 'application/x-www-form-urlencoded', 'App-Type': 9 },
     data: `username=${username}&password=${password}`,
     method: 'post'
   }).then(res => res.data)

+ 18 - 23
src/api/power-role.js

@@ -1,8 +1,8 @@
 import { axios } from '@/utils/request'
 
-// 获取列表数据
+// 分页查询角色
 export const getPowerRoleList = params => {
-  const url = `yyrole/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `role/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -11,46 +11,41 @@ export const getPowerRoleList = params => {
     method: 'POST'
   })
 }
-
-// 改变权限状态接口 flag 0:禁用 1:启用
+// 保存角色
+export const saveRolePower = params => {
+  return axios({
+    url: 'role/save',
+    data: params,
+    method: 'POST'
+  })
+}
+// flag 0:禁用 1:启用  启禁用角色
 export const updateEnableStatus = params => {
   return axios({
-    url: `yyrole/enable/${params.id}/${params.flag}`,
+    url: `role/enable/${params.id}/${params.flag}`,
     data: {},
     method: 'get'
   })
 }
-
-// 删除用户接口
+// 删除角色
 export const delectRolePower = params => {
   return axios({
-    url: `yyrole/delete/${params.id}`,
+    url: `role/delete/${params.id}`,
     data: {},
     method: 'get'
   })
 }
-
-// 新增/编辑保存接口
-export const saveRolePower = params => {
-  return axios({
-    url: 'yyrole/save',
-    data: params,
-    method: 'POST'
-  })
-}
-
-// 获取菜单树数据
+// 查询可用所有菜单
 export const getMenuList = params => {
-  const url = `yyrole/findAllMenu/${params.id}`
+  const url = `role/findAllMenu/${params.id}`
   return axios({
     url: url,
     method: 'get'
   })
 }
-
-// 保存权限分配
+// 保存角色菜单关系
 export const addMenuPower = params => {
-  const url = `yyrole/saveRoleMenu`
+  const url = `role/saveRoleMenu`
   return axios({
     url: url,
     data: params,

+ 18 - 23
src/api/power-user.js

@@ -3,15 +3,22 @@ import { axios } from '@/utils/request'
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: 'yyuser/resetPwd',
+    url: 'user/resetPwd',
     data: params,
     method: 'POST'
   })
 }
-
-// 获取列表数据
+// 启用禁用
+export const updateEnableStatus = params => {
+  return axios({
+    url: `user/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+// 分页查询用户
 export const getPowerUserList = params => {
-  const url = `yyuser/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `user/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -20,38 +27,26 @@ export const getPowerUserList = params => {
     method: 'POST'
   })
 }
-
-// 改变权限状态接口
-export const updateEnableStatus = params => {
-  return axios({
-    url: `yyuser/enable/${params.id}/${params.flag}`,
-    data: {},
-    method: 'get'
-  })
-}
-
 // 删除用户接口
 export const delectUserPower = params => {
   return axios({
-    url: `yyuser/delete/${params.id}`,
+    url: `user/delete/${params.id}`,
     data: {},
     method: 'get'
   })
 }
-
-// 新增/编辑保存接口
-export const saveUserPower = params => {
+// 查询所有角色
+export const getRoleList = params => {
   return axios({
-    url: 'yyuser/save',
+    url: 'role/findAll',
     data: params,
     method: 'POST'
   })
 }
-
-// 获取角色列表接口
-export const getRoleList = params => {
+// 保存用户
+export const saveUserPower = params => {
   return axios({
-    url: 'yyrole/findAll',
+    url: 'user/save',
     data: params,
     method: 'POST'
   })

+ 16 - 4
src/views/CardVoucherAuth/user/userList.vue

@@ -8,20 +8,19 @@
               <a-input allowClear v-model.trim="queryParam.name" placeholder="请输入用户名称"/>
             </a-form-item>
           </a-col>
-
           <a-col :md="6" :sm="24">
             <a-form-item label="手机号码">
               <a-input allowClear v-model.trim="queryParam.phone" placeholder="请输入手机号码"/>
             </a-form-item>
           </a-col>
-
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
               <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.loginFlag" allowClear placeholder="请选择状态"></v-select>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="4" :sm="24" class="flex-sp">
             <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button @click="reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -30,7 +29,6 @@
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="openModal">新建</a-button>
     </div>
-
     <s-table
       ref="table"
       size="default"
@@ -149,6 +147,15 @@ export default {
     refreshTable () {
       this.$refs.table.refresh(true)
     },
+    //  重置
+    reset () {
+      this.queryParam = {
+        name: '',
+        phone: '',
+        loginFlag: ''
+      }
+      this.$refs.table.refresh(true)
+    },
     // 新建
     openModal () {
       this.showModal = true
@@ -224,6 +231,11 @@ export default {
   .table-page-search-wrapper .ant-form-inline .ant-form-item{
     margin-bottom: 0;
   }
+  .flex-sp{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
   .action-button{
    line-height: 40px;
    white-space: nowrap;

+ 9 - 9
src/views/bnSetting/menu/adminMenus.vue

@@ -178,14 +178,14 @@
 
       </a-col>
     </a-row>
-    <childModal parentType="admin" :visible="showChildModal" @refresh="getYyMenuList" :data="parentData" @close="showChildModal = false"></childModal>
+    <childModal parentType="admin" :visible="showChildModal" @refresh="getMenuList" :data="parentData" @close="showChildModal = false"></childModal>
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import childModal from './childModal.vue'
-import { getYyMenuList, saveYyMenu, deleteYyMenu } from '@/api/menu.js'
+import { getMenuList, saveMenu, deleteMenu } from '@/api/menu.js'
 
 export default {
   name: 'Menu',
@@ -310,8 +310,8 @@ export default {
       })
     },
     // 获取菜单树列表
-    getYyMenuList () {
-      getYyMenuList().then(res => {
+    getMenuList () {
+      getMenuList().then(res => {
         console.log(res, 'res1111111')
         if (res.status == 200) {
           this.treeData = res.data
@@ -372,12 +372,12 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          deleteYyMenu({
+          deleteMenu({
             id: _this.formData.id
           }).then(res => {
             if (res.status == 200) {
               _this.$message.success('删除成功')
-              _this.getYyMenuList()
+              _this.getMenuList()
             }
           }).catch(() => {
             _this.$message.success('删除失败, 请稍后重试')
@@ -392,11 +392,11 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
-          saveYyMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
+          saveMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
-              _this.getYyMenuList()
+              _this.getMenuList()
               _this.clear()
             } else {
               // this.$message.warning(res.message)
@@ -417,7 +417,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getYyMenuList()
+      vm.getMenuList()
     })
   },
   watch: {

+ 2 - 2
src/views/bnSetting/menu/childModal.vue

@@ -188,7 +188,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { saveYyMenu, saveMdMenu } from '@/api/menu.js'
+import { saveMenu, saveMdMenu } from '@/api/menu.js'
 export default {
   name: 'ChildModal',
   components: {
@@ -252,7 +252,7 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
-          const saveRequest = this.parentType == 'store' ? saveMdMenu : saveYyMenu
+          const saveRequest = this.parentType == 'store' ? saveMdMenu : saveMenu
           saveRequest(Object.assign(this.formData, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {

+ 2 - 2
src/views/power/menu/childModal.vue

@@ -158,7 +158,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
-import { saveMenu } from '@/api/menu.js'
+import { saveYyMenu } from '@/api/menu.js'
 export default {
   name: 'ChildModal',
   components: {
@@ -216,7 +216,7 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log(values.formData, ' formData.type222222222')
-          saveMenu(Object.assign(this.formData, values.formData)).then(res => {
+          saveYyMenu(Object.assign(this.formData, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')

+ 9 - 9
src/views/power/menu/menu.vue

@@ -120,14 +120,14 @@
 
       </a-col>
     </a-row>
-    <childModal :visible="showChildModal" @refresh="getMenuList" :data="parentData" @close="showChildModal = false"></childModal>
+    <childModal :visible="showChildModal" @refresh="getYyMenuList" :data="parentData" @close="showChildModal = false"></childModal>
   </a-card>
 </template>
 
 <script>
 import { STable, VSelect } from '@/components'
 import childModal from './childModal.vue'
-import { getMenuList, saveMenu, deleteMenu } from '@/api/menu.js'
+import { getYyMenuList, saveYyMenu, deleteYyMenu } from '@/api/menu.js'
 
 export default {
   name: 'Menu',
@@ -247,8 +247,8 @@ export default {
       })
     },
     // 获取菜单树列表
-    getMenuList () {
-      getMenuList().then(res => {
+    getYyMenuList () {
+      getYyMenuList().then(res => {
         if (res.status == 200) {
           this.treeData = res.data
         }
@@ -307,12 +307,12 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          deleteMenu({
+          deleteYyMenu({
             id: _this.formData.id
           }).then(res => {
             if (res.status == 200) {
               _this.$message.success('删除成功')
-              _this.getMenuList()
+              _this.getYyMenuList()
             }
           }).catch(() => {
             _this.$message.success('删除失败, 请稍后重试')
@@ -326,11 +326,11 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          saveMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
+          saveYyMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
               this.$message.success(res.message ? res.message : '保存成功')
-              _this.getMenuList()
+              _this.getYyMenuList()
               _this.clear()
             } else {
               // this.$message.warning(res.message)
@@ -349,7 +349,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getMenuList()
+      vm.getYyMenuList()
     })
   }
 }