From 5ad1e3b327f9d3e4ab0ebb7390e934a47a3f3d07 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Jan 2024 15:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 108 ++++++++++++++++++++++--
common/style/reset.css | 6 ++
components/NavBar.vue | 2 +-
pages/ProductManage/SlittingFeeding.vue | 26 +++++-
pages/ProductManage/ZjOutStore.vue | 4 +-
pages/WarehouseManage/CheckDtl.vue | 2 +-
pages/home/home.vue | 16 ++--
pages/login/login.vue | 1 +
8 files changed, 138 insertions(+), 27 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index 234f4fb..e76759c 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -1,5 +1,5 @@
page {
- background-color: #f6f6f6!important;
+ background-color: #f2f5fa !important;
min-height: 100% !important;
height: 100% !important;
}
@@ -106,17 +106,21 @@ uni-button:after {
height: 100%;
}
.zd_content {
+ position: relative;
+ top: calc(var(--status-bar-height) + 72rpx);
width: 100%;
height: auto;
- padding: calc(var(--status-bar-height) + 92rpx) 14rpx 82rpx 14rpx;
+ padding: 20rpx 14rpx 128rpx 14rpx;
+ background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%)
}
.zd_wrapper {
width: 100%;
height: auto;
background-color: #fff;
border-radius: 24rpx;
- padding: 14rpx;
+ padding: 22rpx 14rpx;
margin-bottom: 20rpx;
+ box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
}
.filter_item {
display: flex;
@@ -263,26 +267,98 @@ uni-button:after {
width: 100%;
z-index: 200;
background-color: #fff;
- padding-top: 10rpx;
+ padding-top: 20rpx;
+ box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
+}
+.submit-bar_new {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ z-index: 200;
+ background-color: #fff;
+ padding: 20rpx;
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
}
.submit-button {
- font-size: 30rpx;
- line-height: 62rpx;
+ font-size: 34rpx;
+ line-height: 88rpx;
color: #ff6a00;
text-align: center;
letter-spacing: 1rpx;
padding: 0 22rpx;
background-color: #fff;
border: 1px solid #ff6a00;
- margin: 0 40rpx 10rpx 0;
- border-radius: 30rpx;
+ margin: 0 40rpx 20rpx 0;
+ border-radius: 10rpx;
+}
+.submit-button_new {
+ width: 35%;
+ font-size: 34rpx;
+ line-height: 88rpx;
+ color: #fff;
+ text-align: center;
+ letter-spacing: 1rpx;
+ padding: 0 22rpx;
+ background-color: #ff6a00;
+ border-radius: 10rpx;
+}
+.submit-more {
+ width: 20%;
+ font-size: 34rpx;
+ line-height: 34rpx;
+ padding: 27rpx 10rpx;
+ color: #000;
+ text-align: center;
+ background-color: #fff
}
.btn-disabled, .submit-button[disabled] {
background-color: #c9c9c9;
border: 1px solid #c9c9c9;
color: #fff;
}
+.more_btns_wraper {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ z-index: 201;
+ padding: 0 20rpx 20rpx;
+ transition: all .3s;
+}
+.more-button {
+ font-size: 34rpx;
+ line-height: 88rpx;
+ color: #ff6a00;
+ text-align: center;
+ border-radius: 0;
+ background-color: transparent;
+}
+.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
+ color: #c9c9c9;
+ border: none;
+}
+.more-button:last-child {
+ border-bottom: none;
+}
+.more_btns_cancle {
+ margin-top: 20rpx;
+ width: 100%;
+ font-size: 34rpx;
+ line-height: 88rpx;
+ color: #000;
+ text-align: center;
+ background-color: #fff;
+ border-radius: 20rpx;
+}
+.more_btns_items{
+ width: 100%;
+ border-radius: 20rpx;
+ background-color: #fff;
+}
/** 下拉框 */
.uni-select__selector {
@@ -332,11 +408,25 @@ uni-button:after {
max-width: 300px;
margin: 40rpx auto 0;
display: flex;
- justify-content: space-between;
+ justify-content: center;
align-items: center;
}
.msg_btn {
+ width: 45%;
border-radius: 10rpx;
+ margin: 0;
+ font-size: 34rpx;
+ line-height: 78rpx;
+ color: #fff;
+ text-align: center;
+ background-color: #ff6a00;
+ border-radius: 44rpx;
+ box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn_cancle {
+ background-color: #fff;
+ color: #000;
+ margin-right: 20rpx;
}
.msg_btn:disabled {
background-color: #c9c9c9;
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..3ff57b1 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -40,4 +40,10 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+}
+.popshow {
+ transform: translateY(0);
+}
+.pophide {
+ transform: translateY(100%);
}
\ No newline at end of file
diff --git a/components/NavBar.vue b/components/NavBar.vue
index 1d2a635..e45ed5f 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -54,7 +54,7 @@
_fj()
position fixed
_wh(100%, calc(var(--status-bar-height) + 72rpx))
- background-color $red
+ background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
z-index 200
padding 0 20rpx
.page_name
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 4c65aa6..21c4730 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -76,12 +76,25 @@
-
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
@@ -110,8 +123,8 @@
-
-
+
+
@@ -153,7 +166,8 @@
val4: '',
val5: '',
disabled1: false,
- disabled2: false
+ disabled2: false,
+ btn_active: false
};
},
created () {
@@ -227,6 +241,7 @@
},
handleSure () {
this.active = true
+ this.btn_active = false
},
cancleModal () {
this.active = false
@@ -295,6 +310,7 @@
title: '点位不能为空',
icon: 'none'
})
+ this.btn_active = false
return
}
try {
@@ -303,6 +319,7 @@
this.active = false
this.val1 = ''
this.pkId = ''
+ this.btn_active = false
this.searchList()
uni.showToast({
title: res.message,
@@ -310,6 +327,7 @@
})
} catch (e) {
this.disabled2 = false
+ this.btn_active = false
}
},
}
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index 61cad8b..bec7ff4 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -102,8 +102,8 @@
{{$t('button.search')}}
-
-
+
+
diff --git a/pages/WarehouseManage/CheckDtl.vue b/pages/WarehouseManage/CheckDtl.vue
index 7eccb44..08e3ac3 100644
--- a/pages/WarehouseManage/CheckDtl.vue
+++ b/pages/WarehouseManage/CheckDtl.vue
@@ -106,7 +106,7 @@
-
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index f815c5b..4cf512c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,7 +21,7 @@
-