fix: 修复取消活动后还可以编辑和取消、详情页参与者卡片展示NTRP 等级、生成海报的图片质量降低到1M以下, 详情页海报与测试结果页海报

Merge branch 'master' into feat/liujie
查询下载账单
2026-02-08 22:57:35 +08:00 · 2026-02-08 21:25:19 +08:00 · 2026-02-08 16:03:08 +08:00 · 2026-02-08 12:46:27 +08:00 · 2026-02-08 12:46:01 +08:00 · 2026-02-08 12:36:21 +08:00
37 changed files with 1522 additions and 857 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -0,0 +1,2 @@
+APP_ENV=dev
+TARO_APP_ID=wx815b533167eb7b53
--- a/.env.dev_local
+++ b/.env.dev_local
@@ -0,0 +1,2 @@
+APP_ENV=dev_local
+TARO_APP_ID=wx815b533167eb7b53
--- a/.env.pr
+++ b/.env.pr
@@ -0,0 +1,2 @@
+APP_ENV=pr
+TARO_APP_ID=wx915ecf6c01bea4ec
--- a/.env.sit
+++ b/.env.sit
@@ -0,0 +1,2 @@
+APP_ENV=sit
+TARO_APP_ID=wx815b533167eb7b53
--- a/config/env.config.ts
+++ b/config/env.config.ts
@@ -0,0 +1,79 @@
+/**
+ * 统一环境配置（dev/sit/pr）
+ * 构建时通过 APP_ENV 选择，defineConstants 注入业务代码
+ * project.config.json 的 appid 由 scripts/sync-project-config.js 同步
+ */
+
+export type EnvType = "dev" | "dev_local" | "sit" | "pr";
+
+export interface EnvConfig {
+  name: string;
+  apiBaseURL: string;
+  ossBaseURL: string;
+  appid: string;
+  timeout: number;
+  enableLog: boolean;
+  enableMock: boolean;
+  customerService: {
+    corpId: string;
+    serviceUrl: string;
+  };
+}
+
+const baseConfig = {
+  apiBaseURL: "https://tennis.bimwe.com",
+  ossBaseURL: "https://bimwe.oss-cn-shanghai.aliyuncs.com",
+  appid: "wx815b533167eb7b53", // 测试号
+  timeout: 15000,
+  enableLog: true,
+  enableMock: false,
+  customerService: {
+    corpId: "ww51fc969e8b76af82",
+    serviceUrl: "https://work.weixin.qq.com/kfid/kfc64085b93243c5c91",
+  },
+}
+
+export const envConfigs: Record<EnvType, EnvConfig> = {
+  // 本地开发：API 指向本地或测试服
+  dev: {
+    name: "DEV",
+    // apiBaseURL: "http://localhost:9098",
+    ...baseConfig
+  },
+  // 本地联调：API 指向本机
+  dev_local: {
+    name: "DEV_LOCAL",
+
+    ...Object.assign(baseConfig, {
+      apiBaseURL: "http://localhost:9098",
+    })
+
+  },
+
+  // SIT 测试环境
+  sit: {
+    name: "SIT",
+    ...Object.assign(baseConfig, {
+      apiBaseURL: "https://tennis.bimwe.com",
+    })
+  },
+
+  // PR 生产环境
+  pr: {
+    name: "PR",
+    apiBaseURL: "https://youchang.qiongjingtiyu.com",
+    ossBaseURL: "https://youchang2026.oss-cn-shanghai.aliyuncs.com",
+    appid: "wx915ecf6c01bea4ec", // 生产小程序 appid，按实际填写
+    timeout: 10000,
+    enableLog: false,
+    enableMock: false,
+    customerService: {
+      corpId: "ww9a2d9a5d9410c664",
+      serviceUrl: "https://work.weixin.qq.com/kfid/kfcd355e162e0390684",
+    },
+  },
+};
+
+export function getEnvConfig(env: EnvType): EnvConfig {
+  return envConfigs[env];
+}
--- a/config/index.ts
+++ b/config/index.ts
@@ -2,11 +2,21 @@ import { defineConfig, type UserConfigExport } from '@tarojs/cli'
 import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'
 import devConfig from './dev'
 import prodConfig from './prod'
-// import vitePluginImp from 'vite-plugin-imp'
+import { getEnvConfig, type EnvType } from './env.config'
 import path from 'path'

+// 环境：dev(本地) | dev_local(联调) | sit(测试) | pr(生产)
+const ENV_LIST: EnvType[] = ['dev', 'dev_local', 'sit', 'pr']
+
 // https://taro-docs.jd.com/docs/next/config#defineconfig-辅助函数
 export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
