Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

@@ -63,7 +63,7 @@
           <!-- 时间 -->
           <!-- 时间 -->
           <div class="select_item_box">
           <div class="select_item_box">
             <div class="label">
             <div class="label">
-              {{ triggerLanguage(language, "时间", "Event Date & Time") }}
+              {{ triggerLanguage(language, "场次", "Session") }}
             </div>
             </div>
             <div class="select_item">
             <div class="select_item">
               <div
               <div
@@ -118,7 +118,9 @@
             }}
             }}
           </div>
           </div>
           <div v-else class="btn forPc" style="margin-left: 40px" @click="toSelectSeat()">
           <div v-else class="btn forPc" style="margin-left: 40px" @click="toSelectSeat()">
-            {{ triggerLanguage(language, "添加观影人", "Add Moviegoers") }}
+            {{
+              triggerLanguage(language, "立即购票", "Buy tickets now")
+            }}
           </div>
           </div>
 
 
         </div>
         </div>
@@ -235,7 +237,7 @@ function toSelectSeat() {
     return
     return
   }
   }
   checkNonPayment().then(res => {
   checkNonPayment().then(res => {
-    if (!res.count) {
+    if (res.data) {
       router.push({
       router.push({
         name: 'confirmOrder',
         name: 'confirmOrder',
         params: {
         params: {
@@ -245,7 +247,7 @@ function toSelectSeat() {
         }
         }
       })
       })
     } else {
     } else {
-      router.push('/center/myInfo')
+      router.push('/center/myReservation')
     }
     }
 
 
   })
   })

@@ -121,7 +121,8 @@
               </div>
               </div>
 
 
               <div class="text-right">
               <div class="text-right">
-                <el-button v-if="b.orderType == 0&&b.viewStatus!=0" class="mb10" plain round size="small" type="success"
+                <el-button v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
+                           size="small" type="success"
                            @click="Rebook(b)">
                            @click="Rebook(b)">
                   {{ language == 0 ? '再次预订' : 'Rebook' }}
                   {{ language == 0 ? '再次预订' : 'Rebook' }}
                 </el-button>
                 </el-button>
@@ -208,16 +209,25 @@ function goDetail(b) {
 
 
 function Rebook(row) {
 function Rebook(row) {
   console.log(row)
   console.log(row)
-  router.push({
-    name: 'hotelDetail',
-    params: {
-      cptId: row.activeId,
-      hotelId: row.hotelId
-    },
-    query: {
-      id: row.extId
-    }
-  })
+  if (row.orderType == 0) {
+    router.push({
+      name: 'hotelDetail',
+      params: {
+        cptId: row.activeId,
+        hotelId: row.hotelId
+      },
+      query: {
+        id: row.extId
+      }
+    })
+  } else {
+    router.push({
+      name: 'ticket',
+      params: {
+        activeId: row.activeId,
+      }
+    })
+  }
 }
 }
 
 
 const cancel = (row) => {
 const cancel = (row) => {