Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/mall/tripMobile.vue

@@ -669,6 +669,16 @@
         overflow: auto;
         -webkit-overflow-scrolling: touch;
     }
+    .notFoundPage{
+        position:fixed;
+        width:100%;
+        height:100%;
+        top:0;
+        z-index:999;
+        background-color: #fff;
+        text-align: center;
+        line-height: 100px;
+    }
 </style>
 
 <template>
@@ -942,8 +952,11 @@
                     </div>
                 </div>
             </div>
-</div>
-<div class="tripMenuWrap" v-if="showDialog">
+        </div>
+        <div class="notFoundPage" v-if="showDiv">
+            未找到指定页面
+        </div>
+        <div class="tripMenuWrap" v-if="showDialog">
             <div class="greyBg"></div>
             <div class="tripMenu">
                 <div class="btnPageHeader">选择查看的页面</div>
@@ -976,12 +989,12 @@
                     <div class="btnDay" v-for="(item,index) in dataList.dayList" @click="goDaySwiper(index,'dayList'+(index+1))" :key="index">D{{index+1}}</div>
                 </div>
             </div>
-</div>
-<div class="swiperFixedBtn" @click="showMenu()">
+        </div>
+        <div class="swiperFixedBtn" @click="showMenu()">
             <i class="iconfont icon-more1 TripctrlBtn" v-if="!showDialog"></i>
             <i class="iconfont icon-cha TripctrlBtn" v-else></i>
-</div>
-</div>
+        </div>
+    </div>
 </template>
 <script>
     import Swiper from "swiper";
@@ -1003,6 +1016,7 @@
                 swiperV: '',
                 showType: 1, //显示类型(1-所有的，2-每天的)
                 travelLngLat: [],
+                showDiv:false
             };
         },
         created() {},
@@ -1013,6 +1027,12 @@
         mounted() {
             this.msg.ID = this.$route.query.ID;
             this.msg.tcid = this.$route.query.tcid;
+            var oldTimeStamp = this.$route.query.ExpireTime;
+            var timestamp = Date.parse(new Date());
+            if(timestamp>oldTimeStamp){
+                // this.Error('超时');
+                this.showDiv=true;
+            }
             this.getTrip();
             //加载滑动
         },