diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index a1083b41..112fd4c4 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -19,17 +19,22 @@
- - -
- +
+ + +
+ +
+ @@ -58,6 +63,7 @@ export default defineComponent({ const resourceList = reactive({ data: [] }) const resourceTotal = ref(0) const current = ref(1) + const loadingData = ref(false) // 选项卡 const titleName = ref([ { @@ -120,6 +126,8 @@ export default defineComponent({ // 获取融合服务列表 const getIntegrationList = () => { + loadingData.value = true; + console.log('获取融合服务列表------------>'); let postData = { limit: currentPageSize.value, page: currentPage.value, @@ -130,13 +138,17 @@ export default defineComponent({ } getIntegrationServicesList(postData).then( (res) => { + loadingData.value = false; if (res.data.code !== 0) { return message.error(res.data.msg) } + console.log('res.data------------>', res.data); + resourceList.data = res.data.data.list || [] resourceTotal.value = res.data.data.total || 0 }, (err) => { + loadingData.value = false; message.error(err) } ) @@ -180,6 +192,7 @@ export default defineComponent({ } onMounted(() => { + console.log('222----onMounted-------->', 222); listKey2.value++ getAppResources() }) @@ -215,6 +228,7 @@ export default defineComponent({ titleName, changeCards, number, + loadingData, } }, components: { diff --git a/front/src/views/home/packagingDetails.vue b/front/src/views/home/packagingDetails.vue index 6cf964cc..d1a293ca 100644 --- a/front/src/views/home/packagingDetails.vue +++ b/front/src/views/home/packagingDetails.vue @@ -20,7 +20,9 @@
-
描述:{{ detailInfoObj.description || '--' }}
+ +
描述:{{ detailInfoObj.description || '--' }}
+
@@ -29,12 +31,11 @@ 申请使用 - + - 收藏 + {{ detailInfoObj.isCollect == 'true' ? '已收藏' : '收藏' }}
@@ -299,12 +300,10 @@ getIntegrationServicesDeatil(id) .name { font-size: 0.16rem; - margin-bottom: 0.2rem; - margin-top: 0.2rem; } .area { - margin-bottom: 0.2rem; + margin: 0.1rem 0; } .desc { @@ -319,7 +318,7 @@ getIntegrationServicesDeatil(id) .btn-box { position: absolute; - bottom: 0; + bottom: -15px; left: 0.2rem; .btn-text { @@ -341,5 +340,4 @@ getIntegrationServicesDeatil(id) .list-box { padding: 0.4rem; } -