diff --git a/pages.json b/pages.json index 516f0ea..6728827 100644 --- a/pages.json +++ b/pages.json @@ -124,7 +124,7 @@ { "path": "verification/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTextStyle": "black", "navigationStyle": "custom", "navigationBarTitleText": "核销页面" @@ -133,6 +133,7 @@ { "path": "verification/detail", "style": { + "enablePullDownRefresh": false, "navigationBarTextStyle": "black", "navigationBarTitleText": "核销详情" } @@ -152,7 +153,7 @@ "current": 0, // 当前激活的条件,默认为 0 "list": [{ "name": "", // 条件名称 - "path": "pagesA/task_hall/list", // 要打开的页面路径 + "path": "pagesA/verification/index", // 要打开的页面路径 "query": "" // 可选的页面参数 }] } diff --git a/pages/index/index.vue b/pages/index/index.vue index f917188..2f53f4a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -178,7 +178,7 @@ { image: uni.$globalData?.RESOURCE_URL + 'home/grid/hexiao.png', title: '核销入库', - type: '' + type: 'verification' }, { image: uni.$globalData?.RESOURCE_URL + 'home/grid/xiaoxi.png', diff --git a/pagesA/verification/index.vue b/pagesA/verification/index.vue index ae106c8..6269417 100644 --- a/pagesA/verification/index.vue +++ b/pagesA/verification/index.vue @@ -13,46 +13,62 @@ 核销中心 + + + + + + - + - + - - 连续核销 - - + + + + + + 连续核销 + + + + - + - + - + - 点击扫描二维码核销 - {{continuousMode ? '连续核销模式已开启' : '核销成功后将跳转到详情页'}} + 点击扫描二维码入库核销 + {{continuousMode ? '连续核销模式已开启' : ''}} - + 请输入订单号 - - + + 立即核销 @@ -60,8 +76,7 @@ - + 最近核销记录 @@ -86,20 +101,15 @@ - 暂无核销记录 - - - - {{continuousMode ? '连续核销模式下,完成核销后可继续操作' : '核销完成后将跳转至详情页'}} - - + @@ -107,7 +117,8 @@ import { ref, reactive } from 'vue' import { onLoad } from '@dcloudio/uni-app' import { useNavigation } from '@/hooks/useNavigation' - + import { useToast } from '@/uni_modules/wot-design-uni' + const Toast = useToast() // 使用导航 composable const { hasMultiplePages, // 是否有多个页面在路由栈中 @@ -123,11 +134,11 @@ // 核销记录 const verificationRecords = ref([ // 示例数据,实际应为空数组 - // { - // orderNumber: 'JD202503050001', - // time: '2025-03-05 21:58:34', - // status: 'success' // success, fail, pending - // } + { + orderNumber: 'JD202503050001', + time: '2025-03-05 21:58:34', + status: 'success' // success, fail, pending + } ]) // 扫码核销 @@ -137,7 +148,7 @@ handleVerification(res.result) }, fail: (err) => { - Toast.fail('扫码失败,请重试') + Toast.error('扫码失败,请重试') } }) } @@ -145,7 +156,7 @@ // 提交订单号核销 const submitOrderNumber = () => { if (!orderNumber.value) { - Toast.fail('请输入订单号') + Toast.error('请输入订单号') return } handleVerification(orderNumber.value) @@ -183,10 +194,7 @@ }, 800) } else { // 非连续模式 - 直接跳转到详情页 - Toast.loading({ - message: '核销中...', - duration: 0 - }) + Toast.loading('核销中...') // 模拟API请求 setTimeout(() => { @@ -199,7 +207,7 @@ url: `/pagesA/verification/detail?orderNumber=${code}` }) } else { - Toast.fail('核销失败,请重试') + Toast.error('核销失败,请重试') } }, 800) } @@ -245,10 +253,11 @@ \ No newline at end of file diff --git a/unocss/a-hua-unocss/index.scss b/unocss/a-hua-unocss/index.scss index 322fb65..aa8d5a2 100644 --- a/unocss/a-hua-unocss/index.scss +++ b/unocss/a-hua-unocss/index.scss @@ -1,122 +1,6 @@ -.li-items-center{align-items:center} -.items-center{align-items:center} -.justify-end{justify-content:end} -.justify-center{justify-content:center} -.li-justify-between{justify-content:space-between} -.justify-between{justify-content:space-between} -.li-bg-white{background-color:rgb(255,255,255)} -.li-flex{display:flex} -.li-flex-center{display:flex;align-items:center;justify-content:center} -.li-flex-col{flex-direction:column} -.li-font-bold{font-weight:bold} -.li-h-130{height:130rpx} -.li-h-160{height:160rpx} -.li-h-220{height:220rpx} -.li-h-58{height:58rpx} -.li-justify-around{justify-content:space-around} -.li-ml-22{margin-left:22rpx} -.li-ml-25{margin-left:25rpx} -.li-ml-35{margin-left:35rpx} -.li-mr-25{margin-right:25rpx} -.li-mr-5{margin-right:5rpx} -.li-mt-10{margin-top:10rpx} -.li-mt-12{margin-top:12rpx} -.li-mt-14{margin-top:14rpx} -.li-mt-15{margin-top:15rpx} -.li-mt-20{margin-top:20rpx} -.li-mt-30{margin-top:30rpx} -.li-mx-auto{margin-left:auto;margin-right:auto} -.li-pt-15{padding-top:15rpx} -.li-px-25{padding-left:25rpx;padding-right:25rpx} -.li-px-30{padding-left:30rpx;padding-right:30rpx} -.li-px-40{padding-left:40rpx;padding-right:40rpx} -.li-px-50{padding-left:50rpx;padding-right:50rpx} -.li-py-25{padding-top:25rpx;padding-bottom:25rpx} -.li-rd-10{border-radius:10rpx} -.li-rd-15{border-radius:15rpx} -.li-text-010B3E-color{color:rgb(1,11,62)} -.li-text-22{font-size:22rpx} -.li-text-24{font-size:24rpx} -.li-text-26{font-size:26rpx} -.li-text-28{font-size:28rpx} -.li-text-30{font-size:30rpx} -.li-text-343333-color{color:rgb(52,51,51)} -.li-text-43{font-size:43rpx} -.li-text-48{font-size:48rpx} -.li-text-AFB2B8-color{color:rgb(175,178,184)} -.li-text-B1B0B0-color{color:rgb(177,176,176)} -.li-text-F42429-color{color:rgb(244,36,41)} -.li-w-130{width:130rpx} -.li-w-310{width:310rpx} -.li-w-58{width:58rpx} -.li-w-full-70{width:70%} -.li-w-full-88{width:88%} -.pt-10{padding-top:10rpx} -.bg-FFFFFF{background-color:rgb(255,255,255)} -.bg-f9f9f9{background-color:rgb(249,249,249)} -.li-mb-8{margin-bottom:8rpx} -.li-ml-15{margin-left:15rpx} -.li-ml-6{margin-left:6rpx} -.li-mr-6{margin-right:6rpx} -.li-mt-300-important{margin-top:300rpx !important} -.li-p-15{padding:15rpx} -.li-pb-15{padding-bottom:15rpx} -.li-pb-30{padding-bottom:30rpx} -.li-pt-25{padding-top:25rpx} -.li-pt-4{padding-top:4rpx} -.li-text-32{font-size:32rpx} -.li-text-323232-color{color:rgb(50,50,50)} -.li-text-333333-color{color:rgb(51,51,51)} -.li-text-36{font-size:36rpx} -.li-text-42{font-size:42rpx} -.li-text-55{font-size:55rpx} -.li-text-70{font-size:70rpx} -.li-text-9a9a9a-color{color:rgb(154,154,154)} -.li-text-ff0000-color{color:rgb(255,0,0)} -.li-w-full-100{width:100%} -.li-w-full-92{width:92%} - -.li-bottom-0{bottom:0} -.li-fixed{position:fixed} -.li-h-110{height:110rpx} -.li-items-start{align-items:start} -.li-mb-12{margin-bottom:12rpx} -.li-mb-20{margin-bottom:20rpx} -.li-ml-20{margin-left:20rpx} -.li-mr-10{margin-right:10rpx} -.li-mr-12{margin-right:12rpx} -.li-mr-3{margin-right:3rpx} -.li-mr-30{margin-right:30rpx} -.li-mt-40{margin-top:40rpx} -.li-pb-25{padding-bottom:25rpx} -.li-pl-20{padding-left:20rpx} -.li-pl-30{padding-left:30rpx} -.li-pr-30{padding-right:30rpx} -.li-pt-2{padding-top:2rpx} -.li-pt-20{padding-top:20rpx} -.li-pt-30{padding-top:30rpx} -.li-py-35{padding-top:35rpx;padding-bottom:35rpx} -.li-py-6{padding-top:6rpx;padding-bottom:6rpx} -.li-rd-20{border-radius:20rpx} -.li-rd-bl-50-important{border-bottom-left-radius:50rpx !important} -.li-text-009aff-color{color:rgb(0,154,255)} -.li-text-40{font-size:40rpx} -.li-text-5f5f5f-color{color:rgb(95,95,95)} -.li-text-right{text-align:right} -.li-w-110{width:110rpx} -.li-w-150{width:150rpx} -.li-w-400{width:400rpx} -.overflow-hidden{overflow:hidden} - -.li-h-90{height:90rpx} -.li-ml-30{margin-left:30rpx} -.li-py-20{padding-top:20rpx;padding-bottom:20rpx} -.li-text-25{font-size:25rpx} -.li-text-52{font-size:52rpx} -.li-w-90{width:90rpx} -.li-w-full-80{width:80%} - -.li-mr-40{margin-right:40rpx} - + + +.li-text-35{font-size:35rpx} +.li-text-46{font-size:46rpx}