From 7cce4aae6902dcd670c4c0c550a70ebff524b6ba Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Mon, 8 Apr 2024 11:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=8C=81=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js |  3 +++
 src/pages/order/list/list.js  | 23 ++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index af0cdda9..5a9c1d08 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -23,6 +23,7 @@ export default class topNav extends React.Component {
   }
   //点击一级菜单
   showlinkmenu(e, item) {
+    sessionStorage.setItem("previousPath", window.location.hash.replace("#", "").split("?")[0])
     let self = this
     try {
       item.children.forEach((it) => {
@@ -53,6 +54,7 @@ export default class topNav extends React.Component {
     Bus.emit("closeMask", false) //中介传参，关闭弹出框
   }
   btnfn(item2) {
+    sessionStorage.setItem("previousPath", window.location.hash.replace("#", "").split("?")[0])
     this.setState({ pathname2: item2.router })
     this.setState({ showflag: true })
     sessionStorage.setItem("showflag", true)
@@ -60,6 +62,7 @@ export default class topNav extends React.Component {
   }
   //返回
   backFn(items) {
+    sessionStorage.setItem("previousPath", window.location.hash.replace("#", "").split("?")[0])
     this.setState({ pathname2: items.router })
     sessionStorage.setItem("showflag", true)
     sessionStorage.setItem("pathname2", items.router)
diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index b5bf71a0..2688508a 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -432,6 +432,20 @@ export default class orderList extends React.Component {
       product_id: product_id ? product_id.key : "",
       reseller_id: reseller_id ? reseller_id.key : ""
     }
+    sessionStorage.setItem(
+      "state",
+      JSON.stringify({
+        page,
+        limit,
+        status,
+        option,
+        key_word,
+        orderType,
+        pay_status,
+        voucher_status,
+        search
+      })
+    )
     if (orderType) {
       //区分立减金和商品
       data.type = orderType
@@ -479,7 +493,14 @@ export default class orderList extends React.Component {
 
   componentWillMount() {
     let datetime = [tomonth + " " + "00:00:00", day + " " + "23:59:59"]
-    this.getOrderFn(datetime)
+    if (sessionStorage.getItem("previousPath") === "/home/order-addetails") {
+      const state = JSON.parse(sessionStorage.getItem("state"))
+      this.setState({ ...state }, () => {
+        this.getOrderFn(datetime)
+      })
+    } else {
+      this.getOrderFn(datetime)
+    }
     this.getPlan()
     this.setState({ tableHeight: window.innerHeight - 490, combinedValue: datetime })
   }