diff --git a/.gitignore b/.gitignore index dbf2be4..b454a48 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ coverage *.sw? .prettierrc.js auto-imports.d.ts +components.d.ts diff --git a/components.d.ts b/components.d.ts index 4f54c9f..24999a5 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,11 +12,15 @@ declare module 'vue' { ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElIcon: typeof import('element-plus/es')['ElIcon'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] + ElPagination: typeof import('element-plus/es')['ElPagination'] ElRow: typeof import('element-plus/es')['ElRow'] + ElTag: typeof import('element-plus/es')['ElTag'] EquipCard: typeof import('./src/components/equipCard.vue')['default'] EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default'] FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default'] diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue index 5d73515..e4f5e0c 100644 --- a/src/components/Navmenu/index.vue +++ b/src/components/Navmenu/index.vue @@ -4,11 +4,11 @@ const navMenuList = [ { name: '首页', routerName: 'home' }, { name: '自选直租', routerName: 'equipList' }, - { name: '寻源比价', routerName: '/home' }, + { name: '寻源比价', routerName: 'parity' }, { name: '二手交易', routerName: '/home' }, { name: '保险业务', routerName: '/home' }, { name: '检验业务', routerName: '/home' }, - { name: '企业专区', routerName: '/home' } + { name: '企业专区', routerName: 'enterpriseZone' } ] const navMenuClick = (name: any) => { diff --git a/src/layout/header.vue b/src/layout/header.vue index 655959a..5b8a652 100644 --- a/src/layout/header.vue +++ b/src/layout/header.vue @@ -87,7 +87,7 @@ 登录 / - 注册 + 注册 退出登录 diff --git a/src/router/index.ts b/src/router/index.ts index bf48931..134249e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -122,6 +122,28 @@ const routes: Array = [ }, 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', // 主路由地址 diff --git a/src/views/enterpriseZone/index.vue b/src/views/enterpriseZone/index.vue new file mode 100644 index 0000000..44d5405 --- /dev/null +++ b/src/views/enterpriseZone/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue index ebf3bf2..28db392 100644 --- a/src/views/equip/detail.vue +++ b/src/views/equip/detail.vue @@ -9,20 +9,26 @@
-
{{ pageData.modelName }}{{ pageData.deviceName }}
+
+ {{ pageData.modelName }}{{ pageData.deviceName }} +
{{ pageData.maStatusStr }}
-
已审核
+
已审核
浏览{{ pageData.searchNum }}
{{ v.label }}:
-
{{ - v.key.split(',').map(key => { - return pageData[key] - }).join('') +
+ {{ + v.key + .split(',') + .map((key) => { + return pageData[key] + }) + .join('') }}
@@ -35,29 +41,27 @@ {{ pageData.monthLeasePrice }} /月
-
+
- + - + {{ isCollect ? '装备已收藏' : '收藏装备' }}
联系商家
-
我要租
+
我要租
- +
- +
{{ pageData.companyName }}
@@ -78,9 +82,10 @@
{{ v.label }}:
-
{{ - pageData[v.key] - }} +
+ {{ pageData[v.key] }}
@@ -89,7 +94,7 @@
装备外观
- +
@@ -99,48 +104,48 @@
换一批
- +
+ v-model="dialoglease" + title="填写租赁信息" + lock-scroll + class="dialoglease" + width="60%"> - + ref="ruleFormRef" + :model="ruleForm" + :rules="rules" + label-width="120px" + class="demo-ruleForm" + status-icon> - + - + @@ -148,23 +153,28 @@ + v-model="ruleForm.entryTime" + value-format="YYYY-MM-DD" + type="date" + placeholder="请选择" /> - + @@ -178,24 +188,16 @@ - - 否 - + - - 不需要 - - - 增值税普票 - - - 增值税专票 - + 不需要 + 增值税普票 + 增值税专票 @@ -203,808 +205,789 @@ - + + :price="`${ + ruleForm.durationUnit == '1' ? pageData.monthLeasePrice : pageData.dayLeasePrice + }`" + :name="`${pageData.modelName}${pageData.deviceName}`" + :company="pageData.companyName" + :url="pageData.picUrl" + :brand="pageData.brand" + :code="pageData.code" + :group="pageData.groupName" + :position="`${pageData.provinceStr}${pageData.cityStr || ''}${ + pageData.areaStr || '' + }`" + :specifications="pageData.specification" + :type="pageData.typeName" + :unit="ruleForm.durationUnit == '1' ? '月' : '天'">
- 合计总价:{{ priceChange }}元 + 合计总价: + {{ priceChange }}元
- -
+ +
{{ pageData.authPhone }}
diff --git a/src/views/parity/index.vue b/src/views/parity/index.vue new file mode 100644 index 0000000..3189f1d --- /dev/null +++ b/src/views/parity/index.vue @@ -0,0 +1,7 @@ + + + + +