Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

pages/order/order.vue

@@ -21,11 +21,31 @@
 	import orderListItem from "./components/order-list-item";
 	import useOrderList from "@/composables/order/useOrderList";
 	import filter from '@/components/filter/filter.vue';
+	import {onUnload,onLoad} from '@dcloudio/uni-app'
+	import { reactive } from "vue";
 	const {
 		data,
 		tabbarRef
 	} = useOrderList();
 	
+	onLoad((option : any) => {
+		if(option.indexPage){
+			state.indexPage = option.indexPage
+		}
+	})
+
+	onUnload(()=>{
+		if(state.indexPage == 1){
+			uni.reLaunch({
+				url: `/pages/index/index`
+			});
+		}
+	})
+	
+	const state = reactive({
+		indexPage:0
+	});
+	
 	
 </script>
 

subpackage/orders/order_payment.vue

@@ -565,7 +565,7 @@
 						confirmText: "我知道了",
 						success() {
 							uni.redirectTo({
-								url: `/pages/order/order`
+								url: `/pages/order/order?indexPage=1`
 							});
 						}
 					});

subpackage/orders/release-products.vue

@@ -231,7 +231,7 @@
 						confirmText: "我知道了",
 						success() {
 							uni.redirectTo({
-								url: `/pages/order/order`
+								url: `/pages/order/order?indexPage=1`
 							});
 						}
 					});