+  const appEnv = (
+    (ENV_LIST.includes(mode as EnvType) ? mode : process.env.APP_ENV) ||
+    (process.env.NODE_ENV === 'production' ? 'pr' : 'dev')
+  ) as EnvType
+
+  const envConfig = getEnvConfig(appEnv)
+
  const baseConfig: UserConfigExport<'webpack5'> = {
    projectName: 'playBallTogether',
    date: '2025-8-9',
@@ -22,6 +32,13 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
    outputRoot: 'dist',
    plugins: ['@tarojs/plugin-html'],
    defineConstants: {
+      'process.env.APP_ENV': JSON.stringify(appEnv),
+      'process.env.API_BASE_URL': JSON.stringify(envConfig.apiBaseURL),
+      'process.env.OSS_BASE_URL': JSON.stringify(envConfig.ossBaseURL),
+      'process.env.ENABLE_LOG': JSON.stringify(envConfig.enableLog),
+      'process.env.TIMEOUT': JSON.stringify(envConfig.timeout),
+      'process.env.CUSTOMER_CORP_ID': JSON.stringify(envConfig.customerService.corpId),
+      'process.env.CUSTOMER_SERVICE_URL': JSON.stringify(envConfig.customerService.serviceUrl),
    },
    alias: {
      '@': path.resolve(__dirname, '..', 'src'),
@@ -76,6 +93,9 @@ export default defineConfig<'webpack5'>(async (merge, { command, mode }) => {
      },
      // @ts-expect-error: Taro 类型定义缺少 mini.hot
      hot: true,
+      projectConfig: {
+        appid: envConfig.appid,
+      },
    },
    h5: {
      publicPath: '/',
--- a/package.json
+++ b/package.json
@@ -10,32 +10,17 @@
    "framework": "React"
  },
  "scripts": {
-    "build": "npm run build:weapp ",
-    "dev": "npm run dev:weapp ",
-    "build:weapp": "taro build --type weapp --mode production",
-    "build:swan": "taro build --type swan",
-    "build:alipay": "taro build --type alipay",
-    "build:tt": "taro build --type tt",
-    "build:h5": "taro build --type h5",
-    "build:rn": "taro build --type rn",
-    "build:qq": "taro build --type qq",
-    "build:jd": "taro build --type jd",
-    "build:quickapp": "taro build --type quickapp",
-    "dev:weapp": "npm run build:weapp -- --watch",
-    "dev:swan": "npm run build:swan -- --watch",
-    "dev:alipay": "npm run build:alipay -- --watch",
-    "dev:tt": "npm run build:tt -- --watch",
-    "dev:h5": "npm run build:h5 -- --watch",
-    "dev:rn": "npm run build:rn -- --watch",
-    "dev:qq": "npm run build:qq -- --watch",
-    "dev:jd": "npm run build:jd -- --watch",
-    "dev:quickapp": "npm run build:quickapp -- --watch"
+    "dev": "npm run dev:weapp",
+    "dev:local": "npm run dev:weapp:dev_local",
+    "dev:weapp": "node scripts/sync-project-config.js dev && taro build --type weapp --mode dev --watch",
+    "dev:weapp:dev_local": "node scripts/sync-project-config.js dev_local && taro build --type weapp --mode dev_local --watch",
+    "build": "npm run build:weapp",
+    "build:weapp": "node scripts/sync-project-config.js pr && taro build --type weapp --mode pr",
+    "build:sit": "node scripts/sync-project-config.js sit && taro build --type weapp --mode sit",
+    "build:pr": "node scripts/sync-project-config.js pr && taro build --type weapp --mode pr",
+    "dev:h5": "npm run build:h5 -- --watch"
  },
-  "browserslist": [
-    "last 3 versions",
-    "Android >= 4.1",
-    "ios >= 8"
-  ],
+  "browserslist": ["last 3 versions", "Android >= 4.1", "ios >= 8"],
  "author": "",
  "dependencies": {
    "@babel/plugin-transform-runtime": "^7.28.3",
--- a/scripts/sync-project-config.js
+++ b/scripts/sync-project-config.js
@@ -0,0 +1,25 @@
+const fs = require('fs');
+const path = require('path');
+
+require('ts-node/register/transpile-only');
+
+const envArg = process.argv[2];
+const appEnv = envArg || process.env.APP_ENV || (process.env.NODE_ENV === 'production' ? 'pr' : 'dev');
+
+const envConfigPath = path.resolve(__dirname, '../config/env.config.ts');
+const { envConfigs } = require(envConfigPath);
+
+const config = envConfigs[appEnv];
+if (!config) {
+  console.error(`[sync-project-config] Unknown APP_ENV: ${appEnv}`);
+  process.exit(1);
+}
+
+const projectConfigPath = path.resolve(__dirname, '../project.config.json');
+const projectConfigRaw = fs.readFileSync(projectConfigPath, 'utf-8');
+const projectConfig = JSON.parse(projectConfigRaw);
+
+projectConfig.appid = config.appid;
+
+fs.writeFileSync(projectConfigPath, JSON.stringify(projectConfig, null, 2) + '\n', 'utf-8');
+console.log(`[sync-project-config] project.config.json appid -> ${config.appid} (${appEnv})`);
--- a/src/components/CustomPopup/CustomPopup.tsx
+++ b/src/components/CustomPopup/CustomPopup.tsx
@@ -0,0 +1,208 @@
+import React, { useRef, useState, useEffect } from 'react'
+import type { CSSProperties, ReactNode } from 'react'
+import { View, Text } from '@tarojs/components'
+import { Button } from '@nutui/nutui-react-taro'
+import { useKeyboardHeight } from '@/store/keyboardStore'
+import styles from './index.module.scss'
+
+export interface CustomPopupProps {
+  visible: boolean
+  onClose: () => void
+  title?: ReactNode
+  showHeader?: boolean
+  hideFooter?: boolean
+  cancelText?: string
+  confirmText?: string
+  onCancel?: () => void
+  onConfirm?: () => void
+  children?: ReactNode
+  className?: string
+  style?: CSSProperties
+  // 与 CommonPopup 保持入参一致
+  position?: 'center' | 'bottom' | 'top' | 'left' | 'right'
+  round?: boolean
+  zIndex?: number
+  enableDragToClose?: boolean
+}
+
+const CustomPopup: React.FC<CustomPopupProps> = ({
+  visible,
+  onClose,
+  title,
+  showHeader = false,
+  hideFooter = false,
+  cancelText = '返回',
+  confirmText = '完成',
+  onCancel,
+  onConfirm,
+  children,
+  className,
+  style,
+  position = 'bottom',
+  round = true,
+  zIndex,
+  enableDragToClose = true,
+}) => {
+  const [dragOffset, setDragOffset] = useState(0)
+  const [isDragging, setIsDragging] = useState(false)
+  const touchStartY = useRef(0)
+
+  // 使用全局键盘状态
+  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener } = useKeyboardHeight()
+
+  // 使用全局键盘状态监听
+  useEffect(() => {
+    // 初始化全局键盘监听器
+    initializeKeyboardListener()
+    
+    // 添加本地监听器
+    const removeListener = addListener((height, visible) => {
+      console.log('CustomPopup 收到键盘变化:', height, visible)
+    })
+
+    return () => {
+      removeListener()
+    }
+  }, [initializeKeyboardListener, addListener])
+
+  if (!visible) {
+    return null
+  }
+
+  const handleCancel = () => {
+    if (onCancel) {
+      onCancel()
+    } else {
+      onClose()
+    }
+  }
+
+  const handleTouchStart = (e: any) => {
+    if (!enableDragToClose) return
+
+    touchStartY.current = e.touches[0].clientY
+    setIsDragging(true)
+  }
+
+  const handleTouchMove = (e: any) => {
+    if (!enableDragToClose || !isDragging) return
+
+    const currentY = e.touches[0].clientY
+    const deltaY = currentY - touchStartY.current
+
+    if (deltaY > 0) {
+      setDragOffset(Math.min(deltaY, 100))
+    }
+  }
+
+  const handleTouchEnd = () => {
+    if (!enableDragToClose || !isDragging) return
+
+    setIsDragging(false)
+
+    if (dragOffset > 50) {
+      onClose()
+    }
+
+    setDragOffset(0)
+  }
+
+  const overlayAlignItems =
+    position === 'center'
+      ? 'center'
+      : position === 'top'
+      ? 'flex-start'
+      : 'flex-end'
+
+  const handleOverlayClick = () => {
+    onClose()
+  }
+
+  // 阻止弹窗内的触摸事件冒泡
+  const handleTouchMoveInPopup = (e: any) => {
+    if (!isKeyboardVisible) {
+      e.stopPropagation()
+    }
+  }
+
+
+  return (
+    <View
+      className={styles['custom-popup-overlay']}
+      style={{ zIndex: zIndex ?? undefined, alignItems: overlayAlignItems }}
+      onClick={handleOverlayClick}
+    >
+      <View className={styles['custom-popup-move']} onTouchMove={handleTouchMoveInPopup} catchMove></View>
+      <View
+        className={`${styles['custom-popup']} ${className ? className : ''}`}
+        style={{
+          ...style,
+          paddingBottom: isKeyboardVisible ? `${keyboardHeight}px` : undefined,
+        }}
+        onClick={(e) => {
+          e.stopPropagation()
+        }}
+      >
+        {enableDragToClose && (
+          <View
+            className={styles['custom-popup__drag-handle-container']}
+            onTouchStart={handleTouchStart}
+            onTouchMove={handleTouchMove}
+            onTouchEnd={handleTouchEnd}
+          >
+            <View
+              className={styles['custom-popup__drag-handle']}
+              style={{
+                transform: `translateX(-50%) translateY(${dragOffset * 0.3}px)`,
+                opacity: isDragging ? 0.8 : 1,
+                transition: isDragging ? 'none' : 'all 0.3s ease-out',
+              }}
+            />
+          </View>
+        )}
+
+        {showHeader && (
+          <View className={styles['custom-popup__header']}>
+            {typeof title === 'string' ? (
+              <Text className={styles['custom-popup__title']}>{title}</Text>
+            ) : (
+              title
+            )}
+            <View className={styles['close_button']} onClick={onClose}>
+              <View className={styles['close_icon']}>
+                <View className={styles['close_line']} />
+                <View className={styles['close_line']} />
+              </View>
+            </View>
+          </View>
+        )}
+
+        <View className={styles['custom-popup__body']}>{children}</View>
+
+        {!hideFooter && !isKeyboardVisible && (
+          <View className={styles['custom-popup__footer']}>
+            <Button
+              className={`${styles['custom-popup__btn']} ${styles['custom-popup__btn-cancel']}`}
+              type="default"
+              size="small"
+              onClick={handleCancel}
+            >
+              {cancelText}
+            </Button>
+            <Button
+              className={`${styles['custom-popup__btn']} ${styles['custom-popup__btn-confirm']}`}
+              type="primary"
+              size="small"
+              onClick={onConfirm}
+            >
+              {confirmText}
+            </Button>
+          </View>
+        )}
+      </View>
+    </View>
+  )
+}
+
+export default CustomPopup
+
--- a/src/components/CustomPopup/index.module.scss
+++ b/src/components/CustomPopup/index.module.scss
@@ -0,0 +1,155 @@
+@use "~@/scss/themeColor.scss" as theme;
+
+.custom-popup-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 999;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+.custom-popup-move{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 998;
+}
+.custom-popup {
+  position: relative;
+  z-index: 999;
+  width: 100%;
+  padding: 0;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  background-color: theme.$page-background-color;
+  border-radius: 20px 20px 0 0;
+  overflow: hidden;
+  transition: padding-bottom 0.3s ease;
+  .custom-popup__drag-handle-container {
+    position: relative;
+    height: 0;
+  }
+
+  .custom-popup__drag-handle {
+    position: absolute;
+    top: 6px;
+    left: 50%;
+    width: 90px;
+    height: 30px;
+    z-index: 10;
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+
+    &::before {
+      content: "";
+      width: 32px;
+      height: 4px;
+      background-color: rgba(22, 24, 35, 0.2);
+      border-radius: 2px;
+    }
+  }
+
+  .custom-popup__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 16px 20px;
+
+    .custom-popup__title {
+      font-family: "PingFang SC";
+      font-weight: 600;
+      font-size: 22px;
+      line-height: 1.27em;
+      color: #000000;
+      text-align: center;
+    }
+
+    .close_button {
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: #ffffff;
+      border: 1px solid rgba(0, 0, 0, 0.06);
+      border-radius: 50%;
+      cursor: pointer;
+      box-shadow: 0px 4px 36px 0px rgba(0, 0, 0, 0.06);
+
+      .close_icon {
+        position: relative;
+        width: 24px;
+        height: 24px;
+
+        .close_line {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          width: 17px;
+          height: 3px;
+          border-radius: 3px;
+          background: #000000;
+          transform: translate(-50%, -50%) rotate(45deg);
+
+          &:nth-child(2) {
+            transform: translate(-50%, -50%) rotate(-45deg);
+          }
+        }
+      }
+    }
+  }
+
+  .custom-popup__body {
+    flex: 1 1 auto;
+    max-height: 80vh;
+    overflow-y: auto;
+  }
+
+  .custom-popup__footer {
+    padding: 8px 10px 0 10px;
+    display: flex;
+    gap: 8px;
+    background: #fafafa;
+    padding-bottom: max(10px, env(safe-area-inset-bottom));
+  }
+
+  .custom-popup__btn {
+    flex: 1;
+    font-feature-settings: "liga" off, "clig" off;
+    font-family: "PingFang SC";
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 600;
+    line-height: normal;
+  }
+
+  .custom-popup__btn-cancel {
+    background: #f5f6f7;
+    color: #1f2329;
+    border: none;
+    width: 154px;
+    height: 44px;
+    border-radius: 12px !important;
+    border: 0.5px solid rgba(0, 0, 0, 0.06);
+    background: #fff;
+    padding: 4px 10px;
+  }
+
+  .custom-popup__btn-confirm {
+    width: 154px;
+    height: 44px;
+    border: 0.5px solid rgba(0, 0, 0, 0.06);
+    background: #000;
+    border-radius: 12px !important;
+    padding: 4px 10px;
+  }
+}
+
--- a/src/components/CustomPopup/index.ts
+++ b/src/components/CustomPopup/index.ts
@@ -0,0 +1,4 @@
+import CustomPopup from './CustomPopup'
+export default CustomPopup
+export * from './CustomPopup'
+
--- a/src/components/GameManagePopup/index.module.scss
+++ b/src/components/GameManagePopup/index.module.scss
@@ -13,7 +13,9 @@
    align-items: center;
    color: #000;
    text-align: center;
-    font-feature-settings: 'liga' off, 'clig' off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
    font-family: "PingFang SC";
    font-size: 16px;
    font-style: normal;
@@ -32,7 +34,9 @@
    padding-top: 24px;
    color: #000;
    text-align: center;
-    font-feature-settings: 'liga' off, 'clig' off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
    font-family: "PingFang SC";
    font-size: 16px;
    font-style: normal;
@@ -48,8 +52,10 @@
    align-items: center;

    .tips {
-      color: rgba(60, 60, 67, 0.60);
-      font-feature-settings: 'liga' off, 'clig' off;
+      color: rgba(60, 60, 67, 0.6);
+      font-feature-settings:
+        "liga" off,
+        "clig" off;
      font-family: "PingFang SC";
      font-size: 16px;
      font-style: normal;
@@ -62,13 +68,15 @@
      margin-top: 8px;
      padding: 8px;
      border-radius: 4px;
-      background: #F0F0F0;
+      background: #f0f0f0;

      .input {
        width: 100%;
        &:placeholder-shown {
-          color: rgba(60, 60, 67, 0.30);
-          font-feature-settings: 'liga' off, 'clig' off;
+          color: rgba(60, 60, 67, 0.3);
+          font-feature-settings:
+            "liga" off,
+            "clig" off;
          font-family: "PingFang SC";
          font-size: 14px;
          font-style: normal;
@@ -84,11 +92,12 @@
    justify-content: space-between;
    align-items: center;
    height: 44px;
-    border-top: 0.5px solid #CECECE;
-    background: #FFF;
+    border-top: 0.5px solid #cecece;
+    background: #fff;
    margin-top: 2px;

-    .confirm, .cancel {
+    .confirm,
+    .cancel {
      width: 50%;
      height: 44px;
      display: flex;
@@ -96,7 +105,9 @@
      align-items: center;
      color: #000;
      text-align: center;
-      font-feature-settings: 'liga' off, 'clig' off;
+      font-feature-settings:
+        "liga" off,
+        "clig" off;
      font-family: "PingFang SC";
      font-size: 16px;
      font-style: normal;
@@ -109,4 +120,4 @@
      }
    }
  }
-}
+}
--- a/src/components/GameManagePopup/index.tsx
+++ b/src/components/GameManagePopup/index.tsx
@@ -186,7 +186,7 @@ export default forwardRef(function GameManagePopup(props, ref) {
    .some((item) => item.user.id === userInfo.id);

  const finished = [MATCH_STATUS.FINISHED, MATCH_STATUS.CANCELED].includes(
-    detail.match_status
+    detail.match_status,
  );

  const inTwoHours = dayjs(detail.start_time).diff(dayjs(), "hour") < 2;
@@ -207,7 +207,7 @@ export default forwardRef(function GameManagePopup(props, ref) {
        style={{ minHeight: "unset" }}
      >
        <View className={styles.container}>
-          {!inTwoHours && !hasOtherParticiappants && (
+          {!finished && !inTwoHours && !hasOtherParticiappants && (
            <View className={styles.button} onClick={handleEditGame}>
              编辑活动
            </View>
@@ -217,12 +217,12 @@ export default forwardRef(function GameManagePopup(props, ref) {
              重新发布
            </View>
          )}
-          {!inTwoHours && !hasOtherParticiappants && (
+          {!finished && !inTwoHours && !hasOtherParticiappants && (
            <View className={styles.button} onClick={handleCancelGame}>
              取消活动
            </View>
          )}
-          {hasJoin && (
+          {!finished && hasJoin && (
            <View className={styles.button} onClick={handleQuitGame}>
              退出活动
            </View>
--- a/src/components/ListCard/index.scss
+++ b/src/components/ListCard/index.scss
@@ -53,7 +53,7 @@
 }

 .location-position {
-  flex: 1;
+  // flex: 1;
  min-width: 0; // 允许缩小
  white-space: nowrap;
  overflow: hidden;
--- a/src/components/ListCard/index.tsx
+++ b/src/components/ListCard/index.tsx
@@ -127,10 +127,10 @@ const ListCard: React.FC<ListCardProps> = ({
      return (
        <View className="double-image">
          <View className="image-container">
-            {renderItemImage(image_list?.[0])}
+            {renderItemImage(image_list?.[1])}
          </View>
          <View className="image-container">
-            {renderItemImage(image_list?.[1])}
+            {renderItemImage(image_list?.[0])}
          </View>
        </View>
      );
--- a/src/components/Picker/CalendarDialog/DialogCalendarCard.tsx
+++ b/src/components/Picker/CalendarDialog/DialogCalendarCard.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useRef } from "react";
 import CommonPopup from "@/components/CommonPopup";
 import { View } from "@tarojs/components";
+import Taro from "@tarojs/taro";
 import CalendarUI, {
  CalendarUIRef,
 } from "@/components/Picker/CalendarUI/CalendarUI";
@@ -47,6 +48,13 @@ const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
        onClose();
        return;
      }
+      if (!selected) {
+        Taro.showToast({
+          title: '请选择日期',
+          icon: "none",
+        });
+        return;
+      }
      // 年份选择完成后，进入月份选择
      setType("time");
    } else if (type === "month") {
--- a/src/components/Picker/DayDialog/index.tsx
+++ b/src/components/Picker/DayDialog/index.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useRef } from "react";
 import CommonPopup from "@/components/CommonPopup";
+import Taro from "@tarojs/taro";
 import { View } from "@tarojs/components";
 import CalendarUI, {
  CalendarUIRef,
@@ -32,6 +33,13 @@ const DayDialog: React.FC<DayDialogProps> = ({
  } | null>(null);
  const handleConfirm = () => {
    console.log(selected, 'selectedselected');
+    if (!selected) {
+      Taro.showToast({
+        title: '请选择日期',
+        icon: "none",
+      });
+      return;
+    }
    const finalDate = dayjs(selected as Date).format("YYYY-MM-DD");
      if (onChange){
        onChange(finalDate)
--- a/src/components/Radar/indexV2.tsx
+++ b/src/components/Radar/indexV2.tsx
--- a/src/components/TextareaTag/TextareaTag.tsx
+++ b/src/components/TextareaTag/TextareaTag.tsx
@@ -79,6 +79,7 @@ const TextareaTag: React.FC<TextareaTagProps> = ({
            autoHeight={true}
            onFocus={onFocus}
            onBlur={onBlur}
+            adjustPosition={false}
          />
          <View className={`char-count${isOverflow ? ' char-count--error' : ''}`}>
            {value.description.length}/{maxLength}
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -8,6 +8,7 @@ import NumberInterval from "./NumberInterval";
 import TimeSelector from "./TimeSelector";
 import TitleTextarea from "./TitleTextarea";
 import CommonPopup from "./CommonPopup";
+import CustomPopup from "./CustomPopup";
 import { CalendarUI, DialogCalendarCard } from "./Picker";
 import CommonDialog from "./CommonDialog";
 import PublishMenu from "./PublishMenu/PublishMenu";
@@ -37,6 +38,7 @@ export {
  TimeSelector,
  TitleTextarea,
  CommonPopup,
+  CustomPopup,
  DialogCalendarCard,
  CalendarUI,
  CommonDialog,
--- a/src/config/env.ts
+++ b/src/config/env.ts
@@ -1,135 +1,61 @@
-import Taro from '@tarojs/taro'
+import Taro from "@tarojs/taro";

-// 环境类型
-export type EnvType = 'development' | 'production'
+/**
+ * 环境配置：从 config/env.config.ts 经 defineConstants 注入
+ * 构建时由 config/index.ts 根据 APP_ENV 选择并注入
+ */
+export type EnvType = "dev" | "dev_local" | "sit" | "pr";

-// 环境配置接口
 export interface EnvConfig {
-  name: string
-  apiBaseURL: string
-  ossBaseURL: string
-  timeout: number
-  enableLog: boolean
-  enableMock: boolean
-  // 客服配置
+  name: string;
+  apiBaseURL: string;
+  ossBaseURL: string;
+  timeout: number;
+  enableLog: boolean;
+  enableMock: boolean;
  customerService: {
-    corpId: string
-    serviceUrl: string
-    phoneNumber?: string
-    email?: string
-  }
+    corpId: string;
+    serviceUrl: string;
+  };
 }

-// 各环境配置
-const envConfigs: Record<EnvType, EnvConfig> = {
-
-
-  // 开发环境
-  development: {
-    name: '开发环境',
-    apiBaseURL: 'https://tennis.bimwe.com',
-    ossBaseURL: 'https://bimwe.oss-cn-shanghai.aliyuncs.com',
-    //apiBaseURL: 'http://localhost:9098',
-    timeout: 15000,
-    enableLog: true,
-    enableMock: false,
-    // 客服配置
-    customerService: {
-      corpId: 'ww51fc969e8b76af82', // 企业ID
-      serviceUrl: 'https://work.weixin.qq.com/kfid/kfc64085b93243c5c91',
-
-    }
+// 从 defineConstants 注入的编译时常量读取
+const getInjectedConfig = (): EnvConfig => ({
+  name: process.env.APP_ENV || "dev",
+  apiBaseURL: process.env.API_BASE_URL || "",
+  ossBaseURL: process.env.OSS_BASE_URL || "",
+  timeout: Number(process.env.TIMEOUT) || 10000,
+  enableLog: process.env.ENABLE_LOG === "true",
+  enableMock: false,
+  customerService: {
+    corpId: process.env.CUSTOMER_CORP_ID || "",
+    serviceUrl: process.env.CUSTOMER_SERVICE_URL || "",
  },
+});

+export const getCurrentEnv = (): EnvType =>
+  (process.env.APP_ENV as EnvType) || "dev";

+export const getCurrentConfig = (): EnvConfig => getInjectedConfig();

-  
+export const isDevelopment = (): boolean =>
+  getCurrentEnv() === "dev" || getCurrentEnv() === "dev_local" || getCurrentEnv() === "sit";

+export const isProduction = (): boolean => getCurrentEnv() === "pr";

-
-  // 生产环境1
-  production: {
-    name: '生产环境1',
-    apiBaseURL: 'https://tennis.bimwe.com',
-    ossBaseURL: 'https://bimwe.oss-cn-shanghai.aliyuncs.com',
-    timeout: 10000,
-    enableLog: false,
-    enableMock: false,
-    // 客服配置
-    customerService: {
-      corpId: 'ww51fc969e8b76af82', // 企业ID
-      serviceUrl: 'https://work.weixin.qq.com/kfid/kfc64085b93243c5c91',
-
-    }
-  },
-
-  //生产环境2
-  // production: {
-  //   name: '生产环境2',
-  //   apiBaseURL: 'https://youchang.qiongjingtiyu.com',
-  //   ossBaseURL: 'https://youchang2026.oss-cn-shanghai.aliyuncs.com',
-  //   timeout: 10000,
-  //   enableLog: false,
-  //   enableMock: false,
-  //   // 客服配置
-  //   customerService: {
-  //     corpId: 'ww9a2d9a5d9410c664', // 企业ID
-  //     serviceUrl: 'https://work.weixin.qq.com/kfid/kfcd355e162e0390684',
-  //   }
-  // }
-}
-
-// 获取当前环境
-export const getCurrentEnv = (): EnvType => {
-  // 在小程序环境中，使用默认逻辑判断环境
-  // 可以根据实际需要配置不同的判断逻辑
-
-  // 可以根据实际部署情况添加更多判断逻辑
-  // 比如通过 Taro.getEnv() 获取当前平台环境
-
-  const isProd = process.env.NODE_ENV === 'production'
-  if (isProd) {
-    return 'production'
-  } else {
-    return 'development'
-  }
-}
-
-// 获取当前环境配置
-export const getCurrentConfig = (): EnvConfig => {
-  const env = getCurrentEnv()
-  return envConfigs[env]
-}
-
-// 获取指定环境配置
-export const getEnvConfig = (env: EnvType): EnvConfig => {
-  return envConfigs[env]
-}
-
-// 是否为开发环境
-export const isDevelopment = (): boolean => {
-  return getCurrentEnv() === 'development'
-}
-
-// 是否为生产环境
-export const isProduction = (): boolean => {
-  return getCurrentEnv() === 'production'
-}
-
-
-
-// 环境配置调试信息
 export const getEnvInfo = () => {
-  const config = getCurrentConfig()
+  const config = getCurrentConfig();
  return {
    env: getCurrentEnv(),
    config,
-    taroEnv: Taro.getEnv(),
-    platform: Taro.getEnv() === Taro.ENV_TYPE.WEAPP ? '微信小程序' :
-      Taro.getEnv() === Taro.ENV_TYPE.WEB ? 'Web' :
-        Taro.getEnv() === Taro.ENV_TYPE.RN ? 'React Native' : '未知'
-  }
-}
+    taroEnv: (Taro as any).getEnv?.(),
+    platform:
+      (Taro as any).getEnv?.() === (Taro as any).ENV_TYPE?.WEAPP
+        ? "微信小程序"
+        : (Taro as any).getEnv?.() === (Taro as any).ENV_TYPE?.WEB
+          ? "Web"
+          : "未知",
+  };
+};

-// 导出当前环境配置（方便直接使用）
-export default getCurrentConfig()
+export default getCurrentConfig();
--- a/src/game_pages/detail/components/Participants/index.tsx
+++ b/src/game_pages/detail/components/Participants/index.tsx
@@ -40,7 +40,7 @@ function isFull(counts) {
 function matchNtrpRequestment(
  target?: string,
  min?: string,
-  max?: string
+  max?: string,
 ): boolean {
  // 目标值为空或 undefined
  if (!target?.trim()) return true;
@@ -110,7 +110,7 @@ export default function Participants(props) {
    user_action_status;
  const showApplicationEntry =
    [can_pay, can_substitute, is_substituting, waiting_start].every(
-      (item) => !item
+      (item) => !item,
    ) &&
    can_join &&
    dayjs(start_time).isAfter(dayjs());
@@ -138,7 +138,7 @@ export default function Participants(props) {

              Taro.navigateTo({
                url: `/login_pages/index/index?redirect=${encodeURIComponent(
-                  fullPath
+                  fullPath,
                )}`,
              });
            }
@@ -153,7 +153,7 @@ export default function Participants(props) {
  const matchNtrpReq = matchNtrpRequestment(
    userInfo?.ntrp_level,
    skill_level_min,
-    skill_level_max
+    skill_level_max,
  );

  function handleSelfEvaluate() {
@@ -180,7 +180,7 @@ export default function Participants(props) {
  }

  function generateTextAndAction(
-    user_action_status: null | { [key: string]: boolean }
+    user_action_status: null | { [key: string]: boolean },
  ):
    | undefined
    | { text: string | React.FC; action?: () => void; available?: boolean } {
@@ -259,7 +259,7 @@ export default function Participants(props) {
          const res = await OrderService.getUnpaidOrder(id);
          if (res.code === 0) {
            navto(
-              `/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`
+              `/order_pages/orderDetail/index?id=${res.data.order_info.order_id}`,
            );
          }
        }),
@@ -296,10 +296,11 @@ export default function Participants(props) {
  const { action = () => {} } = generateTextAndAction(user_action_status)!;

  const leftCount = max_participants - participant_count;
-  const leftSubstituteCount = (max_substitute_players || 0) - (substitute_count || 0);
+  const leftSubstituteCount =
+    (max_substitute_players || 0) - (substitute_count || 0);
  const showSubstituteApplicationEntry =
    [can_pay, can_join, is_substituting, waiting_start].every(
-      (item) => !item
+      (item) => !item,
    ) &&
    can_substitute &&
    dayjs(start_time).isAfter(dayjs());
@@ -336,7 +337,7 @@ export default function Participants(props) {
              refresherBackground="#FAFAFA"
              className={classnames(
                styles["participants-list-scroll"],
-                showApplicationEntry ? styles.withApplication : ""
+                showApplicationEntry ? styles.withApplication : "",
              )}
              scrollX
            >
@@ -377,14 +378,14 @@ export default function Participants(props) {
                        src={avatar_url}
                        onClick={handleViewUserInfo.bind(
                          null,
-                          participant_user_id
+                          participant_user_id,
                        )}
                      />
                      <Text className={styles["participants-list-item-name"]}>
                        {nickname || "未知"}
                      </Text>
                      <Text className={styles["participants-list-item-level"]}>
-                        {displayNtrp}
+                        NTRP {displayNtrp}
                      </Text>
                      <Text className={styles["participants-list-item-role"]}>
                        {role}
@@ -400,97 +401,107 @@ export default function Participants(props) {
        )}
      </View>
      {/* 候补区域 */}
-      {max_substitute_players > 0 && (substitute_count > 0 || showSubstituteApplicationEntry) && (
-        <View className={styles["detail-page-content-participants"]}>
-          <View className={styles["participants-title"]}>
-            <Text>候补</Text>
-            <Text>·</Text>
-            <Text>{leftSubstituteCount > 0 ? `剩余空位 ${leftSubstituteCount}` : "已满员"}</Text>
-          </View>
-          <View className={styles["participants-list"]}>
-            {/* 候补申请入口 */}
-            {showSubstituteApplicationEntry && (
-              <View
-                className={styles["participants-list-application"]}
-                onClick={() => {
-                  action?.();
-                }}
-              >
-                <Image
-                  className={styles["participants-list-application-icon"]}
-                  src={img.ICON_DETAIL_APPLICATION_ADD}
-                />
-                <Text className={styles["participants-list-application-text"]}>
-                  申请候补
-                </Text>
-              </View>
-            )}
-            {/* 候补成员列表 */}
-            <ScrollView
-              refresherBackground="#FAFAFA"
-              className={classnames(
-                styles["participants-list-scroll"],
-                showSubstituteApplicationEntry ? styles.withApplication : ""
+      {max_substitute_players > 0 &&
+        (substitute_count > 0 || showSubstituteApplicationEntry) && (
+          <View className={styles["detail-page-content-participants"]}>
+            <View className={styles["participants-title"]}>
+              <Text>候补</Text>
+              <Text>·</Text>
+              <Text>
+                {leftSubstituteCount > 0
+                  ? `剩余空位 ${leftSubstituteCount}`
+                  : "已满员"}
+              </Text>
+            </View>
+            <View className={styles["participants-list"]}>
+              {/* 候补申请入口 */}
+              {showSubstituteApplicationEntry && (
+                <View
+                  className={styles["participants-list-application"]}
+                  onClick={() => {
+                    action?.();
+                  }}
+                >
+                  <Image
+                    className={styles["participants-list-application-icon"]}
+                    src={img.ICON_DETAIL_APPLICATION_ADD}
+                  />
+                  <Text
+                    className={styles["participants-list-application-text"]}
+                  >
+                    申请候补
+                  </Text>
+                </View>
              )}
-              scrollX
-            >
-              <View
-                className={styles["participants-list-scroll-content"]}
-                style={{
-                  width: `${
-                    Math.max(substitute_members.length, 1) * 103 + (Math.max(substitute_members.length, 1) - 1) * 8
-                  }px`,
-                }}
+              {/* 候补成员列表 */}
+              <ScrollView
+                refresherBackground="#FAFAFA"
+                className={classnames(
+                  styles["participants-list-scroll"],
+                  showSubstituteApplicationEntry ? styles.withApplication : "",
+                )}
+                scrollX
              >
-                {substitute_members.map((substitute) => {
-                  const {
-                    is_organizer,
-                    user: {
-                      avatar_url,
-                      nickname,
-                      level,
-                      ntrp_level,
-                      id: substitute_user_id,
-                    },
-                  } = substitute;
-                  const role = is_organizer ? "组织者" : "参与者";
-                  // 优先使用 ntrp_level，如果没有则使用 level
-                  const ntrpValue = ntrp_level || level;
-                  // 格式化显示 NTRP，如果没有值则显示"初学者"
-                  const displayNtrp = ntrpValue
-                    ? formatNtrpDisplay(ntrpValue)
-                    : "初学者";
-                  return (
-                    <View
-                      key={substitute.id}
-                      className={styles["participants-list-item"]}
-                    >
-                      <Image
-                        className={styles["participants-list-item-avatar"]}
-                        mode="aspectFill"
-                        src={avatar_url}
-                        onClick={handleViewUserInfo.bind(
-                          null,
-                          substitute_user_id
-                        )}
-                      />
-                      <Text className={styles["participants-list-item-name"]}>
-                        {nickname || "未知"}
-                      </Text>
-                      <Text className={styles["participants-list-item-level"]}>
-                        {displayNtrp}
-                      </Text>
-                      <Text className={styles["participants-list-item-role"]}>
-                        {role}
-                      </Text>
-                    </View>
-                  );
-                })}
-              </View>
-            </ScrollView>
+                <View
+                  className={styles["participants-list-scroll-content"]}
+                  style={{
+                    width: `${
+                      Math.max(substitute_members.length, 1) * 103 +
+                      (Math.max(substitute_members.length, 1) - 1) * 8
+                    }px`,
+                  }}
+                >
+                  {substitute_members.map((substitute) => {
+                    const {
+                      is_organizer,
+                      user: {
+                        avatar_url,
+                        nickname,
+                        level,
+                        ntrp_level,
+                        id: substitute_user_id,
+                      },
+                    } = substitute;
+                    const role = is_organizer ? "组织者" : "参与者";
+                    // 优先使用 ntrp_level，如果没有则使用 level
+                    const ntrpValue = ntrp_level || level;
+                    // 格式化显示 NTRP，如果没有值则显示"初学者"
+                    const displayNtrp = ntrpValue
+                      ? formatNtrpDisplay(ntrpValue)
+                      : "初学者";
+                    return (
+                      <View
+                        key={substitute.id}
+                        className={styles["participants-list-item"]}
+                      >
+                        <Image
+                          className={styles["participants-list-item-avatar"]}
+                          mode="aspectFill"
+                          src={avatar_url}
+                          onClick={handleViewUserInfo.bind(
+                            null,
+                            substitute_user_id,
+                          )}
+                        />
+                        <Text className={styles["participants-list-item-name"]}>
+                          {nickname || "未知"}
+                        </Text>
+                        <Text
+                          className={styles["participants-list-item-level"]}
+                        >
+                          {displayNtrp}
+                        </Text>
+                        <Text className={styles["participants-list-item-role"]}>
+                          {role}
+                        </Text>
+                      </View>
+                    );
+                  })}
+                </View>
+              </ScrollView>
+            </View>
          </View>
-        </View>
-      )}
+        )}
      <NTRPEvaluatePopup type={EvaluateScene.detail} ref={ntrpRef} showGuide />
    </>
  );
--- a/src/login_pages/index/index.scss
+++ b/src/login_pages/index/index.scss
@@ -9,6 +9,23 @@

 }

+.link_button
+{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  height: 52px;
+  border-radius: 16px;
+  border: none;
+  position: relative;
+  font-size: 16px;
+
+  .button_text {
+    color: #fff;
+  }
+}
+
 // 背景图片和渐变覆盖层
 .background_image {
  position: absolute;
--- a/src/login_pages/index/index.tsx
+++ b/src/login_pages/index/index.tsx
@@ -155,6 +155,11 @@ const LoginPage: React.FC = () => {
    e.stopPropagation();
  };

+  // 返回首页
+  const handle_return_home = () => {
+    Taro.navigateTo({ url: "/main_pages/index" });
+  };
+
  return (
    <View className="login_page">
      <View className="background_image">
@@ -211,6 +216,10 @@ const LoginPage: React.FC = () => {
            <Text className="button_text">手机号快捷登录</Text>
          </Button>

+          <View className="return_home_button link_button" onClick={handle_return_home}>
+            <Text className="button_text">返回首页</Text>
+          </View>
+
          {/* 用户协议复选框 */}
          <View className="terms_checkbox_section">
            <View className="checkbox_container" onClick={handle_toggle_terms}>
--- a/src/other_pages/enable_notification/index.scss
+++ b/src/other_pages/enable_notification/index.scss
@@ -1,7 +1,9 @@
 .enable_notification_page {
  width: 100%;
-  // min-height: 100vh;
-  // background: radial-gradient(circle at 50% 0%, rgba(191, 255, 239, 1) 0%, rgba(255, 255, 255, 1) 37%);
+  height: 100%;
+  background: radial-gradient(circle at 50% 0%, rgba(191, 255, 239, 1) 0%, rgba(255, 255, 255, 1) 37%);
+  box-sizing: border-box;
+
  display: flex;
  flex-direction: column;

@@ -34,6 +36,7 @@
    box-shadow: 0px 4px 20px 0px rgba(0, 0, 0, 0.08);
    box-sizing: border-box;
    position: absolute;
+    background: #ffffff;

    // 第三个卡片（最上面）
    &--3 {
--- a/src/other_pages/ntrp-evaluate/index.tsx
+++ b/src/other_pages/ntrp-evaluate/index.tsx
@@ -16,7 +16,7 @@ import { useGlobalState } from "@/store/global";
 import { delay, getCurrentFullPath } from "@/utils";
 import { formatNtrpDisplay } from "@/utils/helper";
 import { waitForAuthInit } from "@/utils/authInit";
-import httpService from "@/services/httpService";
+// import httpService from "@/services/httpService";
 import DetailService from "@/services/detailService";
 import { OSS_BASE } from "@/config/api";
 import CloseIcon from "@/static/ntrp/ntrp_close_icon.svg";
--- a/src/publish_pages/publishBall/components/AiImportPopup/AiImportPopup.tsx
+++ b/src/publish_pages/publishBall/components/AiImportPopup/AiImportPopup.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { View, Text, Textarea, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
-import { ConfigProvider, Loading, Popup, Toast } from '@nutui/nutui-react-taro'
+import { ConfigProvider, Loading, Toast } from '@nutui/nutui-react-taro'
 import styles from './index.module.scss'
 import uploadFiles from '@/services/uploadFiles'
 import publishService from '@/services/publishService'
@@ -109,7 +109,10 @@ const AiImportPopup: React.FC<AiImportPopupProps> = ({
  }

  const handleTextChange = (e: any) => {
-    setText(e.detail.value)
+    const text = e.detail.value;
+    const maxAllowedLength = 120;
+    const truncatedVal = text.length > maxAllowedLength ? text.slice(0, maxAllowedLength) : text
+    setText(truncatedVal)
  }

  // 使用全局键盘状态监听
@@ -191,73 +194,90 @@ const AiImportPopup: React.FC<AiImportPopupProps> = ({
  }

  const showManualButton = uploadFailCount >= maxFailCount
+  if (!visible) {
+    return null
+  }

+  // 阻止弹窗内的触摸事件冒泡
+  const handleTouchMoveInPopup = (e) => {
+    if (!isKeyboardVisible) {
+      e.stopPropagation()
+    }
+  }
+  
  return (
-    <Popup
-      visible={visible}
-      position="bottom"
-      round={true}
-      closeable={false}
-      onClose={closePopupBefore}
-      className={styles.aiImportPopup}
-      style={{ paddingBottom: isKeyboardVisible ? `${keyboardHeight}px` : undefined }}
-    >
-      <View className={styles.popupContent}>
-        {/* 头部 */}
-        <View className={styles.header}>
-          <View className={styles.titleContainer}>
-            <Image src={images.ICON_IMPORTANT_BLACK} className={styles.lightningIcon} />
-            <Text className={styles.title}>智能导入球局信息</Text>
-          </View>
-          <View className={styles.closeButton} onClick={closePopupBefore}>
-            <Image src={images.ICON_CLOSE} className={styles.lightningIcon} />
-          </View>
-        </View>
-
-        {/* 文本域 */}
-        <View className={styles.textAreaContainer}>
-          <Textarea
-            className={styles.textArea}
-            value={text}
-            onInput={handleTextChange}
-            onFocus={() => {}}
-            onBlur={() => {}}
-            placeholder="在此「粘贴识别」或输入文本，智能拆分球局时间、费用、地点和其他信息，并帮你智能生成球局标题"
-            maxlength={-1}
-            showConfirmBar={false}
-            placeholderClass={styles.textArea_placeholder}
-            autoHeight
-            // 关闭系统自动上推，改为手动根据键盘高度加内边距
-            adjustPosition={false}
-          />
-          <View className={styles.charCount}>
-            <Text className={`${styles.charCountText} ${isCharCountExceeded ? styles.charCountTextExceeded : ''}`}>
-              {text.length}/100
-            </Text>
-          </View>
-        </View>
-
-        {/* 图片识别按钮 */}
-        <View className={styles.imageRecognitionContainer}>
-          <View className={`${styles.imageRecognitionButton} ${uploadLoading ? styles.uploadLoadingContainer : ''}`} onClick={handleImageRecognition}>
-            {
-              uploadLoading ? (<Image src={images.ICON_UPLOAD_SUCCESS} className={styles.cameraIcon} />) : (<Image src={images.ICON_UPLOAD_IMG} className={styles.cameraIcon} />)
-            }
-            <Text className={styles.imageRecognitionText}>图片识别</Text>
-            <Text className={styles.imageRecognitionDesc}>{uploadLoading ? '已上传 1 张图片' : '支持订场截图/小红书笔记截图等图片'}</Text>
-          </View>
-        </View>
-
-        {/* 底部按钮 */}
-        <View className={styles.bottomButtons}>
-          {showManualButton && (
-            <View className={styles.manualButton} onClick={handleManualPublish}>
-              <Text className={styles.manualButtonText}>手动发布球局</Text>
+    <View 
+      className={styles.aiImportPopupOverlay}
+      >
+      <View className={styles.aiImportPopupWrapper} onTouchMove={handleTouchMoveInPopup} catchMove></View>
+      <View
+        className={styles.aiImportPopup}
+        style={{ paddingBottom: isKeyboardVisible ? `${keyboardHeight}px` : undefined }}
+      >
+        <View className={styles.popupContent}>
+          {/* 头部 */}
+          <View className={styles.header}>
+            <View className={styles.titleContainer}>
+              <Image src={images.ICON_IMPORTANT_BLACK} className={styles.lightningIcon} />
+              <Text className={styles.title}>智能导入球局信息</Text>
            </View>
-          )}
-          <View className={styles.pasteButton} onClick={handlePasteAndRecognize}>
-            {
-              loading ? (
+            <View className={styles.closeButton} onClick={closePopupBefore}>
+              <Image src={images.ICON_CLOSE} className={styles.lightningIcon} />
+            </View>
+          </View>
+
+          {/* 文本域 */}
+          <View className={styles.textAreaContainer}>
+            <Textarea
+              className={styles.textArea}
+              value={text}
+              onInput={handleTextChange}
+              onFocus={() => {}}
+              onBlur={() => {}}
+              placeholder="在此「粘贴识别」或输入文本，智能拆分球局时间、费用、地点和其他信息，并帮你智能生成球局标题"
+              maxlength={-1}
+              showConfirmBar={false}
+              placeholderClass={styles.textArea_placeholder}
+              autoHeight
+              // 关闭系统自动上推，改为手动根据键盘高度加内边距
+              adjustPosition={false}
+            />
+            <View className={styles.charCount}>
+              <Text className={`${styles.charCountText} ${isCharCountExceeded ? styles.charCountTextExceeded : ''}`}>
+                {text.length}/100
+              </Text>
+            </View>
+          </View>
+
+          {/* 图片识别按钮 */}
+          <View className={styles.imageRecognitionContainer}>
+            <View
+              className={`${styles.imageRecognitionButton} ${
+                uploadLoading ? styles.uploadLoadingContainer : ''
+              }`}
+              onClick={handleImageRecognition}
+            >
+              {uploadLoading ? (
+                <Image src={images.ICON_UPLOAD_SUCCESS} className={styles.cameraIcon} />
+              ) : (
+                <Image src={images.ICON_UPLOAD_IMG} className={styles.cameraIcon} />
+              )}
+              <Text className={styles.imageRecognitionText}>图片识别</Text>
+              <Text className={styles.imageRecognitionDesc}>
+                {uploadLoading ? '已上传 1 张图片' : '支持订场截图/小红书笔记截图等图片'}
+              </Text>
+            </View>
+          </View>
+
+          {/* 底部按钮 */}
+          <View className={styles.bottomButtons}>
+            {showManualButton && (
+              <View className={styles.manualButton} onClick={handleManualPublish}>
+                <Text className={styles.manualButtonText}>手动发布球局</Text>
+              </View>
+            )}
+            <View className={styles.pasteButton} onClick={handlePasteAndRecognize}>
+              {loading ? (
                <View className={styles.loadingContainer}>
                  <ConfigProvider theme={{ nutuiLoadingIconColor: '#fff', nutuiLoadingIconSize: '20px' }}>
                    <Loading type="circular" />
@@ -269,13 +289,13 @@ const AiImportPopup: React.FC<AiImportPopupProps> = ({
                  <Image src={images.ICON_COPY} className={styles.clipboardIcon} />
                  <Text className={styles.pasteButtonText}>粘贴并识别</Text>
                </>
-              )
-            }
+              )}
+            </View>
          </View>
        </View>
+        <Toast id="toast" />
      </View>
-      <Toast id="toast" />
-    </Popup>
+    </View>
  )
 }

--- a/src/publish_pages/publishBall/components/AiImportPopup/index.module.scss
+++ b/src/publish_pages/publishBall/components/AiImportPopup/index.module.scss
@@ -1,14 +1,34 @@
@use '~@/scss/themeColor.scss' as theme;

+.aiImportPopupOverlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9998;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.aiImportPopupWrapper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9998;
+}
 .aiImportPopup {
-  background-color: #fff;
-  &:global(.nut-popup-bottom.nut-popup-round) {
-    border-radius: 20px 20px 0 0!important;
-  }
+  width: 100%;
+  background-color:#fafafa;
+  border-radius: 16px 16px 0 0;
+  position: relative;
+  z-index: 9999;
  .popupContent {
-    width: 100%;
-    background: #fff;
-    border-radius: 16px 16px 0 0;
+    width: 100%;   
    padding: 0;
    box-sizing: border-box;
    max-height: 80vh;
--- a/src/publish_pages/publishBall/components/SelectStadium/SelectStadium.tsx
+++ b/src/publish_pages/publishBall/components/SelectStadium/SelectStadium.tsx
@@ -3,7 +3,7 @@ import { View, Text, Input, ScrollView, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { Loading } from '@nutui/nutui-react-taro'
 import StadiumDetail, { StadiumDetailRef } from './StadiumDetail'
-import { CommonPopup } from '../../../../components'
+import { CommonPopup, CustomPopup } from '../../../../components'
 import { getLocation } from '@/utils/locationUtils'
 import PublishService from '@/services/publishService'
 import images from '@/config/images'
@@ -188,24 +188,20 @@ const SelectStadium: React.FC<SelectStadiumProps> = ({
  // 如果显示详情页面
  if (showDetail && selectedStadium) {
    return (
-      <CommonPopup
+      <CustomPopup
        visible={visible}
        onClose={handleCancel}
        cancelText="返回"
        confirmText="确认"
-        className="select-stadium-popup"
        onCancel={handleDetailCancel}
        onConfirm={handleConfirm}
-        position="bottom"
-        //style={{ paddingBottom: keyboardVisible ? `20px` : undefined }}
-        round
      >
-        <StadiumDetail
-          ref={stadiumDetailRef}
-          stadium={selectedStadium}
-          //onAnyInput={handleAnyInput}
-        />
-      </CommonPopup>
+        {/* 内容区域 */}
+          <StadiumDetail
+            ref={stadiumDetailRef}
+            stadium={selectedStadium}
+          />
+      </CustomPopup>
    )
  }

--- a/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.scss
+++ b/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.scss
@@ -4,7 +4,7 @@
  display: flex;
  flex-direction: column;
  .stadium-detail-scroll{
-    height:60vh;
+    max-height:60vh;
  }
  // 已选球场
    // 场馆列表
--- a/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx
+++ b/src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx
@@ -1,10 +1,11 @@
-import React, { useState, useCallback, forwardRef, useImperativeHandle } from 'react'
+import React, { useState, useCallback, forwardRef, useImperativeHandle, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { View, Text, Image, ScrollView } from '@tarojs/components'
 import images from '@/config/images'
 import TextareaTag from '@/components/TextareaTag'
 // import CoverImageUpload, { type CoverImage } from '@/components/ImageUpload'
 import UploadCover, { type CoverImageValue } from '@/components/UploadCover'
+import { useKeyboardHeight } from '@/store/keyboardStore'
 import { useDictionaryActions } from '@/store/dictionaryStore'

 import './StadiumDetail.scss'
@@ -69,12 +70,16 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
  stadium,
  onAnyInput
 }, ref) => {
-  const [openPicker, setOpenPicker] = useState(false);
+  const [openPicker, setOpenPicker] = useState(false);  //为了解决上传图片时按钮样式问题
  const [scrollTop, setScrollTop] = useState(0);
  const { getDictionaryValue } = useDictionaryActions()
  const court_type = getDictionaryValue('court_type') || []
  const court_surface = getDictionaryValue('court_surface') || []
  const supplementary_information = getDictionaryValue('supplementary_information') || []
+
+  // 使用全局键盘状态
+  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener } = useKeyboardHeight()
+
  const  stadiumInfo = [
    {
      label: '场地类型',
@@ -171,19 +176,47 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({



-   const changeTextarea = (value) => {
+  // 使用全局键盘状态监听
+  useEffect(() => {
+    // 初始化全局键盘监听器
+    initializeKeyboardListener()
+    
+    // 添加本地监听器
+    const removeListener = addListener((height, visible) => {
+      console.log('AiImportPopup 收到键盘变化:', height, visible)
+    })
+
+    return () => {
+      removeListener()
+    }
+  }, [initializeKeyboardListener, addListener])
+
+   const changeTextarea = (value: boolean) => {
    if (value) {
      // 先滚动到底部
-      setScrollTop(scrollTop ? scrollTop + 1 : 9999);
+      setScrollTop(140);
      // 使用 setTimeout 确保滚动后再更新 openPicker 
    }
   }

-   const changePicker = (value) => {
+   // 当键盘显示时触发 changeTextarea
+   useEffect(() => {
+     if (isKeyboardVisible) {
+       changeTextarea(true)
+     }
+   }, [isKeyboardVisible])
+
+   const changePicker = (value:boolean) => {
    setOpenPicker(value);
   }

  console.log(stadium,'stadiumstadium');
+  
+  // 计算滚动区域的最大高度
+  const scrollMaxHeight = isKeyboardVisible 
+    ? `calc(100vh - ${keyboardHeight+40}px)` 
+    : '60vh'
+  
  return (
    <View className='stadium-detail'>
      <ScrollView 
@@ -191,6 +224,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
        refresherBackground="#FAFAFA"  
        scrollY={!openPicker}
        scrollTop={scrollTop}
+        style={{ maxHeight: scrollMaxHeight }}
      >
        {/* 已选球场 */}
      <View
@@ -235,7 +269,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
                <TextareaTag
                  value={formData[item.prop]}
                  onChange={(value) => {
-                    changeTextarea(true)
+                    //changeTextarea(true)
                    updateFormData(item.prop, value)
                  }}
                  // onBlur={() => changeTextarea(false)}
--- a/src/publish_pages/publishBall/index.tsx
+++ b/src/publish_pages/publishBall/index.tsx
@@ -783,6 +783,7 @@ const PublishBall: React.FC = () => {
    >
      <GeneralNavbar
        title={titleBar}
+        backgroundColor={'#FAFAFA'}
        className={styles["publish-ball-navbar"]}
      />
      <View
--- a/src/services/loginService.ts
+++ b/src/services/loginService.ts
@@ -263,7 +263,7 @@ export const save_login_state = (token: string, user_info: WechatUserInfo) => {
 export const clear_login_state = () => {
  try {
    // 使用 tokenManager 清除令牌
-    tokenManager.clearTokens();
+    // tokenManager.clearTokens();

    // 清除其他登录状态
    Taro.removeStorageSync("user_info");
--- a/src/user_pages/downloadBillRecords/index.tsx
+++ b/src/user_pages/downloadBillRecords/index.tsx
@@ -66,6 +66,34 @@ const DownloadBillRecords: React.FC = () => {
      });
    }
  };
+
+  const handlePreviewFile = (fileUrl: string) => {
+    wx.downloadFile({
+      url: fileUrl,
+      success: (res) => {
+        if (res.statusCode === 200) {
+          // 确保文件路径正确并添加扩展名
+          const filePath = res.tempFilePath;
+          wx.openDocument({
+            filePath: filePath,
+            fileType: 'xlsx', // 指定文件类型为xlsx
+            showMenu: true, // 显示右上角菜单按钮
+            success: (openRes) => {
+              console.log('打开文档成功');
+            },
+            fail: (err) => {
+              console.error('打开文档失败', err);
+            }
+          });
+        } else {
+          console.error('下载失败，状态码:', res.statusCode);
+        }
+      },
+      fail: (err) => {
+        console.error('下载失败', err);
+      }
+    });
+  }
  return (
    <View className="download-bill-records-page">
      {/* 导航栏 */}
@@ -94,7 +122,7 @@ const DownloadBillRecords: React.FC = () => {
          Taro.navigateBack();
        }}
      />
-      <View 
+      <View
        className="records-container"
        style={{ marginTop: `${totalHeight}px` }}
      >
@@ -111,7 +139,7 @@ const DownloadBillRecords: React.FC = () => {
            </View>
            <View className="info-item">
              <Text></Text>
-              <Text className="btn">查看材料</Text>
+              <Text className="btn" onClick={() => handlePreviewFile(record.file_url)}>查看材料</Text>
            </View>
          </View>
        )) : <EmptyState text="暂无数据" />}
--- a/src/user_pages/joinGroup/index.scss
+++ b/src/user_pages/joinGroup/index.scss
@@ -37,6 +37,7 @@

  .qrcode {
    width: 240px;
+    height: 240px;
    margin: 32px 0 -20px;
  }

--- a/src/utils/genPoster.ts
+++ b/src/utils/genPoster.ts
@@ -282,7 +282,9 @@ function drawTextWrap(
 /** 核心纯函数：生成海报图片 */
 export async function generatePosterImage(data: any): Promise<string> {
  console.log("start !!!!");
-  const dpr = Taro.getWindowInfo().pixelRatio;
+  // const dpr = Taro.getWindowInfo().pixelRatio;
+  const dpr = 1;
+  // console.log(dpr, 'dpr')
  const width = 600;
  const height = 1000;

@@ -433,7 +435,7 @@ export async function generatePosterImage(data: any): Promise<string> {
  const { tempFilePath } = await Taro.canvasToTempFilePath({
    canvas,
    fileType: 'png',
-    quality: 1,
+    quality: 0.7,
  });
  return tempFilePath;
 }
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -17,6 +17,8 @@ declare namespace NodeJS {
    NODE_ENV: 'development' | 'production',
    /** 当前构建的平台 */
    TARO_ENV: 'weapp' | 'swan' | 'alipay' | 'h5' | 'rn' | 'tt' | 'quickapp' | 'qq' | 'jd'
+    /** 应用环境标识 */
+    APP_ENV: 'dev' | 'dev_local' | 'sit' | 'pr'
    /**
     * 当前构建的小程序 appid
     * @description 若不同环境有不同的小程序，可通过在 env 文件中配置环境变量`TARO_APP_ID`来方便快速切换 appid， 而不必手动去修改 dist/project.config.json 文件
Author	SHA1	Message	Date
刘杰	c47ebce43c	fix: 修复取消活动后还可以编辑和取消、详情页参与者卡片展示NTRP 等级、生成海报的图片质量降低到1M以下, 详情页海报与测试结果页海报	2026-02-08 22:57:35 +08:00
刘杰	b0f4b5713d	Merge branch 'master' into feat/liujie	2026-02-08 21:25:19 +08:00
Ultrame	f7f10f5d15	查询下载账单	2026-02-08 16:03:08 +08:00
李瑞	2bcdd93479	Merge branch 'feat/juguohong/20260206'	2026-02-08 12:46:27 +08:00
李瑞	af2c472030	处理图片顺序	2026-02-08 12:46:01 +08:00
张成	8d0ed5b1b3	1	2026-02-08 12:36:21 +08:00
张成	e99986c52a	修改审核不通过的问题	2026-02-08 12:29:48 +08:00
张成	4b2f6707cc	1	2026-02-08 12:18:04 +08:00
张成	a019fe473b	Merge branch 'master' of https://git.bimwe.com/bimwe/mini-programs	2026-02-08 12:14:11 +08:00
张成	1d0d2edaa2	修改项目 build 结构	2026-02-08 12:14:10 +08:00
Ultrame	5926e096b5	图片样式优化	2026-02-08 12:09:46 +08:00
筱野	e07f2ad2d1	解决按钮问题与键盘弹出问题	2026-02-07 23:37:28 +08:00
筱野	bfc6a149f0	修改日期问题弹出问题	2026-02-07 22:15:14 +08:00
李瑞	6f73bb6d99	Merge branch 'feat/juguohong/20260206'	2026-02-07 22:09:39 +08:00
李瑞	744169fe34	处理地点展示样式	2026-02-07 22:08:30 +08:00