diff --git a/src/apis/Permission.js b/src/apis/Permission.js index d5d83c3..408a377 100644 --- a/src/apis/Permission.js +++ b/src/apis/Permission.js @@ -11,15 +11,3 @@ export function getMenuNavApi() { method: 'get', }) } - -/** - * @description:用户角色 - * @param - * @return: - */ -export function getUser() { - return request({ - url: `/user/getUser`, - method: 'get', - }) -} \ No newline at end of file diff --git a/src/apis/apiManage.js b/src/apis/apiManage.js index e6b89fd..9f19761 100644 --- a/src/apis/apiManage.js +++ b/src/apis/apiManage.js @@ -50,6 +50,18 @@ export function saveMallUserInfo(data) { }) } +/** + * @description 修改登录账号 详情 + * @param {*} data + * @returns data + */ +export function getMallUserInfo(id) { + return request({ + url: `/serviceInfo/getMallUserInfo?serviceId=${id}`, + method: 'get' + }) +} + /** * @description 设置时长 * @param {*} data diff --git a/src/apis/home.js b/src/apis/home.js new file mode 100644 index 0000000..dbf6cca --- /dev/null +++ b/src/apis/home.js @@ -0,0 +1,36 @@ +import request from "@/utils/request.js"; +/** + * @description:用户角色 + * @param + * @return: + */ +export function getUser() { + return request({ + url: `/user/getUser`, + method: 'get', + }) +} + +/** + * @description: api 剩余时长 + * @param + * @return: + */ +export function current() { + return request({ + url: `/serviceInfo/current`, + method: 'get', + }) +} + +/** + * @description: 私有化 剩余时长 + * @param + * @return: + */ +export function privateDeployAdminCurrent() { + return request({ + url: `/serviceInfo/privateDeployAdminCurrent`, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/apis/login.js b/src/apis/login.js index 4a2dc8b..b1c9bb4 100644 --- a/src/apis/login.js +++ b/src/apis/login.js @@ -17,6 +17,19 @@ export function loginApi(data) { }) } +/** + * @description 退出登录 + * @params email,password,code + * @returns data + */ +export function logoutApi(data) { + return request({ + // url: `/api/user/loginByEmail`, + url: `/logout`, + method: 'get' + }) +} + /** /** * @description:重新发送邮件 diff --git a/src/apis/template.js b/src/apis/template.js new file mode 100644 index 0000000..e0b9ff9 --- /dev/null +++ b/src/apis/template.js @@ -0,0 +1,13 @@ +import request from "@/utils/request.js"; + +/** + * @description 获取合作商列表 + * @param {*} (pageNum,pageSize) + * @returns data + */ +export function templateListApi(pageNum, pageSize) { + return request({ + url: `/personMould/serviceMouldList?pageNum=${pageNum}&pageSize=${pageSize}`, + method: 'get' + }) +} \ No newline at end of file diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 1a6a781..146ab76 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,3 +1,10 @@ + diff --git a/src/router/index.ts b/src/router/index.ts index 3975cfe..4ccde17 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -154,28 +154,21 @@ export const constantRoutes: RouteRecordRaw[] = [ { path: "/", component: Layout, - redirect: "/editPass", + redirect: "/home", children: [ { - path: "editPass", - component: () => import("@/views/editPass/index.vue"), - name: "editPass", + path: "/home", + component: () => import("@/views/home/index.vue"), + name: "home", meta: { - title: "editPass", - icon: "homepage", + title: "home", + icon: "home", affix: true, name: "ruleListMangage.title", }, }, - ], - }, - { - path: "/", - component: Layout, - redirect: "/apiManage", - children: [ { - path: "apiManage", + path: "/apiManage", component: () => import("@/views/apiManage/index.vue"), name: "apiManage", meta: { @@ -185,15 +178,8 @@ export const constantRoutes: RouteRecordRaw[] = [ name: "ruleListMangage.title", }, }, - ], - }, - { - path: "/", - component: Layout, - redirect: "/privatization", - children: [ { - path: "privatization", + path: "/privatization", component: () => import("@/views/privatization/index.vue"), name: "privatization", meta: { @@ -203,6 +189,17 @@ export const constantRoutes: RouteRecordRaw[] = [ name: "ruleListMangage.title", }, }, + { + path: "/template", + component: () => import("@/views/template/index.vue"), + name: "template", + meta: { + title: "template", + icon: "homepage", + affix: true, + name: "ruleListMangage.title", + }, + }, ], } ]; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 72d806d..438210f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -25,6 +25,7 @@ export const useUserStore = defineStore("user", () => { * @returns */ function login(loginData: LoginData) { + debugger return new Promise((resolve, reject) => { loginApi(loginData) .then((response) => { diff --git a/src/store/modules/userInfo.js b/src/store/modules/userInfo.js index bfd1626..4928e4c 100644 --- a/src/store/modules/userInfo.js +++ b/src/store/modules/userInfo.js @@ -1,3 +1,10 @@ +/* + * @Autor: Chutingting + * @Date: 2023-11-02 11:32:51 + * @LastEditors: Chutingting + * @LastEditTime: 2023-11-08 10:26:54 + * @Description: + */ import { defineStore } from "pinia"; import { store } from "@/store"; import { diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 8858534..efb8d02 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -14,6 +14,7 @@ declare module '@vue/runtime-core' { EditPosition: typeof import('./../components/EditPosition.vue')['default'] 'EditPosition copy': typeof import('./../components/EditPosition copy.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] @@ -35,11 +36,17 @@ declare module '@vue/runtime-core' { GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] + IEpAvatar: typeof import('~icons/ep/avatar')['default'] + IEpClock: typeof import('~icons/ep/clock')['default'] IEpDocument: typeof import('~icons/ep/document')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] + IEpHouse: typeof import('~icons/ep/house')['default'] IEpIconMenu: typeof import('~icons/ep/icon-menu')['default'] IEpLink: typeof import('~icons/ep/link')['default'] IEpPlus: typeof import('~icons/ep/plus')['default'] + IEpPointer: typeof import('~icons/ep/pointer')['default'] + IEpUser: typeof import('~icons/ep/user')['default'] + IEpUserFilled: typeof import('~icons/ep/user-filled')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] MyLoading: typeof import('./../components/myLoading.vue')['default'] diff --git a/src/utils/request.js b/src/utils/request.js index 6be64e7..2cd74ed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -27,11 +27,11 @@ const request = axios.create({ request.interceptors.request.use( function (config) { - // 给所有授权的请求提供token - const AccessToken = localStorage.getItem("AccessToken") - if (AccessToken) { - config.headers.token = AccessToken - } + // // 给所有授权的请求提供token + // const AccessToken = localStorage.getItem("AccessToken") + // if (AccessToken) { + // config.headers.token = AccessToken + // } return config }, function (error) { diff --git a/src/views/apiManage/index copy.vue b/src/views/apiManage/index copy.vue deleted file mode 100644 index 72d8476..0000000 --- a/src/views/apiManage/index copy.vue +++ /dev/null @@ -1,411 +0,0 @@ - - - - - - diff --git a/src/views/apiManage/index.vue b/src/views/apiManage/index.vue index f75bb86..c81d489 100644 --- a/src/views/apiManage/index.vue +++ b/src/views/apiManage/index.vue @@ -198,7 +198,7 @@ import { linkEmits } from "element-plus"; import { getCurrentInstance } from "vue"; -import { businessListApi, addBusinessApi, setRemainingTimes, saveMallUserInfo } from '@/apis/apiManage.js' +import { businessListApi, addBusinessApi, setRemainingTimes, saveMallUserInfo, getMallUserInfo } from '@/apis/apiManage.js' import { useI18n } from "vue-i18n"; @@ -379,11 +379,21 @@ const accountDialogVisible = ref(false); const mallUserInfoFlag = ref(false); const loginAccount = (item) => { if (item.mallUserInfo) { - formData.value.name = item.name - formData.value.username = item.username + getMallUserInfo(item.id).then(res => { + if (res.code === 200) { + formData2.value = { + serviceId: item.id, + username: res.data.username, + name: res.data.name, + password: '', + phone: res.data.phone + }; + } + }) + } else { + formData2.value.serviceId = item.id } mallUserInfoFlag.value = item.mallUserInfo ? true : false - formData2.value.serviceId = item.id accountDialogVisible.value = true } diff --git a/src/views/editPass/index.vue b/src/views/editPass/index.vue index f21599e..6f132b2 100644 --- a/src/views/editPass/index.vue +++ b/src/views/editPass/index.vue @@ -2,7 +2,7 @@ * @Autor: Chutingting * @Date: 2023-11-05 19:03:11 * @LastEditors: Chutingting - * @LastEditTime: 2023-11-07 17:55:54 + * @LastEditTime: 2023-11-08 16:45:31 * @Description: 修改密码 -->