no message

@@ -40,3 +40,10 @@ export function getIndexScheduleList(params) {
     params: params
     params: params
   })
   })
 }
 }
+export function newbilllist(query) {
+  return request({
+    url: `/ota/norder/list`,
+    method: 'get',
+    params: query
+  })
+}

@@ -391,6 +391,12 @@ export const constantRoutes = [
             name: 'photography',
             name: 'photography',
             meta: { title: 'Photography Appointment' }
             meta: { title: 'Photography Appointment' }
           },
           },
+          {
+            path: 'pay',
+            component: () => import('@/viewsPc/booking/pay'),
+            name: 'bookingPay',
+            meta: { title: 'pay' }
+          }
         ]
         ]
       },
       },
       {
       {

@@ -44,7 +44,7 @@
                   </div>
                   </div>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item v-for="(n,index) in form.roomNum" :key="index" :label="`入住人${index+1}`">
                 <el-form-item v-for="(n,index) in form.roomNum" :key="index" :label="`入住人${index+1}`">
-                  <el-input v-model="rzUserArr[index]" placeholder="每间填一位住客姓名"/>
+                  <el-input v-model="rzUserArr[index]" :placeholder="language==0?'每间填一位住客姓名':'Each room fill in one name of the guest'"/>
                 </el-form-item>
                 </el-form-item>
                 <el-form-item :label="language==0?'预计到店':'Expected check-in'">
                 <el-form-item :label="language==0?'预计到店':'Expected check-in'">
                   <el-select v-model="form.ddDate"
                   <el-select v-model="form.ddDate"
@@ -143,8 +143,9 @@ import {ref, reactive, onMounted} from "vue";
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import {checkResidueRoom, newsSubmitOrderHotel} from "@/apiPc/booking"
 import {checkResidueRoom, newsSubmitOrderHotel} from "@/apiPc/booking"
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
-import {ElMessage} from "element-plus";
-
+import {ElMessage,ElMessageBox} from "element-plus";
+import useUserStore from "@/store/modules/user";
+const user = useUserStore().user
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
@@ -324,6 +325,10 @@ function countMoney() {
 }
 }
 
 
 function submit() {
 function submit() {
+  if(!user){
+    useUserStore().setReLogin()
+  }
+
   if (usedays == 0) {
   if (usedays == 0) {
     ElMessage.error(language.value == 0 ? '入住时间跨度需大于一天' : 'Check-in time must be greater than one day')
     ElMessage.error(language.value == 0 ? '入住时间跨度需大于一天' : 'Check-in time must be greater than one day')
     return
     return
@@ -365,7 +370,7 @@ function submit() {
   console.log(form.value.room)
   console.log(form.value.room)
 
 
   // 提交确认
   // 提交确认
-  ElMessage.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
+  ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
     confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
     confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
     cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
     cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
     type: 'warning'
     type: 'warning'
@@ -377,6 +382,13 @@ function submit() {
           checkreRooms()
           checkreRooms()
         } else {
         } else {
           //去付钱
           //去付钱
+          router.push({
+            name: 'bookingPay',
+            query: {
+              orderId:res.data.orderId,
+              money:res.data.total
+            }
+          })
         }
         }
       } else {
       } else {
         ElMessage.warning(language.value == 0 ? '无可预定的房间' : 'No rooms available to book')
         ElMessage.warning(language.value == 0 ? '无可预定的房间' : 'No rooms available to book')
@@ -385,21 +397,6 @@ function submit() {
   })
   })
 }
 }
 
 
-function pay() {
-  //确认付款
-  ElMessage.confirm(language.value == 0 ? '确认付款吗？' : 'Confirm payment?', {
-    confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
-    cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
-    type: 'warning'
-  }).then(() => {
-    newsSubmitOrderHotel(form.value).then(res => {
-      if (res.data) {
-        if (res.data.roomNum == -100) {
-        }
-      }
-    })
-  })
-}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -3,7 +3,25 @@
     <el-card :body-style="{'padding':'0'}">
     <el-card :body-style="{'padding':'0'}">
       <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'我的预订':'My reservation' }}</h3></div>
       <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'我的预订':'My reservation' }}</h3></div>
       <el-empty :image="`/img/order_no.png`" :image-size="228"  v-if="list?.length == 0"/>
       <el-empty :image="`/img/order_no.png`" :image-size="228"  v-if="list?.length == 0"/>
+      <div v-for="b in list">
+        <h3>{{b.name}}</h3>
 
 
+        <div v-if="b.orderType == 0">
+          <div><label class="blueTag"> 酒店订单</label>
+            订单编号：
+            {{ b.id }}</div>
+          <div>
+            {{b.messageObj?.roomStayDate}}
+          </div>
+          <div>
+            {{b.messageObj?.roomName}}
+          </div>
+          <div>
+            {{b.messageObj?.roomInfo}}
+          </div>
+        </div>
+        {{b}}
+      </div>
       <div class="pd20"></div>
       <div class="pd20"></div>
     </el-card>
     </el-card>
   </div>
   </div>
@@ -12,8 +30,21 @@
 <script setup>
 <script setup>
 import {onMounted} from "@vue/runtime-core";
 import {onMounted} from "@vue/runtime-core";
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
+import {newbilllist} from "@/apiPc/common";
 const language= useStorage('language',0)
 const language= useStorage('language',0)
 const list = ref([])
 const list = ref([])
+
+onMounted(()=>{
+  getList()
+})
+function getList() {
+  newbilllist().then(res=>{
+    list.value = res.rows
+    for (var b of list.value) {
+      b.messageObj = JSON.parse(b.message)
+    }
+  })
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -68,8 +68,8 @@ const props = defineProps({
 })
 })
 const language= useStorage('language',0)
 const language= useStorage('language',0)
 function goBooking(n) {
 function goBooking(n) {
-  ElMessage.warning(language.value==0?'建设中,敬请期待':'Building！')
-  return
+  // ElMessage.warning(language.value==0?'建设中,敬请期待':'Building！')
+  // return
   switch (n) {
   switch (n) {
     case 0:
     case 0:
       // 票务
       // 票务