Merge branch 'prod' into dev

# Conflicts:
#	src/viewsPc/guide/index.vue

@@ -96,7 +96,7 @@
 
 
           <div class="content" v-if="activeName==8">
           <div class="content" v-if="activeName==8">
             <label>点击下载：</label>
             <label>点击下载：</label>
-            <a target="_blank" class="text-primary" @click="showBuilding">
+            <a target="_blank" class="text-primary"  href="/file/COMPETITION_GUIDE_0511V1.pdf">
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
               2024 WDSF亚洲体育舞蹈节参赛指南
               2024 WDSF亚洲体育舞蹈节参赛指南
             </a>
             </a>
@@ -199,7 +199,7 @@
           <div class="content" v-if="activeName==71"><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">
           <div class="content" v-if="activeName==8">
             <label>Download：</label>
             <label>Download：</label>
-            <a target="_blank" class="text-primary" >
+            <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
               <el-icon style="position: relative;top: 2px"><download/></el-icon>
              2024 WDSF ASIAN DANCESPORT FESTIVAL ENTRY GUIDE
              2024 WDSF ASIAN DANCESPORT FESTIVAL ENTRY GUIDE
             </a>
             </a>

@@ -76,8 +76,8 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
         },
         },
         '/dev-api/ztx-webSite': {
         '/dev-api/ztx-webSite': {
-          target: 'https://dance.itechtop.cn/stage-api',
-          // target: 'http://192.168.1.118:8081/',
+          // target: 'https://dance.itechtop.cn/stage-api',
+          target: 'http://192.168.1.118:8081/',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },