Merge branch 'bug-order' into order

@@ -216,6 +216,7 @@ const logout = () => {
     return useUserStore().logOut()
   }).then(() => {
     isLogin.value = true
+    router.push('/')
     location.reload()
   })
 }

@@ -69,6 +69,7 @@
                    :disabled-date="disabledDateRZ"
                    :placeholder="language==0?'选择日期':'Select date'"
                    format="YYYY-MM-DD"
+                   :clearable="false"
                    value-format="YYYY-MM-DD"/>
               </span>
             </li>
@@ -107,7 +108,7 @@
                  </el-button>
 
 
-                  <el-button v-else  :disabled="!r.useCount"  class="btn-lineG w100" :class="{'forbid':!r.useCount}" round type="pri mary" @click="goOrder(r)">Select</el-button>
+                  <el-button v-else style="color: #fff"  :disabled="!r.useCount"  class="btn-lineG w100" :class="{'forbid':!r.useCount}" round type="pri mary" @click="goOrder(r)">Select</el-button>
 <!--                   <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0">-->
 <!--                     剩余 {{(r.roomCount - (r.useCount||0)).toFixed()}} 间-->
 <!--                   </div>-->
@@ -161,21 +162,25 @@ onMounted(() => {
     formTime.value = null
   }).finally(()=>{
     console.log(formTime.value)
-    if (formTime.value){
-      if (dayjs().isBefore(dayjs(formTime.value.hqStart))){
-        hotTime.value[0]=dayjs(formTime.value.hqStart).format('YYYY-MM-DD')
-        hotTime.value[1]=dayjs(formTime.value.hqEnd).add(1,'day').format('YYYY-MM-DD')
-      } else{
-        hotTime.value[0]=dayjs().format('YYYY-MM-DD')
-        hotTime.value[1]=dayjs().add(1,'day').format('YYYY-MM-DD')
-      }
-    }
+    getDateTime()
 
     getData()
   })
 
 })
 
