diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py
index 3907266..f187983 100644
--- a/app/api/endpoints/user.py
+++ b/app/api/endpoints/user.py
@@ -134,7 +134,7 @@ async def phone_login(
     db: Session = Depends(get_db),
     response: Response = None
 ):
-    """手机号登录 （用于微信）"""
+    """ 手机号登录（测试环境） """
 
     # 查找或创建用户
     user = db.query(UserDB).filter(UserDB.phone == request.phone).first()
diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index 415d9b6..628a7ce 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -1,24 +1,25 @@
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Response
 from sqlalchemy.orm import Session
 from app.models.database import get_db
-from app.api.deps import get_current_user
-from app.models.user import UserDB
+from app.models.user import UserInfo,UserDB, PhoneLoginRequest, generate_user_code
 from app.core.response import success_response, error_response, ResponseModel
 from app.core.wechat import WeChatClient
+from app.core.security import create_access_token, set_jwt_cookie
 from pydantic import BaseModel
 
 router = APIRouter()
 
 class PhoneNumberRequest(BaseModel):
     code: str  # 手机号获取凭证
+    referral_code: str = None  # 推荐码（可选）
 
-@router.post("/phone-number", response_model=ResponseModel)
-async def get_phone_number(
-    request: PhoneNumberRequest):
-    """获取用户手机号
-    
-    通过微信获取手机号凭证换取用户手机号
-    """
+@router.post("/phone-login", response_model=ResponseModel)
+async def wechat_phone_login(
+    request: PhoneNumberRequest,
+    db: Session = Depends(get_db),
+    response: Response = None
+):
+    """通过微信手机号登录/注册"""
     try:
         # 初始化微信客户端
         wechat = WeChatClient()
@@ -29,8 +30,47 @@ async def get_phone_number(
         if not phone_info or not phone_info.get('phone_number'):
             return error_response(code=400, message="获取手机号失败")
         
-        return success_response(data={
-            "phone": phone_info['phone_number']
-        })
+        phone = phone_info['phone_number']
+        
+        # 查找或创建用户
+        user = db.query(UserDB).filter(UserDB.phone == phone).first()
+        if not user:
+            # 生成用户编码
+            user_code = generate_user_code(db)
+            
+            user = UserDB(
+                username=f"user_{phone[-4:]}",
+                phone=phone,
+                user_code=user_code,
+                referral_code=request.referral_code
+            )
+            db.add(user)
+            db.flush()  # 获取用户ID
+            
+            # 发放优惠券
+            from app.api.endpoints.user import issue_register_coupons
+            issue_register_coupons(db, user.userid)
+            
+            db.commit()
+            db.refresh(user)
+        
+        # 创建访问令牌
+        access_token = create_access_token(
+            data={"phone": user.phone, "userid": user.userid}
+        )
+        
+        # 设置JWT cookie
+        if response:
+            set_jwt_cookie(response, access_token)
+        
+        return success_response(
+            message="登录成功",
+            data={
+                "user": UserInfo.model_validate(user),
+                "access_token": access_token,
+                "token_type": "bearer"
+            }
+        )
     except Exception as e:
-        return error_response(code=500, message=f"获取手机号失败: {str(e)}") 
\ No newline at end of file
+        db.rollback()
+        return error_response(code=500, message=f"登录失败: {str(e)}") 
\ No newline at end of file
diff --git a/app/main.py b/app/main.py
index dd783e4..6584485 100644
--- a/app/main.py
+++ b/app/main.py
@@ -30,7 +30,7 @@ app.add_middleware(
 app.add_middleware(RequestLoggerMiddleware)
 
 # 添加用户路由
-app.include_router(wechat.router,prefix="/wechat",tags=["微信接口"]) 
+app.include_router(wechat.router,prefix="/api/wechat",tags=["微信"]) 
 app.include_router(user.router, prefix="/api/user", tags=["用户"])
 app.include_router(address.router, prefix="/api/address", tags=["配送地址"])
 app.include_router(community.router, prefix="/api/community", tags=["社区"])