提交代码

frontend/src/pages/FirstLoginRewardPage.tsx

@@ -322,35 +322,12 @@ export const FirstLoginRewardPage = () => {
                 justifyContent: 'center',
               }}
             >
-              <button
-                type="button"
-                onClick={handleShareClose}
-                style={{
-                  position: 'absolute',
-                  top: px2vmin(-56),
-                  right: `calc((100% - ${px2vmin(311)}) / 2 - ${px2vmin(5)})`,
-                  width: px2vmin(30),
-                  height: px2vmin(30),
-                  padding: 0,
-                  border: 'none',
-                  background: 'none',
-                  pointerEvents: 'auto',
-                  zIndex: 10000,
-                }}
-                aria-label="Close share modal"
-              >
-                <img
-                  src={closeBtn}
-                  alt="Close"
-                  style={{ width: '100%', height: '100%', display: 'block' }}
-                />
-              </button>
-
               {shareImages.length > 0 && (
                 <div
                   onTouchStart={handleTouchStart}
                   onTouchEnd={handleTouchEnd}
                   style={{
+                    position: 'relative',
                     width: px2vmin(311),
                     display: 'flex',
                     justifyContent: 'center',
@@ -358,6 +335,30 @@ export const FirstLoginRewardPage = () => {
                     pointerEvents: 'auto',
                   }}
                 >
+                  <button
+                    type="button"
+                    onClick={handleShareClose}
+                    style={{
+                      position: 'absolute',
+                      right: 0,
+                      top: 0,
+                      transform: 'translate(-50%, -130%)',
+                      width: px2vmin(30),
+                      height: px2vmin(30),
+                      padding: 0,
+                      border: 'none',
+                      background: 'none',
+                      pointerEvents: 'auto',
+                      zIndex: 10000,
+                    }}
+                    aria-label="Close share modal"
+                  >
+                    <img
+                      src={closeBtn}
+                      alt="Close"
+                      style={{ width: '100%', height: '100%', display: 'block' }}
+                    />
+                  </button>
                   <div
                     style={{
                       position: 'relative',
@@ -473,7 +474,7 @@ export const FirstLoginRewardPage = () => {
                 flexDirection: 'column',
                 alignItems: 'center',
                 paddingTop: px2vmin(12),
-                paddingBottom: px2vmin(24),
+                paddingBottom: px2vmin(12),
               }}
             >
               {/* 顶部拖拽指示条 */}
@@ -483,16 +484,18 @@ export const FirstLoginRewardPage = () => {
                   height: px2vmin(4),
                   backgroundColor: '#79747E',
                   borderRadius: px2vmin(4),
+                  flexShrink: 0,
                 }}
               />
 
               {/* 提示文字和按钮 */}
               <div
                 style={{
-                  marginTop: px2vmin(24),
+                  flex: 1,
                   display: 'flex',
                   flexDirection: 'column',
                   alignItems: 'center',
+                  justifyContent: 'center',
                   width: '100%',
                 }}
               >
@@ -503,7 +506,7 @@ export const FirstLoginRewardPage = () => {
                     fontSize: px2vmin(14),
                     textAlign: 'center',
                     lineHeight: px2vmin(14),
-                    marginBottom: px2vmin(12),
+                    marginBottom: px2vmin(18),
                   }}
                 >
                   长按上方图片保存到相册后领取奖励
@@ -518,7 +521,7 @@ export const FirstLoginRewardPage = () => {
                     padding: 0,
                     background: 'none',
                     // width: px2vmin(118),
-                    height: px2vmin(48),
+                    height: px2vmin(40),
                     cursor: 'pointer',
                   }}
                 >

frontend/src/pages/ProfilePage.tsx

@@ -1270,8 +1270,8 @@ export const ProfilePage = () => {
               <button
                 onClick={handleCloseUsernameModal}
                 style={{
-                  width: px2vmin(90),
-                  height: px2vmin(48),
+                  width: px2vmin(80),
+                  height: px2vmin(42),
                   backgroundImage: `url(${cancelBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',
@@ -1284,8 +1284,8 @@ export const ProfilePage = () => {
               <button
                 onClick={handleSaveUsername}
                 style={{
-                  width: px2vmin(94),
-                  height: px2vmin(48),
+                  width: px2vmin(84),
+                  height: px2vmin(42),
                   backgroundImage: `url(${isUsernameChanged ? changeBtnActiveImage : changeBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',
@@ -1471,8 +1471,8 @@ export const ProfilePage = () => {
               <button
                 onClick={handleCloseBotNameModal}
                 style={{
-                  width: px2vmin(90),
-                  height: px2vmin(48),
+                  width: px2vmin(80),
+                  height: px2vmin(42),
                   backgroundImage: `url(${cancelBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',
@@ -1485,8 +1485,8 @@ export const ProfilePage = () => {
               <button
                 onClick={handleSaveBotName}
                 style={{
-                  width: px2vmin(94),
-                  height: px2vmin(48),
+                  width: px2vmin(84),
+                  height: px2vmin(42),
                   backgroundImage: `url(${isBotNameChanged ? changeBtnActiveImage : changeBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',
@@ -1617,8 +1617,8 @@ export const ProfilePage = () => {
                 onClick={handleCloseFeedbackModal}
                 disabled={isSubmittingFeedback}
                 style={{
-                  width: px2vmin(90),
-                  height: px2vmin(46),
+                  width: px2vmin(85),
+                  height: px2vmin(44),
                   backgroundImage: `url(${cancelBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',
@@ -1633,8 +1633,8 @@ export const ProfilePage = () => {
                 onClick={handleSubmitFeedback}
                 disabled={!feedbackText.trim() || isSubmittingFeedback}
                 style={{
-                  width: px2vmin(76),
-                  height: px2vmin(46),
+                  width: px2vmin(72),
+                  height: px2vmin(44),
                   backgroundImage: `url(${feedbackText.trim() ? sendBtnActiveImage : sendBtnImage})`,
                   backgroundSize: 'cover',
                   backgroundRepeat: 'no-repeat',