diff --git a/common/style/layout.css b/common/style/layout.css index fd83206..7dd4c3c 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -107,7 +107,7 @@ uni-button:after { .zd_content { width: 100%; height: auto; - padding: 92rpx 15rpx 82rpx 14rpx; + padding: 108rpx 15rpx 120rpx 14rpx; } .zd_wrapper { width: 100%; @@ -285,32 +285,6 @@ uni-button:after { } /** 提交栏 **/ -.submit-bar { - display: flex; - flex-wrap: wrap; - justify-content: flex-end; - align-items: center; - position: fixed; - bottom: 0; - left: 0; - width: 100%; - z-index: 200; - background-color: #fff; - padding-top: 10rpx; - box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); -} -.submit-button { - font-size: 30rpx; - line-height: 62rpx; - color: #D7592F ; - text-align: center; - letter-spacing: 1rpx; - padding: 0 22rpx; - background-color: #fff; - border: 1px solid #D7592F ; - margin: 0 40rpx 10rpx 0; - border-radius: 30rpx; -} .submitbar { position: fixed; bottom: 0; @@ -318,13 +292,13 @@ uni-button:after { width: 100%; z-index: 200; background-color: #fff; - padding: 10rpx 0; + padding: 20rpx 0 19rpx 0; box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7); } .btn-submit { padding: 0; - font-size: 30rpx; - line-height: 62rpx; + font-size: 28rpx; + line-height: 73rpx; border-radius: 10rpx; } .btn-default { @@ -342,21 +316,17 @@ uni-button:after { border: 1px solid #c9c9c9; background-color: #c9c9c9; } -.btn-disabled, .submit-button[disabled]:not([type]) { - color: #fff; - border: 1px solid #c9c9c9; - background-color: #c9c9c9; -} uni-button[disabled]:not([type]) { color: #fff; border: 1px solid #c9c9c9; background-color: #c9c9c9; } + /** 下拉框 */ .uni-select__selector { z-index: 300 !important; } - + /** 弹窗 */ .popshow { transform: translateY(0); diff --git a/components/NavBar.vue b/components/NavBar.vue index 0f4c46e..5c0eee4 100644 --- a/components/NavBar.vue +++ b/components/NavBar.vue @@ -53,7 +53,7 @@ .header _fj() position fixed - _wh(100%, 72rpx) + _wh(100%, 88rpx) background-color $red z-index 200 padding 0 20rpx diff --git a/components/upTop.vue b/components/upTop.vue new file mode 100644 index 0000000..0725d64 --- /dev/null +++ b/components/upTop.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/pages/SecondPhase/DeliveryUnbind.vue b/pages/SecondPhase/DeliveryUnbind.vue index 26d703b..8d4da79 100644 --- a/pages/SecondPhase/DeliveryUnbind.vue +++ b/pages/SecondPhase/DeliveryUnbind.vue @@ -66,21 +66,25 @@ + + + diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index a87f68e..9634a9c 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -1,24 +1,28 @@ -