From 505628d0cbb764f14634aa21e40e954a5a97be5f Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sat, 26 Feb 2022 00:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E8=AE=A2=E5=8D=95=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/src/main/resources/template/js/meal/mealShenkeChoose.js | 4 ++--
 .../resources/template/js/mealOrder/storeMealOrderAdd.js     | 5 +++--
 shop/src/main/resources/template/js/store/storeList.js       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/shop/src/main/resources/template/js/meal/mealShenkeChoose.js b/shop/src/main/resources/template/js/meal/mealShenkeChoose.js
index 53f158720..4bdab95bd 100644
--- a/shop/src/main/resources/template/js/meal/mealShenkeChoose.js
+++ b/shop/src/main/resources/template/js/meal/mealShenkeChoose.js
@@ -24,7 +24,7 @@ layui.config({
 		table.render({
 		    id: 'messageTable',
 		    elem: '#messageTable',
-		    method: 'post',
+		    method: 'GET',
 		    url: shopBasePath + 'getMealListByShenke',
 		    where: getTableParams(),
 			even: true,
@@ -34,7 +34,7 @@ layui.config({
 		        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 				{ field: 'mealName', title: '套餐', align: 'left', width: 200 },
 				{ field: 'name', title: '规格', align: 'left', width: 200 },
-				{ field: 'mealNum', title: '可使用次数', width: 120 },
+				{ field: 'totalCount', title: '可使用次数', width: 120 },
 				{ field: 'showPrice', title: '展示价', width: 100 },
 		    ]],
 		    done: function(res, curr, count){
diff --git a/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js b/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js
index 5af3e9206..ec2042911 100644
--- a/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js
+++ b/shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js
@@ -78,6 +78,7 @@ layui.config({
                     var mealMation = JSON.parse($("#mealId" + rowNum.toString()).attr("mealMaion"));
                     var row = {
                         mealId: mealMation.mealId,
+                        skuId: mealMation.id,
                         memberCarId: $("#carId" + rowNum.toString()).val(),
                         mealName: mealMation.name,
                         mealNum: mealMation.totalCount,
@@ -172,8 +173,8 @@ layui.config({
                         // 获取表格行号
                         var thisRowNum = trId.replace("tr", "");
 
-                        $("#mealId" + thisRowNum.toString()).val(mealMation.title);
-                        $("#num" + thisRowNum.toString()).html(mealMation.mealNum);
+                        $("#mealId" + thisRowNum.toString()).val(mealMation.name);
+                        $("#num" + thisRowNum.toString()).html(mealMation.totalCount);
                         $("#price" + thisRowNum.toString()).html(mealMation.showPrice);
                         $("#mealId" + thisRowNum.toString()).attr("mealMaion", JSON.stringify(mealMation));
                         calcAllPrice();
diff --git a/shop/src/main/resources/template/js/store/storeList.js b/shop/src/main/resources/template/js/store/storeList.js
index efef58735..8f857928e 100644
--- a/shop/src/main/resources/template/js/store/storeList.js
+++ b/shop/src/main/resources/template/js/store/storeList.js
@@ -29,7 +29,7 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers'},
-            { field: 'name', title: '门店', align: 'left', width: 140, fixed: 'left', templet: function(d){
+            { field: 'name', title: '门店', align: 'left', width: 270, fixed: 'left', templet: function(d){
                 return '<a lay-event="select" class="notice-title-click">' + d.name + '</a>';
             }},
             { field: 'areaName', title: '所属区域', width: 120 },
-- 
GitLab