update
This commit is contained in:
@@ -291,6 +291,7 @@ class MiaoStarsBasicApi:
|
||||
"""获取用户头像"""
|
||||
# Cloudreve V4 获取用户信息以获取头像URL
|
||||
user_info = self.getUserInfo()
|
||||
logger.info(f"用户信息API返回:{user_info}")
|
||||
if user_info.get("code") != 0:
|
||||
return QPixmap(":app/images/logo.png")
|
||||
|
||||
@@ -326,7 +327,7 @@ class MiaoStarsBasicApi:
|
||||
|
||||
# 转换响应格式
|
||||
if isinstance(r, dict):
|
||||
return {"code": 0, "data": r}
|
||||
return r
|
||||
else:
|
||||
return {"code": -1, "msg": "获取用户信息失败"}
|
||||
|
||||
|
||||
@@ -109,26 +109,26 @@ class UserConfig:
|
||||
if self.userData:
|
||||
return self.userData["data"].get("nickname", "")
|
||||
else:
|
||||
return ""
|
||||
return None
|
||||
|
||||
@property
|
||||
def userEmail(self):
|
||||
if self.userData:
|
||||
return self.userData["data"].get("user_name", "")
|
||||
return self.userData["data"].get("email", "")
|
||||
else:
|
||||
return ""
|
||||
return None
|
||||
|
||||
@property
|
||||
def userGroup(self):
|
||||
if self.userData:
|
||||
return self.userData.get("data", {}).get("group", {}).get("name", "")
|
||||
else:
|
||||
return ""
|
||||
return None
|
||||
|
||||
@property
|
||||
def userScore(self):
|
||||
if self.userData:
|
||||
return str(self.userData["data"].get("score", 0))
|
||||
# @property
|
||||
# def userScore(self):
|
||||
# if self.userData:
|
||||
# return str(self.userData["data"].get("score", 0))
|
||||
|
||||
@property
|
||||
def userCreatedTime(self):
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 219 KiB |
BIN
app/resource/images/logolong.png
Normal file
BIN
app/resource/images/logolong.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 331 KiB |
2
app/resource/resource-build.txt
Normal file
2
app/resource/resource-build.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
# 注意:转换完成后把resource.py里的import PySide6改为import PyQt6
|
||||
pyside6-rcc ./app/resource/resource.qrc -o ./app/resource/resource.py
|
||||
166678
app/resource/resource.py
166678
app/resource/resource.py
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,7 @@
|
||||
<file>images/empty.png</file>
|
||||
<file>images/title.jpg</file>
|
||||
<file>images/loadFailure.png</file>
|
||||
<file>images/logolong.png</file>
|
||||
|
||||
<file>icons/login.svg</file>
|
||||
<file>icons/register.svg</file>
|
||||
|
||||
@@ -33,7 +33,7 @@ class RegisterWindow(Window):
|
||||
def __init__(self, parent=None):
|
||||
logger.info("初始化注册窗口")
|
||||
super().__init__(parent=parent)
|
||||
setThemeColor("#2F80ED")
|
||||
setThemeColor("#1976d2")
|
||||
self.setTitleBar(MSFluentTitleBar(self))
|
||||
|
||||
self.verificationCode = ""
|
||||
@@ -43,6 +43,7 @@ class RegisterWindow(Window):
|
||||
self.loginLayout = QVBoxLayout()
|
||||
|
||||
self.promotionalImageLabel = ImageLabel(self)
|
||||
self.logoImage = ImageLabel(self)
|
||||
|
||||
self.pivot = Pivot(self)
|
||||
self.stackedWidget = PopUpAniStackedWidget(self)
|
||||
@@ -65,8 +66,13 @@ class RegisterWindow(Window):
|
||||
self.setWindowIcon(QIcon(":app/images/logo.png"))
|
||||
self.setFixedSize(690, 470)
|
||||
|
||||
self.promotionalImageLabel.setImage(":app/images/background.png")
|
||||
self.promotionalImageLabel.scaledToWidth(300)
|
||||
# self.promotionalImageLabel.setImage(":app/images/background.png")
|
||||
# self.promotionalImageLabel.scaledToWidth(300)
|
||||
|
||||
self.logoImage.setImage(":app/images/logolong.png")
|
||||
self.logoImage.scaledToWidth(130)
|
||||
|
||||
self
|
||||
|
||||
self.pivot.addItem("LoginWidget", "登录", icon=":app/icons/login.svg")
|
||||
|
||||
@@ -108,19 +114,23 @@ class RegisterWindow(Window):
|
||||
def __initLayout(self):
|
||||
logger.debug("初始化注册窗口布局")
|
||||
self.loginLayout.setContentsMargins(10, 40, 10, 40)
|
||||
self.hBoxLayout.setContentsMargins(25, 30, 15, 30)
|
||||
self.hBoxLayout.setContentsMargins(25, 30, 15, 0)
|
||||
self.loginLayout.addWidget(
|
||||
self.logoImage, 0, Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignCenter,
|
||||
)
|
||||
|
||||
self.loginLayout.addWidget(
|
||||
self.pivot, 0, Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignLeft
|
||||
self.pivot, 0, Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignCenter,
|
||||
)
|
||||
self.loginLayout.addSpacing(25)
|
||||
|
||||
self.loginLayout.addSpacing(10)
|
||||
self.loginLayout.addWidget(self.stackedWidget)
|
||||
|
||||
self.hBoxLayout.addWidget(
|
||||
self.promotionalImageLabel, 0, Qt.AlignmentFlag.AlignBottom
|
||||
)
|
||||
# self.hBoxLayout.addWidget(
|
||||
# self.promotionalImageLabel, 0, Qt.AlignmentFlag.AlignBottom
|
||||
# )
|
||||
self.hBoxLayout.addSpacing(10)
|
||||
self.hBoxLayout.addWidget(VerticalSeparator(self))
|
||||
# self.hBoxLayout.addWidget(VerticalSeparator(self))
|
||||
self.hBoxLayout.addSpacing(10)
|
||||
self.hBoxLayout.addLayout(self.loginLayout)
|
||||
logger.debug("注册窗口布局初始化完成")
|
||||
|
||||
@@ -66,9 +66,9 @@ class BasicInformationSettingCard(GroupHeaderCardWidget):
|
||||
lang("当前用户组"),
|
||||
QLabel(self),
|
||||
)
|
||||
self.addGroup(
|
||||
":app/icons/Score.svg", userConfig.userScore, "积分", QLabel(self)
|
||||
)
|
||||
# self.addGroup(
|
||||
# ":app/icons/Score.svg", userConfig.userScore, "积分", QLabel(self)
|
||||
# )
|
||||
self.addGroup(
|
||||
":app/icons/Date.svg",
|
||||
userConfig.userCreatedTime,
|
||||
@@ -245,7 +245,7 @@ class SettingInterface(ScrollArea):
|
||||
self.themeSettingWidget = ThemeSettingWidget(self.scrollWidget)
|
||||
self.agreementLabelWidget = AgreementLabelWidget(self.scrollWidget)
|
||||
self.infoLabel = BodyLabel(
|
||||
"增值电信业务经营许可证:B1-20191399鄂ICP备2025132158号 \n ©2025 LeonPan \n 武汉喵星创想互联网科技有限公司",
|
||||
"Powered by LeonCloud with ❤ \n ©2025 LeonPan",
|
||||
self.scrollWidget,
|
||||
)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from qfluentwidgets import (
|
||||
CheckBox,
|
||||
LineEdit,
|
||||
PasswordLineEdit,
|
||||
PushButton,
|
||||
PrimaryPushButton,
|
||||
)
|
||||
|
||||
from app.core import CaptchaThread,cfg, qconfig
|
||||
@@ -31,7 +31,7 @@ class LoginWidget(QWidget):
|
||||
self.rememberMeCheckBox.checkStateChanged.connect(
|
||||
lambda: qconfig.set(cfg.rememberMe, self.rememberMeCheckBox.isChecked())
|
||||
)
|
||||
self.loginButton = PushButton("登录", self)
|
||||
self.loginButton = PrimaryPushButton("登录", self)
|
||||
self.loginButton.setDisabled(False)
|
||||
|
||||
self.verificationCodeLabel = QLabel(self)
|
||||
|
||||
Reference in New Issue
Block a user