feat: 上下模模块按钮交互和样式优化

master^2
zhongwenkai 2 days ago
parent c1899601a7
commit b1633ce7fe

@ -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;
}
</style>

@ -169,6 +169,7 @@
<!-- 底部操作栏 -->
<view class="bottom-actions">
<view class="bottom-btn cancel-btn" @click="handleCancel">{{ t('functionCommon.cancel') }}</view>
<view class="bottom-btn confirm-btn" @click="handleConfirm">{{ t('moldOperate.confirmDismount') }}</view>
</view>
@ -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;

@ -452,6 +452,10 @@ function handleCancel() {
remarkText.value = ''
selectedOperator.value = null
operatorIndex.value = -1
//
uni.navigateBack({
fail: () => uni.switchTab({ url: '/pages/work' })
})
}
function goBack() {

@ -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;
}
</style>

Loading…
Cancel
Save