diff --git a/Dockerfile b/Dockerfile
index 7cd6f63..73f37ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,7 @@
-# 构建阶段
-FROM node:18-alpine as builder
-
-WORKDIR /app
-
-# 复制项目文件
-COPY package*.json ./
-
-# 安装依赖
-RUN npm install
-
-# 复制源代码
-COPY . .
-
-# 构建项目
-RUN npm run build
-
-# 生产阶段
 FROM nginx:1.25.3-alpine
 
 # 从构建阶段复制构建结果到nginx目录
-COPY --from=builder /app/dist /usr/share/nginx/html
+ADD go_fish_web.tar.gz /usr/share/nginx/html
 
 # 复制nginx配置
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..b233ca0
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,64 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('📄文件信息') {
+            steps {
+                sh 'pwd'
+                sh 'ls -al'
+                echo '🚀开始推送文件到坤爷服务器'
+                sh 'scp Dockerfile root@47.109.22.188:~/go_fish_web'
+                sh 'scp nginx.conf root@47.109.22.188:~/go_fish_web'
+                echo '✨推送完成'
+            }            
+        }
+
+        stage('🛠️构建项目') {
+            steps {  
+                withDockerContainer('node:18-alpine') {
+                    sh 'npm -v'
+                    sh 'npm config set registry https://registry.npmmirror.com'                        
+                    sh 'npm install'                        
+                    sh 'npm run build' 
+                    sh 'ls -al'                    
+                }                
+            }            
+        }
+
+        stage('🎁打包制品'){
+            steps {
+                dir('dist') {
+                    sh 'ls -al'
+                    sh 'tar -zcvf go_fish_web.tar.gz *'
+                    archiveArtifacts artifacts: 'go_fish_web.tar.gz',
+                                                   allowEmptyArchive: true,
+                                                   fingerprint: true,
+                                                   onlyIfSuccessful: true
+                    sh 'ls -al'
+                    echo '🚀开始推送制品到坤爷服务器'
+                    sh 'scp go_fish_web.tar.gz root@47.109.22.188:~/go_fish_web'
+                    echo '✨推送完成'
+                }
+            }
+        }
+
+        stage('🏓远程部署') {
+            steps {  
+                echo '🚀开始远程部署'
+                sh 'ssh root@47.109.22.188 "docker stop go_fish_web && docker rm go_fish_web && docker rmi go_fish_web && docker build -t go_fish_web ~/go_fish_web"'
+                sh 'ssh root@47.109.22.188 "docker run --restart=always --name go_fish_web -d -p 30030:80 -v /etc/localtime:/etc/localtime:ro go_fish_web"'
+                sh 'ssh root@47.109.22.188 "docker ps -a"'
+                echo '✨远程部署完成'
+            }            
+        }
+    }
+
+    post {
+        success {
+            echo 'Deployment successful!'
+        }
+        failure {
+            echo 'Deployment failed.'
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pages/fishbaskets/Fishbaskets.vue b/src/pages/fishbaskets/Fishbaskets.vue
index dd7782b..6070c47 100644
--- a/src/pages/fishbaskets/Fishbaskets.vue
+++ b/src/pages/fishbaskets/Fishbaskets.vue
@@ -156,19 +156,26 @@ const handleProcessFish = async () => {
 
 // 手动处理鱼
 const handleFish = async (fishId) => {
-  try {
-    loading.value = true;
-    const res = await handleFishById(fishId);
-    if (res) {
-      ElMessage.success(res + " 🎉");
-      await fetchFishList();
+    loading.value = true
+    try {
+        const res = await handleFishById(fishId)
+        if (res.success) {
+            ElMessage.success(res.message + ' 🎉')
+            fetchFishList()
+        }
+        else{
+            ElMessage.error(res.message + ' 😢')
+        }
+    } catch (err) {
+        console.log('====================================');
+        console.log(err);
+        console.log('====================================');
+        ElMessage.warning('处理失败，请稍后再试 ⏳')
     }
-  } catch (err) {
-    ElMessage.warning("处理失败，请稍后再试 ⏳");
-  } finally {
-    loading.value = false;
-  }
-};
+    finally {
+        loading.value = false
+    }
+}
 
 // 处理出售操作
 const handleSell = async (fish) => {
diff --git a/src/pages/fishing/Fishing.vue b/src/pages/fishing/Fishing.vue
index 9721ca8..35b4518 100644
--- a/src/pages/fishing/Fishing.vue
+++ b/src/pages/fishing/Fishing.vue
@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div class="fishing-page">
     <div class="fishing-container">
       <div class="fishing-area">
@@ -11,38 +12,29 @@
         >
           <div class="fishing-scene" @click="handleFish"></div>
           <div class="ripple"></div>
+=======
+    <div class="fishing-page">
+        <div class="fishing-container">
+            <div class="fishing-area">
+                <div class="fishing-animation" :class="{ 'fishing-active': isFishing }">
+                    <div class="fishing-scene" @click="handleFish"></div>
+                    <div class="ripple"></div>
+                </div>
+                <div class="result" v-if="resultMessage || nextPullTime">
+                    <el-alert v-if="resultMessage" :title="resultMessage" :type="currentCatch.length>0 ? 'success' : 'info'"
+                        :closable="false" show-icon />
+                    <el-alert v-if="nextPullTime" :title="`下次可钓鱼时间：${nextPullTime}`" type="warning" :closable="false" show-icon />
+                </div>
+            </div>
+            <div class="log-area">
+                <FishingLog :logs="fishingLogs" />
+                <div class="back-button">
+                    <el-button @click="goHome" size="small" type="default" icon="ArrowLeft">返回</el-button>
+                </div>
+            </div>
+>>>>>>> 4a4857fa8239db297faeeaf348f16654927c8bb7
         </div>
-        <div class="result" v-if="resultMessage || nextPullTime">
-          <el-alert
-            v-if="resultMessage"
-            :title="resultMessage"
-            :type="currentCatch ? 'success' : 'info'"
-            :closable="false"
-            show-icon
-          />
-          <el-alert
-            v-if="nextPullTime"
-            :title="`下次可钓鱼时间：${nextPullTime}`"
-            type="warning"
-            :closable="false"
-            show-icon
-          />
-        </div>
-      </div>
-      <div class="log-area">
-        <FishingLog :logs="fishingLogs" />
-        <div class="back-button">
-          <el-button
-            @click="goHome"
-            size="small"
-            type="default"
-            icon="ArrowLeft"
-            >返回</el-button
-          >
-        </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script setup>
@@ -56,7 +48,7 @@ const router = useRouter();
 const resultMessage = ref("");
 const nextPullTime = ref("");
 const isFishing = ref(false);
-const currentCatch = ref(null);
+const currentCatch = ref([]); // 改为数组
 const fishingLogs = ref([]);
 const clickCount = ref(0);
 const targetClicks = ref(0);
@@ -66,17 +58,18 @@ const fishEscapeTimer = ref(null);
 
 // 从localStorage加载缓存的钓鱼日志
 const loadCachedLogs = () => {
-  const cachedLogs = localStorage.getItem("fishingLogs");
-  if (cachedLogs) {
-    fishingLogs.value = JSON.parse(cachedLogs);
-  }
+    const cachedLogs = localStorage.getItem("fishingLogs");
+    if (cachedLogs) {
+        fishingLogs.value = JSON.parse(cachedLogs);
+    }
 };
 
 // 保存钓鱼日志到localStorage
 const saveLogs = () => {
-  localStorage.setItem("fishingLogs", JSON.stringify(fishingLogs.value));
+    localStorage.setItem("fishingLogs", JSON.stringify(fishingLogs.value));
 };
 
+<<<<<<< HEAD
 // 生成随机点击阈值（1-5秒内的随机次数）
 const generateRandomTarget = () => {
   return Math.floor(Math.random() * 15) + 5; // 5-20次随机点击
@@ -98,10 +91,13 @@ const willReelFail = () => {
 };
 
 // 组件挂载时加载缓存的日志
+=======
+>>>>>>> 4a4857fa8239db297faeeaf348f16654927c8bb7
 onMounted(() => {
-  loadCachedLogs();
+    loadCachedLogs();
 });
 
+<<<<<<< HEAD
 // 组件卸载时清除定时器
 onBeforeUnmount(() => {
   if (fishEscapeTimer.value) {
@@ -179,103 +175,120 @@ const handleFish = async () => {
   // 调用钓鱼接口
   currentCatch.value = null;
   resultMessage.value = "正在钓鱼中...";
+=======
+onBeforeUnmount(() => {
+    localStorage.removeItem("fishingLogs");
+});
 
-  try {
-    const res = await fishingClick();
-    if (res.success && res.data) {
-      const items = res.data.items || [];
-      if (res.data.nextPullTime) {
-        nextPullTime.value = new Date(res.data.nextPullTime).toLocaleString();
-      }
+const handleFish = async () => {
+    if (isFishing.value) return;
 
-      if (items.length > 0) {
-        const fish = items[0];
-        currentCatch.value = fish;
-        resultMessage.value = `你钓到了一条${fish.isRare ? "稀有的" : ""}「${
-          fish.fishName
-        }」，重量 ${fish.weight}`;
-        ElMessage.success("钓鱼成功！🎣");
-
-        // 添加到日志并保存到localStorage
-        fishingLogs.value.unshift({
-          time: new Date(),
-          fishName: fish.fishName,
-          weight: fish.weight,
-          isRare: fish.isRare,
-        });
-        saveLogs();
-      } else {
-        resultMessage.value = "什么也没钓到，下次好运 🍀";
-        ElMessage.warning("什么也没钓到，下次好运 🍀");
-      }
-    } else {
-      resultMessage.value = res.message || "钓鱼失败";
-      if (res.data?.nextPullTime) {
-        nextPullTime.value = new Date(res.data.nextPullTime).toLocaleString();
-      }
-      ElMessage.error(res.message || "钓鱼失败 🎣");
+    isFishing.value = true;
+    currentCatch.value = [];
+    resultMessage.value = "正在钓鱼中...";
+>>>>>>> 4a4857fa8239db297faeeaf348f16654927c8bb7
+
+    try {
+        const res = await fishingClick();
+        if (res.success && res.data) {
+            const items = res.data.items || [];
+            if (res.data.nextPullTime) {
+                nextPullTime.value = new Date(res.data.nextPullTime).toLocaleString();
+            }
+
+            if (items.length > 0) {
+                currentCatch.value = items;
+
+                // 构建展示信息
+                const messageList = items.map(fish =>
+                    `「${fish.isRare ? "稀有的" : ""}${fish.fishName}」，重量 ${fish.weight}`
+                );
+                resultMessage.value = `你钓到了：\n${messageList.join("\n")}`;
+                ElMessage.success("钓鱼成功！🎣");
+
+                // 添加所有钓到的鱼到日志
+                const newLogs = items.map(fish => ({
+                    time: new Date(),
+                    fishName: fish.fishName,
+                    weight: fish.weight,
+                    isRare: fish.isRare,
+                }));
+                fishingLogs.value.unshift(...newLogs);
+                saveLogs();
+            } else {
+                resultMessage.value = "什么也没钓到，下次好运 🍀";
+                ElMessage.warning("什么也没钓到，下次好运 🍀");
+            }
+        } else {
+            resultMessage.value = res.message || "钓鱼失败";
+            if (res.data?.nextPullTime) {
+                nextPullTime.value = new Date(res.data.nextPullTime).toLocaleString();
+            }
+            ElMessage.error(res.message || "钓鱼失败 🎣");
+        }
+    } catch (err) {
+        resultMessage.value = "钓鱼出错，请稍后重试";
+        ElMessage.error("钓鱼出错，请稍后重试 🌊");
+        console.error(err);
+    } finally {
+        isFishing.value = false;
     }
-  } catch (err) {
-    resultMessage.value = "钓鱼出错，请稍后重试";
-    ElMessage.error("钓鱼出错，请稍后重试 🌊");
-    console.error(err);
-  } finally {
-    isFishing.value = false;
-  }
 };
 
 const goHome = () => {
-  router.push("/");
+    router.push("/");
 };
+
 </script>
 
 <style scoped>
 .fishing-page {
-  padding: 20px;
+    padding: 20px;
 }
 
 .fishing-container {
-  display: grid;
-  grid-template-columns: 1fr 400px;
-  gap: 20px;
-  max-width: 1200px;
-  margin: 0 auto;
-  min-height: calc(100vh - 40px);
+    display: grid;
+    grid-template-columns: 1fr 400px;
+    gap: 20px;
+    max-width: 1200px;
+    margin: 0 auto;
+    min-height: calc(100vh - 40px);
 }
 
 .back-button {
-  margin-top: 20px;
-  text-align: center;
+    margin-top: 20px;
+    text-align: center;
 }
 
 .back-button .el-button {
-  padding: 12px 24px;
-  font-size: 16px;
-  border-radius: 24px;
-  transition: all 0.3s ease;
-  background: #409eff;
-  border: 1px solid #409eff;
-  color: white;
-  font-weight: bold;
+    padding: 12px 24px;
+    font-size: 16px;
+    border-radius: 24px;
+    transition: all 0.3s ease;
+    background: #409eff;
+    border: 1px solid #409eff;
+    color: white;
+    font-weight: bold;
 }
 
 .back-button .el-button:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 16px rgba(64, 158, 255, 0.3);
-  background: #66b1ff;
-  border-color: #66b1ff;
+    transform: translateY(-2px);
+    box-shadow: 0 4px 16px rgba(64, 158, 255, 0.3);
+    background: #66b1ff;
+    border-color: #66b1ff;
 }
 
 .fishing-area {
-  text-align: center;
-  background: #fff;
-  padding: 20px;
-  border-radius: 8px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  position: relative;
+    text-align: center;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    position: relative;
 }
 
 .fishing-animation {
+<<<<<<< HEAD
   height: 500px;
   position: relative;
   margin: 20px 0;
@@ -296,10 +309,29 @@ const goHome = () => {
   background-size: cover;
   transition: transform 0.2s ease;
   pointer-events: auto;
+=======
+    height: 500px;
+    position: relative;
+    margin: 20px 0;
+    overflow: hidden;
+    border-radius: 8px;
+    background: #fff;
+    cursor: pointer;
+}
+
+.fishing-scene {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: url("@/assets/fishing-scene.svg") no-repeat center;
+    background-size: cover;
+>>>>>>> 4a4857fa8239db297faeeaf348f16654927c8bb7
 }
 
 .fishing-active .fishing-scene {
-  animation: scene-active 3s ease-in-out infinite;
+    animation: scene-active 3s ease-in-out infinite;
 }
 
 .reeling .fishing-scene {
@@ -307,44 +339,51 @@ const goHome = () => {
 }
 
 .ripple {
-  position: absolute;
-  width: 30px;
-  height: 30px;
-  background: rgba(255, 255, 255, 0.7);
-  border-radius: 50%;
-  left: 60%;
-  top: 70%;
-  transform: translate(-50%, -50%) scale(0);
-  opacity: 0;
+    position: absolute;
+    width: 30px;
+    height: 30px;
+    background: rgba(255, 255, 255, 0.7);
+    border-radius: 50%;
+    left: 60%;
+    top: 70%;
+    transform: translate(-50%, -50%) scale(0);
+    opacity: 0;
 }
 
 .fishing-active .ripple {
-  animation: ripple 2s infinite;
+    animation: ripple 2s infinite;
+}
+
+<<<<<<< HEAD
+=======
+.fishing-controls {
+    margin: 20px 0;
 }
 
+>>>>>>> 4a4857fa8239db297faeeaf348f16654927c8bb7
 .result {
-  margin-top: 20px;
+    margin-top: 20px;
 }
 
 @keyframes ripple {
-  0% {
-    transform: translate(-50%, -50%) scale(0);
-    opacity: 1;
-  }
-  100% {
-    transform: translate(-50%, -50%) scale(4);
-    opacity: 0;
-  }
+    0% {
+        transform: translate(-50%, -50%) scale(0);
+        opacity: 1;
+    }
+    100% {
+        transform: translate(-50%, -50%) scale(4);
+        opacity: 0;
+    }
 }
 
 @keyframes scene-active {
-  0%,
-  100% {
-    transform: scale(1);
-  }
-  50% {
-    transform: scale(1.02);
-  }
+    0%,
+    100% {
+        transform: scale(1);
+    }
+    50% {
+        transform: scale(1.02);
+    }
 }
 
 @keyframes reel {