Merge branch 'feat/liujie'

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);
+}

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 (
     <View className={styles.container}>
       <View className={styles.top}>
-        <View className={styles.header}></View>
-        <View className={styles.avatarWrap}></View>
+        <View className={styles.header}>
+          <View className={styles.closeBtn} onClick={close}>
+            <Image className={styles.closeIcon} src={CloseIcon} />
+          </View>
+        </View>
+        <View className={styles.avatarWrap}>
+          <View className={styles.avatar}>
+            <Image
+              className={styles.avatarUrl}
+              src={userInfo.avatar_url}
+              mode="aspectFit"
+            />
+          </View>
+          {/* avatar side */}
+          <View className={styles.addonImage}>
+            <Image
+              className={styles.docImage}
+              src={DocCopy}
+              mode="aspectFill"
+            />
+          </View>
+        </View>
+        <View>
           <View className={styles.title}>
-          <View></View>
-          <View></View>
+            <Text>快速测一测✏️</Text>
+          </View>
+          <View className={styles.title}>
+            <Text>你的</Text>
+            <Text className={styles.colorTip}> (</Text>
+            <Text className={styles.strongTip}>NTRP</Text>
+            <Text className={styles.colorTip}>) </Text>
+            <Text>水平?</Text>
+          </View>
         </View>
         <View className={styles.desc}>
           <Text>首次发布球局前，需完善 NTRP 水平信息</Text>
         </View>
       </View>
+      <View className={styles.bottom}>
+        <View className={styles.jump}>
+          <Button onClick={handleTest}>
+            <Text>快速测试</Text>
+            <Image className={styles.jumpIcon} src={ArrwoRight} />
+          </Button>
+        </View>
+        <View className={styles.direct}>
+          <Button onClick={skipGuide}>
+            <Text>我了解我的水平，无需测试</Text>
+          </Button>
+        </View>
+      </View>
     </View>
   );
 }

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,

src/other_pages/message/index.tsx

@@ -112,7 +112,7 @@ const Message = () => {
       </View>
 
       {/* 消息列表 */}
-      <ScrollView scrollY className="message-list">
+      <ScrollView scrollY className="message-list"   scrollWithAnimation enhanced showScrollbar={false} >
         {filteredMessages.length > 0 ? (
           <View className="message-list-content">
             {filteredMessages.map(renderMessageItem)}

src/static/ntrp/ntrp_popup_close.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M7 7L17 17" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+  <path d="M7 17L17 7" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

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;