会员系统整改

shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js

@@ -87,15 +87,8 @@ layui.config({
                     var rowNum = $(item).attr("trcusid").replace("tr", "");
                     var mealMation = JSON.parse($("#mealId" + rowNum.toString()).attr("mealMaion"));
                     var row = {
-                        mealId: mealMation.mealId,
-                        skuId: mealMation.id,
+                        mealId: mealMation.id,
                         memberCarId: $("#carId" + rowNum.toString()).val(),
-                        mealName: mealMation.name,
-                        mealNum: mealMation.totalCount,
-                        remainMealNum: mealMation.totalCount,
-                        mealExplain: mealMation.memberDes,
-                        mealConsume: mealMation.oilDes,
-                        mealPrice: mealMation.showPrice
                     };
                     tableData.push(row);
                 });
@@ -185,12 +178,10 @@ layui.config({
                         // 获取表格行号
                         var thisRowNum = trId.replace("tr", "");
 
-                        $("#mealId" + thisRowNum.toString()).val(mealMation.name);
-                        $("#mealExplain" + thisRowNum.toString()).html(mealMation.memberDes);
-                        $("#mealExplain" + thisRowNum.toString()).attr("title", mealMation.memberDes);
+                        $("#mealId" + thisRowNum.toString()).val(mealMation.title);
+                        $("#mealExplain" + thisRowNum.toString()).html(mealMation.mealExplain);
                         $("#mealConsume" + thisRowNum.toString()).html(mealMation.oilDes);
-                        $("#mealConsume" + thisRowNum.toString()).attr("title", mealMation.oilDes);
-                        $("#num" + thisRowNum.toString()).html(mealMation.totalCount);
+                        $("#num" + thisRowNum.toString()).html(mealMation.mealNum);
                         $("#price" + thisRowNum.toString()).html(mealMation.showPrice);
                         $("#mealId" + thisRowNum.toString()).attr("mealMaion", JSON.stringify(mealMation));
                         calcAllPrice();

shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html

@@ -89,13 +89,13 @@
         <table id="messageTable" lay-filter="messageTable"></table>
 
         <script type="text/html" id="tableBar">
-            {{# if(d.cancleState == 1 && d.state == 1 && auth('1645623479038') && d.source == 2 && d.currentUserId == d.createId){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1645623479038') && d.currentUserId == d.createId) { }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="complateKeepFit">完成保养</a>
             {{# } }}
-            {{# if(d.cancleState == 1 && d.state == 2 && auth('1644378387049') && !isNull(d.mealOrderChildId) && d.source == 2){ }}
+            {{# if(d.cancleState == 1 && d.state == 2 && auth('1644378387049') && !isNull(d.mealOrderChildId)) { }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="verification">核销</a>
             {{# } }}
-            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644842786855') && d.source == 2 && d.currentUserId == d.createId){ }}
+            {{# if(d.cancleState == 1 && d.state == 1 && auth('1644842786855') && d.currentUserId == d.createId) { }}
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="cancleOrder">取消保养</a>
             {{# } }}
         </script>