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/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

@@ -152,7 +152,9 @@ const ListContainer = (props) => {
   // 插入 banner 卡片（在 bannerListIndex 位置插入，不替换数据）
   function insertBannerCard(list) {
     if (!bannerListImage) return list;
-    if (!list || !Array.isArray(list)) return list ?? [];
+    if (!list || !Array.isArray(list)) {
+      list = [];
+    }
     const idx = Number(bannerListIndex);
     return [
       ...list.slice(0, idx),
@@ -231,10 +233,12 @@ const ListContainer = (props) => {
     );
   };
 
+  const showNoData = isShowNoData && !loading && memoizedList?.length === 0;
+
   // 渲染列表
   const renderList = () => {
     // 请求数据为空
-    if (isShowNoData) {
+    if (showNoData) {
       return (
         <ListLoadError
           reload={reload}

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/user_pages/wallet/index.tsx

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