From c8a88198b461accb1dd4c24777e8f70b4a0a1106 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 27 Dec 2024 09:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 9 ++++++--- src/App.vue | 2 +- src/components/header/index.vue | 2 +- src/layout/header.vue | 10 +++++----- src/router/index.ts | 6 +++--- src/views/Login.vue | 2 +- src/views/order/index.vue | 1 - vite.config.ts | 2 +- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/components.d.ts b/components.d.ts index 082c31f..b0bbef1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -23,11 +23,13 @@ declare module 'vue' { ElCollapse: typeof import('element-plus/es')['ElCollapse'] ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElCountdown: typeof import('element-plus/es')['ElCountdown'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + 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'] @@ -35,6 +37,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm'] ElProgress: typeof import('element-plus/es')['ElProgress'] @@ -42,6 +45,9 @@ declare module 'vue' { ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] 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'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] @@ -65,7 +71,4 @@ declare module 'vue' { UploadComponentNewTwo: typeof import('./src/components/uploadComponentNewTwo/index.vue')['default'] UploadImg: typeof import('./src/components/uploadImg.vue')['default'] } - export interface ComponentCustomProperties { - vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] - } } diff --git a/src/App.vue b/src/App.vue index dc7329e..037fc4f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,7 +8,7 @@ onMounted(async () => { if (origin.indexOf('ticket') != -1) { console.log('origin.split爱玩送ticket') - const res = await loginNewApi({ ticket: origin.split('ticket=')[1] }) + const res = await loginNewApi({ ticket: origin.split('ticket=')[1],sysType:0 }) console.log(res, '登录结果') } }) diff --git a/src/components/header/index.vue b/src/components/header/index.vue index 9ad887b..9290deb 100644 --- a/src/components/header/index.vue +++ b/src/components/header/index.vue @@ -182,7 +182,7 @@ const onJumpMessage = () => { v-if="isMyInfoPage()" :src="headerLogo" fit="cover" - @click="$router.push('/mall-view')" + @click="$router.push('/home')" />
diff --git a/src/layout/header.vue b/src/layout/header.vue index 4a95650..16cc389 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -107,7 +107,7 @@ const searchKeywordBtn = () => { store.addHistoryRecord(keywordIptValue.value) - if (route.path == '/equipList') { + if (route.path.includes('equipList')) { if (searchTypeName.value === '装备') { $bus.emit('search', keywordIptValue.value) } else { @@ -117,7 +117,7 @@ const searchKeywordBtn = () => { }) } } - if (route.path == '/parity') { + if (route.path.includes('parity')) { if (searchTypeName.value == '需求') { $bus.emit('search', keywordIptValue.value) } else { @@ -128,7 +128,7 @@ const searchKeywordBtn = () => { } $bus.emit('search', keywordIptValue.value) } - if (route.path == '/mall-view') { + if (route.path.includes('home')) { if (searchTypeName.value === '装备') { router.push({ name: 'equipList', @@ -142,7 +142,7 @@ const searchKeywordBtn = () => { }) } } - if (route.path == '/enterpriseZone') { + if (route.path.includes('enterpriseZone')) { if (searchTypeName.value == '装备') { router.push({ name: 'equipList', @@ -338,7 +338,7 @@ const onJumpMessage = () => {
-