Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/leaderPay2.vue

@@ -1643,8 +1643,8 @@
               if (!Diningmap[ai.UseTimeStr]) {
                 Diningdest.push({
                   UseTimeStr: ai.UseTimeStr,
-                  DiningID: ai.DiningID,
-                  id: ai.DiningID + ai.UseTimeStr,
+                  DiningID: ai.NewDiningID,
+                  id: ai.NewDiningID + ai.UseTimeStr,
                   data: [ai]
                 });
                 Diningmap[ai.UseTimeStr] = ai;
@@ -1652,7 +1652,7 @@
                 let list = []
                 for (var j = 0; j < Diningdest.length; j++) {
                   var dj = Diningdest[j];
-                  if (dj.UseTimeStr == ai.UseTimeStr && dj.DiningID == ai.DiningID) {
+                  if (dj.UseTimeStr == ai.UseTimeStr && dj.NewDiningID == ai.NewDiningID) {
                     dj.data.push(ai);
                     break;
                   } else {
@@ -1662,8 +1662,8 @@
                 for (let i = 0; i < list.length; i++) {
                   Diningdest.push({
                     UseTimeStr: ai.UseTimeStr,
-                    DiningID: ai.DiningID,
-                    id: ai.DiningID + ai.UseTimeStr,
+                    DiningID: ai.NewDiningID,
+                    id: ai.NewDiningID + ai.UseTimeStr,
                     data: [ai]
                   });
                 }