no message

杨炀
Showing 7 changed files with 24 additions and 16 deletions
src/viewsPc/index.vue
src/viewsPc/index_en.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/matchInfo-projectList.vue
src/viewsPc/match/detail.vue
src/viewsPc/match/detail_en.vue
vite.config.js
--- a/src/viewsPc/index.vue
View file @bdfcd17
+++ b/src/viewsPc/index.vue
View file @bdfcd17
 <template>
  <div>
    <div class="banner">
-      <el-carousel class="forPc" height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
+      <el-carousel class="forPc" autoplay :interval="3000" height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
        <el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id">
          <div class="bannerItem">
            <div class="h100">
              <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
              <img v-else class="bannerImg" src="@/assets/dance/banner.png">
              <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
                <div class="banner-count" v-if="n.time>0"  @click="goMatch(n)">
                  距离开始还有
                  <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
@@ -88,13 +87,13 @@
          <el-col :sm="24" :lg="10">
            <div class="bgbg">
              <h1 style="color: #fff">{{matchData?.name}}</h1>
-              <a class="zn-btn" @click="goGuide" target="_blank">参赛指南
+              <a class="zn-btn" @click="goGuide" target="_blank" v-show="matchData?.id=='1778253367748993026'">参赛指南
                <el-icon>
                  <download/>
                </el-icon>
              </a>
 <!--              <el-button type="primary" @click="popMaster">青少年公益课</el-button>-->
-              <a class="zn-btn ml20 btn-q"  @click="popMaster">青少年公益课报名</a>
+              <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'" @click="popMaster">青少年公益课报名</a>
              <div>
                <a class="ding"  @click="handlePickup">接/送机服务</a>
--- a/src/viewsPc/index_en.vue
View file @bdfcd17
+++ b/src/viewsPc/index_en.vue
View file @bdfcd17
@@ -86,11 +86,13 @@
            <div class="bgbg">
              <h1 style="color: #fff">{{matchData?.name}}</h1>
              <div style="margin-bottom: 30px">
-                <a class="zn-btn" style="font-size: 15px" @click="goGuide">GUIDELINE<el-icon><download /></el-icon>
+                <a class="zn-btn" style="font-size: 15px"  v-show="matchData?.id=='1778253367748993026'" @click="goGuide">
+                  GUIDELINE
+                  <el-icon><download /></el-icon>
                </a>
-                <a class="zn-btn ml20 btn-q" style="font-size: 15px;margin-right: 20px" @click="popMaster">Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>
+                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'" style="font-size: 15px;margin-right: 20px" @click="popMaster">
+                  Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>
                </a>
                <div>
                  <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service
                  </a>
@@ -531,7 +533,7 @@ const handlePickup=()=>{
  .bgbg{height: 100%;
    padding: 5%;display: flex;
    flex-direction: column;
-    justify-content: space-between;
+    justify-content: center;
    img{margin: 5% 0}
  }
  .itemBox{
--- a/src/viewsPc/match/chooseSportsman.vue
View file @bdfcd17
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @bdfcd17
@@ -102,7 +102,8 @@
                    <div class="flexBetween w100">
                      <div class="l">
                        {{ c.code }}:{{ c.name }}（{{c.danceType}}）
-                        <div>{{ c.danceTypeDetailStr }}</div>
+                        <div v-if="c.danceType=='Breaking'">--</div>
+                        <div v-else>{{c.danceTypeDetailStr}}</div>
                      </div>
                      <div class="text-primary">{{ language == 0 ? '¥' : '€' }}{{ c.serviceFee }}</div>
                    </div>
--- a/src/viewsPc/match/components/matchInfo-projectList.vue
View file @bdfcd17
+++ b/src/viewsPc/match/components/matchInfo-projectList.vue
View file @bdfcd17
@@ -13,7 +13,10 @@
        <el-table-column :label="language==0?'舞种':'DISCIPLINE'" width="110" prop="danceType" align="center">
        </el-table-column>
        <el-table-column :label="language==0?'舞种明细':'Dance Detail'" width="120" prop="danceTypeDetailStr" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.danceType=='Breaking'">--</span>
+            <span v-else>{{scope.row.danceTypeDetailStr}}</span>
+          </template>
        </el-table-column>
        <el-table-column :label="language==0?'参赛性别':'Sex'" align="center">
--- a/src/viewsPc/match/detail.vue
View file @bdfcd17
+++ b/src/viewsPc/match/detail.vue
View file @bdfcd17
@@ -64,7 +64,7 @@
          </el-col>
          <el-col :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'">
            <p class="countDownTitle"><span>报名截止倒计时</span></p>
-            <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
+            <van-count-down :time="startSign>0?startSign>0:time" format="DD 天 HH 时 mm 分 ss 秒">
              <template #default="timeData">
                <span class="block">{{ timeData.days }}</span>
                <span class="colon">天</span>
@@ -78,7 +78,9 @@
            </van-count-down>
            <div class="mt30">
-              <a class="btn-lineG mb20" v-if="matchData.progressStatusCode=='2'" @click="choseSignType" style="display: block;text-align: center;">我要报名</a>
+              <a class="btn-lineG mb20" v-if="matchData.progressStatusCode=='2'" @click="choseSignType" style="display: block;text-align: center;">
+                我要报名
+              </a>
              <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名已结束</div>
              <div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">报名未开始</div>
            </div>
@@ -218,9 +220,10 @@ const data = reactive({
  menu1: [{name: '分站赛', active: 1}, {name: '赛事详情', active: 0}, {name: '日程', active: 0}],
  signDoneGroupList: [],
  time: '',
+  time2: '',
  startSign: ''
 })
-const {loading,error,time,startSign, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data)
+const {loading,error,time,time2,startSign, matchData, matchId, groupId, activeName2, popupGroupList, menu, menu1, signDoneGroupList} = toRefs(data)
 const group = useUserStore().group
 const user = useUserStore().user
 onMounted(() => {
--- a/src/viewsPc/match/detail_en.vue
View file @bdfcd17
+++ b/src/viewsPc/match/detail_en.vue
View file @bdfcd17
@@ -138,7 +138,7 @@
              <span v-else>REGISTRATION COUNTDOWN</span>
            </p>
-            <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
+            <van-count-down :time="startSign>0?startSign>0:time" format="DD 天 HH 时 mm 分 ss 秒">
              <template #default="timeData">
                <span class="block">{{ timeData.days }}</span>
                <span class="colon">{{ language == 0 ? '天' : 'Days' }}</span>
--- a/vite.config.js
View file @bdfcd17
+++ b/vite.config.js
View file @bdfcd17
@@ -84,8 +84,8 @@ export default defineConfig(({ mode, command }) => {
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
          // target: 'http://192.168.1.131:8081/',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
-          // target: 'https://wdsfwuxicenter.com/stage-api/',
+          target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
        },