no message

@@ -79,7 +79,8 @@ export function submitMasterApply(data) {
 }
 }
 export function masterClassList(query) {
 export function masterClassList(query) {
   return request({
   return request({
-    url: `/league/courseItem/list`,
+    // url: `/league/courseItem/list`,
+    url: `/league/courseItem/getCoursrItemByCourseId`,
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })

@@ -440,12 +440,24 @@ export const constantRoutes = [
             meta: { title: 'pay' }
             meta: { title: 'pay' }
           },
           },
           {
           {
+            path: 'payticket',
+            component: () => import('@/viewsPc/booking/payticket'),
+            name: 'payticket',
+            meta: { title: '票务' }
+          },
+          {
             path: 'payOk',
             path: 'payOk',
             component: () => import('@/viewsPc/booking/payOk'),
             component: () => import('@/viewsPc/booking/payOk'),
             name: 'bookingPayOk',
             name: 'bookingPayOk',
             meta: { title: 'payOk' }
             meta: { title: 'payOk' }
           },
           },
           {
           {
+            path: 'payticketOk',
+            component: () => import('@/viewsPc/booking/payticketOk'),
+            name: 'payticketOk',
+            meta: { title: '票务-paypal' }
+          },
+          {
             path: 'invoice',
             path: 'invoice',
             component: () => import('@/viewsPc/booking/invoicing'),
             component: () => import('@/viewsPc/booking/invoicing'),
             name: 'invoice',
             name: 'invoice',

+<template>
+  <div>
+    <div class="box">
+      <el-card class="mb60 mt30" v-loading="loading">
+        <div class="text-center mt30">
+          <el-icon color="#32B16C" size="80">
+            <SuccessFilled/>
+          </el-icon>
+          <p class="text-success mb20">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
+
+          <el-button type="primary" class="btn-lineG mb60" @click="goBillDetail" round>
+            {{ language == 0 ? '返回订单详情' : 'Return order details' }}
+          </el-button>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {ref} from "vue";
+import {useRoute, useRouter} from "vue-router";
+import {onMounted} from "@vue/runtime-core";
+import {callbackPalPay} from "@/apiPc/booking";
+import {useStorage} from "@vueuse/core/index";
+
+const route = useRoute()
+const router = useRouter()
+const language= useStorage('language',0)
+const orderId = ref(route.query.orderId)
+const type = ref('')
+const loading = ref(false)
+
+onMounted(() => {
+  var code = decodeURIComponent(orderId.value)
+  console.log(code)
+  loading.value = true
+  callbackPalPay(code).then(res => {
+      loading.value = false
+      type.value = res.data.orderType
+  })
+})
+
+function goBillDetail() {
+  router.push({
+    name: 'bookingPay',
+    query: {
+      orderId: route.query.orderId,
+      orderType: type.value
+    }
+  })
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

@@ -11,8 +11,19 @@
         <el-step :title="language==0?'选择课程':'Courses'" />
         <el-step :title="language==0?'选择课程':'Courses'" />
       </el-steps>
       </el-steps>
       <div v-if="activeStep==0">
       <div v-if="activeStep==0">
-        <div class="mb60" style="max-height: 50vh;overflow: auto">
-
+        <div class="mb60 xzRich" style="max-height: 50vh;overflow: auto">
+            <div v-if="language==0"><br/>
+              报到时间：2024年7月14日13:30 -17:00<br/><br/>
+              报到地点：无锡君来世尊酒店<br/><br/>
+              江苏省 无锡市 滨湖区 和风路111号
+            </div>
+          <div v-else style="width: 350px;margin: auto"><br/>
+            Check in from 13:30 to 17:00 on July 14, 2024.<br/>
+            Check in address: Worldhotel Grand Juna Wuxi<br/>
+            No.111 Hefeng Road, Binhu District, Wuxi, Jiangsu<br/>
+            Contact Person：Oliver Zhu<br/>
+            Tel: +86 10 67183764<br/>
+          </div>
         </div>
         </div>
         <div class="text-center">
         <div class="text-center">
           <el-button type="primary" v-if="courseList.length>0" class="btn-lineG" round @click="setActive(1)">{{ language == 0 ? '下一步' : 'NEXT' }}</el-button>
           <el-button type="primary" v-if="courseList.length>0" class="btn-lineG" round @click="setActive(1)">{{ language == 0 ? '下一步' : 'NEXT' }}</el-button>
@@ -98,8 +109,10 @@
           <div class="tip text-danger mb20" v-else>*Select the courses to enroll in (at least one, no more than two)</div>
           <div class="tip text-danger mb20" v-else>*Select the courses to enroll in (at least one, no more than two)</div>
           <el-checkbox-group size="large" v-model="form.courseId" @change="courseChange">
           <el-checkbox-group size="large" v-model="form.courseId" @change="courseChange">
             <div v-for="c in courseList" class="mb20">
             <div v-for="c in courseList" class="mb20">
-              <el-checkbox :value="c.id" border class="w100" :disabled="(form.courseId?.length>=2&&form.courseId.indexOf(c.id)==-1)||disChoose">{{language == 0 ?c.name:c.nameEn}}</el-checkbox>
-
+              <el-checkbox :value="c.id" border class="w100" :disabled="(form.courseId?.length>=2&&form.courseId.indexOf(c.id)==-1)||disChoose||(form.nationality==240&&c.viewStateCn == 0)||(form.nationality!=240&&c.viewStateEn == 0)">
+                {{language == 0 ?c.name:c.nameEn}}
+                <el-tag class="ml20" v-if="(form.nationality==240&&c.viewStateCn == 0)||(form.nationality!=240&&c.viewStateEn == 0)" type="danger" effect="dark">{{language == 0 ?'已报满':'Already full'}}</el-tag>
+              </el-checkbox>
             </div>
             </div>
           </el-checkbox-group>
           </el-checkbox-group>
 
 
@@ -176,7 +189,7 @@ watch(show, (value) => {
 function getCourse() {
 function getCourse() {
   // '1777256058082189313'
   // '1777256058082189313'
   masterClassList({cptId:cptId.value}).then(res=>{
   masterClassList({cptId:cptId.value}).then(res=>{
-    courseList.value = res.rows
+    courseList.value = res.data
   })
   })
 }
 }
 function setActive(n) {
 function setActive(n) {
@@ -236,6 +249,8 @@ function checkCard() {
   getByCard({card:form.value.passportNo}).then(res=>{
   getByCard({card:form.value.passportNo}).then(res=>{
     if(res.data){
     if(res.data){
       form.value = res.data
       form.value = res.data
+    } else {
+      form.value.courseId = []
     }
     }
   })
   })
 }
 }
@@ -290,6 +305,7 @@ const close = () =>{
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
+.xzRich{line-height: 2;font-size: 14px;}
 .boxInvitation {
 .boxInvitation {
   width: 90%;
   width: 90%;
   margin: auto
   margin: auto