diff --git a/package.json b/package.json index f8b844d..b7983b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wms-pda", - "version": "1.0.139", + "version": "1.0.140", "private": true, "description": "天豹云仓 WMS_PDA(uni-app Vue2 + @vue/cli 4.5)", "scripts": { diff --git a/src/manifest.json b/src/manifest.json index eb53c3e..e3c004b 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "WMS_PDA", "appid" : "__UNI__0B3DAD3", "description" : "多平台快速开发的UI框架", - "versionName" : "1.0.139", - "versionCode" : 1000139, + "versionName" : "1.0.140", + "versionCode" : 1000140, "transformPx" : false, "app-plus" : { "statusbar" : { diff --git a/src/pages/replenishment/replenishShorts.vue b/src/pages/replenishment/replenishShorts.vue index cadfde3..84fa039 100644 --- a/src/pages/replenishment/replenishShorts.vue +++ b/src/pages/replenishment/replenishShorts.vue @@ -1099,7 +1099,7 @@ flex: 1; min-width: 0; margin-right: 16rpx; - font-size: 34rpx; + font-size: 36rpx; color: #303133; line-height: 1.4; word-break: break-all; diff --git a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue index b98fd79..9bc5960 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue @@ -27,7 +27,7 @@ v-for="opt in statusOptions" :key="opt.value" class="filter-group__item" - :class="{ 'filter-group__item--active': statusFilter === opt.value }" + :class="filterItemClass(opt)" @click="$emit('status-change', opt.value)" > {{ opt.label }} @@ -38,6 +38,8 @@ @@ -86,6 +99,10 @@ export default { padding-right: 200rpx; } + ::v-deep .u-search__content__input { + font-size: 34rpx; + } + ::v-deep .u-search__content__close { margin-right: 12rpx; } @@ -174,9 +191,28 @@ export default { box-shadow: 0 4rpx 12rpx rgba(41, 121, 255, 0.28); } +/* 激活态色调与卡片状态一致:待盘点=蓝 / 盘点中=橙 / 已完成=绿 */ +.filter-group__item--active.filter-group__item--tone-strong { + background: #2979ff; + border-color: #2979ff; + box-shadow: 0 4rpx 12rpx rgba(41, 121, 255, 0.28); +} + +.filter-group__item--active.filter-group__item--tone-warning { + background: #ff9800; + border-color: #ff9800; + box-shadow: 0 4rpx 12rpx rgba(255, 152, 0, 0.28); +} + +.filter-group__item--active.filter-group__item--tone-success { + background: #18a058; + border-color: #18a058; + box-shadow: 0 4rpx 12rpx rgba(24, 160, 88, 0.28); +} + .filter-group__item-text { - font-size: 30rpx; - color: #303133; + font-size: 34rpx; + color: #606266; white-space: nowrap; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue b/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue index a2ce679..e6cd957 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue @@ -116,7 +116,7 @@ export default { .summary-panel__group { margin: 24rpx 0 6rpx; - font-size: 30rpx; + font-size: 32rpx; font-weight: 600; color: #2979ff; diff --git a/src/pages/warehouse/inventoryCountDetail.vue b/src/pages/warehouse/inventoryCountDetail.vue index 6cb494b..63404f9 100644 --- a/src/pages/warehouse/inventoryCountDetail.vue +++ b/src/pages/warehouse/inventoryCountDetail.vue @@ -1068,6 +1068,10 @@ export default { flex: 1; min-width: 0; overflow: hidden; + + ::v-deep .u-tabs__wrapper__nav__item__text { + font-size: 34rpx; + } } .tabs-container__switch {