no message

杨炀
Showing 12 changed files with 110 additions and 53 deletions
public/file/GUIDE.pdf
src/viewsPc/center/myInfo.vue
src/viewsPc/guide/index.vue
src/viewsPc/index.vue
src/viewsPc/index_en.vue
src/viewsPc/match/chooseCoach.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/addCoach.vue
src/viewsPc/match/components/addCoach_en.vue
src/viewsPc/match/components/addWdsf.vue
src/viewsPc/register/personal.vue
src/viewsPc/register/team/step2.vue
--- a/public/file/GUIDE.pdf deleted 100644 → 0
View file @c8463b4
+++ b/public/file/GUIDE.pdf deleted 100644 → 0
View file @c8463b4
--- a/src/viewsPc/center/myInfo.vue
View file @b80ab69
+++ b/src/viewsPc/center/myInfo.vue
View file @b80ab69
@@ -49,7 +49,7 @@
            <el-form-item :label="language==0?'证件号':'Passport number'">
              <el-input v-model="myform.passportNumber"/>
            </el-form-item>
-            <el-form-item :label="language==0?'有效证件':'Valid Certificates Scanning Copy'" required>
+            <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
              <file-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/>
            </el-form-item>
            <el-form-item :label="language==0?'WDSF会员号':'WDSF MIN'" prop="wdsfMin">
--- a/src/viewsPc/guide/index.vue
View file @b80ab69
+++ b/src/viewsPc/guide/index.vue
View file @b80ab69
@@ -28,12 +28,14 @@
            <div>运动队从一楼正大门通过安检进入馆内，乘坐扶梯上二楼，到达 竞赛区域。技术官员乘坐组委会安排通行车辆从场馆北坡道直接到达 二楼平台B5馆出入口进入馆内。</div>
            <div>整个二层按不同的功能分为五个区域，所有人员根据所持证件规 定权限到达不同的区域，红色为VIP区，蓝色为办公工作区，黄色为 观赛区，紫色为竞赛区，粉色为公共区域。</div>
          </div>
+          <div class="content" v-if="activeName!=0&&activeName<8">
-          <div class="content" v-if="activeName==1">
+            待更新
+          </div>
+          <div class="content" v-if="activeName==11">
            <div>注册报到中心位于酒店大堂，服务时间为7月19-22日10:00-22:00， 同时也作为咨询台。</div>
            <div>相关紧急通知、餐食安排和交通服务等信息将公布在公告栏，如有疑 问或需服务，可前往注册报到中心进行咨询。</div>
          </div>
-          <div class="content" v-if="activeName==2">
+          <div class="content" v-if="activeName==21">
            <h4>一、证件使用与保管</h4>
            <p>证件要妥善保管，不得故意损毁，证件仅限本人使用，严禁转让， 严禁超范围使用，严禁私自增减，涂改证件内容。
            </p>
@@ -45,10 +47,10 @@
            <p>本次赛事将使用以下颜色和数字表示相关注册分区:</p>
            <img  src="@/assets/zhinan/6.jpg"/>
          </div>
-          <div class="content" v-if="activeName==3">
+          <div class="content" v-if="activeName==31">
            <el-empty description="暂未上线"></el-empty>
          </div>
-          <div class="content" v-if="activeName==4">
+          <div class="content" v-if="activeName==41">
            <h4>一、抵离安排</h4>
            <p>所有技术官员、运动队接送站由组委会统一安排车辆接送，抵达站 应选择无锡苏南硕放机场、上海浦东国际机场和上海虹桥国际机场。
            </p>
@@ -77,7 +79,7 @@
            <p>4. 下车时务必带齐自身携带物品，谨防遗失。</p>
            <p>5. 如错失赛会车辆或中途临时需要出行，请及时与咨询台联系。</p>
          </div>
