diff --git a/pageQuota/quotation/index.vue b/pageQuota/quotation/index.vue index 2cfbd52..34ad1eb 100644 --- a/pageQuota/quotation/index.vue +++ b/pageQuota/quotation/index.vue @@ -1,6 +1,5 @@ @@ -101,18 +158,39 @@ } // 列表 + const showGoods = ref(false) + const showGoods1 = ref(false) + const showGoods2 = ref(false) const goodsList = ref([]) + const goodsList1 = ref([]) + const goodsList2 = ref([]) + const getGoodsList = async (type) => { - let res = await OpurchaseGoodsOfferListApi({ - type - }) - goodsList.value = res.data.lists - - goodsList.value.forEach(item => { - item.nums = item.nums ? item.nums : '' - item.price = (+item.price) ? item.price : '' - }) - + if (type == 1) { + showGoods2.value = false + showGoods1.value = false + let res = await OpurchaseGoodsOfferListApi({ + type + }) + goodsList1.value = res.data.lists + goodsList1.value.forEach(item => { + item.nums = item.nums ? item.nums : '' + item.price = (+item.price) ? item.price : '' + }) + showGoods1.value = true + } else { + showGoods1.value = false + showGoods2.value = false + let res = await OpurchaseGoodsOfferListApi({ + type + }) + goodsList2.value = res.data.lists + goodsList2.value.forEach(item => { + item.nums = item.nums ? item.nums : '' + item.price = (+item.price) ? item.price : '' + }) + showGoods2.value = true + } } const changeTabs = (num) => { diff --git a/pages/index/index.vue b/pages/index/index.vue index 0b6ff6c..b85eed6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,7 @@ @@ -180,7 +180,6 @@ let lastScollTop = 0 const hideHeadView = (e) => { if (e.detail.scrollTop <= 0 || e.detail.scrollTop >= targetHeight.value) return - // num.value = e.detail.scrollTop isScroll.value = e.detail.scrollTop > lastScollTop lastScollTop = e.detail.scrollTop @@ -373,8 +372,6 @@ getgoodClassList(); getGoodList(); - - }) onShow(() => { getCartList(); @@ -396,7 +393,7 @@ } setTimeout(() => { getWXDom() - }, 100) + }, 500) })