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

@@ -85,9 +85,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>
@@ -97,9 +97,42 @@
   </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

@@ -4,8 +4,10 @@
       <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-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">
@@ -63,9 +65,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>
@@ -75,9 +77,42 @@
   </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/threeday.vue

@@ -48,7 +48,8 @@
         <el-col :span="16">
           <div class="item hor-box">
             <div class="image">
-                            <img crossOrigin="Anonymous" :src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
+              <img crossOrigin="Anonymous"
+                :src="day.details[1].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
             </div>
           </div>
         </el-col>
@@ -57,7 +58,8 @@
         <el-col :span="16">
           <div class="item hor-box">
             <div class="image">
-                            <img crossOrigin="Anonymous" :src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
+              <img crossOrigin="Anonymous"
+                :src="day.details[2].img+'?x-oss-process=image/resize,w_663,image/crop,g_west,w_663,h_244'" />
             </div>
           </div>
         </el-col>
@@ -118,9 +120,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>
@@ -130,9 +132,42 @@
   </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/twoday.vue

@@ -62,9 +62,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>
@@ -74,9 +74,42 @@
   </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>