this is lastest update

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 === 0) {
-		if (index == 1) {
+			advanceOrderList.value = tempAdvanceOrderList.value
-			advanceOrderList.value = advanceOrderList.value.filter(item => item.orderStatus === '待发货')
 		}
-		if (index == 2) {
+		if (index === 1) {
-			advanceOrderList.value = advanceOrderList.value.filter(item => item.orderStatus === '交易成功')
+			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 === '待支付') {

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
+		}
 	}
 	
 	

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 === '待支付') {

pages/store-home/main/testMain.vue

@@ -12,23 +12,23 @@
 	    </view>
 	  </view>
 	  
-		<carousel class="pos_2" :img-list="imgList" url-key="url" @selected="selectedBanner"/>
+		<carousel class="pos_2" :img-list="imgList" url-key="url"/>
 	  
 		<!-- 类别列表 -->
 	  <view class="flex-col justify-start items-center section_4 pos_3">
 	    <!-- <view class="flex-col"> -->
 			<view class="my-aside">
 	      <view class="flex-col items-center self-stretch group" 
-							v-for="(item, index) in sort" 
+							v-for="(item, index) in typeList" 
 							:key="index"
 							@click="changeTypes(item , index)"
 							>
-	        <image
+						<image
-						:style="changeImgStyle(index)"
+						  :style="changeImgStyle(index)"
-	          class="image_3" mode="aspectFill"
+						  class="image_3" mode="aspectFill"
-	          :src="publicPath + item.imgurl"
+						  :src="publicPath + typeImgUrl[index]"
-	        />
+						/>
-	        <text class="font_2 text_4" :style="FontsStyle(index)">{{ item.name }}</text>
+	        <text class="font_2 text_4" :style="FontsStyle(index)">{{ item }}</text>
 	      </view>
 			</view>
 	    <!-- </view> -->
@@ -36,7 +36,7 @@
 		<!-- 商品列表 -->
 	  <view class="flex-col pos_5">
 			<view class="good-list"> 
-	    <view class="flex-row list-item mt-9" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)">
+	    <view class="flex-row list-item mt-9" v-for="(item, index) in goodList" :key="index" @click="goToProduct(item)">
 	      <image
 	        class="self-center image_4" mode="aspectFill"
 	        :src="publicPath + item.goodImg.split(';')[0]"
@@ -68,6 +68,7 @@ import carousel from '@/components/vear-carousel/vear-carousel'
 import { workshopUrl } from '../../../common/globalImagesUrl';
 import { storeHomeUrl } from '../../../common/globalImagesUrl';
 import { publicPath } from '../../../common/globalImagesUrl';
+import { all } from 'mathjs';
 const bkgUrl = ref(storeHomeUrl + '/main/bkg.png')
 const currentColor = ref(0);
 const sort = ref([{}]) //商品类别对象数组
@@ -76,21 +77,28 @@ const productList = ref([{}]) //类别下对应的商品
 const cookie = wx.getStorageSync("cookie") 
 const imgList = ref([])   //轮播图展示数组
 const carouseList = ref([])   //轮播图数组
+const allGoodList = ref(null)
+const typeList = ref(null)
+const goodList = ref(null)
+const typeImgUrl = ref(null)
+let pointIdx = 0;
 
 const product_type = ref({
 	type: "材料包"
 })
 
-onLoad( async (options)=>{
+onLoad((options)=>{
 	getFonts()
-	await Getsort()
+	// await Getsort()
-	await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
+	// await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
-	await getCarouseList()
+	getAllGoods()
+	getCarouseList()
 })
-onPullDownRefresh( async ()=>{  //下拉刷新
+onPullDownRefresh( ()=>{  //下拉刷新
-	await Getsort()
+	// await Getsort()
-	await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
+	// await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
-	await getCarouseList()
+	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
+	const goToSearch = () => {
-	product_type.value.type = item.name
+		uni.navigateTo({
-	const res = await uni.request({
+			url: '../../workshop/searchGood/searchGood?type=1'
-		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 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'
-		})
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-