From 4e9dadca94d3ba7a966f64e1a9bfa02f92f8ab72 Mon Sep 17 00:00:00 2001
From: zm2000 <18386612143@163.com>
Date: Thu, 25 Jun 2026 20:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=A3=E8=B4=A7=E3=80=81?=
=?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env.js | 4 +-
.../order/order-review-comps/ReviewDetail.vue | 1 +
pages/work/order/order-review.vue | 414 +++++++++++++++---
pages/work/order/picking.vue | 249 +++++++----
4 files changed, 526 insertions(+), 142 deletions(-)
diff --git a/env.js b/env.js
index b87b72a..c33f58a 100644
--- a/env.js
+++ b/env.js
@@ -1,4 +1,4 @@
-export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
-// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
+// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
+export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
export const API_URL = `${BASE_URL}/system` //后台接口域名
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
diff --git a/pages/work/order/order-review-comps/ReviewDetail.vue b/pages/work/order/order-review-comps/ReviewDetail.vue
index 37aa2c8..70930b6 100644
--- a/pages/work/order/order-review-comps/ReviewDetail.vue
+++ b/pages/work/order/order-review-comps/ReviewDetail.vue
@@ -425,6 +425,7 @@ import voice from '@/core/utils/voice';
},
selectGoods(index) {
this.currentGoodsIndex = index;
+ this.$emit('goodsItemClick');
},
toggleViewMode() {
this.viewMode = this.viewMode === 'grid' ? 'list' : 'grid';
diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue
index 003edae..955617c 100644
--- a/pages/work/order/order-review.vue
+++ b/pages/work/order/order-review.vue
@@ -50,6 +50,7 @@
@confirmRecheck="handleConfirmRecheck"
@autoConfirmAndNext="handleAutoConfirmAndNext"
@reprint="handleReprint"
+ @goodsItemClick="handleGoodsItemClick"
/>
@@ -126,7 +127,7 @@
+
+
+
+
+
@@ -216,6 +223,36 @@
>不需要称重
+
+ 绑定包材
+
+ 开启
+ 关闭
+
+
+
+ 包材软键盘
+
+ 激活
+ 不激活
+
+
发货模式
@@ -361,11 +398,15 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
showWeighPopup: false,
weighWeight: 0,
weighAfterReview: false,
+ weighCancelled: false,
packageInputCode: '',
scannedPackageCode: '',
scannedPackageId: '',
scannedPackageMaterial: null,
suggestedPkg: null,
+ enablePackageBinding: true,
+ packageBindingActivated: false,
+ showPackageBindingPopup: false,
autoShip: true,
printStationList: [],
selectedStationId: '',
@@ -390,6 +431,8 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
_debugMode: false,
_debugLogs: [],
_autoSelectFirst: false,
+ packageBindingCancelled: false,
+ skipPackagePopupOnAllScanned: false,
showDetailView: false,
showListDrawer: false,
detailGoodsList: [],
@@ -416,6 +459,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
};
},
computed: {
+ isAllGoodsScanned() {
+ return this.detailGoodsList.length > 0 && this.detailGoodsList.every(item => Number(item.scannedQty) >= Number(item.planQty));
+ },
printStationFilteredList() {
const list = Array.isArray(this.printStationList) ? this.printStationList : [];
const keyword = this.normalizeKeyword(this.printStationInputKeyword);
@@ -802,6 +848,12 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
if (Number.isFinite(qty) && qty > 0) {
this.scanQuantity = qty;
}
+ if (typeof stored.enablePackageBinding === 'boolean') {
+ this.enablePackageBinding = stored.enablePackageBinding;
+ }
+ if (typeof stored.packageBindingActivated === 'boolean') {
+ this.packageBindingActivated = stored.packageBindingActivated;
+ }
}
} catch (e) {
// 忽略
@@ -813,7 +865,9 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
printMode: this.printMode,
weighAfterReview: this.weighAfterReview,
autoShip: this.autoShip,
- scanQuantity: this.scanQuantity
+ scanQuantity: this.scanQuantity,
+ enablePackageBinding: this.enablePackageBinding,
+ packageBindingActivated: this.packageBindingActivated
});
} catch (e) {
console.warn('[OrderReview] 保存设置失败:', e);
@@ -936,7 +990,8 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
},
handlePrintStationInput(value) {
const keyword = this.normalizeKeyword(value);
- this.showPrintStationDropdown = true;
+ // 输入时不显示打印台列表,避免误选
+ this.showPrintStationDropdown = false;
if (!keyword) {
return;
}
@@ -953,7 +1008,6 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
const name = String(exactMatch.name || '');
const code = String(exactMatch.customBarcode || '');
this.printStationInputKeyword = code ? `${name}(${code})` : name;
- this.showPrintStationDropdown = false;
uni.showToast({
title: `已匹配:${name}`,
icon: 'none'
@@ -964,9 +1018,8 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
}
},
handlePrintStationInputFocus() {
- if (this.printStationList.length > 0) {
- this.showPrintStationDropdown = true;
- }
+ // 聚焦时不显示打印台列表,避免误选
+ this.showPrintStationDropdown = false;
},
handlePrintStationInputBlur() {
// 延迟关闭,让点击选项事件有机会执行
@@ -1031,10 +1084,17 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
},
handleBroadcastResult(result) {
const scanText = this.normalizeScanResult(result);
+ console.log('[OrderReview] handleBroadcastResult 扫描结果:', scanText, '原始数据:', result);
if (!scanText) {
return;
}
- // 称重弹窗打开时,扫描走包材搜索
+ // 包材绑定弹窗打开时,扫描只处理包材条码
+ if (this.showPackageBindingPopup) {
+ this.packageInputCode = scanText;
+ this.handlePackageCodeConfirm({ detail: { value: scanText } });
+ return;
+ }
+ // 称重弹窗打开时,处理扫描
if (this.showWeighPopup) {
this.packageInputCode = scanText;
this.handlePackageCodeConfirm({ detail: { value: scanText } });
@@ -1735,6 +1795,10 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
goPickGoodsDetail(item) {
if (!item) return;
+ // 切换订单时重置包材/称重取消标志,新订单继续正常弹窗
+ this.packageBindingCancelled = false;
+ this.weighCancelled = false;
+
// 收集商品明细数据
let rawItems = [];
if (Array.isArray(item?.detailItems)) {
@@ -1830,6 +1894,8 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
this.autoPrintOrder(item);
}
}
+
+
},
backToList() {
this.showDetailView = false;
@@ -1894,17 +1960,56 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
}
},
handleDetailAllScanned() {
+ // 切换订单时的 allScanned 跳过自动弹窗(仅通过 handleGoodsItemClick 触发)
+ if (this.skipPackagePopupOnAllScanned) {
+ this.skipPackagePopupOnAllScanned = false;
+ return;
+ }
+ // 如果用户取消了包材绑定,不再自动弹出
+ if (this.packageBindingCancelled) {
+ return;
+ }
+ // 散单模式不走包材流程
+ if (this.listType !== 'single' && this.enablePackageBinding) {
+ this.packageInputCode = '';
+ this.scannedPackageCode = '';
+ this.scannedPackageId = '';
+ this.scannedPackageMaterial = null;
+ this.suggestedPkg = this.detailInfo?.suggestedPkg || null;
+ this.showPackageBindingPopup = true;
+ return;
+ }
+ this.afterPackageBinding();
+ },
+ handleGoodsItemClick() {
+ // 点击商品列表项时,如果之前取消过包材绑定则重新弹出
+ if (this.packageBindingCancelled && this.listType !== 'single' && this.enablePackageBinding && !this.showPackageBindingPopup) {
+ this.packageBindingCancelled = false;
+ // 延迟重新打开,等待弹窗关闭动画完成
+ setTimeout(() => {
+ this.packageInputCode = '';
+ this.scannedPackageCode = '';
+ this.scannedPackageId = '';
+ this.scannedPackageMaterial = null;
+ this.suggestedPkg = this.detailInfo?.suggestedPkg || null;
+ this.showPackageBindingPopup = true;
+ }, 350);
+ return;
+ }
+ // 如果之前取消过称重,重新弹出称重弹窗
+ if (this.weighCancelled && !this.showWeighPopup) {
+ this.weighCancelled = false;
+ this.weighWeight = 0;
+ this.showWeighPopup = true;
+ }
+ },
+ afterPackageBinding() {
// 团购模式始终需要称重,散单根据设置
const needWeigh = this.listType === 'group' || this.weighAfterReview;
if (needWeigh) {
console.log('[weigh] listType:', this.listType, 'itemsWeight:', this.detailInfo?.itemsWeight, 'refWeightG:', this.refWeightG);
// 需要称重:弹出称重抽屉
this.weighWeight = 0;
- this.packageInputCode = '';
- this.scannedPackageCode = '';
- this.scannedPackageId = '';
- this.scannedPackageMaterial = null;
- this.suggestedPkg = this.detailInfo?.suggestedPkg || null;
this.showWeighPopup = true;
return;
}
@@ -1969,6 +2074,115 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
uni.showToast({ title: msg, icon: 'none' });
}
},
+ handlePackageBindingKeyUp(e) {
+ // 检测回车键直接触发确认
+ if (e?.key === 'Enter') {
+ this.handlePackageBindingConfirm();
+ }
+ },
+ handlePackageBindingInputConfirm() {
+ this.handlePackageBindingConfirm();
+ },
+ async handlePackageBindingConfirm() {
+ this.showPackageBindingPopup = false;
+ this.packageBindingCancelled = false;
+ uni.showLoading({ title: '提交复核中...' });
+ try {
+ const waybillNo = String(this.detailInfo?.waybillNo || '').trim();
+ // 如果输入了包材条码但还未搜索匹配,先搜索
+ let finalPackageCode = '';
+ if (this.packageInputCode && !this.scannedPackageCode) {
+ try {
+ const res = await this.$http('setting.packageMaterial.search', { keyword: this.packageInputCode });
+ const list = Array.isArray(res?.data) ? res.data : [];
+ const matched = list.find(item => String(item.material_code || '') === this.packageInputCode) || list[0];
+ if (matched) {
+ finalPackageCode = String(matched.id || '');
+ }
+ } catch (e) {
+ console.warn('[packageBinding] 搜索包材失败:', e);
+ }
+ } else if (this.scannedPackageCode) {
+ finalPackageCode = this.scannedPackageId || this.scannedPackageCode;
+ } else if (this.suggestedPkg?.id) {
+ finalPackageCode = this.suggestedPkg.id;
+ }
+ // 并发提交:复核确认 + 包材绑定
+ const promises = [this.callConfirmRecheckInternal()];
+ if (finalPackageCode && waybillNo) {
+ promises.push(
+ this.$http('order.bindExpressPackageMaterialByWaybill', {
+ waybill_code: waybillNo,
+ package_material_id: finalPackageCode
+ }).catch(pkgErr => {
+ console.warn('[packageBinding] 包材绑定失败(不阻塞):', pkgErr);
+ })
+ );
+ }
+ await Promise.all(promises);
+ uni.hideLoading();
+ uni.showToast({ title: '复核提交成功', icon: 'success' });
+ this.speakVoice('发货成功');
+ // 复核成功后进入称重或下一单流程
+ this.afterPackageBinding();
+ } catch (error) {
+ uni.hideLoading();
+ const message = String(error?.message || error?.msg || error?.errMsg || '复核提交失败');
+ uni.showToast({ title: message, icon: 'none' });
+ }
+ },
+ handlePackageBindingSkip() {
+ // 取消按钮仅关闭弹窗,不提交复核
+ this.showPackageBindingPopup = false;
+ this.packageBindingCancelled = true;
+ },
+ async callConfirmRecheckInternal() {
+ const params = this.buildRecheckParams();
+ if (!params) {
+ throw new Error('缺少订单/波次ID');
+ }
+ await this.$http('order.recheckOrder.confirmRecheck', params);
+ // 通知订单复核页面更新列表状态
+ uni.$emit('orderReviewCompleted', {
+ orderId: this.detailInfo.orderId,
+ waveNo: this.detailInfo.waveNo,
+ waveId: this.detailInfo.waveId,
+ listType: this.detailInfo.listType
+ });
+ // 先复核后打印:复核完成后发送未打印订单的打印
+ if (this.effectivePrintMode === 'reviewFirst' && this.printStationId) {
+ const isGroup = this.detailInfo?.listType === 'group';
+ const isAlreadyPrinted = isGroup
+ ? (this.detailInfo?.unprintedCount || 0) === 0 && (this.detailInfo?.orderCount || 0) > 0
+ : !!this.detailInfo?.isPrinted;
+ if (!isAlreadyPrinted) {
+ this.autoPrintOrder(this.detailInfo);
+ }
+ }
+ // 刷新订单列表数据
+ if (this.keyword) {
+ this.requestScanOrder(this.keyword, true);
+ }
+ // 标记当前已复核
+ const currentId = String(this.detailInfo?.orderId || this.detailInfo?.recordId || '');
+ if (currentId) {
+ const id = Number(currentId);
+ if (id > 0 && !this.reviewedOrderIds.includes(id)) {
+ this.reviewedOrderIds = [...this.reviewedOrderIds, id];
+ }
+ this.orderList = this.orderList.map(item => {
+ const itemId = Number(item.id || item.orderId || 0);
+ if (itemId === id) {
+ return { ...item, isReviewed: true, unreviewedCount: 0 };
+ }
+ return item;
+ });
+ }
+ },
+ handleWeighCancel() {
+ this.showWeighPopup = false;
+ this.weighCancelled = true;
+ },
async handleWeighSave() {
if (!this.weighWeight || this.weighWeight <= 0) {
uni.showToast({ title: '请输入有效重量', icon: 'none' });
@@ -1976,7 +2190,6 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
}
const weighKg = this.weighWeight / 1000;
const orderId = Number(this.detailInfo?.orderId || this.detailInfo?.recordId || 0);
- const waybillNo = String(this.detailInfo?.waybillNo || '').trim();
if (!orderId) {
uni.showToast({ title: '缺少订单ID', icon: 'none' });
return;
@@ -1987,34 +2200,14 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
order_id: orderId,
weighing_weight: weighKg
});
- // 提交包材绑定
- let packageCode = '';
- if (this.scannedPackageCode) {
- packageCode = this.scannedPackageId || this.scannedPackageCode;
- } else if (this.suggestedPkg?.id) {
- packageCode = this.suggestedPkg.id;
- }
- if (packageCode && waybillNo) {
- try {
- await this.$http('order.bindExpressPackageMaterialByWaybill', {
- waybill_code: waybillNo,
- package_material_id: packageCode
- });
- } catch (pkgErr) {
- console.warn('[weigh] 包材绑定失败(不阻塞):', pkgErr);
- }
- }
uni.hideLoading();
uni.showToast({ title: '称重完成', icon: 'success' });
this.showWeighPopup = false;
+ this.weighCancelled = false;
this.speakVoice('称重完成');
- // 称重完成后调用复核API
- const ok = await this.callConfirmRecheck();
- if (ok) {
- // 判断自动/手动发货
- if (this.autoShip) {
- setTimeout(() => this.goToNextOrder(), 500);
- }
+ // 称重完成后进入下一单
+ if (this.autoShip) {
+ setTimeout(() => this.goToNextOrder(), 500);
}
} catch (error) {
uni.hideLoading();
@@ -2023,6 +2216,24 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
}
},
async handleConfirmRecheck() {
+ // 如果包材绑定被取消过,重新弹出包材弹窗
+ if (this.packageBindingCancelled && this.listType !== 'single' && this.enablePackageBinding) {
+ this.packageBindingCancelled = false;
+ this.packageInputCode = '';
+ this.scannedPackageCode = '';
+ this.scannedPackageId = '';
+ this.scannedPackageMaterial = null;
+ this.suggestedPkg = this.detailInfo?.suggestedPkg || null;
+ this.showPackageBindingPopup = true;
+ return;
+ }
+ // 如果之前取消过称重,重新弹出称重弹窗
+ if (this.weighCancelled) {
+ this.weighCancelled = false;
+ this.weighWeight = 0;
+ this.showWeighPopup = true;
+ return;
+ }
const ok = await this.callConfirmRecheck();
if (ok && this.autoShip) {
setTimeout(() => this.goToNextOrder(), 500);
@@ -2769,6 +2980,95 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue';
opacity: 0.7;
}
+ /* 包材绑定弹窗 */
+ .package-popup {
+ padding: 48rpx 32rpx calc(40rpx + env(safe-area-inset-bottom));
+ background: #ffffff;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ }
+
+ .package-popup-title {
+ font-size: 38rpx;
+ font-weight: 600;
+ color: #303133;
+ text-align: center;
+ margin-bottom: 32rpx;
+ }
+
+ .package-popup-body {
+ margin-bottom: 32rpx;
+ }
+
+ .package-ref-row {
+ text-align: center;
+ margin-bottom: 20rpx;
+ word-break: break-all;
+ }
+
+ .package-ref-label {
+ font-size: 32rpx;
+ color: #909399;
+ word-break: break-all;
+ }
+
+ .package-ref-value {
+ color: #2979ff;
+ font-weight: 500;
+ font-size: 32rpx;
+ }
+
+ .package-ref-spec {
+ font-size: 28rpx;
+ color: #c0c4cc;
+ word-break: break-all;
+ }
+
+ .package-input-row {
+ display: flex;
+ justify-content: center;
+ margin-top: 24rpx;
+ }
+
+ .package-input {
+ width: 70%;
+ height: 80rpx;
+ border: 2rpx solid #dcdfe6;
+ border-radius: 12rpx;
+ text-align: center;
+ font-size: 36rpx;
+ color: #303133;
+ padding: 0 16rpx;
+ }
+
+ .package-popup-footer {
+ display: flex;
+ gap: 20rpx;
+ }
+
+ .package-footer-btn {
+ flex: 1;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
+ border-radius: 12rpx;
+ font-size: 36rpx;
+ }
+
+ .package-footer-btn--skip {
+ background: #f5f5f5;
+ color: #909399;
+ }
+
+ .package-footer-btn--confirm {
+ background: #2979ff;
+ color: #ffffff;
+ }
+
+ .package-footer-btn:active {
+ opacity: 0.7;
+ }
+
.scan-qty-btn {
display: flex;
align-items: center;
diff --git a/pages/work/order/picking.vue b/pages/work/order/picking.vue
index 83101de..6010720 100644
--- a/pages/work/order/picking.vue
+++ b/pages/work/order/picking.vue
@@ -9,7 +9,7 @@
-
+
@@ -72,6 +72,22 @@
暂无分配
+
+
+ 上一个
+
+
+ 下一个
+
+
@@ -108,7 +124,6 @@
发送
✕
-
+
+
+
+
+
@@ -180,12 +217,13 @@
selectedBindCartItem: null,
bindCartQueryKeyword: '',
boundCartStorageKey: 'order_picking_bound_cart_v1',
+ showActionsPopup: false,
submittingWavePickTask: false,
currentWavePickSubmitPromise: null,
wavePickSubmitQueue: [],
isNetworkConnected: true,
isFlushingWavePickSubmitQueue: false,
- showActionSheet: false,
+
taskInfo: {
taskId: '',
taskNo: '',
@@ -230,21 +268,6 @@
}
return creatorId === currentUserId;
},
- pickActionList() {
- const actions = [
- {
- name: '完成拣货',
- action: 'completePick'
- }
- ];
- if (this.canCancelPickTask) {
- actions.push({
- name: '取消拣货',
- action: 'cancelPick'
- });
- }
- return actions;
- },
modeName() {
return this.pickingView.modeName || '--';
},
@@ -1155,23 +1178,11 @@
uni.hideLoading();
}
},
- openActionSheet() {
+ openActionsPopup() {
if (!this.hasActiveTask) {
return;
}
- this.showActionSheet = true;
- },
- handleAction(action) {
- switch (action?.action) {
- case 'completePick':
- this.handleCompletePick();
- break;
- case 'cancelPick':
- this.handleCancelPick();
- break;
- default:
- this.showActionSheet = false;
- }
+ this.showActionsPopup = true;
},
requestWavePickTaskComplete(taskIdNumber, options = {}) {
const payload = {
@@ -1191,7 +1202,7 @@
});
},
handleCompletePick() {
- this.showActionSheet = false;
+ this.showActionsPopup = false;
if (!this.hasActiveTask) {
uni.showToast({
title: '缺少拣货任务',
@@ -1290,7 +1301,7 @@
});
},
handleCancelPick() {
- this.showActionSheet = false;
+ this.showActionsPopup = false;
if (!this.canCancelPickTask) {
uni.showToast({
title: '仅任务创建人可取消',
@@ -1672,6 +1683,16 @@
selectPickItem(index) {
this.selectedIndex = Number(index || 0);
},
+ handlePrevItem() {
+ if (this.selectedIndex > 0) {
+ this.selectedIndex -= 1;
+ }
+ },
+ handleNextItem() {
+ if (this.selectedIndex < this.filteredPickItems.length - 1) {
+ this.selectedIndex += 1;
+ }
+ },
previewSelectedItemImage() {
const urls = Array.isArray(this.selectedItemImageUrls) && this.selectedItemImageUrls.length
? this.selectedItemImageUrls
@@ -1793,11 +1814,13 @@
display: flex;
align-items: center;
justify-content: flex-end;
- gap: 40rpx;
- flex-wrap: nowrap;
min-width: 0;
}
+ ::v-deep .nav-right .u-icon {
+ flex-shrink: 0;
+ }
+
.nav-action-btn {
height: 48rpx;
padding: 0 12rpx;
@@ -1834,15 +1857,80 @@
text-overflow: ellipsis;
}
- ::v-deep .nav-right .u-icon {
- flex-shrink: 0;
- }
-
.nav-right--disabled {
opacity: 0.45;
pointer-events: none;
}
+ /* 操作弹窗 */
+ .actions-popup {
+ padding: 48rpx 32rpx calc(40rpx + env(safe-area-inset-bottom));
+ background: #ffffff;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ }
+
+ .actions-popup-title {
+ font-size: 38rpx;
+ font-weight: 600;
+ color: #303133;
+ text-align: center;
+ margin-bottom: 36rpx;
+ }
+
+ .actions-popup-body {
+ display: flex;
+ gap: 20rpx;
+ margin-bottom: 32rpx;
+ }
+
+ .actions-popup-btn {
+ flex: 1;
+ height: 100rpx;
+ border-radius: 16rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .actions-popup-btn--cancel {
+ background: #fff1f0;
+ border: 2rpx solid #ffccc7;
+ }
+
+ .actions-popup-btn--complete {
+ background: #2979ff;
+ border: 2rpx solid #2979ff;
+ }
+
+ .actions-popup-btn__text {
+ font-size: 34rpx;
+ font-weight: 500;
+ line-height: 1;
+ }
+
+ .actions-popup-btn__text--cancel {
+ color: #f56c6c;
+ }
+
+ .actions-popup-btn__text--complete {
+ color: #ffffff;
+ }
+
+ .actions-popup-footer {
+ display: flex;
+ justify-content: center;
+ }
+
+ .actions-popup-close-btn {
+ padding: 16rpx 48rpx;
+ font-size: 34rpx;
+ color: #909399;
+ border: 1rpx solid #dcdfe6;
+ border-radius: 10rpx;
+ background: #f5f5f5;
+ }
+
.loading-wrap {
background: #ffffff;
border-radius: 12rpx;
@@ -2054,6 +2142,44 @@
height: 8rpx;
}
+ .alloc-nav {
+ display: flex;
+ gap: 16rpx;
+ margin-top: 12rpx;
+ flex-shrink: 0;
+ }
+
+ .alloc-nav-btn {
+ flex: 1;
+ height: 64rpx;
+ border-radius: 10rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #f5f7fa;
+ border: 1rpx solid #dcdfe6;
+ }
+
+ .alloc-nav-btn--primary {
+ background: #2979ff;
+ border-color: #2979ff;
+ }
+
+ .alloc-nav-btn--disabled {
+ opacity: 0.4;
+ pointer-events: none;
+ }
+
+ .alloc-nav-btn__text {
+ font-size: 32rpx;
+ color: #606266;
+ font-weight: 500;
+ }
+
+ .alloc-nav-btn--primary .alloc-nav-btn__text {
+ color: #ffffff;
+ }
+
.index-cell {
flex: 0 0 calc((100% - 32rpx) / 5);
width: calc((100% - 32rpx) / 5);
@@ -2228,47 +2354,4 @@
height: calc(20rpx + env(safe-area-inset-bottom));
}
- /* ====== 调试输入框 ====== */
- .debug-input-bar {
- position: fixed;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9999;
- display: flex;
- align-items: center;
- gap: 12rpx;
- padding: 12rpx 20rpx;
- padding-bottom: calc(12rpx + env(safe-area-inset-bottom));
- background: rgba(0, 0, 0, 0.85);
- backdrop-filter: blur(10px);
- }
- .debug-input-label {
- color: #ff6b6b;
- font-size: 24rpx;
- font-weight: 600;
- white-space: nowrap;
- }
- .debug-input-field {
- flex: 1;
- height: 60rpx;
- background: #ffffff;
- border-radius: 8rpx;
- padding: 0 16rpx;
- font-size: 26rpx;
- color: #303133;
- }
- .debug-input-btn {
- padding: 8rpx 20rpx;
- background: #2979ff;
- color: #ffffff;
- border-radius: 8rpx;
- font-size: 24rpx;
- font-weight: 600;
- }
- .debug-input-close {
- padding: 8rpx 12rpx;
- color: #ffffff;
- font-size: 28rpx;
- }