From 8a717c6b8f54a45ff013b8e68599aad2918cc88c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 二月 2023 17:35:49 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/module/voucher/index.scss | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/module/voucher/index.scss b/src/tabviews/custom/components/module/voucher/index.scss
index aa48f4d..a2bae1b 100644
--- a/src/tabviews/custom/components/module/voucher/index.scss
+++ b/src/tabviews/custom/components/module/voucher/index.scss
@@ -7,6 +7,7 @@
background-size: cover;
min-height: 150px;
overflow-y: auto;
+ overflow-x: hidden;
color: #000000;
.voucher-header {
@@ -20,7 +21,6 @@
}
}
.voucher-body {
- padding: 0 30px;
.voucher-code {
display: inline-block;
width: 160px;
@@ -71,6 +71,28 @@
width: 60px;
}
}
+ .pre-temp-wrap {
+ padding: 10px 0px;
+ .temp-text {
+ display: inline-block;
+ width: 22%;
+ white-space: nowrap;
+ padding-left: 10px;
+
+ .ant-input {
+ width: calc(100% - 70px);
+ }
+ .ant-select {
+ width: calc(100% - 70px);
+ }
+ }
+ .temp-action {
+ float: right;
+ .ant-btn {
+ margin-left: 15px;
+ }
+ }
+ }
}
.add-background {
@@ -107,3 +129,30 @@
display: none;
}
}
+.mk-voucher-dropdown-wrap {
+ background: #ffffff;
+ border: 1px solid #d8d8d8;
+ border-radius: 4px;
+ min-height: 66px;
+ .ant-btn {
+ display: block;
+ width: 100%;
+ border: none;
+ }
+ .split {
+ width: 100%;
+ height: 1px;
+ background: #d8d8d8;
+ }
+}
+.mk-temp-add-modal {
+ .ant-form-item {
+ .ant-form-item-label {
+ width: 170px;
+ }
+ .ant-form-item-control-wrapper {
+ width: 250px;
+ display: inline-block;
+ }
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0