Merge branch 'dev-songyang'
This commit is contained in:
commit
164f4d64d3
|
|
@ -29,3 +29,4 @@ coverage
|
||||||
*.sw?
|
*.sw?
|
||||||
.prettierrc.js
|
.prettierrc.js
|
||||||
auto-imports.d.ts
|
auto-imports.d.ts
|
||||||
|
components.d.ts
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,15 @@ declare module 'vue' {
|
||||||
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
|
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
|
||||||
ElCol: typeof import('element-plus/es')['ElCol']
|
ElCol: typeof import('element-plus/es')['ElCol']
|
||||||
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
|
||||||
|
ElEmpty: typeof import('element-plus/es')['ElEmpty']
|
||||||
ElForm: typeof import('element-plus/es')['ElForm']
|
ElForm: typeof import('element-plus/es')['ElForm']
|
||||||
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
ElFormItem: typeof import('element-plus/es')['ElFormItem']
|
||||||
|
ElIcon: typeof import('element-plus/es')['ElIcon']
|
||||||
ElImage: typeof import('element-plus/es')['ElImage']
|
ElImage: typeof import('element-plus/es')['ElImage']
|
||||||
ElInput: typeof import('element-plus/es')['ElInput']
|
ElInput: typeof import('element-plus/es')['ElInput']
|
||||||
|
ElPagination: typeof import('element-plus/es')['ElPagination']
|
||||||
ElRow: typeof import('element-plus/es')['ElRow']
|
ElRow: typeof import('element-plus/es')['ElRow']
|
||||||
|
ElTag: typeof import('element-plus/es')['ElTag']
|
||||||
EquipCard: typeof import('./src/components/equipCard.vue')['default']
|
EquipCard: typeof import('./src/components/equipCard.vue')['default']
|
||||||
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
|
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
|
||||||
FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
|
FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,11 @@
|
||||||
const navMenuList = [
|
const navMenuList = [
|
||||||
{ name: '首页', routerName: 'home' },
|
{ name: '首页', routerName: 'home' },
|
||||||
{ name: '自选直租', routerName: 'equipList' },
|
{ name: '自选直租', routerName: 'equipList' },
|
||||||
{ name: '寻源比价', routerName: '/home' },
|
{ name: '寻源比价', routerName: 'parity' },
|
||||||
{ name: '二手交易', routerName: '/home' },
|
{ name: '二手交易', routerName: '/home' },
|
||||||
{ name: '保险业务', routerName: '/home' },
|
{ name: '保险业务', routerName: '/home' },
|
||||||
{ name: '检验业务', routerName: '/home' },
|
{ name: '检验业务', routerName: '/home' },
|
||||||
{ name: '企业专区', routerName: '/home' }
|
{ name: '企业专区', routerName: 'enterpriseZone' }
|
||||||
]
|
]
|
||||||
|
|
||||||
const navMenuClick = (name: any) => {
|
const navMenuClick = (name: any) => {
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
<span v-if="!isShowLogout">
|
<span v-if="!isShowLogout">
|
||||||
<a class="a-border-none" @click="$router.push('/login')">登录</a>
|
<a class="a-border-none" @click="$router.push('/login')">登录</a>
|
||||||
<span style="margin: 0 3px">/</span>
|
<span style="margin: 0 3px">/</span>
|
||||||
<a>注册</a>
|
<a @click="$router.push('/register')">注册</a>
|
||||||
</span>
|
</span>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
<a @click="handlerLogout">退出登录</a>
|
<a @click="handlerLogout">退出登录</a>
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,28 @@ const routes: Array<RouteRecordRaw> = [
|
||||||
},
|
},
|
||||||
component: () => import('views/collect/index.vue')
|
component: () => import('views/collect/index.vue')
|
||||||
},
|
},
|
||||||
|
// 寻源比价页面
|
||||||
|
{
|
||||||
|
path: '/parity',
|
||||||
|
name: 'parity',
|
||||||
|
meta: {
|
||||||
|
title: '寻源比较',
|
||||||
|
isLogin: true,
|
||||||
|
AuthFlag: false
|
||||||
|
},
|
||||||
|
component: () => import('views/parity/index.vue')
|
||||||
|
},
|
||||||
|
// 企业专区页面
|
||||||
|
{
|
||||||
|
path: '/enterpriseZone',
|
||||||
|
name: 'enterpriseZone',
|
||||||
|
meta: {
|
||||||
|
title: '企业专区',
|
||||||
|
isLogin: true,
|
||||||
|
AuthFlag: false
|
||||||
|
},
|
||||||
|
component: () => import('views/enterpriseZone/index.vue')
|
||||||
|
},
|
||||||
// 个人中心
|
// 个人中心
|
||||||
{
|
{
|
||||||
path: '/myuser', // 主路由地址
|
path: '/myuser', // 主路由地址
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
<script setup lang="ts"></script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>企业专区---</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style></style>
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
<script setup lang="ts"></script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>寻源比价---</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style></style>
|
||||||
Loading…
Reference in New Issue