From c8d62ffb1fa1e83bb2641388dfb5212d9c1741eb Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 25 Mar 2024 10:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- common/style/{layout.css => layout.styl} | 30 ++--- common/style/mixin.styl | 6 +- components/NavBar.vue | 5 +- components/upTop.vue | 20 +-- pages/SecondPhase/DeliveryUnbind.vue | 8 +- pages/SecondPhase/DeliveryUnbindConfirm.vue | 4 +- pages/home/home.vue | 135 ++++++++++++++------ pages/login/login.vue | 4 +- static/image/.DS_Store | Bin 6148 -> 6148 bytes static/image/menu/RF02.png | Bin 1814 -> 3101 bytes static/image/menu/RF03.png | Bin 3101 -> 2265 bytes static/image/menu/RF04.png | Bin 2601 -> 2352 bytes static/image/menu/RF06.png | Bin 3065 -> 3110 bytes static/image/menu/RF07.png | Bin 3110 -> 2742 bytes static/image/menu/RF09.png | Bin 3239 -> 2771 bytes static/image/menu/RF11.png | Bin 0 -> 1814 bytes static/image/menu/RF12.png | Bin 0 -> 2456 bytes utils/mork2.js | 15 ++- 19 files changed, 147 insertions(+), 82 deletions(-) rename common/style/{layout.css => layout.styl} (93%) create mode 100644 static/image/menu/RF11.png create mode 100644 static/image/menu/RF12.png diff --git a/App.vue b/App.vue index 3d97b1b..f401bd7 100644 --- a/App.vue +++ b/App.vue @@ -21,5 +21,5 @@ /*每个页面公共css */ @import '@/common/style/reset.css'; @import '@/common/style/uni.css'; - @import '@/common/style/layout.css'; + @import '@/common/style/layout.styl'; diff --git a/common/style/layout.css b/common/style/layout.styl similarity index 93% rename from common/style/layout.css rename to common/style/layout.styl index 7dd4c3c..ad74884 100644 --- a/common/style/layout.css +++ b/common/style/layout.styl @@ -107,7 +107,7 @@ uni-button:after { .zd_content { width: 100%; height: auto; - padding: 108rpx 15rpx 120rpx 14rpx; + padding: calc(var(--status-bar-height) + 108rpx) 15rpx 120rpx 14rpx; } .zd_wrapper { width: 100%; @@ -268,20 +268,16 @@ uni-button:after { color: #4e6ef2; font-weight: bold; } +.slide_new table thead tr th.fontcol2,.slide_new table tbody tr td.fontcol2 { + color: #d7592f; + font-weight: bold; +} .slide_new table tbody tr.checked td { - border-top: 1px solid #D7592F; - border-bottom: 1px solid #D7592F; + background-color: #f0c560; + color: #fff; } .slide_new table tbody tr.checked td:first-child { - border-left: 1px solid #D7592F; - border-top-left-radius: 8rpx; - border-bottom-left-radius: 8rpx; -} -.slide_new table tbody tr.checked td:last-child { - border-right: 1px solid #D7592F; - border-top-right-radius: 8rpx; - border-bottom-right-radius: 8rpx; - + border-left: 6rpx solid #ff8227; } /** 提交栏 **/ @@ -302,14 +298,14 @@ uni-button:after { border-radius: 10rpx; } .btn-default { - color: #D7592F ; - background-color: #fff; - border: 1px solid #D7592F ; + color: #ff6800; + background: #fff; + border: 1px solid #ff9856; } .btn-success { color: #fff; - border: 1px solid #D7592F ; - background-color: #D7592F ; + border: 1px solid #ff9856; + background: linear-gradient(-45deg, #ff6800, #ff9856); } .btn-info { color: #fff; diff --git a/common/style/mixin.styl b/common/style/mixin.styl index 86ef090..48d8bf0 100644 --- a/common/style/mixin.styl +++ b/common/style/mixin.styl @@ -1,4 +1,8 @@ -$red = #D7592F +$red = #D7592F +$red1 = #ff6800 +$red2 = #ff8227 +$red3 = #ff9856 +$red4 = #ff6800 $green = #6CBE8B $yellow = #E9B451 $blue = #6798ef diff --git a/components/NavBar.vue b/components/NavBar.vue index 5c0eee4..11e541e 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -53,10 +53,11 @@ .header _fj() position fixed - _wh(100%, 88rpx) + _wh(100%, calc(var(--status-bar-height) + 88rpx)) background-color $red + background linear-gradient(to bottom, $red1, $red2) z-index 200 - padding 0 20rpx + padding var(--status-bar-height) 20rpx 0 20rpx .page_name _font(32rpx, 32rpx, #fff,700,center) diff --git a/components/upTop.vue b/components/upTop.vue index 0725d64..3a98d69 100644 --- a/components/upTop.vue +++ b/components/upTop.vue @@ -1,6 +1,6 @@ @@ -37,13 +37,13 @@ .back-top position: fixed; z-index: 9999; - right: 20rpx; - bottom: 150rpx; - // background-color: rgba(150,150,150,.3); - width: 80rpx; - height: 80rpx; - // line-height: 80rpx; - // border-radius: 50%; - // text-align: center; - // box-shadow: 0 4rpx 16rpx rgba(28,31,35,.3); + right: 10rpx; + bottom: 130rpx; + background-color: #fff; + width: 70rpx; + height: 70rpx; + line-height: 70rpx; + border-radius: 50%; + text-align: center; + box-shadow: 0 4rpx 16rpx rgba(28,31,35,.3); \ No newline at end of file diff --git a/pages/SecondPhase/DeliveryUnbind.vue b/pages/SecondPhase/DeliveryUnbind.vue index 8d4da79..58501e8 100644 --- a/pages/SecondPhase/DeliveryUnbind.vue +++ b/pages/SecondPhase/DeliveryUnbind.vue @@ -23,7 +23,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -74,8 +74,8 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import UpTop from '@/components/upTop.vue' - // import {twoPdaIvtQuery} from '@/utils/getData2.js' - import {twoPdaIvtQuery} from '@/utils/mork2.js' + import {twoPdaIvtQuery} from '@/utils/getData2.js' + // import {twoPdaIvtQuery} from '@/utils/mork2.js' export default { components: { NavBar, diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue index 4705c01..0746bfb 100644 --- a/pages/SecondPhase/DeliveryUnbindConfirm.vue +++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue @@ -23,7 +23,7 @@
单据号单据号 状态 总重量 明细数
{{e.bill_code}}{{e.bill_code}} {{e.bill_status}} {{e.total_qty}} {{e.detail_count}}
- + @@ -34,7 +34,7 @@ - + diff --git a/pages/home/home.vue b/pages/home/home.vue index f87379a..594997d 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,16 +1,25 @@
木箱号木箱号 点位编码 点位名称 重量
{{e.package_box_sn}}{{e.package_box_sn}} {{e.point_code}} {{e.point_name}} {{e.box_weight}}