From 56b474f407ce6160325ed589e425fabfdb3f423d Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 24 Mar 2025 11:30:22 +0800 Subject: [PATCH] this is lastest update --- .../photoProductsOrderDetail.vue | 16 ++- .../clotherRentOrderList.vue | 9 +- pages/my-order/myOrderList/myOrderList.vue | 15 ++- pages/store-home/main/testMain.vue | 119 +++++++++--------- 4 files changed, 88 insertions(+), 71 deletions(-) diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue index 9a93338..9c48e47 100644 --- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue +++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue @@ -130,9 +130,10 @@ const cancelBookingOrder = ref(null) const deleteBookingOrder = ref(null) const advanceOrderList = ref([]) + const tempAdvanceOrderList = ref([]) const isShowMask = ref(false) const bkgUrl = ref(bookUrl + '/photoProductsOrderDetail/bkg.png') - onLoad((options) => { + onLoad(() => { getFonts() }) @@ -204,12 +205,14 @@ } } } - await getAdvanceOrder() - if (index == 1) { - advanceOrderList.value = advanceOrderList.value.filter(item => item.orderStatus === '待发货') + if (index === 0) { + advanceOrderList.value = tempAdvanceOrderList.value } - if (index == 2) { - advanceOrderList.value = advanceOrderList.value.filter(item => item.orderStatus === '交易成功') + if (index === 1) { + advanceOrderList.value = tempAdvanceOrderList.value.filter(item => item.orderStatus === '待发货') + } + if (index === 2) { + advanceOrderList.value = tempAdvanceOrderList.value.filter(item => item.orderStatus === '交易成功') } } @@ -311,6 +314,7 @@ } }) advanceOrderList.value = res.data.data + tempAdvanceOrderList.value = res.data.data console.log('订单列表打印==================>') advanceOrderList.value.forEach(order => { if (order.orderStatus === '待支付') { diff --git a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue index 7244a96..78ada61 100644 --- a/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue +++ b/pages/clothesRent/clotherRentOrderList/clotherRentOrderList.vue @@ -129,6 +129,7 @@ const cookie = wx.getStorageSync("cookie") //请求头 const bkgUrl = ref(clothesRentUrl + '/clothesRentOrderList/bkg.png') const orderList = ref([]) + const tempOrderList = ref([]) let wxPayTimer = null; let loading = false; @@ -176,6 +177,7 @@ } }) orderList.value = res.data.data + tempOrderList.value = res.data.data dealTimeout() orderList.value.forEach(order => { startCountdown(order) @@ -194,10 +196,11 @@ color.value[i] = '#323232' } } - await getRentOrderList() if (point.value !== 0) { - orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) - } + orderList.value = tempOrderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) + } else { + orderList.value = tempOrderList.value + } } diff --git a/pages/my-order/myOrderList/myOrderList.vue b/pages/my-order/myOrderList/myOrderList.vue index 823e5ba..5fbc9ef 100644 --- a/pages/my-order/myOrderList/myOrderList.vue +++ b/pages/my-order/myOrderList/myOrderList.vue @@ -140,6 +140,7 @@ let orderStatusList = ['全部', '待支付', '待发货', '待收货', '已退款'] const cookie = wx.getStorageSync('cookie') const orderList = ref([]) + const tempOrderList = ref([]) const orderNumber = ref('') const isHiddenInput = ref(true) const status = ref(0) @@ -210,8 +211,10 @@ } await getMyOrder() if (point.value !== 0) { - orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) - } + orderList.value = tempOrderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) + } else { + orderList.value = tempOrderList.value + } } @@ -228,10 +231,11 @@ color.value[i] = '#323232' } } - await getMyOrder() if (point.value !== 0) { - orderList.value = orderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) - } + orderList.value = tempOrderList.value.filter(item => item.orderStatus === orderStatusList[point.value]) + } else { + orderList.value = tempOrderList.value + } } const getMyOrder = async () => { @@ -249,6 +253,7 @@ }) console.log(res.data.data) orderList.value = res.data.data + tempOrderList.value = res.data.data dealTimeout() orderList.value.forEach(order => { if (order.orderStatus === '待支付') { diff --git a/pages/store-home/main/testMain.vue b/pages/store-home/main/testMain.vue index ad11dd2..c7c64a2 100644 --- a/pages/store-home/main/testMain.vue +++ b/pages/store-home/main/testMain.vue @@ -12,23 +12,23 @@ - + - - {{ item.name }} + + {{ item }} @@ -36,7 +36,7 @@ - + { +onLoad((options)=>{ getFonts() - await Getsort() - await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别 - await getCarouseList() + // await Getsort() + // await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别 + getAllGoods() + getCarouseList() }) -onPullDownRefresh( async ()=>{ //下拉刷新 - await Getsort() - await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别 - await getCarouseList() +onPullDownRefresh( ()=>{ //下拉刷新 + // await Getsort() + // await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别 + getAllGoods() + getCarouseList() setTimeout(()=>{ uni.stopPullDownRefresh() //停止下拉刷新 },1000) @@ -148,30 +156,46 @@ const Getsort = async ()=>{ } // console.log('获取商品分类==>',res.data.data); } -//更改类别 -const changeTypes = async (item , index) =>{ - currentColor.value = index - product_type.value.type = item.name - const res = await uni.request({ - url: baseUrl + '/category/list/type', - method: 'POST', - data: { - id : item.id - }, - header:{ - cookie, - } - }) - if(res.data.code === 1) { - productList.value = res.data.data[item.id] - } else { - uni.showToast({ //商品请求错误 - title: '更改类别错误', - icon: 'none', - duration: 2000 + + + const goToSearch = () => { + uni.navigateTo({ + url: '../../workshop/searchGood/searchGood?type=1' }) } + + + + + + const getAllGoods = async () => { + const res = await uni.request({ + url: baseUrl + '/global/getAllGoods', + method: 'GET' + }) + allGoodList.value = Object.entries(res.data.data) + typeList.value = allGoodList.value.map(item => item[0]) + typeImgUrl.value = allGoodList.value.map(item => item[1].image) + goodList.value = allGoodList.value[0][1].goodLabelVOList + } + + + //更改类别 + const changeTypes = async (item , index) =>{ + currentColor.value = index + product_type.value.type = item.name + if (pointIdx === index) return + pointIdx = index + goodList.value = allGoodList.value[pointIdx][1].goodLabelVOList } + + + + + + + + //点击后颜色变为红色 const FontsStyle = (index) => ({ color: currentColor.value === index ? '#C35C5D' : '#727272' @@ -196,25 +220,6 @@ const goToProduct = (item) => { - const goToSearch = () => { - uni.navigateTo({ - url: '../../workshop/searchGood/searchGood?type=1' - }) - } - - - - - - - - - - - - - -