diff --git a/pages.json b/pages.json
index d0a357b..a81c77c 100644
--- a/pages.json
+++ b/pages.json
@@ -81,6 +81,14 @@
"navigationStyle": "custom",
"navigationBarTitleText": "工单大厅"
}
+ },{
+ "path": "task_hall/detail",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTextStyle": "black",
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "工单详情"
+ }
}, {
"path": "my_order/list",
"style": {
@@ -96,7 +104,7 @@
"enablePullDownRefresh": true,
"navigationBarTextStyle": "black",
"navigationStyle": "custom",
- "navigationBarTitleText": "工单详情"
+ "navigationBarTitleText": "我的工单详情"
}
},
{
@@ -119,6 +127,13 @@
"enablePullDownRefresh": true,
"navigationBarTextStyle": "black",
"navigationStyle": "custom",
+ "navigationBarTitleText": "核销页面"
+ }
+ },
+ {
+ "path": "verification/detail",
+ "style": {
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "核销详情"
}
},
@@ -137,8 +152,8 @@
"current": 0, // 当前激活的条件,默认为 0
"list": [{
"name": "", // 条件名称
- "path": "pagesA/message/index", // 要打开的页面路径
+ "path": "pagesA/task_hall/list", // 要打开的页面路径
"query": "" // 可选的页面参数
}]
}
-}
+}
\ No newline at end of file
diff --git a/pagesA/message/index.vue b/pagesA/message/index.vue
index 19ea951..b2012db 100644
--- a/pagesA/message/index.vue
+++ b/pagesA/message/index.vue
@@ -32,7 +32,7 @@
-
@@ -41,10 +41,10 @@
-
+ -->
-
+
diff --git a/pagesA/task_hall/detail.vue b/pagesA/task_hall/detail.vue
new file mode 100644
index 0000000..cda95ca
--- /dev/null
+++ b/pagesA/task_hall/detail.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+ 工单详情
+
+
+
+
+
+
+
+
+
+
+
+ JD2424234324325
+
+
+ 创建时间: 2025-07-09
+
+
+ {{getStatusText(1)}}
+
+
+
+
+
+
+
+ {{getStatusText(1)}}
+ 工单待处理,点击按钮确认接单
+
+
+
+
+
+ 业主信息
+
+
+ 业主姓名
+ 邓大仙儿
+
+
+ 联系方式
+
+
+
+
+
+
+ 177****4485
+
+
+
+
+ 配送地址
+ 中金北区17号楼一单元201室号
+
+
+ 商品备注
+ 放在门口即可
+
+
+ 商品信息
+
+ 燕京 8度U8 500ML*12瓶/箱*2 送燕京9度菊花听500ML*12听
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 接单
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pagesA/task_hall/list.vue b/pagesA/task_hall/list.vue
index 71f6cb9..86248c2 100644
--- a/pagesA/task_hall/list.vue
+++ b/pagesA/task_hall/list.vue
@@ -10,12 +10,12 @@
-
+
-
工单编号: {{item.ticket_no}}
@@ -50,17 +50,24 @@
{{item.order.remark}}
-
+
{{item.commission}}
元/可得佣金
- 接单
+
+ 详情
+ 接单
+
+
+
+
+
@@ -78,14 +85,20 @@
checkRouteStack // 检查当前路由栈状态的方法
} = useNavigation()
+ const loading = ref(false)
+
onLoad(() => {
checkRouteStack()
poolList()
})
onPullDownRefresh(() => {
- refresh()
- uni.stopPullDownRefresh()
+ query.value.page = 1
+ taskList.value = []
+ poolList()
+ setTimeout(() => {
+ uni.stopPullDownRefresh()
+ }, 300)
})
onReachBottom(() => {
@@ -97,19 +110,19 @@
const query = ref({
page: 1,
limit: 10,
- type: "",
+ type: '',
timeRange: 0
})
- var finish = ref()
+ const finish = ref(false)
- const option1 = ref>([
+ const option1 = ref([
{ label: '全部类型', value: '' },
{ label: '商品工单', value: 'F2' },
{ label: '维修工单', value: 'F6' },
{ label: '量房工单', value: 'F4' }
])
- const option2 = ref>([
+ const option2 = ref([
{ label: '全部时间', value: 0 },
{ label: '今天', value: 1 },
{ label: '最近7天', value: 2 },
@@ -130,18 +143,33 @@
url: '/pages/index/index'
})
break;
+ case 'detail':
+ uni.navigateTo({
+ url: '/pagesA/task_hall/detail'
+ })
+ break;
default:
break;
}
}
- const refresh = () => {
+ const refresh = (value : any) => {
+ query.value.type = value.value
+ query.value.page = 1
+ taskList.value = []
+ poolList()
+ }
+ const refresh1 = (value : any) => {
+ query.value.timeRange = value.value
+ query.value.page = 1
taskList.value = []
poolList()
}
const poolList = async () => {
+ loading.value = true
const res = await ticketPoolList(query.value)
+ loading.value = false
if (res.data.length < query.value.limit) {
finish.value = true
}
@@ -188,8 +216,15 @@
}
.custom-shadow {
+ color: #009aff !important;
+ background: linear-gradient(to right, #FFFFFF, #FFFFFF) !important;
+ border:solid 1px #009aff !important;
+ }
+
+ .custom-shadow1 {
color: #ffffff !important;
- background: linear-gradient(to right, #7bbfff, #009aff) !important // box-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%);
+ background: linear-gradient(to right, #7bbfff, #009aff) !important;
+ margin-left: 15rpx !important;
}
::v-deep .wd-drop-menu__list {
diff --git a/pagesA/verification/detail.vue b/pagesA/verification/detail.vue
new file mode 100644
index 0000000..b6a0f5d
--- /dev/null
+++ b/pagesA/verification/detail.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+ 核销详情
+
+
+
+
+
+
+
+
+
+
+
+ JD2424234324325
+
+
+ 创建时间: 2025-07-09
+
+
+ {{getStatusText(3)}}
+
+
+
+
+
+
+
+ {{getStatusText(3)}}
+ 工单待入库,请确认入库
+
+
+
+
+
+ 业主信息
+
+
+ 业主姓名
+ 邓大仙儿
+
+
+ 联系方式
+
+
+
+
+
+
+ 177****4485
+
+
+
+
+ 配送地址
+ 中金北区17号楼一单元201室号
+
+
+ 商品备注
+ 放在门口即可
+
+
+ 商品信息
+
+ 燕京 8度U8 500ML*12瓶/箱*2 送燕京9度菊花听500ML*12听
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 继续录入
+
+
+ 确认入库
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pagesA/verification/index.vue b/pagesA/verification/index.vue
index b6a0f5d..ae106c8 100644
--- a/pagesA/verification/index.vue
+++ b/pagesA/verification/index.vue
@@ -1,5 +1,5 @@
-
+
- 核销详情
+ 核销中心
+
+
+
+
+
-
-
-
-
-
-
- JD2424234324325
-
-
- 创建时间: 2025-07-09
-
-
- {{getStatusText(3)}}
-
+
+
+
+
+
+
+
+
+ 连续核销
+
-
-
-
-
-
- {{getStatusText(3)}}
- 工单待入库,请确认入库
+
+
+
+
+
+
+
+
+
+
+
+ 点击扫描二维码核销
+ {{continuousMode ? '连续核销模式已开启' : '核销成功后将跳转到详情页'}}
+
+
+
+
+
+ 请输入订单号
+
+
+ 立即核销
+
-
-
- 业主信息
-
-
- 业主姓名
- 邓大仙儿
-
-
- 联系方式
-
-
-
-
+
+
+
+ 最近核销记录
+
+
+
+
-
- 177****4485
+
+ {{record.orderNumber}}
+ {{record.time}}
-
-
- 配送地址
- 中金北区17号楼一单元201室号
-
-
- 商品备注
- 放在门口即可
-
-
- 商品信息
-
- 燕京 8度U8 500ML*12瓶/箱*2 送燕京9度菊花听500ML*12听
-
-
-
-
-
-
-
-
-
-
-
+
+ {{record.status === 'success' ? '核销成功' :
+ record.status === 'fail' ? '核销失败' : '处理中'}}
-
-
-
-
-
-
-
-
- 继续录入
-
-
- 确认入库
-
-
+
+
+
+
+ 暂无核销记录
+
+
+
+
+ {{continuousMode ? '连续核销模式下,完成核销后可继续操作' : '核销完成后将跳转至详情页'}}
+
+
+
+
\ No newline at end of file
diff --git a/unocss/a-hua-unocss/index.scss b/unocss/a-hua-unocss/index.scss
index 0706141..322fb65 100644
--- a/unocss/a-hua-unocss/index.scss
+++ b/unocss/a-hua-unocss/index.scss
@@ -1,7 +1,6 @@
.li-items-center{align-items:center}
.items-center{align-items:center}
-.li-justify-center{justify-content:center}
.justify-end{justify-content:end}
.justify-center{justify-content:center}
.li-justify-between{justify-content:space-between}
@@ -19,6 +18,7 @@
.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}
@@ -43,6 +43,7 @@
.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)}
@@ -51,105 +52,30 @@
.li-w-58{width:58rpx}
.li-w-full-70{width:70%}
.li-w-full-88{width:88%}
-.li-font-550{font-weight:550}
-.li-h-68{height:68rpx}
-.li-mt-100{margin-top:100rpx}
-.li-mt-28{margin-top:28rpx}
-.li-mt-32{margin-top:32rpx}
-.li-mt-90{margin-top:90rpx}
-.li-mx-10{margin-left:10rpx;margin-right:10rpx}
-.li-pt-270{padding-top:270rpx}
-.li-rd-40{border-radius:40rpx}
-.li-text-000000-color{color:rgb(0,0,0)}
-.li-text-2EA1EA-color{color:rgb(46,161,234)}
-.li-text-38{font-size:38rpx}
-.li-text-a5a5a5-color{color:rgb(165,165,165)}
-.li-w-150{width:150rpx}
-.li-w-420{width:420rpx}
-.li-w-full-80{width:80%}
-.li-w-full-85{width:85%}
-.li-w-full-90{width:90%}
-.li-h-100{height:100rpx}
-.li-ml-20{margin-left:20rpx}
-.li-ml-200{margin-left:200rpx}
-.li-ml-30{margin-left:30rpx}
-.li-mr-10{margin-right:10rpx}
-.li-mr-30{margin-right:30rpx}
-.li-mt-300-important{margin-top:300rpx !important}
-.li-pt-2{padding-top:2rpx}
-.li-py-20{padding-top:20rpx;padding-bottom:20rpx}
-.li-rd-full-50{border-radius:50%}
-.li-text-25{font-size:25rpx}
-.li-text-35{font-size:35rpx}
-.li-text-42{font-size:42rpx}
-.li-text-46{font-size:46rpx}
-.li-w-100{width:100rpx}
+.pt-10{padding-top:10rpx}
.bg-FFFFFF{background-color:rgb(255,255,255)}
.bg-f9f9f9{background-color:rgb(249,249,249)}
-.border-4-white{border-style:solid;border-color:rgb(255,255,255);border-width:4rpx}
-.li-h-240{height:240rpx}
-.li-h-250{height:250rpx}
-.li-h-50{height:50rpx}
-.li-h-60{height:60rpx}
-.li-items-end{align-items:end}
-.li-justify-start{justify-content:start}
-.li-mb-2{margin-bottom:2rpx}
-.li-ml-4{margin-left:4rpx}
-.li-ml-50{margin-left:50rpx}
-.li-mr-20{margin-right:20rpx}
-.li-mr-50{margin-right:50rpx}
-.li-mt-26{margin-top:26rpx}
-.li-mt-6{margin-top:6rpx}
-.li-mt-60{margin-top:60rpx}
-.li-mx-20{margin-left:20rpx;margin-right:20rpx}
-.li-mx-40{margin-left:40rpx;margin-right:40rpx}
-.li-pb-10{padding-bottom:10rpx}
-.li-pb-14{padding-bottom:14rpx}
-.li-pb-20{padding-bottom:20rpx}
-.li-pt-20{padding-top:20rpx}
-.li-pt-8{padding-top:8rpx}
-.li-rd-20{border-radius:20rpx}
-.li-rd-tl-30-important{border-top-left-radius:30rpx !important}
-.li-rd-tr-30-important{border-top-right-radius:30rpx !important}
-.li-text-19171B-color{color:rgb(25,23,27)}
-.li-text-20{font-size:20rpx}
-.li-text-32{font-size:32rpx}
-.li-text-34{font-size:34rpx}
-.li-text-706e70-color{color:rgb(112,110,112)}
-.li-text-B2B2B2-color{color:rgb(178,178,178)}
-.li-text-BBBDDA-color{color:rgb(187,189,218)}
-.li-text-F2F7FD-color{color:rgb(242,247,253)}
-.li-text-F8C883-color{color:rgb(248,200,131)}
-.li-text-FFFFFF-color{color:rgb(255,255,255)}
-.li-text-b1bbc7-color{color:rgb(177,187,199)}
-.li-w-240{width:240rpx}
-.li-w-50{width:50rpx}
-.li-w-60{width:60rpx}
-.li-w-full-94{width:94%}
.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-mb-25{margin-bottom:25rpx}
-.li-text-009aff-color{color:rgb(0,154,255)}
-.li-text-999-color{color:rgb(153,153,153)}
-.li-font-400{font-weight:400}
-.li-m-30{margin:30rpx}
-.li-text-595959-color{color:rgb(89,89,89)}
.li-bottom-0{bottom:0}
.li-fixed{position:fixed}
@@ -157,31 +83,40 @@
.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-mr-40{margin-right:40rpx}
-.li-text-a3a3a3-color{color:rgb(163,163,163)}
-
.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}