diff --git a/assets/css/page.scss b/assets/css/page.scss index 3fbcb1f..016f5b2 100644 --- a/assets/css/page.scss +++ b/assets/css/page.scss @@ -943,6 +943,12 @@ padding-bottom: 160rpx; } +// 详情页容器(scanpages 页面统一使用,背景色由各页覆盖) +.detail-page { + min-height: 100vh; + padding-bottom: 180rpx; +} + // 信息分组 .info-group { background: #ffffff; @@ -970,7 +976,7 @@ .info-label { flex-shrink: 0; - width: 180rpx; + width: 200rpx; font-size: 28rpx; color: #666; line-height: 40rpx; @@ -1023,7 +1029,7 @@ // 可点击行(扫码添加) &.info-link { .info-label { - flex: 1; + width: 200rpx; } .scan-icon { @@ -1177,6 +1183,39 @@ } } +// 主渐变按钮(scanpages 多页面复用) +.btn-primary-gradient { + display: flex; + align-items: center; + justify-content: center; + padding: 24rpx; + background: linear-gradient(135deg, $app-primary, #5a9aff); + border-radius: 14rpx; + box-shadow: 0 6rpx 24rpx rgba($app-primary, 0.3); + + &:active { + opacity: 0.9; + transform: scale(0.98); + } + + &--disabled { + background: #c5cbd5; + box-shadow: none; + + &:active { + opacity: 1; + transform: none; + } + } + + &__text { + font-size: 30rpx; + font-weight: 600; + color: #ffffff; + letter-spacing: 2rpx; + } +} + // 网格页面(试压管理等) .page-grid { min-height: 100vh; diff --git a/scanpages/hj/daily_paper.vue b/scanpages/hj/daily_paper.vue index b3bed84..2ee1c23 100644 --- a/scanpages/hj/daily_paper.vue +++ b/scanpages/hj/daily_paper.vue @@ -12,7 +12,7 @@ 焊口位置 - {{ form.WeldingLocationCode ? `${form.WeldingLocationCode}(${form.WeldingLocationName})` : '请选择' }} + {{ form.WeldingLocationCode ? `${form.WeldingLocationCode||'--'}(${form.WeldingLocationName||'--'})` : '请选择' }} diff --git a/scanpages/hj/do_anti_rust.vue b/scanpages/hj/do_anti_rust.vue index e02d24c..02b09c4 100644 --- a/scanpages/hj/do_anti_rust.vue +++ b/scanpages/hj/do_anti_rust.vue @@ -348,22 +348,22 @@ const handleSubmit = async () => { diff --git a/scanpages/hj/material_sampling.vue b/scanpages/hj/material_sampling.vue index 2c2f449..6f87682 100644 --- a/scanpages/hj/material_sampling.vue +++ b/scanpages/hj/material_sampling.vue @@ -84,8 +84,8 @@ - - 提交校验结果 + + 提交校验结果 @@ -200,23 +200,23 @@ const gaugeWidth = (val, min, max) => {