From b71540eb7afcd7d5498f57a599f77936fb631405 Mon Sep 17 00:00:00 2001 From: DU Date: Fri, 23 Jan 2026 23:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E6=9D=86=E6=9F=9C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=AD=98=E5=9C=A8=E6=9F=9C=E7=A7=9F=E8=B5=81=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 5 +++-- src/pages/scan/index.tsx | 2 +- src/pages/user/index.tsx | 2 +- .../cabinetRental/index.config.ts | 0 .../cabinetRental/index.scss | 0 .../cabinetRental/index.tsx | 0 .../poleStorage/index.config.ts | 0 .../poleStorage/index.scss | 0 .../poleStorage/index.tsx | 8 ++++---- src/pagesUser/poleStorageLog/index.config.ts | 5 +++++ src/pagesUser/poleStorageLog/index.scss | 5 +++++ src/pagesUser/poleStorageLog/index.tsx | 20 +++++++++++++++++++ 12 files changed, 39 insertions(+), 8 deletions(-) rename src/{pagesUser => pagesOrder}/cabinetRental/index.config.ts (100%) rename src/{pagesUser => pagesOrder}/cabinetRental/index.scss (100%) rename src/{pagesUser => pagesOrder}/cabinetRental/index.tsx (100%) rename src/{pagesUser => pagesOrder}/poleStorage/index.config.ts (100%) rename src/{pagesUser => pagesOrder}/poleStorage/index.scss (100%) rename src/{pagesUser => pagesOrder}/poleStorage/index.tsx (94%) create mode 100644 src/pagesUser/poleStorageLog/index.config.ts create mode 100644 src/pagesUser/poleStorageLog/index.scss create mode 100644 src/pagesUser/poleStorageLog/index.tsx diff --git a/src/app.config.ts b/src/app.config.ts index 16abcaa..5eaf0c9 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -20,8 +20,7 @@ export default defineAppConfig({ root: 'pagesUser', name: 'user-package', pages: [ - 'poleStorage/index', // 存杆柜记录 - 'cabinetRental/index', // 存杆柜租赁 + 'poleStorageLog/index', // 存杆柜记录 'orderList/index', // 订单记录 'orderDetail/index', // 订单详情 'unsettledOrders/index', // 未结算账单 @@ -53,6 +52,8 @@ export default defineAppConfig({ 'accountBalance/index', // 账户余额 'recharge/index', // 余额充值 'rechargeDetail/index', // 充值明细 + 'poleStorage/index', // 存杆柜列表 + 'cabinetRental/index', // 存杆柜租赁 ] } ], diff --git a/src/pages/scan/index.tsx b/src/pages/scan/index.tsx index 923e7e2..754687d 100644 --- a/src/pages/scan/index.tsx +++ b/src/pages/scan/index.tsx @@ -68,7 +68,7 @@ const ScanIndex = observer(() => { // 去存杆柜 const handlePoleStorage = () => { Taro.navigateTo({ - url: '/pagesUser/poleStorage/index' + url: '/pagesOrder/poleStorage/index' }) } diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 06b6062..1f656b0 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -34,7 +34,7 @@ const UserIndex = observer(() => { // 服务项配置 const serviceItems = [ - { icon: poleStorageIcon, title: '存杆柜记录', path: '/pagesUser/poleStorage/index' }, + { icon: poleStorageIcon, title: '存杆柜记录', path: '/pagesUser/poleStorageLog/index' }, { icon: orderListIcon, title: '订单记录', path: '/pagesUser/orderList/index' }, { icon: unsettledOrdersIcon, title: '未结算账单', path: '/pagesUser/unsettledOrders/index' }, { icon: goodsConsIcon, title: '商品消费', path: '/pagesUser/goodsCons/index' }, diff --git a/src/pagesUser/cabinetRental/index.config.ts b/src/pagesOrder/cabinetRental/index.config.ts similarity index 100% rename from src/pagesUser/cabinetRental/index.config.ts rename to src/pagesOrder/cabinetRental/index.config.ts diff --git a/src/pagesUser/cabinetRental/index.scss b/src/pagesOrder/cabinetRental/index.scss similarity index 100% rename from src/pagesUser/cabinetRental/index.scss rename to src/pagesOrder/cabinetRental/index.scss diff --git a/src/pagesUser/cabinetRental/index.tsx b/src/pagesOrder/cabinetRental/index.tsx similarity index 100% rename from src/pagesUser/cabinetRental/index.tsx rename to src/pagesOrder/cabinetRental/index.tsx diff --git a/src/pagesUser/poleStorage/index.config.ts b/src/pagesOrder/poleStorage/index.config.ts similarity index 100% rename from src/pagesUser/poleStorage/index.config.ts rename to src/pagesOrder/poleStorage/index.config.ts diff --git a/src/pagesUser/poleStorage/index.scss b/src/pagesOrder/poleStorage/index.scss similarity index 100% rename from src/pagesUser/poleStorage/index.scss rename to src/pagesOrder/poleStorage/index.scss diff --git a/src/pagesUser/poleStorage/index.tsx b/src/pagesOrder/poleStorage/index.tsx similarity index 94% rename from src/pagesUser/poleStorage/index.tsx rename to src/pagesOrder/poleStorage/index.tsx index 90d40e6..4cc25f5 100644 --- a/src/pagesUser/poleStorage/index.tsx +++ b/src/pagesOrder/poleStorage/index.tsx @@ -8,7 +8,7 @@ import { Tabs } from '@taroify/core' import EmptyData from '@/components/EmptyData' import './index.scss' -const pipeIcon = require('../../pagesOrder/images/pipeIcon.png') +const pipeIcon = require('../images/pipeIcon.png') // 存杆柜数据接口 interface CabinetItem { @@ -73,7 +73,7 @@ const PoleStorage = () => { const handleRenew = (id: string, cabinetName: string) => { console.log('续租', id, cabinetName) Taro.navigateTo({ - url: `/pagesUser/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=renew` + url: `/pagesOrder/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=renew` }) } @@ -81,7 +81,7 @@ const PoleStorage = () => { const handleReturn = (id: string, cabinetName: string) => { console.log('退租', id, cabinetName) Taro.navigateTo({ - url: `/pagesUser/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=return` + url: `/pagesOrder/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=return` }) } @@ -89,7 +89,7 @@ const PoleStorage = () => { const handleRent = (id: string, cabinetName: string) => { console.log('租赁', id, cabinetName) Taro.navigateTo({ - url: `/pagesUser/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=rental` + url: `/pagesOrder/cabinetRental/index?cabinetId=${id}&cabinetName=${cabinetName}&type=rental` }) } diff --git a/src/pagesUser/poleStorageLog/index.config.ts b/src/pagesUser/poleStorageLog/index.config.ts new file mode 100644 index 0000000..3410d0e --- /dev/null +++ b/src/pagesUser/poleStorageLog/index.config.ts @@ -0,0 +1,5 @@ +export default { + navigationBarTitleText: '存杆柜记录', + navigationBarBackgroundColor: '#FFFFFF', + navigationBarTextStyle: 'black', +} diff --git a/src/pagesUser/poleStorageLog/index.scss b/src/pagesUser/poleStorageLog/index.scss new file mode 100644 index 0000000..890699b --- /dev/null +++ b/src/pagesUser/poleStorageLog/index.scss @@ -0,0 +1,5 @@ +.pole-storage-log-page { + min-height: 100vh; + background-color: #F2F3F5; + padding: 30px; +} diff --git a/src/pagesUser/poleStorageLog/index.tsx b/src/pagesUser/poleStorageLog/index.tsx new file mode 100644 index 0000000..a315eee --- /dev/null +++ b/src/pagesUser/poleStorageLog/index.tsx @@ -0,0 +1,20 @@ +/** + * 存杆柜记录 + */ +import { View, Text } from '@tarojs/components' +import { useLoad } from '@tarojs/taro' +import './index.scss' + +const PoleStorageLog = () => { + useLoad(() => { + console.log('存杆柜记录页面加载') + }) + + return ( + + 存杆柜记录 + + ) +} + +export default PoleStorageLog