Merge branch 'master' into feat/liujie

This commit is contained in:
2025-12-29 10:13:13 +08:00
5 changed files with 16 additions and 16 deletions

View File

@@ -2,7 +2,7 @@ import Taro from "@tarojs/taro";
import { View, Canvas } from "@tarojs/components"; import { View, Canvas } from "@tarojs/components";
import { forwardRef, useImperativeHandle } from "react"; import { forwardRef, useImperativeHandle } from "react";
import shareLogoSvg from "@/static/ntrp/ntrp_share_logo.png"; import shareLogoSvg from "@/static/ntrp/ntrp_share_logo.png";
import docCopySvg from "@/static/ntrp/ntrp_doc_copy.svg"; import docCopyPng from "@/static/ntrp/ntrp_doc_copy.png";
import { OSS_BASE_URL } from "@/config/api"; import { OSS_BASE_URL } from "@/config/api";
interface RadarChartV2Props { interface RadarChartV2Props {
@@ -315,7 +315,7 @@ const RadarChartV2 = forwardRef<RadarChartV2Ref, RadarChartV2Props>((props, ref)
const addonRotation = 8 * (Math.PI / 180); // 旋转 8 度 const addonRotation = 8 * (Math.PI / 180); // 旋转 8 度
try { try {
const docCopyImg = await loadImage(canvas, docCopySvg); const docCopyImg = await loadImage(canvas, docCopyPng);
ctx.save(); ctx.save();
// 移动到旋转中心 // 移动到旋转中心

View File

@@ -159,7 +159,7 @@ function Index() {
function handleViewUserInfo(userId) { function handleViewUserInfo(userId) {
navto( navto(
isMyOwn userId === myInfo.id
? "/user_pages/myself/index" ? "/user_pages/myself/index"
: `/user_pages/other/index?userid=${userId}` : `/user_pages/other/index?userid=${userId}`
); );

View File

@@ -16,7 +16,7 @@
justify-content: flex-start; justify-content: flex-start;
padding: 0; padding: 0;
position: relative; position: relative;
height: calc(100vh - 98px); height: calc(100vh);
} }
// 空状态图片 // 空状态图片
@@ -56,13 +56,13 @@
// 按钮区域 // 按钮区域
&__buttons { &__buttons {
position: absolute; position: absolute;
bottom: 110px; bottom: 48px;
left: 0; left: 0;
right: 0; right: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
padding: 0 20px; padding: 8px 20px;
z-index: 1; z-index: 1;
align-items: center; align-items: center;
} }
@@ -72,7 +72,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 251px; width: 100%;
height: 52px; height: 52px;
border-radius: 16px; border-radius: 16px;
box-shadow: 0px 8px 64px 0px rgba(0, 0, 0, 0.1), box-shadow: 0px 8px 64px 0px rgba(0, 0, 0, 0.1),
@@ -87,13 +87,12 @@
// 按钮文字样式 // 按钮文字样式
&_text { &_text {
font-family: 'DingTalk JinBuTi';
font-weight: 400; font-family: 'PingFang SC';
font-size: 18px; font-style: normal;
line-height: 1.11; font-weight: 600;
letter-spacing: -0.05em; font-size: 16px;
text-align: center; line-height: 22px;
color: #000000;
} }
// 主要按钮(去看看其他球局) // 主要按钮(去看看其他球局)
@@ -101,6 +100,8 @@
background: #000000; background: #000000;
border: 2px solid rgba(0, 0, 0, 0.06); border: 2px solid rgba(0, 0, 0, 0.06);
.empty_state_page__button_text { .empty_state_page__button_text {
color: #ffffff; // 黑色背景下使用白色文字 color: #ffffff; // 黑色背景下使用白色文字
} }

View File

@@ -12,13 +12,12 @@ import './index.scss';
function Index() { function Index() {
const { statusNavbarHeightInfo } = useGlobalState() || {}; const { statusNavbarHeightInfo } = useGlobalState() || {};
const { totalHeight = 98 } = statusNavbarHeightInfo || {};
const [countdown, setCountdown] = useState(5); const [countdown, setCountdown] = useState(5);
// 倒计时自动返回 // 倒计时自动返回
useEffect(() => { useEffect(() => {
if (countdown <= 0) { if (countdown <= 0) {
handle_go_to_home(); handle_go_to_home();
return; return;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB