Merge branch 'main' into lvyin

src/app/api/exchange-items/route.js

@@ -5,16 +5,13 @@ import { setCORSHeaders, handleError } from "../../lib/apiUtils";
 
 export async function GET(request) {
   await dbConnect();
-  console.log("GET请求已接收");
   try {
-    const isFromFrontend = request.headers.get("x-from-frontend") === "true";
-
-    console.log("isFromFrontend", isFromFrontend);
-
     let exchangeItems;
     let message;
 
-    exchangeItems = await ExchangeItem.find();
+    exchangeItems = await ExchangeItem.find().sort({
+      order: 1,
+    });
     message =
       exchangeItems.length > 0
         ? "成功获取所有兑换项目"
@@ -40,13 +37,14 @@ export async function GET(request) {
 export async function POST(request) {
   await dbConnect();
   try {
-    const { type, logo, title, points } = await request.json();
+    const { type, logo, title, points, order } = await request.json();
 
     const newExchangeItem = new ExchangeItem({
       type,
       logo,
       title,
       points,
+      order,
     });
     await newExchangeItem.save();
     const response = NextResponse.json(

src/app/api/updateForMatch/route.js

@@ -29,11 +29,9 @@ export async function POST(request) {
 
     // 1. 查找并处理之前的积分历史记录
     const previousPointHistories = await PointHistory.find({ match: matchId });
-    console.log(111, previousPointHistories);
     for (const history of previousPointHistories) {
       // 找到对应的用户并扣除之前加的分数
       const user = await User.findById(history.user);
-      console.log(222, user);
       if (user) {
         user.points -= history.points; // 扣除之前加的分数
         await user.save();

src/app/exchange-points/ExchangeForm.jsx

@@ -12,12 +12,15 @@ export default function ExchangeForm({
 }) {
   const [formData, setFormData] = useState({});
   const [isSubmitting, setIsSubmitting] = useState(false);
-  // const [currentUser, setCurrentUser] = useState(null);
 
-  // useEffect(() => {
-  //   const user = JSON.parse(localStorage.getItem("currentUser") || "null");
-  //   setCurrentUser(user);
-  // }, []);
+  useEffect(() => {
+    if (currentUser && currentUser.account) {
+      setFormData((prevData) => ({
+        ...prevData,
+        account: currentUser.account,
+      }));
+    }
+  }, []);
 
   const handleInputChange = (e) => {
     setFormData({ ...formData, [e.target.name]: e.target.value });
@@ -45,7 +48,6 @@ export default function ExchangeForm({
 
       console.log("params", params);
 
-      console.log("param", params);
       const response = await fetch("/api/exchange-history", {
         method: "POST",
         headers: {
@@ -65,7 +67,9 @@ export default function ExchangeForm({
         const updatedUser = {
           ...currentUser,
           points: currentUser.points - item.points,
+          account: formData.account || currentUser.account,
         };
+        localStorage.setItem("currentUser", JSON.stringify(updatedUser));
         setCurrentUser(updatedUser);
       } else {
         setAlert({ type: "error", message: res.error });
@@ -101,10 +105,11 @@ export default function ExchangeForm({
                 type="text"
                 id="account"
                 name="account"
-                placeholder="请输入智博1919账号"
+                placeholder="请输入绿茵直播账号"
                 required
                 className="w-full border rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"
                 onChange={handleInputChange}
+                value={formData.account || ""}
               />
             </div>
           ) : (

src/app/exchange-points/page.js

@@ -29,7 +29,7 @@ export default function ExchangePage() {
 
   useEffect(() => {
     loadExchanges();
-  }, [currentUser]);
+  }, [currentUser?.id]);
 
   const loadExchanges = async () => {
     if (!currentUser) return;

src/app/login/page.js

@@ -46,11 +46,11 @@ export default function LoginPage() {
         <title>登录</title>
       </Head>
 
-      <div className="w-full max-w-md mx-auto">
-        <h2 className="mt-6 text-center text-2xl sm:text-3xl font-extrabold text-gray-900">
-          登录您的账户
+      {/* <div className="w-full max-w-md mx-auto">
+        <h2 className="text-center text-xl font-extrabold text-gray-900">
+          登录
         </h2>
-      </div>
+      </div> */}
 
       <div className="mt-8 w-full max-w-md mx-auto">
         <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">

src/app/models/ExchangeItem.js

@@ -9,6 +9,7 @@ const ExchangeItemSchema = new mongoose.Schema(
     logo: { type: String },
     title: { type: String },
     points: { type: Number },
+    order: { type: Number, default: 0 },
   },
   { timestamps: true }
 );

src/app/personal-center/page.jsx

@@ -6,7 +6,6 @@ import { ChevronLeft, ArrowUpCircle, ArrowDownCircle } from "lucide-react";
 
 import Image from "next/image";
 import InfiniteScroll from "react-infinite-scroll-component";
-import Link from "next/link";
 
 const PAGE_SIZE = 10;
 
@@ -211,11 +210,13 @@ const PersonalCenter = () => {
 
       {activities && activities.length > 0 && (
         <div className="bg-white text-black rounded-lg px-4 py-2 mb-4 shadow-md">
-          <h3 className="text-lg font-bold  text-blue-600">最新活动</h3>
+          <h3 className="text-lg font-bold text-blue-600">最新活动</h3>
           {activities.map((activity) => (
-            <Link
+            <a
               key={activity._id}
               href={activity.link}
+              target="_blank"
+              rel="noopener noreferrer"
               className="flex items-center hover:bg-gray-100 p-2 rounded transition duration-300"
             >
               {activity.icon && (
@@ -233,7 +234,7 @@ const PersonalCenter = () => {
                 className="flex-grow"
                 dangerouslySetInnerHTML={{ __html: activity.title }}
               ></p>
-            </Link>
+            </a>
           ))}
         </div>
       )}
@@ -343,7 +344,7 @@ const PersonalCenter = () => {
                     </span>
                   </p>
                   <p>
-                    总进球数预测：{" "}
+                    总进球数：{" "}
                     <span className="font-medium text-purple-600">
                       {prediction.totalGoals}
                     </span>

src/app/register/page.js

@@ -83,11 +83,11 @@ export default function RegisterPage() {
         <title>注册</title>
       </Head>
 
-      <div className="w-full max-w-md mx-auto">
+      {/* <div className="w-full max-w-md mx-auto">
         <h2 className="mt-6 text-center text-2xl sm:text-3xl font-extrabold text-gray-900">
           创建新账户
         </h2>
-      </div>
+      </div> */}
 
       <div className="mt-8 w-full max-w-md mx-auto">
         <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">

src/app/reset-password/page.js

@@ -110,11 +110,11 @@ export default function ResetPasswordPage() {
         <title>重置密码</title>
       </Head>
 
-      <div className="w-full max-w-md mx-auto">
+      {/* <div className="w-full max-w-md mx-auto">
         <h2 className="mt-6 text-center text-2xl sm:text-3xl font-extrabold text-gray-900">
           重置密码
         </h2>
-      </div>
+      </div> */}
 
       <div className="mt-8 w-full max-w-md mx-auto">
         <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">