From 80e90eeb9687ae4584556247484ced163b28446e Mon Sep 17 00:00:00 2001
From: LyMysterious <LyMy1234@outlook.com>
Date: Sat, 12 Apr 2025 11:55:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E5=8A=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=B1=BC=EF=BC=8C=E5=95=86=E5=BA=97=E8=B4=AD=E4=B9=B0=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/fishbaskets/Fishbaskets.vue | 21 +++++++++--
 src/pages/shop/Shop.vue               | 52 ++++++++++++++-------------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/pages/fishbaskets/Fishbaskets.vue b/src/pages/fishbaskets/Fishbaskets.vue
index 2203f42..795643e 100644
--- a/src/pages/fishbaskets/Fishbaskets.vue
+++ b/src/pages/fishbaskets/Fishbaskets.vue
@@ -5,7 +5,7 @@
         <!-- 处理按钮 -->
         <div style="text-align: right; margin-bottom: 20px;">
             <el-button type="primary" @click="fetchFishList">刷新</el-button>
-            <el-button type="primary" @click="handleProcessFish">一键处理鱼</el-button>
+            <el-button type="primary" @click="handleProcessFish">一键处理普通鱼</el-button>
         </div>
 
         <el-tabs v-model="activeTab" type="card">
@@ -19,7 +19,7 @@
             <el-table-column prop="name" label="鱼名" align="center" width="200" />
             <el-table-column prop="weight" label="重量" align="right" width="150" />
             <el-table-column prop="description" label="描述" />
-            <el-table-column label="是否稀有" align="center" width="150">
+            <el-table-column label="稀有度" align="center" width="150">
                 <template #default="{ row }">
                     <el-tag :type="row.isRare ? 'danger' : 'info'">
                         {{ row.isRare ? '稀有' : '普通' }}
@@ -29,6 +29,7 @@
             <!-- 出售按钮 -->
             <el-table-column label="操作" align="center" width="180">
                 <template #default="{ row }">
+                    <el-button type="primary" @click="handleFish(row.id)">处理</el-button>
                     <el-button v-if="row.isRare" type="danger" @click="handleSell(row)">出售</el-button>
                 </template>
             </el-table-column>
@@ -51,7 +52,6 @@ const fetchFishList = async () => {
         const res = await myFishBaskets()
         if (res) {
             fishList.value = res;
-            ElMessage.success('鱼篓数据加载成功')
         }
     } catch (err) {
         ElMessage.warning('请检查网络或重试')
@@ -85,6 +85,21 @@ const handleProcessFish = async () => {
         ElMessage.warning('处理失败，请稍后再试')
     }
 }
+// 手动处理鱼
+const handleFish = async (fishId) => {
+    try {
+        const res = await handleFishById(fishId)
+        if (res) {
+            ElMessage.success(res)
+            fetchFishList()
+        }
+    } catch (err) {
+        console.log('====================================');
+        console.log(err);
+        console.log('====================================');
+        ElMessage.warning('处理失败，请稍后再试')
+    }
+}
 
 // 处理出售操作
 const handleSell = async (fish) => {
diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue
index 58e8ded..8967c0f 100644
--- a/src/pages/shop/Shop.vue
+++ b/src/pages/shop/Shop.vue
@@ -3,15 +3,15 @@
         <h1>商店 - 您当前拥有 {{ points }} 积分</h1>
 
         <el-table :data="items" style="width: 100%;" height="calc(100vh - 110px)" border>
-            <el-table-column label="ID" prop="id" width="100" align="center"/>
+            <el-table-column label="ID" prop="id" width="100" align="center" />
             <el-table-column label="名称" prop="name" width="200" align="center" />
             <el-table-column label="描述" prop="description" />
-            <el-table-column label="价格(积分)" prop="points" width="150" align="right"/>
-            <el-table-column label="您已拥有" prop="myQuantity" width="150" align="right"/>
+            <el-table-column label="价格(积分)" prop="points" width="150" align="right" />
+            <el-table-column label="您已拥有" prop="myQuantity" width="150" align="right" />
             <el-table-column label="操作" width="180" align="center">
                 <template #default="{ row }">
-                    <el-button v-if="row.points <= points" type="primary" @click="buyItem(row)" :disabled="row.myQuantity >= 1">
-                        {{ row.myQuantity >= 1 ? '已拥有' : '购买' }}
+                    <el-button v-if="row.points <= points" type="primary" @click="buyItem(row)">
+                        购买
                     </el-button>
                     <el-button v-else type="warning" disabled>
                         积分不足
@@ -25,7 +25,7 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import { whatCanIBuy, buy } from '@/api/shop/shop'
-import { ElButton, ElTable, ElTableColumn, ElMessage } from 'element-plus'
+import { ElButton, ElTable, ElTableColumn, ElMessage, ElInput, ElMessageBox } from 'element-plus'
 
 const points = ref(0)  // 当前用户的积分
 const items = ref([])  // 商店物品列表
@@ -33,34 +33,36 @@ const items = ref([])  // 商店物品列表
 // 获取当前用户的积分和商店商品信息
 const fetchData = async () => {
     try {
-        // 假设获取积分的接口
         const pointsRes = await whatCanIBuy()
         points.value = pointsRes.points
         items.value = pointsRes.items
     } catch (err) {
-        console.log('====================================');
-        console.log(err);
-        console.log('====================================');
         ElMessage.error('加载数据失败，请重试')
     }
 }
 
-// 购买物品
-const buyItem = async (item) => {
-    try {
-        const res = await buy({ EquipmentId: item.id, Quantity: 1 })
-        if (res.success) {
-            item.myQuantity += 1
-            points.value -= item.points
-            ElMessage.success(res.message)
-        } else {
-            ElMessage.error(res.message)
+// 购买操作
+const buyItem = async (good) => {
+    const { value: count } = await ElMessageBox.prompt('请输入购买数量', `物品名称  （${good.name}）`, {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        inputPattern: /^(?:[1-9]\d{0,3}|10000)$/,
+        inputErrorMessage: '请输入 1 到 10000 之间的整数'
+    })
+
+    if (count) {
+        try {
+            const res = await await buy({ EquipmentId: good.id, Quantity: 1 })
+            if (res) {
+                good.myQuantity += 1
+                points.value -= good.points
+                ElMessage.success("购买成功")
+            } else {
+                ElMessage.error(res.message)
+            }
+        } catch (err) {
+            ElMessage.error('购买失败，请稍后再试')
         }
-    } catch (err) {
-        console.log('====================================');
-        console.log(err);
-        console.log('====================================');
-        ElMessage.error('购买过程中出错，请稍后再试')
     }
 }