Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/mobileTemplate/shopTemplateEdit/marketing_config.ts

@@ -418,7 +418,6 @@ export const marketingConfig_11 = {
     canEdit: true,
     canHide: false,
     componentName: 'MarketingCard.VerticalContainer',
-    maxLength: 3,
     props: {
       type: 8,
     },

src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/components/rulesLayout/index.tsx

@@ -294,7 +294,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                     name={['activityDefined', 'restrictPrice']}
                     rules={[{
                       required: true, validator: (_rule, value) => {
-                        const pattern = /^-?[1-9]\d*$/;
+                        const pattern = /^[1-9]\d*$/;
                         if (!value) {
                           return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseAmountBargaining' })}`));
                         }
@@ -648,7 +648,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                       initialValue={1}
                       rules={[{
                         required: true, validator: (_rule, value) => {
-                          const pattern = /^-?[1-9]\d*$/;
+                          const pattern = /^[1-9]\d*$/;
                           if (!value) {
                             return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseTuxedoNumber'})}`));
                           }
@@ -815,7 +815,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                       name={['activityDefined', 'integral']}
                       rules={[{
                         required: true, validator: (_rule, value) => {
-                          const pattern = /^-?[1-9]\d*$/;
+                          const pattern = /^[1-9]\d*$/;
                           if (!value) {
                             return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheConsumptionPoints' })}`));
                           }
@@ -869,7 +869,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                   initialValue={1}
                   rules={[{
                     required: true, validator: (_rule, value) => {
-                      const pattern = /^-?[1-9]\d*$/;
+                      const pattern = /^[1-9]\d*$/;
                       if (!value) {
                         return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseNumberLottery' })}`));
                       }