Merge branch 'master' of https://git.bimwe.com/bimwe/mini-programs

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "dist/",
   "projectname": "playBallTogether",
   "description": "playBallTogether",
-  "appid": "wx815b533167eb7b53",
+  "appid": "wx915ecf6c01bea4ec",
   "setting": {
     "urlCheck": true,
     "es6": true,

src/components/ListCard/index.tsx

@@ -46,7 +46,7 @@ const ListCard: React.FC<ListCardProps> = ({
         className="image"
         mode="aspectFill"
         lazyLoad
-        defaultSource={`${OSS_BASE}/front/ball/images/publish-empty-card.svg`}
+        defaultSource={`${OSS_BASE}/front/ball/images/publish-empty-card.png`}
       />
     );
   };

src/components/ListLoadError/index.module.scss

@@ -7,7 +7,6 @@
 
   .listLoadErrorImg {
     width: 154px;
-    height: 154px;
   }
 
   .listLoadErrorText {

src/components/NTRPEvaluatePopup/index.tsx

@@ -67,12 +67,6 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
   const { updateUserInfo } = useUserActions();
   const userInfo = useUserInfo();
   const ntrpLevels = useNtrpLevels();
-  const options = [
-    ntrpLevels.map((item) => ({
-      text: item,
-      value: item,
-    })),
-  ];
   const [evaCallback, setEvaCallback] = useState<EvaluateCallback>({
     type: "",
     next: () => {},
@@ -171,7 +165,7 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
               {visible && (
                 <Picker
                   visible
-                  options={options}
+                  options={ntrpLevels}
                   defaultValue={[ntrp]}
                   onChange={(val) => {
                     console.log(val[0]);

src/components/PublishMenu/PublishMenu.tsx

@@ -3,7 +3,6 @@ import { View, Text, Image } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { useUserInfo } from "@/store/userStore";
 import {
-  useEvaluate,
   EvaluateCallback,
   EvaluateScene,
 } from "@/store/evaluateStore";
@@ -15,6 +14,7 @@ import styles from "./index.module.scss";
 import images from "@/config/images";
 import AiImportPopup from "@/publish_pages/publishBall/components/AiImportPopup";
 import NTRPEvaluatePopup from "../NTRPEvaluatePopup";
+import { useDictionaryStore } from "@/store/dictionaryStore";
 
 export interface PublishMenuProps {
   onPersonalPublish?: () => void;
@@ -30,7 +30,8 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
     area
   } = useListState();
 
-
+  const supportedCitiesList = useDictionaryStore((s) => s.getDictionaryValue('supported_cities')) || [];
+  
   // 使用 useEffect 监听 isVisible 变化，确保所有情况都能触发回调
   useEffect(() => {
     onVisibleChange?.(isVisible);
@@ -67,10 +68,10 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
   };
   const handleMenuItemClick = (type: "individual" | "group" | "ai") => {
     const [_, address] = area;
-    if (address !== '上海市') {
+    if (!supportedCitiesList.includes(address)) {
       (Taro as any).showModal({
         title: '提示',
-        content: '仅上海地区开放，您可加入社群或切换城市',
+        content: '该城市尚未开放，您可加入社群或切换城市',
         showCancel: false,
         confirmText: '知道了'
       })

src/config/images.js

@@ -51,7 +51,7 @@ export default {
   ICON_LIST_LOAD_ERROR: require("@/static/list/icon-load-error.svg"),
   ICON_LIST_RELOAD: require("@/static/list/icon-reload.svg"),
   ICON_LIST_EMPTY: require("@/static/emptyStatus/publish-empty.png"),
-  ICON_LIST_EMPTY_CARD: `${OSS_BASE}/front/ball/images/publish-empty-card.svg`,
+  ICON_LIST_EMPTY_CARD: `${OSS_BASE}/front/ball/images/publish-empty-card.png`,
   ICON_LIST_SEARCH_SEARCH: require("@/static/search/icon-search.svg"),
   ICON_LIST_SEARCH_BACK: require("@/static/search/icon-back.svg"),
   ICON_LIST_SEARCH_CLEAR: require("@/static/search/icon-search-clear.svg"),

src/container/listContainer/index.tsx

@@ -4,7 +4,11 @@ import ListLoadError from "@/components/ListLoadError";
 import ListCardSkeleton from "@/components/ListCardSkeleton";
 import { useReachBottom } from "@tarojs/taro";
 import Taro from "@tarojs/taro";
-import { useUserInfo, useUserActions, useLastTestResult } from "@/store/userStore";
+import {
+  useUserInfo,
+  useUserActions,
+  useLastTestResult,
+} from "@/store/userStore";
 import { NTRPTestEntryCard } from "@/components";
 import { EvaluateScene } from "@/store/evaluateStore";
 import { waitForAuthInit } from "@/utils/authInit";
@@ -46,7 +50,11 @@ const ListContainer = (props) => {
   const { fetchUserInfo, fetchLastTestResult } = useUserActions();
   // 使用全局状态中的测试结果，避免重复调用接口
   const lastTestResult = useLastTestResult();
-  const { bannerListImage, bannerDetailImage, bannerListIndex = 0 } = useDictionaryStore((s) => s.bannerDict) || {};
+  const {
+    bannerListImage,
+    bannerDetailImage,
+    bannerListIndex = 0,
+  } = useDictionaryStore((s) => s.bannerDict) || {};
   useReachBottom(() => {
     // 加载更多方法
     if (loading) {
@@ -102,7 +110,7 @@ const ListContainer = (props) => {
       // 先等待静默登录完成
       await waitForAuthInit();
       // 然后再获取用户信息
-      const userInfoId = userInfo && 'id' in userInfo ? userInfo.id : null;
+      const userInfoId = userInfo && "id" in userInfo ? userInfo.id : null;
       if (!userInfoId) {
         await fetchUserInfo();
         return; // 等待下一次 useEffect 触发（此时 userInfo.id 已有值）
@@ -113,7 +121,13 @@ const ListContainer = (props) => {
       }
     };
     init();
-  }, [evaluateFlag, enableHomeCards, userInfo, lastTestResult, fetchLastTestResult]);
+  }, [
+    evaluateFlag,
+    enableHomeCards,
+    userInfo,
+    lastTestResult,
+    fetchLastTestResult,
+  ]);
 
   // 从全局状态中获取测试状态
   const hasTestInLastMonth = lastTestResult?.has_test_in_last_month || false;
@@ -144,7 +158,11 @@ const ListContainer = (props) => {
     const idx = Number(bannerListIndex);
     return [
       ...list.slice(0, idx),
-      { type: "banner", banner_image_url: bannerListImage, banner_detail_url: bannerDetailImage },
+      {
+        type: "banner",
+        banner_image_url: bannerListImage,
+        banner_detail_url: bannerDetailImage,
+      },
       ...list.slice(idx),
     ];
   }
@@ -153,7 +171,9 @@ const ListContainer = (props) => {
   function insertEvaluateCard(list) {
     if (!list || !Array.isArray(list)) return insertBannerCard(list ?? []);
 
-    const limitedList = shouldLimitByShowNumber ? list.slice(0, showNumber) : list;
+    const limitedList = shouldLimitByShowNumber
+      ? list.slice(0, showNumber)
+      : list;
 
     if (!evaluateFlag || hasTestInLastMonth) {
       return insertBannerCard(limitedList);
@@ -170,7 +190,16 @@ const ListContainer = (props) => {
 
   const memoizedList = useMemo(
     () => (enableHomeCards ? insertEvaluateCard(data) : data),
-    [enableHomeCards, evaluateFlag, data, hasTestInLastMonth, showNumber, bannerListImage, bannerDetailImage, bannerListIndex]
+    [
+      enableHomeCards,
+      evaluateFlag,
+      data,
+      hasTestInLastMonth,
+      showNumber,
+      bannerListImage,
+      bannerDetailImage,
+      bannerListIndex,
+    ]
   );
 
   // 渲染 banner 卡片
@@ -185,7 +214,9 @@ const ListContainer = (props) => {
           const target = item.banner_detail_url;
           if (target) {
             (Taro as any).navigateTo({
-              url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(target)}`,
+              url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(
+                target
+              )}`,
             });
           }
         }}
@@ -198,8 +229,7 @@ const ListContainer = (props) => {
           backgroundPosition: "center",
           backgroundRepeat: "no-repeat",
         }}
-      >
+      ></View>
-      </View>
     );
   };
 
@@ -233,7 +263,10 @@ const ListContainer = (props) => {
           }
           if (enableHomeCards && match?.type === "evaluateCard") {
             return (
-              <NTRPTestEntryCard key={`evaluate-${index}`} type={EvaluateScene.list} />
+              <NTRPTestEntryCard
+                key={`evaluate-${index}`}
+                type={EvaluateScene.list}
+              />
             );
           }
           return <ListCard key={match?.id || index} {...match} />;

src/main_pages/components/MyselfPageContent.tsx

@@ -11,6 +11,8 @@ import { EvaluateScene } from "@/store/evaluateStore";
 import { useUserInfo, useUserActions } from "@/store/userStore";
 import { usePickerOption } from "@/store/pickerOptionsStore";
 import { useGlobalState } from "@/store/global";
+import { useListState } from "@/store/listStore";
+import { useDictionaryStore } from "@/store/dictionaryStore";
 
 interface MyselfPageContentProps {
   isActive?: boolean;
@@ -41,6 +43,10 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
   const [collapseProfile, setCollapseProfile] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
 
+  const { area } = useListState();
+  const supportedCitiesList =
+    useDictionaryStore((s) => s.getDictionaryValue("supported_cities")) || [];
+
   useEffect(() => {
     pickerOption.getCities();
     pickerOption.getProfessions();
@@ -82,7 +88,6 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
       console.log("notEndGames", notEndGames);
 
       return { notEndGames, finishedGames };
-
     },
     []
   );
@@ -100,7 +105,6 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
         games_data = await UserService.get_participated_games(user_info.id);
       }
 
-
       const sorted_games = games_data.sort((a, b) => {
         return (
           new Date(a.original_start_time.replace(/\s/, "T")).getTime() -
@@ -156,6 +160,16 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
   };
 
   const goPublish = () => {
+    const [_, address] = area;
+    if (!supportedCitiesList.includes(address)) {
+      (Taro as any).showModal({
+        title: "提示",
+        content: "该城市尚未开放，您可加入社群或切换城市",
+        showCancel: false,
+        confirmText: "知道了",
+      });
+      return;
+    }
     (Taro as any).navigateTo({
       url: "/publish_pages/publishBall/index",
     });
@@ -258,15 +272,17 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
         <View className={styles.gameTabsSection}>
           <View className={styles.tabContainer}>
             <View
-              className={`${styles.tabItem} ${active_tab === "hosted" ? styles.active : ""
+              className={`${styles.tabItem} ${
-                }`}
+                active_tab === "hosted" ? styles.active : ""
+              }`}
               onClick={() => setActiveTab("hosted")}
             >
               <Text className={styles.tabText}>我主办的</Text>
             </View>
             <View
-              className={`${styles.tabItem} ${active_tab === "participated" ? styles.active : ""
+              className={`${styles.tabItem} ${
-                }`}
+                active_tab === "participated" ? styles.active : ""
+              }`}
               onClick={() => setActiveTab("participated")}
             >
               <Text className={styles.tabText}>我参与的</Text>
@@ -287,7 +303,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
               btnImg="ICON_ADD"
               reload={goPublish}
               isShowNoData={game_records.length === 0}
-              loadMoreMatches={() => { }}
+              loadMoreMatches={() => {}}
               collapse={true}
               style={{
                 paddingBottom: ended_game_records.length ? 0 : "90px",
@@ -313,7 +329,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
                   error={null}
                   errorImg="ICON_LIST_EMPTY_CARD"
                   isShowNoData={ended_game_records.length === 0}
-                  loadMoreMatches={() => { }}
+                  loadMoreMatches={() => {}}
                   collapse={true}
                   style={{ paddingBottom: "90px", overflow: "hidden" }}
                   listLoadErrorWrapperHeight="fit-content"

src/order_pages/orderDetail/index.module.scss

@@ -40,7 +40,9 @@
     border-bottom: 0.5px solid rgba(0, 0, 0, 0.06);
     padding: 8px 12px;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -57,7 +59,9 @@
     align-items: flex-start;
 
     color: rgba(60, 60, 67, 0.6);
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 12px;
     font-style: normal;
@@ -117,7 +121,9 @@
             align-items: center;
             background: #ff3b30;
             color: #fff;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "SF Compact Rounded";
             font-style: normal;
             font-weight: 600;
@@ -133,7 +139,9 @@
             box-sizing: border-box;
             flex-direction: column;
             align-items: center;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "SF Compact Rounded";
             font-size: 22px;
             font-style: normal;
@@ -154,7 +162,9 @@
 
           .date {
             color: #000;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 16px;
             font-style: normal;
@@ -164,7 +174,9 @@
 
           .venueTime {
             color: rgba(0, 0, 0, 0.8);
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 12px;
             font-style: normal;
@@ -191,7 +203,9 @@
           align-items: center;
           gap: 12px;
           color: rgba(0, 0, 0, 0.8);
-          font-feature-settings: "liga" off, "clig" off;
+          font-feature-settings:
+            "liga" off,
+            "clig" off;
           font-family: "PingFang SC";
           font-size: 12px;
           font-style: normal;
@@ -235,7 +249,9 @@
             gap: 4px;
             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;
@@ -251,7 +267,9 @@
           &Address {
             color: rgba(0, 0, 0, 0.8);
             text-align: center;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 12px;
             font-style: normal;
@@ -270,7 +288,9 @@
     justify-content: flex-start;
     gap: 4px;
     color: var(--Labels-Secondary, rgba(60, 60, 67, 0.6));
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 12px;
     font-style: normal;
@@ -307,7 +327,9 @@
 
       & > .buttonText {
         color: #000;
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 12px;
         font-style: normal;
@@ -347,7 +369,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -373,7 +397,9 @@
         width: 120px;
         display: inline-block;
         color: rgba(60, 60, 67, 0.6);
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 14px;
         font-style: normal;
@@ -383,7 +409,9 @@
 
       .content {
         color: #000;
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 14px;
         font-style: normal;
@@ -400,9 +428,10 @@
 
         .orderNo {
           display: flex;
-          justify-content: flex-end;
+          flex-direction: column;
-          align-items: center;
+          justify-content: center;
-          gap: 8px;
+          align-items: flex-end;
+          gap: 0px;
 
           .copy {
             color: #007aff;
@@ -421,7 +450,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -442,7 +473,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: 12px;
       font-style: normal;
@@ -491,7 +524,9 @@
       &:nth-child(1) {
         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: 14px;
         font-style: normal;
@@ -531,7 +566,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -567,7 +604,9 @@
   background: #000;
   box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
   backdrop-filter: blur(16px);
-  font-feature-settings: "liga" off, "clig" off;
+  font-feature-settings:
+    "liga" off,
+    "clig" off;
   font-family: "PingFang SC";
   font-size: 16px;
   font-style: normal;
@@ -600,7 +639,9 @@
     text-align: center;
     // border: 0.5px solid rgba(0, 0, 0, 0.06);
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 16px;
     font-style: normal;
@@ -626,7 +667,9 @@
   padding: 12px 15px;
   color: rgba(60, 60, 67, 0.6);
   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;

src/order_pages/orderList/index.tsx

@@ -293,7 +293,7 @@ const OrderList = () => {
     >
       <GeneralNavbar
         title="球局订单"
-        backgroundColor="transparent"
+        backgroundColor="#ffffff"
         titleClassName={styles.titleClassName}
         className={styles.navbar}
       />

src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx

@@ -230,7 +230,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
         <View className='stadium-item-right'>
           <View className='stadium-name'>{formData.name}</View>
           <View className='stadium-address'>
-            <Text>{calculateDistance(formData.istance || null)} · </Text>
+            <Text>{calculateDistance(formData.istance || null) + ' · '}</Text>
             <Text>{formData.address}</Text>
             <Image src={images.ICON_ARRORW_SMALL} className='stadium-map-icon' />
           </View>

src/user_pages/wallet/index.tsx

@@ -500,6 +500,7 @@ const WalletPage: React.FC = () => {
       {/* 顶部导航栏 */}
       <GeneralNavbar
         title={pageTitle}
+        backgroundColor="#ffffff"
         showBack={true}
         showAvatar={false}
         onBack={() => {