-          <div class="content" v-if="activeName==5">
+          <div class="content" v-if="activeName==51">
            <h4>一、服务时间安排</h4>
            <p>2023年7月20日-2023年7月23日</p>
            <h4>二、医疗点位设置</h4>
@@ -89,13 +91,14 @@
            </p>
            <p>120急救车一辆及急救转运车一辆停在G14通道口等候，车上均配 备除颤仪、氧气钢瓶等急救器材。</p>
          </div>
-          <div class="content" v-if="activeName==6"><el-empty description="暂未上线"></el-empty></div>
+          <div class="content" v-if="activeName==61"><el-empty description="暂未上线"></el-empty></div>
-          <div class="content" v-if="activeName==7"><el-empty description="暂未上线"></el-empty></div>
+          <div class="content" v-if="activeName==71"><el-empty description="暂未上线"></el-empty></div>
          <div class="content" v-if="activeName==8">
            <label>点击下载：</label>
-            <a target="_blank" class="text-primary">
+            <a target="_blank" class="text-primary" @click="showBuilding">
              <el-icon style="position: relative;top: 2px"><download/></el-icon>
-              WDSF亚洲体育舞蹈节参赛指南0714
+              2024 WDSF亚洲体育舞蹈节参赛指南
            </a>
          </div>
        </div>
@@ -127,11 +130,11 @@
            <div>The second floor is divided into five areas according to different functions. All personnel may arrive at different areas according to their access permissions. Red is the VIP area, blue is the office area, yellow is the spectator area, purple is the competition area and pink is the public area.</div>
          </div>
-          <div class="content" v-if="activeName==1">
+          <div class="content" v-if="activeName==11">
            <div>The Registration Center is located in the hotel lobby from 10:00-22:00 on July 19-22, also serves as the info desk.</div>
            <div>For information about emergency notices, catering services, and transportation services will be announced on the notice board. If you have any questions or need services, please contact the Registration Center.</div>
          </div>
-          <div class="content" v-if="activeName==2">
+          <div class="content" v-if="activeName==21">
            <h4>1 Use and Storage of Licenses</h4>
            <p>Licenses shall be properly kept and shall not be intentionally damaged. Licenses shall be used only by the holders, which shall not be transferred to others, used for unauthorized purposes, or altered.</p>
            <p>For access to relevant activity and competition venue, license holders shall wear licenses in a conspicuous position against the chest.</p>
@@ -144,10 +147,10 @@
            <p>The following colors and numbers will be used to indicate the different areas:</p>
            <img  src="@/assets/zhinan/5.jpg"/>
          </div>
-          <div class="content" v-if="activeName==3">
+          <div class="content" v-if="activeName==31">
            <el-empty description="no data"></el-empty>
          </div>
-          <div class="content" v-if="activeName==4">
+          <div class="content" v-if="activeName==41">
            <h4>1.Arrivals and Departures</h4>
            <p>All technical officials and sports teams will be picked up by the organizing committee,
              and the arrival stations should be Wuxi Sunan Shuofang International Airport, Shanghai Pudong International Airport, and Shanghai Hongqiao International Airport.</p>
@@ -180,7 +183,7 @@
            <p>4. When getting off the vehicles, make sure to bring all belongings with you.</p>
            <p>5. If you miss the vehicle or need to make an unplanned travel, please contact the info desk in time.</p>
          </div>
-          <div class="content" v-if="activeName==5">
+          <div class="content" v-if="activeName==51">
            <h4>1. Service Time</h4>
            <p>July 20-23, 2023</p>
            <h4>2. Medical Stations</h4>
@@ -192,13 +195,13 @@
              one nurse, two first aiders, one English-speaking volunteer, and one staff. Both medical stations are fully equipped with medicines needed for on-site medical emergencies.</p>
            <p>One ambulance and one emergency transfer vehicle are waiting at the entrance of G14, and all of them are equipped with first aid equipment such as defibrilla- tors and oxygen cylinders.</p>
          </div>
