diff --git a/src/pages/home/edit-quick-actions.vue b/src/pages/home/edit-quick-actions.vue
index 3b2471b..94f8d7f 100644
--- a/src/pages/home/edit-quick-actions.vue
+++ b/src/pages/home/edit-quick-actions.vue
@@ -476,18 +476,16 @@
.edit-common-btn {
position: absolute;
right: 20rpx;
- height: 60rpx;
display: flex;
align-items: center;
justify-content: center;
- padding: 0 32rpx;
+ padding: 14rpx 28rpx;
background: #2979ff;
- border-radius: 12rpx;
+ border-radius: 8rpx;
transition: all 0.2s ease;
.edit-common-text {
- font-size: 34rpx;
- font-weight: 500;
+ font-size: 36rpx;
color: #fff;
line-height: 1;
}
diff --git a/src/pages/work/order/order-review.vue b/src/pages/work/order/order-review.vue
index 1c3bfaa..ac22d74 100644
--- a/src/pages/work/order/order-review.vue
+++ b/src/pages/work/order/order-review.vue
@@ -46,8 +46,7 @@
- 该订单已被拦截,请勿复核发货
- 查看
+ {{ listType === 'group' ? '该波次有拦截订单' : '该订单已被拦截,请勿复核发货' }}
@@ -99,7 +98,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
@@ -172,7 +193,10 @@ export default {
// 新建任务
showCreatePopup: false,
createTitle: '',
- creating: false
+ creating: false,
+ // 删除任务
+ showDeletePopup: false,
+ deletingTask: null
};
},
computed: {
@@ -249,7 +273,6 @@ export default {
uni.showToast({ title: '查询收件任务失败', icon: 'none' });
} finally {
this.loading = false;
- this.refreshing = false;
}
},
handleSearch() {
@@ -266,8 +289,13 @@ export default {
async handleRefresh() {
if (this.refreshing) return;
this.refreshing = true;
+ // 真机原生 refresher 需先收到 true 再收到 false 才会收回,先让 true 刷新到原生
+ await this.$nextTick();
await this.loadTaskList(this.currentPage);
- this.refreshing = false;
+ // 延迟关闭,避免 true/false 连续赋值被渲染层合并导致一直转圈
+ setTimeout(() => {
+ this.refreshing = false;
+ }, 300);
},
// ===== 进入扫码登记 =====
handleTaskOpen(item) {
@@ -293,15 +321,19 @@ export default {
}
return;
}
- uni.showModal({
- title: '删除收件任务',
- content: `确认删除「${item.title || item.batchNo || item.id}」?删除后不可恢复`,
- success: (modalRes) => {
- if (modalRes.confirm) {
- this.removeTask(item);
- }
- }
- });
+ this.deletingTask = item;
+ this.showDeletePopup = true;
+ },
+ closeDeletePopup() {
+ this.showDeletePopup = false;
+ this.deletingTask = null;
+ },
+ confirmDeleteTask() {
+ const item = this.deletingTask;
+ this.closeDeletePopup();
+ if (item) {
+ this.removeTask(item);
+ }
},
async removeTask(item) {
uni.showLoading({ title: '删除中...', mask: true });
@@ -383,17 +415,21 @@ export default {
}
.nav-create {
+ position: absolute;
+ top: 50%;
+ right: 20rpx;
+ transform: translateY(-50%);
display: flex;
align-items: center;
justify-content: center;
- width: 130rpx;
- height: 60rpx;
+ padding: 14rpx 28rpx;
background: #2979ff;
border-radius: 8rpx;
.nav-create-text {
- font-size: 32rpx;
+ font-size: 36rpx;
color: #ffffff;
+ line-height: 1;
white-space: nowrap;
}
}
@@ -415,35 +451,45 @@ export default {
align-items: center;
.task-scope__item {
+ flex: 1;
+ height: 56rpx;
+ padding: 0 12rpx;
display: flex;
align-items: center;
justify-content: center;
- padding: 8rpx 32rpx;
- margin-right: 16rpx;
background: #f5f7fa;
- border: 1rpx solid #e6e8eb;
- border-radius: 30rpx;
+ border: 1rpx solid #ebeef5;
+ border-radius: 28rpx;
+
+ & + .task-scope__item {
+ margin-left: 16rpx;
+ }
&--active {
- background: #e6f0ff;
+ background: #2979ff;
border-color: #2979ff;
+ box-shadow: 0 4rpx 12rpx rgba(41, 121, 255, 0.28);
}
.task-scope__text {
- font-size: 28rpx;
+ font-size: 34rpx;
color: #606266;
+ white-space: nowrap;
}
&--active .task-scope__text {
- color: #2979ff;
- font-weight: 600;
+ color: #ffffff;
+ font-weight: bold;
}
}
.task-scope__hint {
- flex: 1;
- text-align: right;
- font-size: 24rpx;
+ flex: 2;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ margin-left: 16rpx;
+ font-size: 30rpx;
color: #c0c4cc;
}
}
@@ -479,17 +525,15 @@ export default {
}
.task-list {
- padding: 0 12rpx;
+ padding: 0 16rpx;
box-sizing: border-box;
- /* 左滑时内容被容器裁剪到卡片左边缘(文字贴死左边):给滑动容器留一点左间距 */
::v-deep .u-swipe-action-item {
- margin-left: 12rpx;
+ margin-bottom: 12rpx;
}
}
.task-card {
- margin-bottom: 12rpx;
padding: 20rpx 24rpx;
background: #ffffff;
border: 2rpx solid #ebedf2;
@@ -505,17 +549,15 @@ export default {
min-width: 0;
margin-right: 16rpx;
font-size: 38rpx;
- font-weight: 600;
+ font-weight: bold;
color: #000;
- /* 编号过长时单行省略,避免挤掉右侧登记数 */
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ /* 编号过长时换行显示,避免挤掉右侧登记数 */
+ word-break: break-all;
}
.task-card__count {
flex-shrink: 0;
- font-size: 34rpx;
+ font-size: 36rpx;
color: #ffffff;
background: #52c41a;
border-radius: 24rpx;
@@ -535,7 +577,7 @@ export default {
.task-card__title {
flex: 1;
- font-size: 32rpx;
+ font-size: 36rpx;
color: #303133;
overflow: hidden;
text-overflow: ellipsis;
@@ -561,7 +603,7 @@ export default {
justify-content: space-between;
.task-card__meta-item {
- font-size: 26rpx;
+ font-size: 30rpx;
color: #909399;
}
}
@@ -590,7 +632,7 @@ export default {
.create-popup__title {
font-size: 38rpx;
- font-weight: 600;
+ font-weight: bold;
color: #303133;
}
}
@@ -650,5 +692,67 @@ export default {
}
}
}
+
+ /* ===== 删除任务确认弹窗(参考完成盘点弹窗样式) ===== */
+ .delete-confirm-popup {
+ width: 640rpx;
+ padding: 40rpx 32rpx 32rpx;
+ background: #ffffff;
+ border-radius: 20rpx;
+ box-sizing: border-box;
+ }
+
+ .delete-confirm-popup__title {
+ font-size: 42rpx;
+ font-weight: bold;
+ color: #303133;
+ text-align: center;
+ margin-bottom: 32rpx;
+ }
+
+ .delete-confirm-popup__body {
+ margin-bottom: 36rpx;
+ padding: 24rpx;
+ background: #f5f7fa;
+ border-radius: 12rpx;
+ }
+
+ .delete-confirm-popup__text {
+ font-size: 36rpx;
+ color: #303133;
+ line-height: 1.6;
+ word-break: break-all;
+ }
+
+ .delete-confirm-popup__actions {
+ display: flex;
+ align-items: center;
+ }
+
+ .delete-confirm-popup__btn {
+ flex: 1;
+ height: 88rpx;
+ border-radius: 12rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 36rpx;
+ font-weight: bold;
+ }
+
+ .delete-confirm-popup__btn + .delete-confirm-popup__btn {
+ margin-left: 20rpx;
+ }
+
+ .delete-confirm-popup__btn--cancel {
+ background: #f5f7fa;
+ color: #606266;
+ border: 1rpx solid #dcdfe6;
+ }
+
+ .delete-confirm-popup__btn--confirm {
+ background: #f56c6c;
+ color: #ffffff;
+ }
}