bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单列表字段更新

This commit is contained in:
songyang 2023-12-08 15:05:47 +08:00
parent 6b88074abd
commit 88b4dde528
7 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components.d.ts vendored
View File

@ -10,10 +10,14 @@ declare module 'vue' {
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']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
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']
@ -22,11 +26,18 @@ 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']
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']
ElTag: typeof import('element-plus/es')['ElTag']
ElTimeline: typeof import('element-plus/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']

4
env/.env.dev vendored
View File

@ -5,9 +5,9 @@ VITE_BUILD_MODE = 'dev'
VITE_API_URL = '/proxyApi'
# 开发环境接口地址
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
VITE_proxyTarget = 'http://10.40.92.186:8080' # 赵福海 (登录)
# VITE_proxyTarget = 'http://10.40.92.186:8080' # 赵福海 (登录)
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)
# VITE_proxyTarget = 'http://10.40.92.253:8080' # 牛 (个人中心 基础信息企业申请认证)

9
src/http/api/usercenter/baseinfo.ts
View File

@ -7,3 +7,12 @@ export const applyAttestationApi = (data: any) => {
return post('/zlpt-company/company_info/addCompanyInfo', data)
}
// 获取订单统计接口
export const getOrderCountTotalApi = () => {
return get('/zlpt-order/info/count', {})
}
// 获取装备统计接口
export const getEquipCountTotalApi = () => {
return get('/zlpt-equip/dev/sumType', {})
}

30
src/views/home/index.vue
View File

@ -4,7 +4,7 @@
import { getGoodsClassListApi } from 'http/api/home'
import { useStore } from 'store/main'
import { getHotList } from 'http/api/equip'
const userStore = useStore()
const router = useRouter()
// 获取商品分类
const getGoodsClassList = async () => {
@ -202,13 +202,22 @@
}
])
const hotDeviceList: any = ref([])
/* 获取热搜装备 */
const getHotDeviceList = async () => {
const res = await getHotList({ pageSize: 3 })
const res: any = await getHotList({ pageSize: 3 })
hotDeviceList.value = res.rows
console.log(res, '热搜装备111')
}
getHotDeviceList()
/* 热搜卡片点击跳转至详情页 */
const onClick = (val: any) => {
router.push(`/equipDetail/${val.id}`)
}
</script>
<template>
@ -261,14 +270,15 @@
</div>
<ul class="equip-pic">
<li @click="$router.push('equipDetail/5')" style="cursor: pointer">
<EquipCard />
</li>
<li @click="$router.push('equipDetail/5')" style="cursor: pointer">
<EquipCard />
</li>
<li @click="$router.push('equipDetail/5')" style="cursor: pointer">
<EquipCard />
<li v-for="item in hotDeviceList" :key="item.maId" style="cursor: pointer">
<EquipCard
@onClick="onClick"
:company="item.companyName || '安徽博诺斯有限公司'"
:price="item.monthLeasePrice"
:tags="['待租', '合肥市']"
:name="item.modelName + item.deviceName"
:url="item.picUrl"
:id="item.maId" />
</li>
</ul>

19
src/views/user/baseInfo/index.vue
View File

@ -1,7 +1,11 @@
<script setup lang="ts">
import { ElMessage, ElMessageBox } from 'element-plus'
import EnterpriseCertification from '../../EnterpriseCertification.vue'
import { applyAttestationApi } from 'http/api/usercenter/baseinfo'
import {
applyAttestationApi,
getOrderCountTotalApi,
getEquipCountTotalApi
} from 'http/api/usercenter/baseinfo'
const applyParams: any = reactive({})
@ -9,6 +13,19 @@
const applyAttestation = async () => {
const res = await applyAttestationApi(applyParams.value)
}
// 获取订单统计接口
const getOrderCountTotal = async () => {
const res = await getOrderCountTotalApi()
console.log('获取订单统计', res)
}
// 获取装备统计接口
const getEquipCountTotal = async () => {
const res = await getEquipCountTotalApi()
console.log('获取装备统计', res)
}
getOrderCountTotal()
getEquipCountTotal()
// 旧手机号码
const oldPhoneNumber = ref('15336652321')
// 修改新手机号码的数据源

2
src/views/user/orderManagement/index.vue
View File

@ -94,7 +94,7 @@
}">
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="供应商" />
<el-table-column align="center" prop="createTime" label="订单创建日期" />
<el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态" />

14
src/views/user/orderManagementCz/index.vue
View File

@ -83,13 +83,13 @@
color: '#fff'
}"
fit>
<el-table-column align="center" prop="name" label="订单编号" />
<el-table-column align="center" prop="address" label="客户单位" />
<el-table-column align="center" prop="date" label="订单创建日期" />
<el-table-column align="center" prop="name" label="联系方式" />
<el-table-column align="center" prop="name" label="装备类型" />
<el-table-column align="center" prop="name" label="装备名称" />
<el-table-column align="center" prop="name" label="订单状态" />
<el-table-column align="center" prop="code" label="订单编号" />
<el-table-column align="center" prop="supplierCompany" label="客户单位" />
<el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="orderPhone" label="联系方式" />
<el-table-column align="center" prop="typeName" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" prop="orderStatus" label="订单状态" />
<el-table-column align="center" prop="name" label="操作" width="260px">
<template #default="{ row }">
<el-button size="small" type="primary" @click="confirmBtn(row)">确认</el-button>