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

src/components/commonPage/fourday.vue

@@ -137,9 +137,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+               if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/commonPage/threeday.vue

@@ -177,9 +177,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+               if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/commonPage/twoday.vue

@@ -104,9 +104,13 @@ export default {
         }
       }else{
         if(this.day.jiu2.length==1 && this.day.jiu2[0].name!='温馨的家'){
-          if(this.isDirect===1){
-            suffix = "或同級"
-          }
+          if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
         }
       }
       return suffix;

src/components/confirmationOrderDownLoad.vue

@@ -749,7 +749,7 @@
           // }, null)
 
           _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum +
-                '日游', isPc)
+            '日游', isPc)
         } else {
           this.ToWord(this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游', isPc)
         }
@@ -1182,8 +1182,11 @@
               }
               jin.push(obj)
             } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {
+              //酒店
               let obj = {
                 title: y.childItem.hotelName,
+                newTitle: y.childItem.newHotelName,
+                status: y.childItem.status,
                 content: y.childItem.description,
                 img: y.childItem.imaArray[0].url,
                 ticketName: '',
@@ -1226,7 +1229,9 @@
             if (y.type == 3) {
               jiu2.push({
                 name: y.childItem.hotelName,
-                url: y.childItem.url
+                url: y.childItem.url,
+                newTitle: y.childItem.newHotelName,
+                status: y.childItem.status,
               });
               useDinnerTypeBy = y.childItem.useDinnerType
             }
@@ -1345,7 +1350,6 @@
       threeday,
       fourday,
       fiveday,
-
     },
   }