diff --git a/src/components/NTRPPopupGuide/index.module.scss b/src/components/NTRPPopupGuide/index.module.scss
index e69de29..a277b5d 100644
--- a/src/components/NTRPPopupGuide/index.module.scss
+++ b/src/components/NTRPPopupGuide/index.module.scss
@@ -0,0 +1,59 @@
+@mixin commonAvatarStyle($multiple: 1) {
+ .avatar {
+ flex: 0 0 auto;
+ width: calc(100px * $multiple);
+ height: calc(100px * $multiple);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #fff;
+ border-radius: 50%;
+ border: 1px solid #efefef;
+ overflow: hidden;
+ box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.2), 0 8px 20px 0 rgba(0, 0, 0, 0.12);
+
+ .avatarUrl {
+ width: calc(90px * $multiple);
+ height: calc(90px * $multiple);
+ border-radius: 50%;
+ border: 1px solid #efefef;
+ }
+ }
+
+ .addonImage {
+ flex: 0 0 auto;
+ width: calc(88px * $multiple);
+ height: calc(88px * $multiple);
+ transform: rotate(8deg);
+ flex-shrink: 0;
+ aspect-ratio: 1/1;
+ border-radius: calc(20px * $multiple);
+ border: 4px solid #fff;
+ background: linear-gradient(
+ 0deg,
+ rgba(89, 255, 214, 0.2) 0%,
+ rgba(89, 255, 214, 0.2) 100%
+ ),
+ #fff;
+ box-shadow: 0 4px 36px 0 rgba(0, 0, 0, 0.12);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ box-sizing: border-box;
+ margin-left: calc(-1 * 20px * $multiple);
+
+ .docImage {
+ width: calc(48px * $multiple);
+ height: calc(48px * $multiple);
+ transform: rotate(-7deg);
+ flex-shrink: 0;
+ }
+ }
+}
+
+.avatarWrap {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ @include commonAvatarStyle(0.5);
+}
diff --git a/src/components/NTRPPopupGuide/index.tsx b/src/components/NTRPPopupGuide/index.tsx
index ef3155d..229b538 100644
--- a/src/components/NTRPPopupGuide/index.tsx
+++ b/src/components/NTRPPopupGuide/index.tsx
@@ -1,21 +1,75 @@
import React from "react";
-import { View, Text } from "@tarojs/components";
+import { View, Text, Button, Image } from "@tarojs/components";
+import Taro from "@tarojs/taro";
+import { useUserInfo } from "@/store/userStore";
+import ArrwoRight from "@/static/ntrp/ntrp_arrow_right.svg";
+import CloseIcon from "@/static/ntrp/ntrp_popup_close.svg";
+import DocCopy from "@/static/ntrp/ntrp_doc_copy.svg";
import styles from "./index.module.scss";
-function NtrpPopupGuide() {
+function NtrpPopupGuide(props: { close: () => void; skipGuide: () => void }) {
+ const { close, skipGuide } = props;
+ const userInfo = useUserInfo();
+
+ function handleTest() {
+ Taro.redirectTo({
+ url: `/other_pages/ntrp-evaluate/index`,
+ });
+ }
return (
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {/* avatar side */}
+
+
+
+
+
+
+ 快速测一测✏️
+
+
+ 你的
+ (
+ NTRP
+ )
+ 水平?
+
首次发布球局前,需完善 NTRP 水平信息
+
+
+
+
+
+
+
+
);
}
diff --git a/src/game_pages/detail/index.tsx b/src/game_pages/detail/index.tsx
index 60038f8..d73eab5 100644
--- a/src/game_pages/detail/index.tsx
+++ b/src/game_pages/detail/index.tsx
@@ -315,7 +315,7 @@ function StickyButton(props) {
const displayPrice = is_organizer ? 0 : price;
// user_action_status.can_assess = true;
// user_action_status.can_join = false;
- console.log(user_action_status, "user_action");
+ // console.log(user_action_status, "user_action");
const {
can_assess,
can_join,
diff --git a/src/other_pages/message/index.tsx b/src/other_pages/message/index.tsx
index b48b9dc..e4a6653 100644
--- a/src/other_pages/message/index.tsx
+++ b/src/other_pages/message/index.tsx
@@ -112,7 +112,7 @@ const Message = () => {
{/* 消息列表 */}
-
+
{filteredMessages.length > 0 ? (
{filteredMessages.map(renderMessageItem)}
diff --git a/src/static/ntrp/ntrp_popup_close.svg b/src/static/ntrp/ntrp_popup_close.svg
new file mode 100644
index 0000000..c2a9b6f
--- /dev/null
+++ b/src/static/ntrp/ntrp_popup_close.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/src/user_pages/wallet/index.scss b/src/user_pages/wallet/index.scss
index 03268b6..011c596 100644
--- a/src/user_pages/wallet/index.scss
+++ b/src/user_pages/wallet/index.scss
@@ -4,6 +4,7 @@
min-height: 100vh;
background-color: #f5f5f5;
padding: 5px;
+ box-sizing: border-box;
.wallet_main_card {
background: #000;