diff --git a/src/App.vue b/src/App.vue
index 494f435..6f89e4a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,8 +9,16 @@
         <div class="nav-left">
           <div class="nav-brand">红色警戒3数据分析中心</div>
           <router-link to="/" class="nav-link">热门下载地图</router-link>
+<<<<<<< HEAD
+          
+          <router-link to="/weekly" class="nav-link">每周推荐</router-link>
+          <router-link to="/demands" class="nav-link">办事大厅</router-link>
+          <router-link to="/weapon-match" class="nav-link">Weapon 匹配</router-link>
+
+=======
           <router-link to="/weekly" class="nav-link">每周推荐</router-link>
           <router-link to="/weapon-match" class="nav-link">Weapon 匹配</router-link>
+>>>>>>> 062550d1260d3f66fd69a2d954f426abb5531511
         </div>
       </div>
     </nav>
diff --git a/src/router/index.js b/src/router/index.js
index d010d83..32a3113 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,6 +2,14 @@ import { createRouter, createWebHistory } from 'vue-router'
 
 const routes = [
   {
+<<<<<<< HEAD
+    path: '/demands',
+    name: 'DemandList',
+    component: () => import('../views/DemandList.vue')
+  },
+  {
+=======
+>>>>>>> 062550d1260d3f66fd69a2d954f426abb5531511
     path: '/',
     name: 'Maps',
     component: () => import('../views/Maps.vue')
diff --git a/src/views/DemandList.vue b/src/views/DemandList.vue
new file mode 100644
index 0000000..28268a1
--- /dev/null
+++ b/src/views/DemandList.vue
@@ -0,0 +1,221 @@
+<template>
+    <div class="demand-hall">
+      <header>
+        <h1>办事大厅</h1>
+      </header>
+      
+      <div class="app-content">
+        <div v-if="loading" class="loading">加载中...</div>
+        <div v-if="error" class="error">{{ error }}</div>
+        
+        <div class="demand-list">
+          <div v-for="demand in demands" :key="demand.id || demand.requester + demand.content" class="demand-card">
+            <div class="demand-header">
+              <span class="requester">{{ demand.requester || '匿名' }}</span>
+              <span class="reward" :class="{ 'no-reward': isNoReward(demand.reward) }">
+                {{ demand.reward || '无赏金' }}
+              </span>
+            </div>
+            <div class="content">{{ demand.content || '无具体内容' }}</div>
+            <div class="date">{{ formatDate(demand.date) }}</div>
+          </div>
+        </div>
+        
+        <button class="refresh-btn" @click="fetchDemands">刷新列表</button>
+      </div>
+    </div>
+  </template>
+  
+  <script setup>
+  import { ref, onMounted } from 'vue'
+  
+  // 响应式数据
+  const demands = ref([])
+  const loading = ref(false)
+  const error = ref(null)
+  
+  // 判断是否为无赏金
+  const isNoReward = (reward) => {
+    return !reward || reward === '无赏金'
+  }
+  
+  // 格式化日期
+  const formatDate = (dateString) => {
+    if (!dateString || dateString === 'Test_date') return '日期未提供'
+    
+    try {
+      const date = new Date(dateString)
+      if (isNaN(date.getTime())) {
+        return dateString
+      }
+      
+      const pad = num => num.toString().padStart(2, '0')
+      return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+    } catch (e) {
+      return dateString
+    }
+  }
+  
+  // 获取需求列表
+  const fetchDemands = async () => {
+    loading.value = true
+    error.value = null
+    
+    try {
+      // 使用代理解决跨域问题
+      const targetUrl = 'http://49.232.8.189:8000/demands/getlist'
+      
+      const response = await fetch(targetUrl, {
+        headers: {
+          'X-Requested-With': 'XMLHttpRequest'
+        }
+      })
+      
+      if (!response.ok) {
+        throw new Error(`请求失败: ${response.status}`)
+      }
+      
+      const data = await response.json()
+      demands.value = data
+    } catch (err) {
+      error.value = `加载失败: ${err.message}`
+      console.error('加载需求列表失败:', err)
+    } finally {
+      loading.value = false
+    }
+  }
+  
+  // 组件挂载时自动加载数据
+  onMounted(() => {
+    fetchDemands()
+  })
+  </script>
+  
+  <style scoped>
+  .demand-hall {
+    max-width: 1200px;
+    margin: 0 auto;
+    padding: 20px;
+  }
+  
+  header {
+    background-color: #1890ff;
+    color: white;
+    padding: 20px;
+    border-radius: 5px 5px 0 0;
+    margin-bottom: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  }
+  
+  h1 {
+    font-size: 24px;
+    text-align: center;
+  }
+  
+  .app-content {
+    background-color: #f5f5f5;
+    padding: 20px;
+    border-radius: 0 0 5px 5px;
+  }
+  
+  .demand-list {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
+    gap: 20px;
+  }
+  
+  .demand-card {
+    background-color: white;
+    border-radius: 5px;
+    padding: 20px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    transition: transform 0.3s, box-shadow 0.3s;
+  }
+  
+  .demand-card:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  }
+  
+  .demand-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #eee;
+  }
+  
+  .requester {
+    font-weight: bold;
+    font-size: 18px;
+    color: #333;
+  }
+  
+  .reward {
+    background-color: #fadb14;
+    color: #333;
+    padding: 3px 8px;
+    border-radius: 3px;
+    font-size: 14px;
+  }
+  
+  .reward.no-reward {
+    background-color: #f5f5f5;
+    color: #999;
+  }
+  
+  .content {
+    color: #666;
+    margin-bottom: 15px;
+    line-height: 1.6;
+  }
+  
+  .date {
+    color: #999;
+    font-size: 12px;
+    text-align: right;
+  }
+  
+  .loading {
+    text-align: center;
+    padding: 20px;
+    color: #666;
+  }
+  
+  .error {
+    text-align: center;
+    padding: 20px;
+    color: #f5222d;
+    background-color: #fff1f0;
+    border-radius: 5px;
+    margin-bottom: 20px;
+  }
+  
+  .refresh-btn {
+    display: block;
+    margin: 20px auto;
+    padding: 10px 20px;
+    background-color: #1890ff;
+    color: white;
+    border: none;
+    border-radius: 5px;
+    cursor: pointer;
+    font-size: 16px;
+    transition: background-color 0.3s;
+  }
+  
+  .refresh-btn:hover {
+    background-color: #40a9ff;
+  }
+  
+  @media (max-width: 768px) {
+    .demand-list {
+      grid-template-columns: 1fr;
+    }
+    
+    .demand-hall {
+      padding: 10px;
+    }
+  }
+  </style>
\ No newline at end of file