From dc36257ff892391a6ad32f151340ec0760e78496 Mon Sep 17 00:00:00 2001 From: 吴文康 <2926542760@qq.com> Date: Sat, 19 Feb 2022 19:26:09 +0800 Subject: [PATCH] 后端页面 --- src/api/Partner.js | 9 ++++++++- src/api/ReservationSettings.js | 8 ++++++++ src/api/RobotReservation.js | 8 ++++++++ src/api/incomeDetails.js | 11 +++++++++++ src/api/user.js | 35 ++++++++++++++++++++++++++++++++++- src/components/Breadcrumb/index.vue | 4 ++-- src/icons/logo.jpg | Bin 0 -> 15834 bytes src/layout/components/Navbar.vue | 18 ++++++++++-------- src/layout/components/Sidebar/Logo.vue | 2 +- src/router/index.js | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------- src/views/AdminManage/AdminManage.vue | 2 +- src/views/appointment/appointment.vue | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- src/views/comment/comment.vue | 1 + src/views/externalInfo/externalInfo.vue | 70 +++++++++++++++++++++++++++++++++++++++++++++++----------------------- src/views/login/index.vue | 9 ++++----- src/views/moneys/moneys.vue | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- src/views/partner/partner.vue | 65 ++++++++++++++++++++++++++++++++++++++++++++++------------------- src/views/proportion/proportion.vue | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/record/record.vue | 34 +++++++++++++++++++--------------- src/views/system/calendar.vue | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- src/views/system/missionNum.vue | 4 ++-- src/views/system/robot.vue | 18 ++++++++++-------- src/views/system/updpassword.vue | 2 +- src/views/user/index.vue | 538 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------- src/views/user/managerTable.vue | 14 ++++++++++++-- 25 files changed, 1091 insertions(+), 264 deletions(-) create mode 100644 src/api/incomeDetails.js create mode 100644 src/icons/logo.jpg create mode 100644 src/views/proportion/proportion.vue diff --git a/src/api/Partner.js b/src/api/Partner.js index 2715364..6b83f4b 100644 --- a/src/api/Partner.js +++ b/src/api/Partner.js @@ -1,7 +1,14 @@ import request from '@/utils/request' import utils from '../utils/utils.js' - +//修改合伙人状态 +export function UpdatePartner(data){ + return request({ + url:'/Partner/UpdatePartner', + method:'post', + data + }) +} //根据ID查询合伙人信息 export function GetPartnerById(data) { return request({ diff --git a/src/api/ReservationSettings.js b/src/api/ReservationSettings.js index b481613..5c3bb2d 100644 --- a/src/api/ReservationSettings.js +++ b/src/api/ReservationSettings.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +//移除时间段的时间 +export function RemoveDateSection(data){ + return request({ + url:'/ReservationSettings/RemoveDateSection', + method:'post', + data + }) +} // 设置可预约信息 export function SettingReservation(params) { return request({ diff --git a/src/api/RobotReservation.js b/src/api/RobotReservation.js index 71f1468..d351b22 100644 --- a/src/api/RobotReservation.js +++ b/src/api/RobotReservation.js @@ -45,4 +45,12 @@ export function CreateRobot(data){ method:'post', data }) +} +//修改滚屏预约状态 +export function UpdReservationStatus(data){ + return request({ + url:'/RobotReservation/UpdReservationStatus', + method:'post', + data + }) } \ No newline at end of file diff --git a/src/api/incomeDetails.js b/src/api/incomeDetails.js new file mode 100644 index 0000000..45cc47a --- /dev/null +++ b/src/api/incomeDetails.js @@ -0,0 +1,11 @@ +import request from '@/utils/request' +import utils from '../utils/utils.js' +// 查询所有分成数据 +export function GetListIncomeDetails(data){ + return request({ + url:'/IncomeDetails/GetListIncomeDetails', + method:'post', + data + }) +} + diff --git a/src/api/user.js b/src/api/user.js index 92b8778..708cfc5 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,7 +1,31 @@ import request from '@/utils/request' import utils from '../utils/utils.js' +//根据userid修改VIP特权次数 +export function UpdVipNum(data){ + return request({ + url:`/Users/UpdVipNum?${utils.ObjectToQureyParams(data)}`, + method:'post', + data + }) +} +//查询用户数据包含车辆信息 +export function GetUserByCar(data){ + return request({ + url:'/Users/GetUserByCar', + method:'post', + data + }) +} +//根据用户ID查询下级数据 +export function GetUserListByInviteeUserId(data){ + return request({ + url:'/Users/GetUserList', + method:'post', + data + }) +} //修改密码 @@ -38,9 +62,18 @@ export function DelAdmin(data){ } -// 最新修改固定单量 经理专员 +// 预约结算修改单量 export function UpdateNum(data){ return request({ + url:'/Users/UpdateNum', + method:'post', + data + }) +} + +// 设置经理专员单量 +export function UpdateNumS(data){ + return request({ url:'/Num/UpdateNum', method:'post', data diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 29f9a04..9263198 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -33,7 +33,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched) + matched = [{ path: '/dashboard', meta: { title: '首页' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) @@ -43,7 +43,7 @@ export default { if (!name) { return false } - return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase() + return name.trim().toLocaleLowerCase() === '首页'.toLocaleLowerCase() }, pathCompile(path) { // To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561 diff --git a/src/icons/logo.jpg b/src/icons/logo.jpg new file mode 100644 index 0000000..ee890af Binary files /dev/null and b/src/icons/logo.jpg differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 0ca5cf6..dc78710 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -7,23 +7,23 @@
- +
- - + + Home - + Github - + Docs - Log Out + 退出 @@ -35,7 +35,7 @@ import { mapGetters } from 'vuex' import Breadcrumb from '@/components/Breadcrumb' import Hamburger from '@/components/Hamburger' - +import {removeToken,removeUser} from '../../utils/auth.js' export default { components: { Breadcrumb, @@ -52,7 +52,9 @@ export default { this.$store.dispatch('app/toggleSideBar') }, async logout() { - await this.$store.dispatch('user/logout') + // await this.$store.dispatch('user/logout') + removeToken() + removeUser() this.$router.push(`/login?redirect=${this.$route.fullPath}`) } } diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 040fab6..c2cf587 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -25,7 +25,7 @@ export default { data() { return { title: 'Vue Admin Template', - logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' + logo: '../../../icons/logo.png' } } } diff --git a/src/router/index.js b/src/router/index.js index 5d1fb9e..fc61cdf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -99,24 +99,24 @@ export const constantRoutes = [{ icon: 'table' } }, - { - path: 'manager', - name: 'manager', - component: () => import('@/views/user/manager'), - meta: { - title: '客户经理下级', - icon: 'table' - } - }, - { - path: 'commissioner', - name: 'manager', - component: () => import('@/views/user/commissioner'), - meta: { - title: '推广专员下级', - icon: 'table' - } - } + // { + // path: 'manager', + // name: 'manager', + // component: () => import('@/views/user/manager'), + // meta: { + // title: '客户经理下级', + // icon: 'table' + // } + // }, + // { + // path: 'commissioner', + // name: 'manager', + // component: () => import('@/views/user/commissioner'), + // meta: { + // title: '推广专员下级', + // icon: 'table' + // } + // } ] }, // appointment @@ -135,20 +135,20 @@ export const constantRoutes = [{ }] }, - { - path: '/appointByUserId', - component: Layout, - redirect: '/appointByUserId', - children: [{ - path: 'appointByUserId', - name: '查询预约', - component: () => import('@/views/appointByUserId/appointByUserId'), - meta: { - title: '查询预约', - icon: 'el-icon-s-help', - } - }] - }, + // { + // path: '/appointByUserId', + // component: Layout, + // redirect: '/appointByUserId', + // children: [{ + // path: 'appointByUserId', + // name: '查询预约', + // component: () => import('@/views/appointByUserId/appointByUserId'), + // meta: { + // title: '查询预约', + // icon: 'el-icon-s-help', + // } + // }] + // }, { path: '/AdminManage', component: Layout, @@ -197,6 +197,21 @@ export const constantRoutes = [{ } }] }, + // 分成管理 + { + path: '/proportion', + component: Layout, + redirect: 'proportion', + children: [{ + path: 'proportion', + name: '分成管理', + component: () => import('@/views/proportion/proportion'), + meta: { + title: '分成管理', + icon: 'el-icon-s-help' + } + }] + }, // 外部数据 // { // path: '/externalInfo', @@ -212,20 +227,20 @@ export const constantRoutes = [{ // } // }] // }, - { - path: '/comment', - component: Layout, - redirect: '/comment', - children: [{ - path: 'comment', - name: '评价管理', - component: () => import('@/views/comment/comment'), - meta: { - title: '评价管理', - icon: 'el-icon-s-help' - } - }] - }, + // { + // path: '/comment', + // component: Layout, + // redirect: '/comment', + // children: [{ + // path: 'comment', + // name: '评价管理', + // component: () => import('@/views/comment/comment'), + // meta: { + // title: '评价管理', + // icon: 'el-icon-s-help' + // } + // }] + // }, // record { @@ -352,15 +367,15 @@ export const constantRoutes = [{ // } // }, // rulesstr - { - path: 'rulesstr', - name: 'rulesstr', - component: () => import('@/views/system/rulesstr'), - meta: { - title: '补贴规则设置', - icon: 'table' - } - }, + // { + // path: 'rulesstr', + // name: 'rulesstr', + // component: () => import('@/views/system/rulesstr'), + // meta: { + // title: '补贴规则设置', + // icon: 'table' + // } + // }, { path: 'missionNum', name: 'missionNum', diff --git a/src/views/AdminManage/AdminManage.vue b/src/views/AdminManage/AdminManage.vue index 7f48a92..5a0eb21 100644 --- a/src/views/AdminManage/AdminManage.vue +++ b/src/views/AdminManage/AdminManage.vue @@ -33,7 +33,7 @@ -
diff --git a/src/views/appointment/appointment.vue b/src/views/appointment/appointment.vue index 32e1e11..56611ac 100644 --- a/src/views/appointment/appointment.vue +++ b/src/views/appointment/appointment.vue @@ -2,8 +2,8 @@
- - + + @@ -55,6 +55,16 @@ {{scope.row.UserPhone}} + + + + + + - + @@ -134,7 +144,7 @@ 修改状态 --> - + - - - - + + @@ -95,9 +94,9 @@ return { dialogVisible: false, rules: { - userName: [{ + full_name: [{ required: true, - message: '请输入用户名', + message: '请输入贵姓', trigger: 'change' }, ], phone: [{ @@ -128,6 +127,7 @@ }, TotalCount: 0, form: { + "full_name":'', "id": 0, "userName": "", "phone": "", @@ -211,12 +211,14 @@ if (obj == null) { // 新增 this.form.id = 0 + this.form.full_name='' this.form.userName = '' this.form.phone = '' this.form.carModel ='' } else { // 修改 this.form.id = obj.id + this.form.full_name=obj.full_name this.form.userName = obj.userName this.form.phone = obj.phone this.form.carModel =obj.carModel diff --git a/src/views/system/updpassword.vue b/src/views/system/updpassword.vue index d8ea6d8..140bf0c 100644 --- a/src/views/system/updpassword.vue +++ b/src/views/system/updpassword.vue @@ -53,7 +53,7 @@ this.model.oldpassword='' this.model.newpassword='' removeToken() - removeToken() + removeUser() localStorage.removeItem('userRole') setTimeout(()=>{ this.$router.push({ diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 9e06371..cd5aa1b 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -1,28 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - @@ -200,16 +399,99 @@ 确 定 + + + + + + + + 提交 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + +