Merge branch 'master' into feat/liujie

src/components/Radar/indexV2.tsx

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

src/game_pages/detail/index.tsx

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

src/other_pages/emptyState/index.scss

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

src/other_pages/emptyState/index.tsx

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