Merge branch 'order' of https://code.itechtop.cn/yangyang/dance-pc into order

yyx
Showing 10 changed files with 29 additions and 14 deletions
public/file/COMPETITION GUIDE 0520V1.pdf
public/file/COMPETITION_GUIDE_0511V1.pdf
src/viewsPc/center/index.vue
src/viewsPc/center/myMember.vue
src/viewsPc/guide/index.vue
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/components/matchInfo-projectList.vue
src/viewsPc/match/components/signInfo-table.vue
src/viewsPc/match/pay.vue
vite.config.js
--- a/public/file/COMPETITION GUIDE 0520V1.pdf 0 → 100644
View file @202b603
+++ b/public/file/COMPETITION GUIDE 0520V1.pdf 0 → 100644
View file @202b603
--- a/public/file/COMPETITION_GUIDE_0511V1.pdf deleted 100644 → 0
View file @e6f3bb4
+++ b/public/file/COMPETITION_GUIDE_0511V1.pdf deleted 100644 → 0
View file @e6f3bb4
--- a/src/viewsPc/center/index.vue
View file @202b603
+++ b/src/viewsPc/center/index.vue
View file @202b603
@@ -108,6 +108,13 @@ const menus = ref([
    isActive: false
  },
  {
+    name: language.value==0?'票务预订':'Ticket Reservation',
+    routeName: 'seat_order',
+    picUrl1: '/img/nav_29.png',
+    picUrl2: '/img/nav_29_dwn.png',
+    isActive: false
+  },
+  {
    name: language.value==0?'系统消息':'System messages',
    routeName: 'mySms',
    picUrl1: '/img/nav_30.png',
--- a/src/viewsPc/center/myMember.vue
View file @202b603
+++ b/src/viewsPc/center/myMember.vue
View file @202b603
@@ -193,6 +193,8 @@ function delperson(p) {
    cancelButtonText: c,
    type: 'warning'
  }).then(() => {
+    // This user has registered for the event and cannot be deleted.
    match.delPerson(p.id).then(res => {
      ElMessage.success(msg)
      getList(groupId.value)
--- a/src/viewsPc/guide/index.vue
View file @202b603
+++ b/src/viewsPc/guide/index.vue
View file @202b603
@@ -96,8 +96,8 @@
          <div class="content" v-if="activeName==8">
            <label>点击下载：</label>
-<!--            <a target="_blank" class="text-primary"  href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
+            <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
-              <a @click="showBuilding" class="text-primary">
+<!--              <a @click="showBuilding" class="text-primary">-->
              <el-icon style="position: relative;top: 2px"><download/></el-icon>
              2024 WDSF亚洲体育舞蹈节参赛指南
            </a>
@@ -200,8 +200,8 @@
          <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" href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
+            <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
-            <a @click="showBuilding" class="text-primary">
+<!--            <a @click="showBuilding" class="text-primary">-->
              <el-icon style="position: relative;top: 2px"><download/></el-icon>
             2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE
            </a>
--- a/src/viewsPc/match/chooseProject.vue
View file @202b603
+++ b/src/viewsPc/match/chooseProject.vue
View file @202b603
@@ -39,8 +39,8 @@
                    <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
                  </div>
                  <div class="tip">
-                    <span v-if="language==0">*如果您参加个人项目，或给其它组合/选手进行报名，请点击切换按钮重新选择人员</span>
+                    <span v-if="language==0">*如果您参加个人项目，或给其他组合/选手进行报名，请点击切换按钮重新选择人员</span>
-                    <span v-else>*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.</span>
+                    <span v-else>*If you would like to register individual competitions for yourself or other couples/athletes, please click "Switch" button to re-select persons concerned.</span>
                  </div>
                </div>
              </div>
--- a/src/viewsPc/match/components/matchInfo-projectList.vue
View file @202b603
+++ b/src/viewsPc/match/components/matchInfo-projectList.vue
View file @202b603
@@ -43,7 +43,11 @@
            </div>
            <div v-else>
              <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
-              <div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
+              <div v-if="scope.row.birthPeriodSecond">{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
+              <div v-if="scope.row.birthPeriodThird">{{scope.row.birthPeriodThird?.replace(',',language==0?' 至 ':' to ')}}</div>
+              <div v-if="scope.row.birthPeriodFourth">{{scope.row.birthPeriodFourth?.replace(',',language==0?' 至 ':' to ')}}</div>
+              <div v-if="scope.row.birthPeriodFifth">{{scope.row.birthPeriodFifth?.replace(',',language==0?' 至 ':' to ')}}</div>
+              <div v-if="scope.row.birthPeriodSixth">{{scope.row.birthPeriodSixth?.replace(',',language==0?' 至 ':' to ')}}</div>
            </div>
          </template>
        </el-table-column>
--- a/src/viewsPc/match/components/signInfo-table.vue
View file @202b603
+++ b/src/viewsPc/match/components/signInfo-table.vue
View file @202b603
@@ -61,11 +61,11 @@
      <template #default="scope">
        <el-link v-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='2'"
                 target="_blank"
-                 :href="fillImgUrl(scope.row.signInfo[0].extraPersonInfoMapList[index].value.url)">
+                 :href="fillImgUrl(scope.row.signInfo[0].extraPersonInfoMapList[index]?.value?.url)">
-          <span class="text-primary">{{ scope.row.signInfo[0].extraPersonInfoMapList[index].value.name }}</span>
+          <span class="text-primary">{{ scope.row.signInfo[0].extraPersonInfoMapList[index]?.value?.name }}</span>
        </el-link>
        <img v-else-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='3'" style="width: 50px;"
-             :src="fillImgUrl(scope.row.signInfo[0].extraPersonInfoMapList[index].value.url||scope.row.signInfo[0].extraPersonInfoMapList[index].value)">
+             :src="fillImgUrl(scope.row.signInfo[0].extraPersonInfoMapList[index]?.value?.url||scope.row.signInfo[0]?.extraPersonInfoMapList[index]?.value)">
        <span v-else>{{ scope.row.signInfo[0].extraPersonInfoMapList[index]?.value }}</span>
      </template>
    </el-table-column>
--- a/src/viewsPc/match/pay.vue
View file @202b603
+++ b/src/viewsPc/match/pay.vue
View file @202b603
@@ -116,8 +116,10 @@
          </el-col>
          <el-col :lg="12" v-if="Number(form.totalFee)>0">
            <div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-if="form.payStatus=='1'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+            <div class="priceb" v-else-if="form.payStatus=='1'">{{ language==0?'线下支付待核销':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+            <div class="priceb" v-else-if="form.payStatus=='3'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+            <div class="priceb" v-else-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
+            <div class="priceb" v-else>{{ language==0?'费用总计':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
          </el-col>
        </el-row>
      </el-card>
--- a/vite.config.js
View file @202b603
+++ b/vite.config.js
View file @202b603
@@ -65,7 +65,7 @@ export default defineConfig(({ mode, command }) => {
        // https://cn.vitejs.dev/config/#server-proxy
        '/dev-api/ztx-train': {
          // target: 'http://123.60.96.243:1896/stage-api',
-          target: 'http://192.168.1.25:8686',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
        },
@@ -76,8 +76,8 @@ export default defineConfig(({ mode, command }) => {
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
        },
        '/dev-api/ztx-webSite': {
+          // target: 'https://dance.itechtop.cn/stage-api',
          target: 'https://jijin.wtwuxicenter.com/stage-api',
-          // target: 'http://192.168.1.118:8081/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
        },