From adc9ad730eb824bd3274fa5e06934f564d5430fd Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 15 Mar 2022 11:15:40 +0800
Subject: [PATCH] =?UTF-8?q?BUG0080=20=E6=94=AF=E5=87=BA=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=92=8C=E6=94=B6=E5=85=A5=E5=BE=80=E6=9D=A5=EF=BC=8C=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/js/keepFitOrder/dayKeepFitOrderList.js    |  8 ++++++--
 .../js/storeIntercourse/inComeStoreIntercourse.js      | 10 ++++++++--
 .../js/storeIntercourse/outComeStoreIntercourse.js     | 10 ++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/shop/src/main/resources/template/js/keepFitOrder/dayKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/dayKeepFitOrderList.js
index ad87b43c8..ca6f966e4 100644
--- a/shop/src/main/resources/template/js/keepFitOrder/dayKeepFitOrderList.js
+++ b/shop/src/main/resources/template/js/keepFitOrder/dayKeepFitOrderList.js
@@ -11,7 +11,9 @@ layui.config({
         form = layui.form,
         table = layui.table;
 
-    var intercourseTime = GetUrlParam('intercourseTime');
+    var intercourseTime = parent.intercourseTime;
+    var keepfiStoreId = parent.keepfiStoreId;
+    var mealByStoreId = parent.mealByStoreId;
 
     table.render({
         id: 'messageTable',
@@ -119,7 +121,9 @@ layui.config({
             type: $("#type").val(),
             serviceTechnicianName: $("#serviceTechnicianName").val(),
             createName: $("#createName").val(),
-            intercourseTime: intercourseTime
+            intercourseTime: intercourseTime,
+            storeId: keepfiStoreId,
+            mealByStoreId: mealByStoreId
         };
     }
 
diff --git a/shop/src/main/resources/template/js/storeIntercourse/inComeStoreIntercourse.js b/shop/src/main/resources/template/js/storeIntercourse/inComeStoreIntercourse.js
index 5f35dd0b2..f4ba95996 100644
--- a/shop/src/main/resources/template/js/storeIntercourse/inComeStoreIntercourse.js
+++ b/shop/src/main/resources/template/js/storeIntercourse/inComeStoreIntercourse.js
@@ -1,4 +1,8 @@
 
+var intercourseTime = "";
+var keepfiStoreId = "";
+var mealByStoreId = "";
+
 layui.config({
     base: basePath,
     version: skyeyeVersion
@@ -86,9 +90,11 @@ layui.config({
     }
 
     function queryDetail(data){
-        rowId = data.id;
+        intercourseTime = data.intercourseTime;
+        keepfiStoreId = data.keepfiStoreId;
+        mealByStoreId = data.mealByStoreId;
         _openNewWindows({
-            url: "../../tpl/keepFitOrder/dayKeepFitOrderList.html?intercourseTime=" + data.intercourseTime,
+            url: "../../tpl/keepFitOrder/dayKeepFitOrderList.html",
             title: '明细',
             pageId: "dayKeepFitOrderList",
             area: ['90vw', '90vh'],
diff --git a/shop/src/main/resources/template/js/storeIntercourse/outComeStoreIntercourse.js b/shop/src/main/resources/template/js/storeIntercourse/outComeStoreIntercourse.js
index 8e6325835..a38e18b51 100644
--- a/shop/src/main/resources/template/js/storeIntercourse/outComeStoreIntercourse.js
+++ b/shop/src/main/resources/template/js/storeIntercourse/outComeStoreIntercourse.js
@@ -1,4 +1,8 @@
 
+var intercourseTime = "";
+var keepfiStoreId = "";
+var mealByStoreId = "";
+
 layui.config({
     base: basePath,
     version: skyeyeVersion
@@ -84,9 +88,11 @@ layui.config({
     }
 
     function queryDetail(data){
-        rowId = data.id;
+        intercourseTime = data.intercourseTime;
+        keepfiStoreId = data.keepfiStoreId;
+        mealByStoreId = data.mealByStoreId;
         _openNewWindows({
-            url: "../../tpl/keepFitOrder/dayKeepFitOrderList.html?intercourseTime=" + data.intercourseTime,
+            url: "../../tpl/keepFitOrder/dayKeepFitOrderList.html",
             title: '明细',
             pageId: "dayKeepFitOrderList",
             area: ['90vw', '90vh'],
-- 
GitLab