diff --git a/common/style/layout.css b/common/style/layout.css index 8053aa6..1640c83 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -97,13 +97,13 @@ uni-toast .uni-toast { background-color: #e1e1e1; } .confirm-button{ - min-width: 65px; + min-width: 60px; height: 30px; line-height: 30px; color: #fff; padding: 0; font-size: 13px; - margin-left: 10px; + margin-left: 6px; margin-right: 0; white-space: nowrap; background: center / 100% 100% url(./static/images/button.png) no-repeat; @@ -572,7 +572,7 @@ uni-toast .uni-toast { border-radius: 12px } .pop_label { - font-size: 14px; + font-size: 12px; line-height: 14px; color: #fff; } @@ -587,6 +587,11 @@ uni-toast .uni-toast { .uni-select__selector-empty { color: #fff } +.uni-select__selector-empty, .uni-select__selector-item { + font-size: 13px !important; + line-height: 14px !important; + padding: 10.5px 10px !important; +} .uni-select__selector-item:hover { background-color: #3F6ACA !important; } diff --git a/pages/home/home.vue b/pages/home/home.vue index 855e5ef..e951ea8 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -84,9 +84,9 @@ toPage (e) { let url = '' if (e.ywlx === 'DB') { - url = '/pages/management/alloc-maintenance_new' + url = '/pages/management/alloc-maintenance_new?type=' + e.ywlx } else if (e.ywlx === 'SH') { - url = '/pages/management/receive-confirm_new' + url = '/pages/management/receive-confirm_new?type=' + e.ywlx } else { if (e.djlx === 'LLCKD') { url = '/pages/management/in-storage_LLCKD?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue index 378514e..cc98016 100644 --- a/pages/management/alloc-maintenance_new.vue +++ b/pages/management/alloc-maintenance_new.vue @@ -1,10 +1,10 @@