Merge branch 'base' of http://182.92.169.222:3000/dlsx/ContestPortal into base

src/views/raceInfo/index.vue

@@ -1,32 +1,7 @@
 <template>
   <div class="container-1420 container">
-    <div class="top-image">Banner</div>
-    <!-- 年度比赛列表 -->
-    <div style="margin-top: 30px;font-size: 24px;font-weight: 600;">年度比赛列表:</div>
-    <div class="race-list">
-     
-      <div
-        class="item"
-        v-for="item in reacProjectList"
-        :key="item.id"
-        @click="goToCompetition(item.id)"
-      >
-        <div class="image">
-          <img
-            :src="setImageUrl(item.image)"
-            alt=""
-        
-          />
-        </div>
-        <div class="reac-info">
-          <div class="reac-title">{{ item.name }}</div>
-          <div class="reac-project">{{ item.introduction }}</div>
-          <div class="time">
-            报名时间:{{ item.starttime }}-{{ item.endtime }}
-          </div>
-        </div>
-      </div>
-    </div>
+   
+
     <el-card v-if="reacProjectList.length === 0">
       <div
         style="
@@ -146,6 +121,32 @@
           </el-scrollbar>
         </el-card>
       </div>
+    </div>
+        <!-- 年度比赛列表 -->
+        <div style="margin-top: 30px;font-size: 24px;font-weight: 600;">年度比赛列表:</div>
+    <div class="race-list">
+     
+      <div
+        class="item"
+        v-for="item in reacProjectList"
+        :key="item.id"
+        @click="goToCompetition(item.id)"
+      >
+        <div class="image">
+          <img
+            :src="setImageUrl(item.image)"
+            alt=""
+        
+          />
+        </div>
+        <div class="reac-info">
+          <div class="reac-title">{{ item.name }}</div>
+          <div class="reac-project">{{ item.introduction }}</div>
+          <div class="time">
+            报名时间:{{ item.starttime }}-{{ item.endtime }}
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>

src/views/userInfo/components/reacList.vue

@@ -150,14 +150,7 @@ const headerChange = (pageNumber: any) => {
 }
 // 下载文件
 const download = (url: any,fileName:any) => {
-  console.log(url);
-  
-  const a = document.createElement('a')
-  a.href = url
-  a.download = fileName;
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a);
+ window.open(url)
 }
 </script>