11

src/components/trip/smaple.vue

@@ -85,8 +85,15 @@
       formatDinner() {
         let d = []
         this.trip.dinnerList.forEach(x => {
-          if (x.dinnerName.indexOf('自理') == -1 && x.dinnerName.indexOf('请选择') == -1 && x.dinnerId > 0) {
-            d.push(x)
+          if (x.useDinnerType == "1") {
+            if (x.dinnerId > 0) {
+              console.log("aaaa", x);
+              d.push(x)
+            }
+          } else {
+            if (x.dinnerName.indexOf('自理') == -1 && x.dinnerName.indexOf('请选择') == -1) {
+              d.push(x)
+            }
           }
         })
         if (d && d.length > 0) {
@@ -123,18 +130,15 @@
             h.push(x)
           }
         })
-        console.log("h", h);
         if (h && h.length > 0) {
           let g = this.groupBy(h, (x) => {
             return x.star
           })
           g.forEach(x => {
             let tempStr = this.stars[parseInt(x.key) - 1];
-            console.log("", tempStr)
             if (tempStr && tempStr != '') {
               this.hotel += `${x.data.length}晚${ tempStr}；`
             }
-
           })
         }
       }