From f07d52c5866c46928488c74bcf7e2d6369862c69 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 2 Mar 2022 22:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E8=AE=A2=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=A5=97=E9=A4=90=E8=B4=AD=E4=B9=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/template/js/keepFitOrder/allKeepFitOrderList.js    | 1 +
 .../resources/template/js/keepFitOrder/storeKeepFitOrderList.js  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js
index 12698fd23..d4e9207fa 100644
--- a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js
+++ b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js
@@ -52,6 +52,7 @@ layui.config({
             /*{ field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left", rowspan: '2'},*/
             { title: '下单地址', align: 'center', colspan: '2'},
+            { field: 'mealBuyStoreName', title: '套餐购买门店', align: 'left', rowspan: '2', width: 120 },
             { field: 'state', title: '订单状态', width: 100, align: "center", rowspan: '2', templet: function(d){
                 return shopUtil.getKeepFitOrderStateName(d);
             }},
diff --git a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js
index 30a911a21..66da4fab2 100644
--- a/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js
+++ b/shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js
@@ -48,6 +48,7 @@ layui.config({
             /*{ field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left"},*/
             { field: 'storeName', title: '保养门店', align: 'left', width: 120 },
+            { field: 'mealBuyStoreName', title: '套餐购买门店', align: 'left', width: 120 },
             { field: 'state', title: '订单状态', width: 100, align: "center", templet: function(d){
                 return shopUtil.getKeepFitOrderStateName(d);
             }},
-- 
GitLab