From 0c70fbdac475692ab9777f9dc704cc4ebe5316dd Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 27 Nov 2024 18:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=88=97=E8=A1=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 25 +++------------ src/components/header/index.vue | 8 +++-- src/http/index.ts | 2 +- src/layout/header.vue | 8 +++-- src/store/user.ts | 19 +++++++++-- src/views/Login.vue | 2 ++ src/views/equip/detail.vue | 7 ++--- src/views/user/sourcingNeed/index.vue | 45 +++++++++++++++++---------- 8 files changed, 68 insertions(+), 48 deletions(-) diff --git a/components.d.ts b/components.d.ts index 5e1df1c..8425279 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,16 +8,12 @@ export {} declare module 'vue' { export interface GlobalComponents { Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default'] -<<<<<<< HEAD + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCarousel: typeof import('element-plus/es')['ElCarousel'] ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCascader: typeof import('element-plus/es')['ElCascader'] -======= - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] - ElButton: typeof import('element-plus/es')['ElButton'] ->>>>>>> 3e9ad09a2819e350266aaac04c776f0f461c9e79 ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] @@ -25,34 +21,23 @@ declare module 'vue' { ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] -<<<<<<< HEAD ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] -======= - ElHeader: typeof import('element-plus/es')['ElHeader'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElInput: typeof import('element-plus/es')['ElInput'] ->>>>>>> 3e9ad09a2819e350266aaac04c776f0f461c9e79 ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] -<<<<<<< HEAD ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] -======= - ElRow: typeof import('element-plus/es')['ElRow'] - ElSelect: typeof import('element-plus/es')['ElSelect'] - ElStep: typeof import('element-plus/es')['ElStep'] - ElSteps: typeof import('element-plus/es')['ElSteps'] ->>>>>>> 3e9ad09a2819e350266aaac04c776f0f461c9e79 + ElTag: typeof import('element-plus/es')['ElTag'] ElUpload: typeof import('element-plus/es')['ElUpload'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default'] diff --git a/src/components/header/index.vue b/src/components/header/index.vue index f2fedc0..c606b2c 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -10,7 +10,9 @@ userStore.editMenuList(1) const route = useRoute() const router = useRouter() const isRolesSelect = ref(false) -const rolesName = ref('出租方') +const rolesName = ref('1') + +rolesName.value = localStorage.getItem('rolesType') || 1 // 是否显示退出登录 const isShowLogout = computed(() => { @@ -95,10 +97,12 @@ const onSelectRoles = (type: number) => { rolesName.value = '出租方' userStore.editMenuList(1) userStore.editUserMenuList(1) + localStorage.setItem('rolesType', '1') } else { rolesName.value = '承租方' userStore.editMenuList(2) userStore.editUserMenuList(2) + localStorage.setItem('rolesType', '2') } isRolesSelect.value = false } @@ -137,7 +141,7 @@ const onCarts = () => {
- {{ rolesName }} + {{ rolesName == 1 ? '出租方' : '承租方' }} diff --git a/src/http/index.ts b/src/http/index.ts index 6287df1..5f0909e 100644 --- a/src/http/index.ts +++ b/src/http/index.ts @@ -43,7 +43,7 @@ service.interceptors.response.use( ElMessage.error(data.msg) router.push('/login') } else if (data.code == '500') { - ElMessage.error('请求失败') + ElMessage.error(data.msg) } else { return data diff --git a/src/layout/header.vue b/src/layout/header.vue index 83d88b6..a9cdf12 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -12,7 +12,9 @@ userStore.editMenuList(1) const route = useRoute() const router = useRouter() const isRolesSelect = ref(false) -const rolesName = ref('出租方') +const rolesName = ref('1') + +rolesName.value = localStorage.getItem('rolesType') || 1 // 是否显示退出登录 const isShowLogout = computed(() => { @@ -107,10 +109,12 @@ const onSelectRoles = (type: number) => { rolesName.value = '出租方' userStore.editMenuList(1) userStore.editUserMenuList(1) + localStorage.setItem('rolesType', '1') } else { rolesName.value = '承租方' userStore.editMenuList(2) userStore.editUserMenuList(2) + localStorage.setItem('rolesType', '2') } isRolesSelect.value = false } @@ -149,7 +153,7 @@ const onCarts = () => {
- {{ rolesName }} + {{ rolesName == 1 ? '出租方' : '承租方' }} diff --git a/src/store/user.ts b/src/store/user.ts index b005857..e8e1c8b 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -32,6 +32,19 @@ export const useStore = defineStore('myUser', { { title: '寻源竞价', name: 'sourcingBidding' }, { title: '专区管理', name: 'zoneManag' }, ], + isType: 1, + leaseUserList: [ + { title: '订单管理', name: 'orderManagementCz' }, + { title: '商品管理', name: 'goodsManagement' }, + { title: '商品上下架', name: 'goodsUpdown' }, + { title: '机手管理', name: 'operatorManagement' }, + { title: '寻源竞价', name: 'sourcingBidding' }, + { title: '专区管理', name: 'zoneManag' }, + ], + lesseeUserList: [ + { title: '寻源需求', name: 'sourcingNeed' }, + { title: '订单管理', name: 'orderManagement' }, + ] } }, getters: { @@ -121,9 +134,11 @@ export const useStore = defineStore('myUser', { ] if (type == 1) { this.leaseAndLesseeList = baseList + this.isType = 1 } else { this.leaseAndLesseeList = baseList this.leaseAndLesseeList.splice(3, 1) + this.isType = 2 } }, editUserMenuList(type: number) { @@ -153,9 +168,9 @@ export const useStore = defineStore('myUser', { { // 自定义存储的 key，默认是 store.$id key: 'myUser', - storage: sessionStorage, //缓存模式 可选 localStorage sessionStorage + storage: localStorage, //缓存模式 可选 localStorage sessionStorage // state 中的字段名，按组打包储存 - paths: ['currentMenuType', 'currentMenuItem', 'menuList', 'leaseAndLesseeList'] //需要缓存的字段 与 state中相关联 + paths: ['currentMenuType', 'currentMenuItem', 'menuList', 'leaseAndLesseeList', 'isType'] //需要缓存的字段 与 state中相关联 } ] } diff --git a/src/views/Login.vue b/src/views/Login.vue index 0fa50e3..9c749f3 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -55,6 +55,8 @@ const handlerLogin = async () => { // "https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/2023/12/09/815629f192564db98ac55a643b46f853gouwu.png", // }); // } + + localStorage.setItem('rolesType', '1') // 跳转登录页面 if (route.query && route.query.redirect) { router.push(decodeURIComponent(route.query.redirect)) diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue index 67c6f49..2d037e7 100644 --- a/src/views/equip/detail.vue +++ b/src/views/equip/detail.vue @@ -661,7 +661,6 @@ const rules = reactive({ // dialoglease.value = true // } - const openLease = () => { console.log(pageData.value) onAddCart() @@ -1237,7 +1236,7 @@ const onAddCart = async () => { cursor: pointer; width: calc(100% / 3); font-size: 14px; - font-family: PingFangSC, PingFang SC; + // font-family: PingFangSC, PingFang SC; // font-weight: 600; display: flex; margin-bottom: 35px; @@ -1251,12 +1250,12 @@ const onAddCart = async () => { color: #333333; flex: 1; word-break: break-all; - font-family: 'fangsong'; + // font-family: 'fangsong'; } .fnValue { color: #0087cd; - font-family: 'fangsong'; + // font-family: 'fangsong'; } } } diff --git a/src/views/user/sourcingNeed/index.vue b/src/views/user/sourcingNeed/index.vue index 672319c..b432c1d 100644 --- a/src/views/user/sourcingNeed/index.vue +++ b/src/views/user/sourcingNeed/index.vue @@ -104,17 +104,26 @@ - +