diff --git a/src/pages_function/pages/moldoperate/deviceSelect.vue b/src/pages_function/pages/moldoperate/deviceSelect.vue index a8d5afa..4bbf07c 100644 --- a/src/pages_function/pages/moldoperate/deviceSelect.vue +++ b/src/pages_function/pages/moldoperate/deviceSelect.vue @@ -403,7 +403,7 @@ onShow(async () => { left: 0; right: 0; bottom: 0; - padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom)); + padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom)); background: #fff; box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06); z-index: 99; @@ -411,16 +411,16 @@ onShow(async () => { .bottom-btn { width: 100%; - height: 88rpx; - line-height: 88rpx; + height: 84rpx; + line-height: 84rpx; text-align: center; - border-radius: 12rpx; + border-radius: 16rpx; font-size: 30rpx; font-weight: 600; } .confirm-btn { - background: #2563eb; + background: #1f4b79; color: #fff; } diff --git a/src/pages_function/pages/moldoperate/dismount.vue b/src/pages_function/pages/moldoperate/dismount.vue index 7a320c0..787ee17 100644 --- a/src/pages_function/pages/moldoperate/dismount.vue +++ b/src/pages_function/pages/moldoperate/dismount.vue @@ -169,6 +169,7 @@ + {{ t('functionCommon.cancel') }} {{ t('moldOperate.confirmDismount') }} @@ -600,6 +601,13 @@ async function handleConfirm() { } } +function handleCancel() { + // 返回上一页(管理页面) + uni.navigateBack({ + fail: () => uni.switchTab({ url: '/pages/work' }) + }) +} + onShow(async () => { await Promise.allSettled([loadDevices(), loadLineTree(), loadOperators()]) // 从 globalData 读取设备选择页回传的设备 @@ -983,18 +991,20 @@ onShow(async () => { left: 0; right: 0; bottom: 0; - padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom)); + display: flex; + gap: 18rpx; + padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom)); background: #fff; box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06); z-index: 99; } .bottom-btn { - width: 100%; - height: 88rpx; - line-height: 88rpx; + flex: 1; + height: 84rpx; + line-height: 84rpx; text-align: center; - border-radius: 12rpx; + border-radius: 16rpx; font-size: 30rpx; font-weight: 600; } @@ -1004,6 +1014,11 @@ onShow(async () => { color: #fff; } +.cancel-btn { + background: #eef2f7; + color: #475569; +} + /* ====== 弹窗通用 ====== */ .picker-popup { background: #fff; diff --git a/src/pages_function/pages/moldoperate/index.vue b/src/pages_function/pages/moldoperate/index.vue index 2b0346f..2bd221a 100644 --- a/src/pages_function/pages/moldoperate/index.vue +++ b/src/pages_function/pages/moldoperate/index.vue @@ -452,6 +452,10 @@ function handleCancel() { remarkText.value = '' selectedOperator.value = null operatorIndex.value = -1 + // 返回上一页(管理页面) + uni.navigateBack({ + fail: () => uni.switchTab({ url: '/pages/work' }) + }) } function goBack() { diff --git a/src/pages_function/pages/moldoperate/moldSelect.vue b/src/pages_function/pages/moldoperate/moldSelect.vue index f7692e1..cfe4b3d 100644 --- a/src/pages_function/pages/moldoperate/moldSelect.vue +++ b/src/pages_function/pages/moldoperate/moldSelect.vue @@ -328,7 +328,7 @@ onShow(async () => { left: 0; right: 0; bottom: 0; - padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom)); + padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom)); background: #fff; box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06); z-index: 99; @@ -336,16 +336,16 @@ onShow(async () => { .bottom-btn { width: 100%; - height: 88rpx; - line-height: 88rpx; + height: 84rpx; + line-height: 84rpx; text-align: center; - border-radius: 12rpx; + border-radius: 16rpx; font-size: 30rpx; font-weight: 600; } .confirm-btn { - background: #2563eb; + background: #1f4b79; color: #fff; }