From 123557e255682c1751379ca473239fa7981a0f87 Mon Sep 17 00:00:00 2001
From: wangsongsole
Date: Tue, 12 Jul 2022 11:14:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E6=AC=A1=E5=95=86=E5=93=81=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=95=BF=E7=9F=AD=202=E3=80=81?=
=?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=9C=80=E6=B1=82=E9=99=90=E5=88=B6=E9=9D=A2?=
=?UTF-8?q?=E9=A2=9D=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/knockGold/index.jsx | 7 ++++---
src/components/knockGold/index.less | 6 ++++++
src/components/knockGold/mobileCmponent.jsx | 11 ++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx
index f0656ebd..c18cf274 100644
--- a/src/components/knockGold/index.jsx
+++ b/src/components/knockGold/index.jsx
@@ -480,11 +480,12 @@ export default class addKnockGold extends Component {
return false
}
+ const limitBit = /^-?\d+\.?\d{0,2}$/
if (
- !/([1-9]\d*\.?\d*)|(0\.\d*[1-9])/.test(this.state.model.denomination) ||
- !/([1-9]\d*\.?\d*)|(0\.\d*[1-9])/.test(this.state.model.reduce_amount)
+ !limitBit.test(this.state.model.denomination) ||
+ !limitBit.test(this.state.model.reduce_amount)
) {
- Notify.error('请输入正确的面额金额或立减金额')
+ Notify.error('请输入正确的面额金额或立减金额(保留两位小数)')
return false
}
diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less
index 3f878773..45489f78 100644
--- a/src/components/knockGold/index.less
+++ b/src/components/knockGold/index.less
@@ -94,6 +94,12 @@
font-weight: bold;
}
+ .isTitle {
+ color: #cd4236;
+ font-size: 15px !important;
+ font-weight: bold;
+ }
+
.coupon-right .validity {
width: 280px;
transform: scale(0.85);
diff --git a/src/components/knockGold/mobileCmponent.jsx b/src/components/knockGold/mobileCmponent.jsx
index 8abe9277..3db76966 100644
--- a/src/components/knockGold/mobileCmponent.jsx
+++ b/src/components/knockGold/mobileCmponent.jsx
@@ -1,3 +1,11 @@
+/*
+ * @Author: Wind
+ * @Date: 2022-06-06 14:53:58
+ * @LastEditors: Wind
+ * @LastEditTime: 2022-07-12 10:54:07
+ * @Description:
+ * @FilePath: \frontend\src\components\knockGold\mobileCmponent.jsx
+ */
import { Placeholder } from 'zent'
import './index.less'
const widths = [24, 100, 100, 100, 80, 24, 100, 100, 100, 80, 100, 100, 100, 80]
@@ -15,7 +23,8 @@ export default ({ data }) => {
-
+
{data.batch_goods_name ? data.batch_goods_name : 'xxx'}