+function getDateTime(){
+  if (formTime.value){
+    if (dayjs().isBefore(dayjs(formTime.value.hqStart))){
+      hotTime.value[0]=dayjs(formTime.value.hqStart).format('YYYY-MM-DD')
+      hotTime.value[1]=dayjs(formTime.value.hqStart).add(1,'day').format('YYYY-MM-DD')
+    } else{
+      hotTime.value[0]=dayjs().format('YYYY-MM-DD')
+      hotTime.value[1]=dayjs().add(1,'day').format('YYYY-MM-DD')
+    }
+  }
+}
+
 function getData() {
   loading.value = true
   getHotelById(route.params.hotelId).then(res => {
@@ -278,13 +283,12 @@ function goNext(room) {
   })
 }
 
-function getDaysBetween(e){
-  console.log(hotTime.value)
+function getDaysBetween(){
   if (hotTime.value && hotTime.value.length==2){
     const  d1=dayjs(hotTime.value[0]).format('YYYY-MM-DD')
     const  d2=dayjs(hotTime.value[1]).format('YYYY-MM-DD')
     if (d1==d2){
-      hotTime.value=[]
+      getDateTime()
       return proxy.$modal.msgError(language.value==0?'入住时间跨度需要大于一天':'The duration of the stay must be more than one day.')
     }else{
       getData()
@@ -292,19 +296,18 @@ function getDaysBetween(e){
   }
 }
 
-// function disabledDateRZ(date) {
-//   //判读今天大与form.value.hqStart
-//   console.log(date)
-//   if (formTime.value.hqStart) {
-//     const today = dayjs().format('YYYY-MM-DD')
-//     if (formTime.value.hqStart < today) {
-//       return !((date.getTime() >= dayjs(today).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
-//     } else {
-//       return !((date.getTime() >= dayjs(formTime.value.hqStart).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
-//     }
-//   }
-//   // return true
-// }
+function disabledDateRZ(date) {
+  //判读今天大与form.value.hqStart
+  if (formTime.value.hqStart) {
+    const today = dayjs().format('YYYY-MM-DD')
+    if (formTime.value.hqStart < today) {
+      return !((date.getTime() >= dayjs(today).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
+    } else {
+      return !((date.getTime() >= dayjs(formTime.value.hqStart).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
+    }
+  }
+  // return true
+}
 
 function goMap() {
   return
@@ -451,7 +454,14 @@ function goMap() {
 .oddmb:nth-child(2){margin-bottom: 20px;}
 .forbid{
   cursor:not-allowed !important;
-  color: #a8abb2;
-  filter:grayscale(1);
+  color: #a8abb2 !important;
+  //filter:grayscale(1);
+  background: #fff;
+  div{
+    color: #a8abb2 !important;
+  }
+}
+.forbid:hover{
+  box-shadow:none;
 }
 </style>

@@ -329,6 +329,7 @@ function getDaysBetween(e) {
   // console.log('入住时间arr', e, rzRange.value)
   // console.log(e)
   // console.log(Date.parse(rzRange.value[0]))
+  form.value.roomNum=0
   var d1 = Date.parse(rzRange.value?rzRange.value[0]:null)
   var d2 = Date.parse(rzRange.value?rzRange.value[1]:null)
   if (d1 == d2) {

@@ -2,7 +2,7 @@
   <el-card class="mb20">
     <div class="funcBtns">
       <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button>
-      <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>
+<!--      <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>-->
     </div>
     <div class="from-Card">
       <el-form :inline="true" :model="query" class="mt20" :label-width="language==0?60:80" size="small">

@@ -90,7 +90,7 @@
               </div>
 
               <div class="text-right">
-                <el-button v-if="b.orderType == 0" class="mb10" plain round type="success" @click="Rebook(b)">
+                <el-button v-if="b.orderType == 0&&b.viewStatus!=0" class="mb10" plain round type="success" @click="Rebook(b)">
                   {{ language==0?'再次预订':'Rebook' }}</el-button>
                 <el-button class="mb10" plain round type="primary" @click="goDetail(b)">
                   {{ language==0?'详情':'Detail' }}</el-button>
@@ -120,6 +120,8 @@ import useUserStore from "@/store/modules/user";
 import dayjs from 'dayjs'
 import {cancelOrder2,cancelOrder} from "/@/apiPc/booking";
 
+import {ElMessage} from "element-plus";
+
 const router = useRouter()
 const language= useStorage('language',0)
 const list = ref([])

@@ -79,7 +79,7 @@
               </div>
               <div class="card-header" v-else>
                 <img src="@/assets/sign/gl.png"/>
-                管理
+                {{ language==0?'管理':'Manager' }}
               </div>
             </template>
             <div class="chooseForm">
@@ -313,17 +313,16 @@ function geren() {
 }
 
 function goNext() {
-  console.log(personAllList.value.teamDoctors,form.value)
   // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
   //   ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
   //   return
   // }
-  if((personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&&
-      (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&&
-      (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&&
-      (personAllList.value.others.length>=0 && form.value.other?.toString().length == 0)&&
-      (personAllList.value.officials.length>=0 && form.value.official?.toString().length == 0)&&
-      (personAllList.value.leaders.length>=0 && form.value.leader?.toString().length == 0)
+  if((personAllList.value.coaches.length>0 && form.value.coachs?.toString().length == 0)&&
+      (personAllList.value.teamDoctors.length>0 && form.value.doctor?.toString().length == 0)&&
+      (personAllList.value.translators.length>0 && form.value.translator?.toString().length == 0)&&
+      (personAllList.value.others.length>0 && form.value.other?.toString().length == 0)&&
+      (personAllList.value.officials.length>0 && form.value.official?.toString().length == 0)&&
+      (personAllList.value.leaders.length>0 && form.value.leader?.toString().length == 0)
   ){
     ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', {
       confirmButtonText: language.value==0?'下一步':'Next',
@@ -360,7 +359,8 @@ function next() {
         name: 'chooseProject',
         query: {
           matchId: matchId,
-          isNational:isNational.value
+          isNational:isNational.value,
+          languageSource:languageSource.value
         }
       })
     })
@@ -374,7 +374,8 @@ function next() {
           matchId: matchId,
           groupId: groupId.value,
           signType: signType.value,
-          isNational:isNational.value
+          isNational:isNational.value,
+          languageSource:languageSource.value
         }
       })
     })
@@ -388,6 +389,7 @@ function goPrev() {
       query: {
         matchId: matchId,
         groupId: groupId.value,
+        languageSource:languageSource.value,
         isNational: false
       }
     })
@@ -397,6 +399,7 @@ function goPrev() {
       query: {
         matchId: matchId,
         groupId: groupId.value,
+        languageSource:languageSource.value,
         isNational:isNational.value
       }
     })

@@ -133,7 +133,7 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="Actions">
+              <el-table-column :label="language==0?'操作':'Actions'">
                 <template #default="scope">
                   <a class="text-primary pd10" @click="delperson(scope.row)">
                     {{ language == 0 ? '删除' : 'Delete' }}

@@ -79,9 +79,11 @@
             <div class="panel border">
               <div class="panel-header ">
                 <h3 class="panel-title" v-if="language==0">可参与报名的项目
-                  <span>已报项目在下方查看</span>
+                  <span class="text-danger" v-if="signInfoList.length>0">已报项目在下方查看</span>
+                </h3>
+                <h3 class="panel-title" v-else>Search Events
+                  <span class="text-danger" v-if="signInfoList.length>0">Slide down to view reported projects</span>
                 </h3>
-                <h3 class="panel-title" v-else>Search Events</h3>
                 <div class="fr">
                   <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
                             @change="getProjectList"
@@ -239,7 +241,8 @@ const data = reactive({
   projectQuery: {}, tableType: 1,
   currProjectId: '',
   openTour: false,
-  isNational: false
+  isNational: false,
+  languageSource:''
 })
 const {
   activeTeam,
@@ -267,7 +270,7 @@ const {
   tableType,
   zuQuery,
   openTour, currProjectId,
-  tourCurrent, isNational
+  tourCurrent, isNational,languageSource
 } = toRefs(data)
 const nextButtonProps = ref({})
 const matchId = ref(route.query.matchId)
@@ -281,8 +284,6 @@ onMounted(() => {
   // openTour.value = true
 })
 
-let chargeFlag
-
 function getAthletesList() {
   // athletesList.value
   match.getGroupPersonList({label: '0'}, groupId.value).then(res => {
@@ -303,7 +304,6 @@ function getMatch(id) {
   match.getMatchById({
     id: id
   }).then(res => {
-    chargeFlag = res.data.chargeFlag
     noPhotoCanSign.value = res.data.noPhotoCanSign
     coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
     extraform.value = JSON.parse(res.data.participantsInfo)
@@ -385,7 +385,8 @@ function goPrev() {
   router.push({
     name: `chooseCoach`,
     query: {
-      matchId: matchId.value
+      matchId: matchId.value,
+      languageSource: route.query.languageSource
     }
   })
 }
@@ -871,6 +872,6 @@ watch(choosedchoosed, (newVal, oldVal) => {
 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
 .po-right{position: absolute;right: 0;}
 .panel h3.panel-title{
-  span{ color: #999;font-size: 13px;}
+  span{font-size: 13px;}
 }
 </style>

@@ -9,12 +9,16 @@
     <div class="indexTitle" v-if="form.languageSource!='100'"><h3 class="leftboderTT">报名须知</h3></div>
     <div class="xzbox" v-if="form.languageSource!='100'">
       <div v-html="form.signKnow"></div>
-      <el-link v-if="form.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank">
-        <el-icon :size="20">
-          <Download />
-        </el-icon>
-        {{ JSON.parse(form.signKnowUrl)[0]?.name }}
-      </el-link>
+      <div v-if="form.signKnowUrl">
+        <el-link v-for="(item,index) in JSON.parse(form.signKnowUrl)" type="primary"
+                 :href="fillImgUrl(item.url)" target="_blank">
+          <el-icon :size="20">
+            <Download />
+          </el-icon>
+          {{ item.name }}
+        </el-link>
+      </div>
+
     </div>
 <!--    <div class="indexTitle"><h3 class="leftboderTT">免责声明</h3></div>-->
 <!--    <div class="xzbox">-->

 <template>
   <el-steps :active="activeStep" align-center>
     <el-step :title="language==0?'团队信息':'Team Information'"  />
-    <el-step :title="language==0?'教练/领队/其他':'Coach/Team Head of team/Other'" />
+    <el-step :title="language==0?'教练/领队/其他':'Coach/Head Of Team/Other'" />
     <el-step :title="language==0?'选手报名':'Participant Registration'" />
-    <el-step :title="language==0?'提交审核':'Submit for review'" />
+    <el-step :title="language==0?'提交审核':'Submit For Review'" />
   </el-steps>
 </template>
 

@@ -140,13 +140,15 @@
             <div v-if="menu[5].active==1" class="pd20">
               <div class="xzbox">
                 <div v-html="matchData.signKnow"></div>
-                <el-link v-if="matchData.signKnowUrl" type="primary"
-                         :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
-                  <el-icon :size="20">
-                    <Download/>
-                  </el-icon>
-                  {{ JSON.parse(matchData.signKnowUrl)[0]?.name }}
-                </el-link>
+                <div v-if="matchData.signKnowUrl">{{JSON.parse(matchData.signKnowUrl)}}
+                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
+                           :href="fillImgUrl(item.url)" target="_blank">
+                    <el-icon :size="20">
+                      <Download />
+                    </el-icon>
+                    {{ item.name }}
+                  </el-link>
+                </div>
               </div>
             </div>
           </el-card>

@@ -241,13 +241,15 @@
             <div v-if="menu[5].active==1" class="pd20">
               <div class="xzbox">
                 <div v-html="matchData.signKnow"></div>
-                <el-link v-if="matchData.signKnowUrl" type="primary"
-                         :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
-                  <el-icon :size="20">
-                    <Download/>
-                  </el-icon>
-                  {{ JSON.parse(matchData.signKnowUrl)[0]?.name }}
-                </el-link>
+                <div v-if="matchData.signKnowUrl">
+                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
+                           :href="fillImgUrl(item.url)" target="_blank">
+                    <el-icon :size="20">
+                      <Download />
+                    </el-icon>
+                    {{ item.name }}
+                  </el-link>
+                </div>
               </div>
             </div>
           </el-card>

@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
         },
         '/dev-api': {
           // target: 'http://192.168.1.118:8081/',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
           target: 'https://jijin.wtwuxicenter.com/stage-api',
-          // target: 'https://wdsfwuxicenter.com/stage-api',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }