From f69decdf4d04e861056646658259d551a974c2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 11 Aug 2025 21:03:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(app):=20=E9=87=8D=E6=9E=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=AD=E5=BF=83=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -调整了 app.config.ts 中的页面路径和顺序 - 移除了 article 页面 - 重构了 cart、find、order 和 user 页面的布局和功能 - 优化了导航栏和订单状态的显示逻辑 - 统一了页面样式和图标使用 --- src/app.config.ts | 24 +- src/assets/tabbar/cart-active.png | Bin 0 -> 2586 bytes src/assets/tabbar/cart.png | Bin 0 -> 2657 bytes src/assets/tabbar/order-active.png | Bin 1351 -> 0 bytes src/assets/tabbar/order.png | Bin 1341 -> 0 bytes src/assets/tabbar/store-active.png | Bin 1889 -> 0 bytes src/assets/tabbar/store.png | Bin 1909 -> 0 bytes src/pages/article/article.config.ts | 3 - src/pages/article/article.tsx | 50 ----- src/pages/cart/cart.tsx | 66 +++++- src/pages/find/find.tsx | 38 ++-- src/pages/user/components/OrderIcon.tsx | 211 ------------------ src/pages/user/components/UserCard.tsx | 8 +- src/pages/user/components/UserOrder.tsx | 69 ++++++ src/pages/user/user.tsx | 2 + src/shop/goodsDetail/index.tsx | 6 +- src/shop/orderDetail/index.tsx | 6 +- .../order/components/OrderList.tsx | 0 .../order/components/OrderSearch.scss | 0 .../order/components/OrderSearch.tsx | 0 src/{pages => user}/order/order.config.ts | 0 src/{pages => user}/order/order.scss | 0 src/{pages => user}/order/order.tsx | 77 +++---- 23 files changed, 206 insertions(+), 354 deletions(-) create mode 100644 src/assets/tabbar/cart-active.png create mode 100644 src/assets/tabbar/cart.png delete mode 100644 src/assets/tabbar/order-active.png delete mode 100644 src/assets/tabbar/order.png delete mode 100644 src/assets/tabbar/store-active.png delete mode 100644 src/assets/tabbar/store.png delete mode 100644 src/pages/article/article.config.ts delete mode 100644 src/pages/article/article.tsx delete mode 100644 src/pages/user/components/OrderIcon.tsx create mode 100644 src/pages/user/components/UserOrder.tsx rename src/{pages => user}/order/components/OrderList.tsx (100%) rename src/{pages => user}/order/components/OrderSearch.scss (100%) rename src/{pages => user}/order/components/OrderSearch.tsx (100%) rename src/{pages => user}/order/order.config.ts (100%) rename src/{pages => user}/order/order.scss (100%) rename src/{pages => user}/order/order.tsx (71%) diff --git a/src/app.config.ts b/src/app.config.ts index 977a1ad..04fe247 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -1,9 +1,8 @@ export default defineAppConfig({ pages: [ 'pages/index/index', - 'pages/order/order', 'pages/cart/cart', - // 'pages/find/find', + 'pages/find/find', 'pages/user/user' ], "subpackages": [ @@ -28,6 +27,7 @@ export default defineAppConfig({ { "root": "user", "pages": [ + "order/order", "company/company", "profile/profile", "setting/setting", @@ -82,17 +82,17 @@ export default defineAppConfig({ selectedIconPath: "assets/tabbar/home-active.png", text: "首页", }, - // { - // pagePath: "pages/find/find", - // iconPath: "assets/tabbar/find.png", - // selectedIconPath: "assets/tabbar/find-active.png", - // text: "发现", - // }, { - pagePath: "pages/order/order", - iconPath: "assets/tabbar/order.png", - selectedIconPath: "assets/tabbar/order-active.png", - text: "订单", + pagePath: "pages/find/find", + iconPath: "assets/tabbar/find.png", + selectedIconPath: "assets/tabbar/find-active.png", + text: "发现", + }, + { + pagePath: "pages/cart/cart", + iconPath: "assets/tabbar/cart.png", + selectedIconPath: "assets/tabbar/cart-active.png", + text: "购物车", }, { pagePath: "pages/user/user", diff --git a/src/assets/tabbar/cart-active.png b/src/assets/tabbar/cart-active.png new file mode 100644 index 0000000000000000000000000000000000000000..eaafc5e6af7d90d399dcf860eaaa1525c9481a27 GIT binary patch literal 2586 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 P00000NkvXXu0mjfsN%i< literal 0 HcmV?d00001 diff --git a/src/assets/tabbar/order-active.png b/src/assets/tabbar/order-active.png deleted file mode 100644 index 1e533b8582fcd1f299cb4f72759e406a22696e0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1351 zcmbtU*;A7T9Q=JbBqS1%a7gd~C6XeS9XTx;FaaWp96^prI0{vPfLM-l37;s?C@3wb zhDrqE!I7#&Q3TAu03s1o2#zHx!=)6d4mSov>EFNi(szqN%V+O9n`ZKM*(CCuJIvtYX3SbnuinSz z3@3m@3FE_fKLVlzypwe$8DNP1W&X>zV?t-uyQv=aq)$V(!iiy*acGq1m3e5#gmvO6 zkM_~R+;mHAIZ~eAHJ5X-(y-KIsbTeW?Z%h7Xl?s^Ulv7udT_SiKddadk;;>;N3HWt zZjh((`j1pcB_R~BdEdKK^mOr0)dyubYkv})P;K8|qhX&)kgY_oUN@?dt1He$Ydmz~ zUP>_U>ALGUwAeab-WmE>nm*vLER=GvqU42`(5?k?jx^I2%#W-L1eZzUJG1DbbqtoO zYh~SSKSXrn+mnAP{TCFXT#29WZZQUqWmT60qq?)Mq?8C^3Zq`AA0v3xp9vzf#=e2I zB8&sj11PuMbEDU5zcJy7_ z&+At$Tb#MX>k2$D_$7w{?z~hS=0JQz$>AyptF9H^g5gecArq0g1=#x_vI2iQ0R}CQ z#8qKXqguWW9*lTznRu{2`o@$9c1=wJBE;3*W9tGxF^QrFUUf4|`%ETh(;*%w8o7M7 z^!WV92NN(Bk11C)ifRt0u=tsbTD9m}ft%9o}Me2VZ6Sfm!&pmo#_s#kNeAHyaI}-SYs8W}g>#2tD!q@kc;LjF1-|27z;tm!z}B(HpV|mR49XX)jG1P-Y86AjYWRcO76$G-(urXJg+}||_ESXkeBa~P z8B~0nJot(;UbI^rdH-tUJpZFo>3QWwF=uDV+B%anVO2j@S{SixJ}~Gxd9sH(Yim|S1>3wc{Jb&0X!WPMK8Gp$(bK<1Q`lOl zA#eDJxnXXaU?k3QaoQ|+dNsn;Tpj%w9kEJZFSb)Dkf%t@#c=1Q8=Quk<(**Rs7n`6 zobo3G?{9n86yS=!Kg~^nh zcr2kz^QzT_*BLJ3(NKY{D(dF?PxPpxiqf|W5pOZk=<+Ur37y6kESwnHHv0)=+>r;r z0K}>yu5N*HPvrs`M6p@&1}r29hTb6{oxYTs3}IHMhW0Lz0=rY>&wET3*PapBEH9?S HH7xsIXNosS diff --git a/src/assets/tabbar/order.png b/src/assets/tabbar/order.png deleted file mode 100644 index 082dd342eca4bc27fdd0e57372c5b1af640faec0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1341 zcmbu9>o?R17{{OA&rCEf*$BCmj>}=lrFAKmW}VSsT?a993{#dB4KJPx~e4lfkZ((>SMVDYo z007;<05Vlg?BCJaq~7;@4-Kh-9H&zJ;QEO9TL9c@Ao>sr{ zJdur}w#M0rmsGi(=h1pBP#NSEce0U2``FjH944vgd*$4XvgYUQ`!q0xzFKJ=W0|{l z0wCZzX?a<#y%cv=G5Zt&xe0#c^?R8sMaddJWa8`QFeT6kKEI!%7|goAUgV@?B|wfC z?Kj6--j(%<->GyQ^mXoKwtXfx#3m;vU-vEDP4+n>B&@K`w2AS1%P9 z5Zer88Q-kCFYhgOE-5J)9kaToL7L{#JC2^d!iV96792KwNhkeX6AwWKuC{U z+WCf!h1u*imRHpy3ryMx?!X<%Tl_RNPPQ{_+azLZ?|&@08t%QzEez>amaH9HZX83n zU8;ftO-^FBef^8psNideXd%N`A5tbO7<(d-ns1S&4^Ivo`?D=@z}~)bCr*8iTWBS! zFrB&Jk`NZLqmIKrYnp&EN+_D`??cVkBr=X9ra$!s{t0qFUgaqY+cMeZ)cO`YW(w=M zlKsW6J_$&42EhG;&u{={3>g^@o(G><6Tm|#EF?gBYe%3V96fQ;U>iJ-O}b(SQ*Y*N ziE#7ABijgQ7f*ylL1rQ+qz;(%Efq~5e?Y7tBccN_o)HK$nKSrze#6odBEpdttIl!x zT?&>Kyb+FcuEn_Y_yI5`CuTg4<|;>zPj{Sl@Bw$^c3HwQ4%79fBanvnN>dZJFqnV7 zd@RLHnXdLGhd2`ig-^VIEelWW=7T&n^Ol*N%C{=?F5Q#GtxoZdflNi0e={&^o9oL! z{?PGa6e9AArnn-a%QT~FDE4D>@nICR>U5;yK|9)F00)$0S_1)$n!PS;hT`FlfNkIy zb<)rP%zsI`OoZU(P=_C?l^ggy7k$1X)LAT9LTNR~vM96MSCw=#6QF8;}yY zyNj~O#!VAD^Zdg@u&Z-NPU``YC^5=N-`37qMfc*(aU^YZnhKw>k;oRGb$dCHNzAi<@j09!wxKjSg5 z4GID%JcT?!Nnl`O0~q-ZBqEkrA$u#3>f*5*pf4f^ZU)N;XHhI@G3y#||69*M!awEq z)W^544EM*EH?MykyqhNQr1_W$Jyy#b=~sgA7`>M`kRh{T3Nj;n6Q<4jtzhRpm**7M zhaJVz1?NGDw9D_RMrnR(Z+_`$N<^CdhWG}rtSvWa0w+&5A6zZR*wxgQ0p+@C*6rgy ziqT?0)4t2&5G%#c*@n2}C_`*kyL+osx>apypK}O}mR~t-axdYza_1IeG;45i*?L1M zl?NV6=PICmHmYV<=!!|Xao(A#^Md?(gE#hRNqscUn_N9yww9xG!^wiF*Kd4;rLyK( zh2`H#=S44}c^&-cyW*U9-lUs?v4!7qdUT23X~@5S_VirI7m-5hTNj<3l%KLpfMPi0 zs)`0+MYRksZ!RcHoN2vZ*2=osnU-x7F@DGY1 BH&Orq diff --git a/src/assets/tabbar/store-active.png b/src/assets/tabbar/store-active.png deleted file mode 100644 index 86948d8c103e5105e01cbb2622b7a0192e040fb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1889 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 { - // const {params} = useRouter(); - // const [categoryId, setCategoryId] = useState(3494) - const [list, setList] = useState([]) - - const reload = () => { - // if (params.id) { - // setCategoryId(Number(params.id)) - // } - pageCmsArticle({}).then(res => { - if (res?.list) { - setList(res?.list) - } - }) - } - - useEffect(() => { - reload() - }, []) - - return ( -
-
-
- { - list.map((item, index) => { - return ( -
Taro.navigateTo({url: `/cms/help?id=${item.articleId}`}) }> -
{item.title}
- -
- ) - }) - } -
-
-
- ) -} -export default Article diff --git a/src/pages/cart/cart.tsx b/src/pages/cart/cart.tsx index eccd816..0ee023d 100644 --- a/src/pages/cart/cart.tsx +++ b/src/pages/cart/cart.tsx @@ -7,7 +7,8 @@ import { InputNumber, Button, Empty, - Divider + Divider, + ConfigProvider } from '@nutui/nutui-react-taro'; import {ArrowLeft, Del, Shopping} from '@nutui/icons-react-taro'; import {View} from '@tarojs/components'; @@ -26,6 +27,16 @@ function Cart() { clearCart } = useCart(); + // InputNumber 主题配置 + const customTheme = { + nutuiInputnumberButtonWidth: '28px', + nutuiInputnumberButtonHeight: '28px', + nutuiInputnumberInputWidth: '40px', + nutuiInputnumberInputHeight: '28px', + nutuiInputnumberInputBorderRadius: '4px', + nutuiInputnumberButtonBorderRadius: '4px', + } + useShareTimeline(() => { return { title: '购物车 - 网宿小店' @@ -138,11 +149,52 @@ function Cart() { } }, [selectedItems, cartItems]); + if (cartItems.length === 0) { + return ( + <> + Taro.navigateBack()}/>} + right={ + cartItems.length > 0 && ( + + ) + } + > + 购物车({cartCount}) + + Taro.switchTab({ url: '/pages/index/index' })} + /> + + ) + } + return ( <> - + className="fixed z-10 top-0 w-full"> ￥ {item.price} - + handleQuantityChange(item.goodsId, Number(value))} - className="w-24" /> - handleRemoveItem(item.goodsId)}/> - + + handleRemoveItem(item.goodsId)}/> diff --git a/src/pages/find/find.tsx b/src/pages/find/find.tsx index 05518fc..4d6f16c 100644 --- a/src/pages/find/find.tsx +++ b/src/pages/find/find.tsx @@ -2,7 +2,9 @@ import {useEffect, useState} from "react"; import Taro from '@tarojs/taro'; import {pageCmsArticle} from "@/api/cms/cmsArticle"; import {CmsArticle} from "@/api/cms/cmsArticle/model"; -import {NavBar} from '@nutui/nutui-react-taro' +import {NavBar, Cell} from '@nutui/nutui-react-taro'; +import {Text} from '@tarojs/components'; +import {ArrowRight, ImageRectangle, Coupon, Follow} from '@nutui/icons-react-taro' import './find.scss' /** @@ -17,7 +19,7 @@ const Find = () => { const reload = async () => { setLoading(true) const article = await pageCmsArticle({categoryId: 4289, status: 0}) - if(article){ + if (article) { setList(article?.list) setLoading(false) } @@ -38,27 +40,33 @@ const Find = () => { <> {loading && (
暂无数据
)} { }} - left={ - <> -
- -
- {/**/} - {/*
*/} - {/* */} - {/*
筛选
*/} - {/*
*/} - - } > 发现 {list && ( <> + + + 好物推荐 + + } extra={}/> + + + 权益中心 + + } extra={}/> + + + 我的收藏 + + } extra={}/> )} diff --git a/src/pages/user/components/OrderIcon.tsx b/src/pages/user/components/OrderIcon.tsx deleted file mode 100644 index 9cc9a61..0000000 --- a/src/pages/user/components/OrderIcon.tsx +++ /dev/null @@ -1,211 +0,0 @@ -import {useEffect, useState} from 'react' -import {navigateTo} from '@tarojs/taro' -import Taro from '@tarojs/taro' -import {Button} from '@tarojs/components'; -import {Image} from '@nutui/nutui-react-taro' -import {getUserInfo, getWxOpenId} from "@/api/layout"; -import {TenantId} from "@/config/app"; -import {User} from "@/api/system/user/model"; -// import News from "./News"; -import {myPageBszxBm} from "@/api/bszx/bszxBm"; -import {listCmsNavigation} from "@/api/cms/cmsNavigation"; - -const OrderIcon = () => { - - const [loading, setLoading] = useState(true) - const [isLogin, setIsLogin] = useState(false) - const [userInfo, setUserInfo] = useState() - const [bmLogs, setBmLogs] = useState() - const [navItems, setNavItems] = useState([]) - - /* 获取用户手机号 */ - const handleGetPhoneNumber = ({detail}) => { - const {code, encryptedData, iv} = detail - Taro.login({ - success: function () { - if (code) { - Taro.request({ - url: 'https://server.websoft.top/api/wx-login/loginByMpWxPhone', - method: 'POST', - data: { - code, - encryptedData, - iv, - notVerifyPhone: true, - refereeId: 0, - sceneType: 'save_referee', - tenantId: TenantId - }, - header: { - 'content-type': 'application/json', - TenantId - }, - success: function (res) { - Taro.setStorageSync('access_token', res.data.data.access_token) - Taro.setStorageSync('UserId', res.data.data.user.userId) - setUserInfo(res.data.data.user) - Taro.setStorageSync('Phone', res.data.data.user.phone) - setIsLogin(true) - Taro.showToast({ - title: '登录成功', - icon: 'success' - }); - } - }) - } else { - console.log('登录失败！') - } - } - }) - } - - const onLogin = (item: any, index: number) => { - if(!isLogin){ - return navigateTo({url: `/pages/category/category?id=${item.navigationId}`}) - }else { - // 报名链接 - if(index == 0){ - console.log(bmLogs,'bmLogs') - if(bmLogs && bmLogs.length > 0){ - return navigateTo({url: `/bszx/bm-cert/bm-cert?id=${bmLogs[0].id}`}) - }else { - navigateTo({url: `/user/profile/profile`}) - } - } - // 善款明细 - if(item.navigationId == 4119){ - return navigateTo({url: `/bszx/pay-record/pay-record`}) - } - return navigateTo({url: `/pages/category/category?id=${item.navigationId}`}) - } - } - - const reload = () => { - // 读取栏目 - listCmsNavigation({parentId: 2828,hide: 0}).then(res => { - console.log(res,'9999') - setNavItems(res); - }) - Taro.getUserInfo({ - success: (res) => { - const avatar = res.userInfo.avatarUrl; - setUserInfo({ - avatar, - nickname: res.userInfo.nickName, - sexName: res.userInfo.gender == 1 ? '男' : '女' - }) - getUserInfo().then((data) => { - if (data) { - setUserInfo(data) - setIsLogin(true); - console.log(userInfo, 'userInfo...') - Taro.setStorageSync('UserId', data.userId) - // 获取openId - if (!data.openid) { - Taro.login({ - success: (res) => { - getWxOpenId({code: res.code}).then(() => { - }) - } - }) - } - } - }).catch(() => { - console.log('未登录') - }); - } - }); - // 报名日志 - myPageBszxBm({limit: 1}).then(res => { - if (res.list) { - setBmLogs(res.list); - } - }) - setLoading(false); - }; - - const showAuthModal = () => { - Taro.showModal({ - title: '授权提示', - content: '需要获取您的用户信息', - confirmText: '去授权', - cancelText: '取消', - success: (res) => { - if (res.confirm) { - // 用户点击确认，打开授权设置页面 - openSetting(); - } - } - }); - }; - - const openSetting = () => { - // Taro.openSetting：调起客户端小程序设置界面，返回用户设置的操作结果。设置界面只会出现小程序已经向用户请求过的权限。 - Taro.openSetting({ - success: (res) => { - if (res.authSetting['scope.userInfo']) { - // 用户授权成功，可以获取用户信息 - reload(); - } else { - // 用户拒绝授权，提示授权失败 - Taro.showToast({ - title: '授权失败', - icon: 'none' - }); - } - } - }); - }; - - useEffect(() => { - Taro.getSetting({ - success: (res) => { - if (res.authSetting['scope.userInfo']) { - // 用户已经授权过，可以直接获取用户信息 - console.log('用户已经授权过，可以直接获取用户信息') - reload(); - } else { - // 用户未授权，需要弹出授权窗口 - console.log('用户未授权，需要弹出授权窗口') - showAuthModal(); - } - } - }); - reload(); - }, []) - - return ( -
-
-
- { - navItems.map((item, index) => ( -
- { - isLogin && !loading ? -
{ - onLogin(item, index) - }}> - -
{item?.title}
-
- : - - } -
- )) - } -
-
- {/*倡议书*/} - {/**/} -
- ) -} -export default OrderIcon diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx index 34b2ac7..2e3fedd 100644 --- a/src/pages/user/components/UserCard.tsx +++ b/src/pages/user/components/UserCard.tsx @@ -176,7 +176,7 @@ function UserCard() { } return ( -
+
@@ -200,7 +200,7 @@ function UserCard() { ) }
-
{IsLogin ? userInfo?.mobile : '请点击头像登录'}
+
{IsLogin ? userInfo?.nickname : '请点击头像登录'}
{IsLogin ? (
@@ -215,7 +215,7 @@ function UserCard() { {'个人资料'}
-
+
navTo('/user/wallet/wallet', true)}> 余额 ¥ {userInfo?.balance || '0.00'} diff --git a/src/pages/user/components/UserOrder.tsx b/src/pages/user/components/UserOrder.tsx new file mode 100644 index 0000000..fafba09 --- /dev/null +++ b/src/pages/user/components/UserOrder.tsx @@ -0,0 +1,69 @@ +import {useEffect} from "react"; +import navTo from "@/utils/common"; +import {View, Text} from '@tarojs/components'; +import {ArrowRight, Wallet, Comment, Transit, Refund, Package} from '@nutui/icons-react-taro'; + +function UserOrder() { + + const reload = () => { + + }; + + useEffect(() => { + reload() + }, []); + + return ( + <> + + + + 我的订单 + navTo('/user/order/order', true)}> + 全部订单 + + + + + navTo('/user/order/order?statusFilter=0', true)}> + + 待付款 + + navTo('/user/order/order?statusFilter=1', true)}> + + 待发货 + + navTo('/user/order/order?statusFilter=3', true)}> + + 待收货 + + navTo('/user/order/order?statusFilter=5', true)}> + + 待评价 + + navTo('/user/order/order?statusFilter=7', true)}> + + 退货/售后 + + + + + + + ) +} + +export default UserOrder; diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 30d8672..a18bad0 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -1,5 +1,6 @@ import {useEffect} from 'react' import UserCard from "./components/UserCard"; +import UserOrder from "./components/UserOrder"; import UserCell from "./components/UserCell"; import './user.scss' import UserFooter from "./components/UserFooter"; @@ -13,6 +14,7 @@ function User() { background: 'linear-gradient(to bottom, #e9fff2, #f9fafb)' }}> +
diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx index b5f4f35..5f07907 100644 --- a/src/shop/goodsDetail/index.tsx +++ b/src/shop/goodsDetail/index.tsx @@ -133,7 +133,7 @@ const GoodsDetail = () => { }); // 加载商品规格 - listShopGoodsSpec({ goodsId: Number(goodsId) } as any) + listShopGoodsSpec({goodsId: Number(goodsId)} as any) .then((data) => { setSpecs(data || []); }) @@ -142,7 +142,7 @@ const GoodsDetail = () => { }); // 加载商品SKU - listShopGoodsSku({ goodsId: Number(goodsId) } as any) + listShopGoodsSku({goodsId: Number(goodsId)} as any) .then((data) => { setSkus(data || []); }) @@ -217,7 +217,7 @@ const GoodsDetail = () => { top: "50px", right: "110px", }} - onClick={() => navTo(`/pages/cart/cart`, true)}> + onClick={() => Taro.switchTab({url: `/pages/cart/cart`})}>
diff --git a/src/shop/orderDetail/index.tsx b/src/shop/orderDetail/index.tsx index 391f946..379a8c1 100644 --- a/src/shop/orderDetail/index.tsx +++ b/src/shop/orderDetail/index.tsx @@ -24,7 +24,7 @@ const OrderDetail = () => { if (order.orderStatus === 7) return '客户端申请退款'; // 检查支付状态 (payStatus为boolean类型) - if (!order.payStatus || order.payStatus === false) return '待付款'; + if (!order.payStatus) return '待付款'; // 已付款后检查发货状态 if (order.deliveryStatus === 10) return '待发货'; @@ -109,8 +109,8 @@ const OrderDetail = () => {
- {order.payStatus === 0 && } - {order.payStatus === 0 && } + {!order.payStatus && } + {!order.payStatus && } {order.orderStatus === 1 && } {order.deliveryStatus === 20 && } diff --git a/src/pages/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx similarity index 100% rename from src/pages/order/components/OrderList.tsx rename to src/user/order/components/OrderList.tsx diff --git a/src/pages/order/components/OrderSearch.scss b/src/user/order/components/OrderSearch.scss similarity index 100% rename from src/pages/order/components/OrderSearch.scss rename to src/user/order/components/OrderSearch.scss diff --git a/src/pages/order/components/OrderSearch.tsx b/src/user/order/components/OrderSearch.tsx similarity index 100% rename from src/pages/order/components/OrderSearch.tsx rename to src/user/order/components/OrderSearch.tsx diff --git a/src/pages/order/order.config.ts b/src/user/order/order.config.ts similarity index 100% rename from src/pages/order/order.config.ts rename to src/user/order/order.config.ts diff --git a/src/pages/order/order.scss b/src/user/order/order.scss similarity index 100% rename from src/pages/order/order.scss rename to src/user/order/order.scss diff --git a/src/pages/order/order.tsx b/src/user/order/order.tsx similarity index 71% rename from src/pages/order/order.tsx rename to src/user/order/order.tsx index 1e7a112..2860672 100644 --- a/src/pages/order/order.tsx +++ b/src/user/order/order.tsx @@ -1,6 +1,6 @@ import {useState} from "react"; import Taro, {useDidShow} from '@tarojs/taro' -import {NavBar, Space, Empty, Button, ConfigProvider, Input} from '@nutui/nutui-react-taro' +import {Space, Empty, Button, ConfigProvider, Input} from '@nutui/nutui-react-taro' import {Search, Filter} from '@nutui/icons-react-taro' import { View } from '@tarojs/components'; import OrderList from "./components/OrderList"; @@ -10,7 +10,6 @@ import {pageShopOrder} from "@/api/shop/shopOrder"; import './order.scss' function Order() { - const [statusBarHeight, setStatusBarHeight] = useState() const [list, setList] = useState([]) const [searchParams, setSearchParams] = useState({}) const [showSearch, setShowSearch] = useState(false) @@ -40,55 +39,43 @@ function Order() { } useDidShow(() => { - Taro.getSystemInfo({ - success: (res) => { - setStatusBarHeight(res.statusBarHeight) - }, - }) + // 设置导航栏标题 + Taro.setNavigationBarTitle({ + title: '我的订单' + }); + + Taro.setNavigationBarColor({ + backgroundColor: '#ffffff', + frontColor: '#000000', + }); + reload().then() }); return ( - <> - - -
- - setShowSearch(!showSearch)} - /> - setShowSearch(!showSearch)} - /> - -
- - } - > - 我的订单 - + + {/* 搜索和筛选工具栏 */} + + + setShowSearch(!showSearch)} + /> + setShowSearch(!showSearch)} + /> + + + 共{list.length}个订单 + + {/* 搜索组件 */} {showSearch && ( - + ) } - + ); }