-          <div class="content" v-if="activeName==6"><el-empty description="no data"></el-empty></div>
+          <div class="content" v-if="activeName>0&&activeName<8"><el-empty description="no data"></el-empty></div>
-          <div class="content" v-if="activeName==7"><el-empty description="no data"></el-empty></div>
+          <div class="content" v-if="activeName==71"><el-empty description="no data"></el-empty></div>
          <div class="content" v-if="activeName==8">
            <label>Download：</label>
-            <a target="_blank" class="text-primary" >
+            <a target="_blank" class="text-primary" @click="showBuilding">
              <el-icon style="position: relative;top: 2px"><download/></el-icon>
-              WDSF ASIAN DANCESPORT FESTIVAL ENTRY GUIDE 0714
+             2024 WDSF ASIAN DANCESPORT FESTIVAL ENTRY GUIDE
            </a>
          </div>
        </div>
@@ -209,10 +212,13 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { getNewsListById, getRuleKind } from '@/apiPc/webSite'
-import { useRouter } from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 import {useStorage} from "@vueuse/core";
+import {getCurrentInstance} from "@vue/runtime-core";
 const language = useStorage('language', 0)
 const router = useRouter()
+const route = useRoute()
+const { proxy } = getCurrentInstance()
 const activeName = ref(0)
 const showVipFee = ref(false)
 const list = ref([
@@ -247,17 +253,25 @@ const query = ref({
  pageNum: 1
 })
 onMounted(() => {
-  getKindList()
+  if(route.query.index){
+    changeTab(route.query.index)
+  } else {
+    getKindList()
+  }
 })
 const getKindList = () => {
  changeTab(0)
 }
 const changeTab = (n) => {
+  n = Number(n)
  if(language.value==0){
    nowTab.value = list.value[n]
  } else {
    nowTab.value = list_en.value[n]
  }
+  console.log(nowTab.value)
+  activeName.value = n
  if (nowTab.value.tag == 'fee') {
    showVipFee.value = true
  } else {
@@ -290,6 +304,9 @@ const goDetail = (n) => {
    })
  }
 }
+const showBuilding = () => {
+  proxy.$message.warning(language.value==0?'待更新':'Building')
+}
 </script>
 <style lang="scss" scoped>
 .content{margin: 20px 0 0;text-indent: 2em;
--- a/src/viewsPc/index.vue
View file @b80ab69
+++ b/src/viewsPc/index.vue
View file @b80ab69
@@ -49,7 +49,7 @@
          <el-col :sm="24" :lg="10">
            <div class="bgbg">
              <img src="@/assets/dance/text.png">
-              <a class="zn-btn" href="/file/GUIDE.pdf" target="_blank">参赛指南
+              <a class="zn-btn" @click="goGuide">参赛指南
                <el-icon>
                  <download/>
                </el-icon>
@@ -60,22 +60,22 @@
            <div class="itemBox">
              <el-row :gutter="20">
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn01.png">酒店预订</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn01.png">酒店预订</div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn02.png">车辆预约</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn02.png">车辆预约</div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn03.png">餐饮预约</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn03.png">餐饮预约</div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn04.png">票务预订</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn04.png">票务预订</div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn05.png">化妆预约</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn05.png">化妆预约</div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn06.png">拍照预约</div>
+                  <div class="item" @click="building"><img src="@/assets/dance/btn06.png">拍照预约</div>
                </el-col>
              </el-row>
            </div>
@@ -420,7 +420,7 @@ import _ from 'lodash'
 import {Swiper, SwiperSlide} from 'swiper/vue'
 import {Autoplay, Navigation} from 'swiper'
 import 'swiper/css'
-import {dayjs} from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import * as match from "@/apiPc/match";
 import WeatherIcon from '@/viewsPc/components/weatherIcon'
 const modules = [Autoplay, Navigation]
@@ -556,6 +556,17 @@ const goMatch = (n) => {
 const popWeather = () => {
  weatherdialog.value = true
 }
+const building = () => {
+  ElMessage.warning('建设中，敬请期待')
+}
+const goGuide = () => {
+  router.push({
+    path: `/guide`,
+    query:{
+      index:8
+    }
+  })
+}
 </script>
 <style scoped lang="scss">
--- a/src/viewsPc/index_en.vue
View file @b80ab69
+++ b/src/viewsPc/index_en.vue
View file @b80ab69
@@ -46,7 +46,7 @@
          <el-col :sm="24" :lg="10">
            <div class="bgbg">
              <h1 style="color: #fff">WDSF ASIAN DANCESPORT FESTIVAL .WUXI 2024</h1>
-              <a class="zn-btn" href="/file/GUIDE.pdf" target="_blank">
+              <a class="zn-btn" @click="goGuide">
                ENTRY GUIDE
                <el-icon><download /></el-icon>
              </a>
@@ -56,29 +56,29 @@
            <div class="itemBox">
              <el-row :gutter="20">
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn01.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn01.png">
                    <p>Hotel Reservation</p>
                  </div></el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn02.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn02.png">
                    <p>Vehicle Reservation</p>
                  </div></el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn03.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn03.png">
                    <p>Dining Reservation</p>
                  </div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn04.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn04.png">
                    <p>Ticket Booking</p>
                  </div>
                </el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn05.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn05.png">
                    <p>Makeup Appointment</p>
                  </div></el-col>
                <el-col :sm="12" :lg="8">
-                  <div class="item"><img src="@/assets/dance/btn06.png">
+                  <div class="item" @click="building"><img src="@/assets/dance/btn06.png">
                    <p>Photography Appointment</p>
                  </div></el-col>
              </el-row>
@@ -417,7 +417,7 @@ import _ from 'lodash'
 import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Autoplay, Navigation } from 'swiper'
 import 'swiper/css'
-import { dayjs } from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import * as match from "@/apiPc/match";
 import {rankList} from '@/assets/js/data'
 const modules = [Autoplay, Navigation]
@@ -535,7 +535,17 @@ const goMatch = (n) => {
 const popWeather = () => {
  weatherdialog.value = true
 }
+const building = () => {
+  ElMessage.warning('Building')
+}
+const goGuide = () => {
+  router.push({
+    path: `/guide`,
+    query:{
+      index:8
+    }
+  })
+}
 </script>
 <style scoped lang="scss">
--- a/src/viewsPc/match/chooseCoach.vue
View file @b80ab69
+++ b/src/viewsPc/match/chooseCoach.vue
View file @b80ab69
@@ -400,11 +400,11 @@ function addCoach(n) {
    label: n,
    groupId: groupId.value
  }
-  if(language.value==0){
+  // if(language.value==0){
-    proxy.$refs['dialogAddCoachRef'].open(obj)
+  //   proxy.$refs['dialogAddCoachRef'].open(obj)
-  }else {
+  // }else {
    proxy.$refs['dialogAddCoachRef_En'].open(obj)
-  }
+  // }
 }
 </script>
--- a/src/viewsPc/match/chooseSportsman.vue
View file @b80ab69
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @b80ab69
@@ -26,6 +26,11 @@
                        {{ c.realName }}
                        <img v-if="c.sex=='0'" src="@/assets/img/female.png"/>
                        <img v-if="c.sex=='1'" src="@/assets/img/male.png"/>
+                        {{c.representing}}
+                         {{c.ageGroup}}
+                         {{c.division}}
                        <!--                        -{{ c.age }}-->
                      </div>
                    </el-option>
--- a/src/viewsPc/match/components/addCoach.vue
View file @b80ab69
+++ b/src/viewsPc/match/components/addCoach.vue
View file @b80ab69
@@ -37,7 +37,7 @@
          <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
            <el-input v-model="form.idcCode" @blur="checkCode" :disabled="editgay"/>
          </el-form-item>
-          <el-form-item :label="language==0?'有效证件':'Valid Certificates Scanning Copy'" required :required="form.idcType!='0'">
+          <el-form-item :label="language==0?'有效证件':'Valid Passport'" required :required="form.idcType!='0'">
            <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" />
          </el-form-item>
          <el-form-item :label="language==0?'性别':'Gender'" prop="sex">
--- a/src/viewsPc/match/components/addCoach_en.vue
View file @b80ab69
+++ b/src/viewsPc/match/components/addCoach_en.vue
View file @b80ab69
@@ -48,12 +48,13 @@
              <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?l.label:l.enlabel"/>
            </el-select>
          </el-form-item>
-          <el-form-item :label="language==0?'有效证件':'Valid Documents Scanning Copy'" required>
+          <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
            <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false"
                         :button-text="language==0?'上传':'Upload'"/>
            <div class="tip">
-              <span v-if="language==0">请上传护照副本，用于认证 </span>
+              <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
-              <span v-else>Please upload a passport copy for authentication</span>
+              <span v-else>Please upload a scanned copy of your valid passport for verification of identity information,
+                application of visa invitation letter and purchasing insurance etc.</span>
            </div>
          </el-form-item>
--- a/src/viewsPc/match/components/addWdsf.vue
View file @b80ab69
+++ b/src/viewsPc/match/components/addWdsf.vue
View file @b80ab69
@@ -72,12 +72,14 @@
            type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
        />
      </el-form-item>
-      <el-form-item :label="language==0?'有效证件':'Valid Certificates Scanning Copy'" required>
+      <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
        <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false"
                     :button-text="language==0?'上传':'Upload'"/>
        <div class="tip">
-          <span v-if="language==0">请上传护照副本，用于认证 </span>
+          <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等 </span>
-          <span v-else>Please upload a passport copy for authentication</span>
+          <span v-else>
+            Please upload a scanned copy of your valid passport for verification of identity information,
+            application of visa invitation letter and purchasing insurance etc.</span>
        </div>
      </el-form-item>
--- a/src/viewsPc/register/personal.vue
View file @b80ab69
+++ b/src/viewsPc/register/personal.vue
View file @b80ab69
@@ -63,12 +63,13 @@
                    <el-radio value="1">{{ language == 0 ? '男' : 'male' }}</el-radio>
                  </el-radio-group>
                </el-form-item>
-                <el-form-item :label="language==0?'有效证件':'Valid Certificates Scanning Copy'" required>
+                <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
                  <file-upload v-model="wdsfData.passportUrl" :limit="1" :is-show-tip="false"
                               :button-text="language==0?'上传':'Upload'"/>
                  <div class="tip">
-                    <span v-if="language==0">请上传护照副本，用于认证 </span>
+                    <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
-                    <span v-else>Please upload a passport copy for authentication</span>
+                    <span v-else>Please upload a scanned copy of your valid passport for verification of identity information,
+                      application of visa invitation letter and purchasing insurance etc.</span>
                  </div>
                </el-form-item>
                <el-form-item :label="language==0?'证件号':'Passport number'">
--- a/src/viewsPc/register/team/step2.vue
View file @b80ab69
+++ b/src/viewsPc/register/team/step2.vue
View file @b80ab69
@@ -204,6 +204,16 @@ const goStep1 = () => {
 const goStep3 = () => {
  proxy.$refs.registerRef.validate(valid => {
    if (valid) {
+      if(language.value==0){
+        var pattern = /^1[3456789]\d{9}$/
+        if (!pattern.test(form.value.contactTel)) {
+          ElMessage.warning(language.value == 0 ?'请输入正确的手机号':'Please enter the correct mobile phone number')
+          return
+        }
+      }
      if (!isAgree.value) {
        ElMessage.warning(language.value == 0?'请勾选接受':'Please check the acceptance')
        return