diff --git a/components/renew-modal/renew-modal.vue b/components/renew-modal/renew-modal.vue index ce5302a..9a95793 100644 --- a/components/renew-modal/renew-modal.vue +++ b/components/renew-modal/renew-modal.vue @@ -144,7 +144,6 @@ export default { rented: '已出租', maintenance: '维护中', scrapped: '报废', - normal: '正常', } return statusMap[status] || '未知状态' }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 383b401..c300506 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -55,6 +55,7 @@ import { getNewAnnouncement } from '../../api/article/article.js' import { getBannerList } from '../../api/banner/banner.js' import { getDeviceList } from '../../api/device/device.js' import { renewDevice, getPeriodPackages } from '../../api/lease/lease.js' +import { sleep } from '../../uni_modules/uv-ui-tools/libs/function' export default { components: { @@ -299,9 +300,10 @@ export default { } // 使用设备的类型ID获取套餐 - const typeId = device.typeId || device.originalData?.typeId || device.originalData?.deviceTypeId || '1' + const typeId = + device.typeId || device.originalData?.typeId || device.originalData?.deviceTypeId || '1' console.log('设备类型ID:', typeId) - + const response = await getPeriodPackages(typeId) if (response.code === 200) { @@ -370,6 +372,8 @@ export default { icon: 'success', }) + await sleep(1000) + // 关闭弹窗 this.closeRenewModal()