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

src/components/SalesModule/productQuery.vue

@@ -644,7 +644,7 @@
                 <p class="d12TC">{{item.TCNUM}}（{{item.TCID}}）</p>
                 <p>{{item.LtName}}</p>
                 <el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start" popper-class="max-w250">
-                  <p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p>
+                  <p class="d12p" @click="getJourney(item.ConfigID,item.TCID,item.LineName)" :title="item.Title">{{item.Title}}</p>
                 </el-tooltip>
               </div>
             </div>
@@ -2136,11 +2136,11 @@
         }, err => {})
       },
 
-      getJourney(id, title) {
+      getJourney(id,TCID, title) {
         var that = this;
         this.tripTitle = title;
         this.$nextTick(() => {
-          that.$refs.comTeam.GetTrip(id);
+          that.$refs.comTeam.GetTrip(id,TCID);
         });
         that.outerVisible = true;
       },

src/components/commonPage/TravelTripPreview/fiveday.vue

@@ -88,9 +88,9 @@
                         </div>
                         <div class="val" v-if='day.jiu2.length>0'>
                             <span v-for="(t,k) in day.jiu2" :key="k">
-                                {{t}} ／ 
+                               {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
                             </span>
-                             或同級
+                              {{getHotelSuffix()}}
                         </div>
                         <div class="val" v-else>本日无酒店安排</div>
                     </el-col>
@@ -102,7 +102,29 @@
 <script>
 export default {
     props:{
-        day:{}
+        day:{},
+        isDirect: {},
+    },
+     methods: {
+      getHotelSuffix() {
+        let suffix = "";
+        if (this.day.jiu2.length > 1) {
+          if (this.isDirect === 1) {
+            suffix = "或同級"
+          }
+        } else {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
+            if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
+          }
+        }
+        return suffix;
+      },
     }
 }
 </script>

src/components/commonPage/TravelTripPreview/fourday.vue

 <template>
-    <div class="block-item">
-        <div class="one-block">
-            <div class="item big">
-                <div class="left">
-                    <img crossOrigin="Anonymous" :src='day.details[0].img' />
-                </div>
-                <div class="right">
-                    <div class="details">
-                        <h3 v-html="day.details[0].title"></h3>
-                        <div class="playInfo">
-                            <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
-                                <i class="iconfont icon-menpiao"></i>
-                                {{day.details[0].ticketName}}
-                            </span>
-                            <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
-                                <i class="iconfont icon-shijian1"></i>
-                                约
-                                <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
-                                <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span>
-                            </span>
-                        </div>
-                        <span v-html="day.details[0].content"></span>
-                    </div>
-                </div>
+  <div class="block-item">
+    <div class="one-block">
+      <div class="item big">
+        <div class="left">
+          <img crossOrigin="Anonymous" :src='day.details[0].img' />
+        </div>
+        <div class="right">
+          <div class="details">
+            <h3 v-html="day.details[0].title"></h3>
+            <div class="playInfo">
+              <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
+                <i class="iconfont icon-menpiao"></i>
+                {{day.details[0].ticketName}}
+              </span>
+              <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
+                <i class="iconfont icon-shijian1"></i>
+                约
+                <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
+                <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span>
+              </span>
             </div>
-            <el-row :gutter="4">
-                <el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i">
-                    <div class="item">
-                        <div class="three-item">
-                            <div class="image">
-                                <img crossOrigin="Anonymous" :src='item.img' />
-                            </div>
-                            <h3 v-html="item.title"></h3>
-                            <div class="playInfo">
-                                <span class="playInfo-item" v-if='item.ticketName!=""'>
-                                    <i class="iconfont icon-menpiao"></i>
-                                    {{item.ticketName}}
-                                </span>
-                                <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
-                                    <i class="iconfont icon-shijian1"></i>
-                                    约
-                                    <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
-                                    <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
-                                </span>
-                            </div>
-                            <span v-html="item.content"></span>
-                        </div>
-                    </div>
-                </el-col>
-            </el-row>
-            <div class="item flex" v-if='day.tips.length>0'>
-                <h4>温馨提示</h4>
-                <div class="remark">
-                    <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
-                </div>
+            <span v-html="day.details[0].content"></span>
+          </div>
+        </div>
+      </div>
+      <el-row :gutter="4">
+        <el-col :span="8" v-for="(item,i) in day.details" v-if="i>0" :key="i">
+          <div class="item">
+            <div class="three-item">
+              <div class="image">
+                <img crossOrigin="Anonymous" :src='item.img' />
+              </div>
+              <h3 v-html="item.title"></h3>
+              <div class="playInfo">
+                <span class="playInfo-item" v-if='item.ticketName!=""'>
+                  <i class="iconfont icon-menpiao"></i>
+                  {{item.ticketName}}
+                </span>
+                <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
+                  <i class="iconfont icon-shijian1"></i>
+                  约
+                  <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
+                  <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟</span>
+                </span>
+              </div>
+              <span v-html="item.content"></span>
             </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
-                        </div>
-                        <div class="val">{{day.can.breakfirst}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
-                        </div>
-                        <div class="val">{{day.can.lanuch}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
-                        </div>
-                        <div class="val">{{day.can.dinner}}</div>
-                    </el-col>
-                </el-row>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="item flex" v-if='day.tips.length>0'>
+        <h4>温馨提示</h4>
+        <div class="remark">
+          <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
+        </div>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
             </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="24" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
-                        </div>
-                        <div class="val" v-if='day.jiu2.length>0'>
-                            <span v-for="(t,k) in day.jiu2" :key="k">
-                                {{t}} ／ 
-                            </span>
-                             或同級
-                        </div>
-                        <div class="val" v-else>本日无酒店安排</div>
-                    </el-col>
-                </el-row>
+            <div class="val">{{day.can.breakfirst}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
             </div>
-        </div>
+            <div class="val">{{day.can.lanuch}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
+            </div>
+            <div class="val">{{day.can.dinner}}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="24" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
+            </div>
+            <div class="val" v-if='day.jiu2.length>0'>
+              <span v-for="(t,k) in day.jiu2" :key="k">
+                {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
+              </span>
+              {{getHotelSuffix()}}
+            </div>
+            <div class="val" v-else>本日无酒店安排</div>
+          </el-col>
+        </el-row>
+      </div>
     </div>
+  </div>
 </template>
 <script>
-export default {
-    props:{
-        day:{}
+  export default {
+    props: {
+      day: {},
+      isDirect: {},
+      title: {},
+      dayNum: {}
+    },
+    methods: {
+      getHotelSuffix() {
+        let suffix = "";
+        if (this.day.jiu2.length > 1) {
+          if (this.isDirect === 1) {
+            suffix = "或同級"
+          }
+        } else {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
+            if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
+          }
+        }
+        return suffix;
+      },
+      goUrl(url) {
+        if (url != null && url.length > 0) {
+          if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
+            url = 'http://' + url;
+          }
+          window.open(url, "_blank");
+        }
+      }
     }
-}
+  }
+
 </script>

src/components/commonPage/TravelTripPreview/oneday.vue

 <template>
-    <div class="block-item">
-        <div class="one-block">
-            <div class="item big">
-                <div class="left">
-                    <img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' />
-                    <img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
-                    <img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''" src='../../../assets/img/nll.jpg' />
-                    <img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' />
-                </div>
-                <div class="right">
-                    <div class="details">
-                        <h3 v-html="day.details[0].title"></h3>
-                        <div class="playInfo">
-                            <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
-                                <i class="iconfont icon-menpiao"></i>
-                                {{day.details[0].ticketName}}
-                            </span>
-                            <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
-                                <i class="iconfont icon-shijian1"></i>
-                                约
-                                <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
-                                <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
-                            </span>
-                        </div>
-                        <span v-html="day.details[0].content"></span>
-                    </div>
-                </div>
+  <div class="block-item">
+    <div class="one-block">
+      <div class="item big">
+        <div class="left">
+          <img crossOrigin="Anonymous" v-if="day.details[0].img!=''" :src='day.details[0].img' />
+          <img crossOrigin="Anonymous" v-else-if="day.dayNum==1 && day.details[0].img==''"
+            src='../../../assets/img/nll.jpg' />
+          <img crossOrigin="Anonymous" v-else-if="day.islast && day.details[0].img==''"
+            src='../../../assets/img/nll.jpg' />
+          <img crossOrigin="Anonymous" v-else src='../../../assets/img/activy.jpg' />
+        </div>
+        <div class="right">
+          <div class="details">
+            <h3 v-html="day.details[0].title"></h3>
+            <div class="playInfo">
+              <span class="playInfo-item" v-if='day.details[0].ticketName!=""'>
+                <i class="iconfont icon-menpiao"></i>
+                {{day.details[0].ticketName}}
+              </span>
+              <span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'>
+                <i class="iconfont icon-shijian1"></i>
+                约
+                <span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span>
+                <span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟 </span>
+              </span>
+            </div>
+            <span v-html="day.details[0].content"></span>
+          </div>
+        </div>
+      </div>
+      <div class="item flex" v-if='day.tips.length>0'>
+        <h4>温馨提示</h4>
+        <div class="remark">
+          <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
+        </div>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
             </div>
-            <div class="item flex" v-if='day.tips.length>0'>
-                <h4>温馨提示</h4>
-                <div class="remark">
-                    <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
-                </div>
+            <div class="val">{{day.can.breakfirst}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
             </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
-                        </div>
-                        <div class="val">{{day.can.breakfirst}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
-                        </div>
-                        <div class="val">{{day.can.lanuch}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
-                        </div>
-                        <div class="val">{{day.can.dinner}}</div>
-                    </el-col>
-                </el-row>
+            <div class="val">{{day.can.lanuch}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
             </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="24" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
-                        </div>
-                        <div class="val" v-if='day.jiu2.length>0'>
-                            <span v-for="(t,k) in day.jiu2" :key="k">
-                                {{t}} ／ 
-                            </span>
-                             或同級
-                        </div>
-                        <div class="val" v-else>本日无酒店安排</div>
-                    </el-col>
-                </el-row>
+            <div class="val">{{day.can.dinner}}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="24" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
             </div>
-        </div>
+            <div class="val" v-if='day.jiu2.length>0'>
+              <span v-for="(t,k) in day.jiu2" :key="k">
+                {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
+              </span>
+              {{getHotelSuffix()}}
+            </div>
+            <div class="val" v-else>本日无酒店安排</div>
+          </el-col>
+        </el-row>
+      </div>
     </div>
+  </div>
 </template>
 <script>
-export default {
-    props:{
-        day:{}
-    }
-}
-</script>
\ No newline at end of file
+  export default {
+    props: {
+      day: {},
+      isDirect: {},
+      title: {},
+      dayNum: {}
+    },
+    methods: {
+      getHotelSuffix() {
+        let suffix = "";
+        if (this.day.jiu2.length > 1) {
+          if (this.isDirect === 1) {
+            suffix = "或同級"
+          }
+        } else {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
+            if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
+          }
+        }
+        return suffix;
+      },
+      goUrl(url) {
+        if (url != null && url.length > 0) {
+          if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
+            url = 'http://' + url;
+          }
+          window.open(url, "_blank");
+        }
+      }
+    },
+  };
+
+</script>

src/components/commonPage/TravelTripPreview/twoday.vue

 <template>
-    <div class="block-item">
-        <div class="two-block">
-            <el-row :gutter="4">
-                <el-col :span="12" v-for="item in day.details" :key="item.dayNum">
-                    <div class="item">
-                        <div class="up">
-                            <img crossOrigin="Anonymous" :src='item.img' />
-                        </div>
-                        <div class="down">
-                            <h3 v-if='item.title!=""' v-html="item.title"></h3>
-                            <div class="playInfo">
-                                <span class="playInfo-item" v-if='item.ticketName!=""'>
-                                    <i class="iconfont icon-menpiao"></i>
-                                    {{item.ticketName}}
-                                </span>
-                                <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
-                                    <i class="iconfont icon-shijian1"></i>
-                                    约
-                                    <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
-                                    <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟 </span>
-                                </span>
-                            </div>
-                            <span v-html="item.content"></span>
-                        </div>
-                    </div>
-                </el-col>
-            </el-row>
-            <div class="item flex" v-if='day.tips.length>0'>
-                <h4>温馨提示</h4>
-                <div class="remark">
-                    <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
-                </div>
+  <div class="block-item">
+    <div class="two-block">
+      <el-row :gutter="4">
+        <el-col :span="12" v-for="item in day.details" :key="item.dayNum">
+          <div class="item">
+            <div class="up">
+              <img crossOrigin="Anonymous" :src='item.img' />
             </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
-                        </div>
-                        <div class="val">{{day.can.breakfirst}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
-                        </div>
-                        <div class="val">{{day.can.lanuch}}</div>
-                    </el-col>
-                    <el-col :span="8" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
-                        </div>
-                        <div class="val">{{day.can.dinner}}</div>
-                    </el-col>
-                </el-row>
-            </div>
-            <div class="restaurant">
-                <el-row :gutter="30">
-                    <el-col :span="24" class="restaurant-item">
-                        <div class="key">
-                            <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
-                        </div>
-                        <div class="val" v-if='day.jiu2.length>0'>
-                            <span v-for="(t,k) in day.jiu2" :key="k">
-                                {{t}} ／ 
-                            </span>
-                             或同級
-                        </div>
-                        <div class="val" v-else>本日无酒店安排</div>
-                    </el-col>
-                </el-row>
+            <div class="down">
+              <h3 v-if='item.title!=""' v-html="item.title"></h3>
+              <div class="playInfo">
+                <span class="playInfo-item" v-if='item.ticketName!=""'>
+                  <i class="iconfont icon-menpiao"></i>
+                  {{item.ticketName}}
+                </span>
+                <span class="playInfo-item" v-if='item.playTimeHour || item.playTimeMinutes'>
+                  <i class="iconfont icon-shijian1"></i>
+                  约
+                  <span v-if="item.playTimeHour">{{item.playTimeHour}}小时 </span>
+                  <span v-if="item.playTimeMinutes">{{item.playTimeMinutes}}分钟 </span>
+                </span>
+              </div>
+              <span v-html="item.content"></span>
             </div>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="item flex" v-if='day.tips.length>0'>
+        <h4>温馨提示</h4>
+        <div class="remark">
+          <span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span>
         </div>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_breakfast.png' />
+            </div>
+            <div class="val">{{day.can.breakfirst}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_lunch.png' />
+            </div>
+            <div class="val">{{day.can.lanuch}}</div>
+          </el-col>
+          <el-col :span="8" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_dinner.png' />
+            </div>
+            <div class="val">{{day.can.dinner}}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="restaurant">
+        <el-row :gutter="30">
+          <el-col :span="24" class="restaurant-item">
+            <div class="key">
+              <img crossOrigin="Anonymous" src='../../../assets/img/daily_hotel-1.png' />
+            </div>
+            <div class="val" v-if='day.jiu2.length>0'>
+              <span v-for="(t,k) in day.jiu2" :key="k">
+                {{k==day.jiu2.length-1? (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name) : (t.newTitle!=''&& t.newTitle!=t.name?t.newTitle:t.name)+' / ' }}
+              </span>
+              {{getHotelSuffix()}}
+            </div>
+            <div class="val" v-else>本日无酒店安排</div>
+          </el-col>
+        </el-row>
+      </div>
     </div>
+  </div>
 </template>
 <script>
-export default {
-    props:{
-        day:{}
+  export default {
+    props: {
+      day: {},
+      isDirect: {},
+      title: {},
+      dayNum: {}
+    },
+    methods: {
+      getHotelSuffix() {
+        let suffix = "";
+        if (this.day.jiu2.length > 1) {
+          if (this.isDirect === 1) {
+            suffix = "或同級"
+          }
+        } else {
+          if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != '机场附近酒店') {
+            if (this.day.jiu2[0].status == 1) {
+              suffix = "【保证入住】"
+            } else {
+              if (this.isDirect === 1) {
+                suffix = "或同級"
+              }
+            }
+          }
+        }
+        return suffix;
+      },
+      goUrl(url) {
+        if (url != null && url.length > 0) {
+          if (url.indexOf('http://') == -1 || url.indexOf('https://') == -1) {
+            url = 'http://' + url;
+          }
+          window.open(url, "_blank");
+        }
+      }
     }
-}
+  }
+
 </script>