Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

src/pages/comment/manage/index.less

+@import '../../../global/styles/utils.less';
+
+.productName {
+  .textOverflow();
+}
\ No newline at end of file

src/pages/member/memberLevel/schema/index.tsx

-import { ISchema } from '@formily/antd';
-import { FORM_FILTER_PATH } from '@/formSchema/const';
-
-export const levelSchema: ISchema = {
-  type: 'object',
-  properties: {
-    MEGA_LAYOUI: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      properties: {
-        topLayout: {
-          type: 'object',
-          'x-component': 'mega-layout',
-          'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            levelTag: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                placeholder: '搜索',
-              },
-            },
-          },
-        },
-        [FORM_FILTER_PATH]: {
-          type: 'object', 
-          'x-component': 'flex-layout', 
-          'x-component-props': {
-            rowStyle: {
-              flexWrap: 'nowrap',
-            },
-            colStyle: {
-              marginLeft: 20,
-            },
-          }, 
-          properties: {
-            roleName: {
-              type: 'string', 
-              'x-component': 'Input',
-              'x-component-props': {
-                placeholder: '角色名称', 
-                allowClear: true, 
-              },
-            },
-            submit: {
-              'x-component': 'Submit',
-              'x-component-props': {
-                children: '查询',
-              },
-            },
-          }, 
-        },
-      },
-    },
-  },
-};
+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+export const levelSchema: ISchema = {
+  type: 'object',
+  properties: {
+    MEGA_LAYOUI: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        topLayout: {
+          type: 'object',
+          'x-component': 'mega-layout',
+          'x-component-props': {
+            grid: true,
+          },
+          properties: {
+            levelTag: {
+              type: 'string',
+              'x-component': 'Search',
+              'x-component-props': {
+                placeholder: '搜索',
+                tip: '输入 会员等级标签 进行搜索', 
+              },
+            },
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object', 
+          'x-component': 'flex-layout', 
+          'x-component-props': {
+            rowStyle: {
+              flexWrap: 'nowrap',
+            },
+            colStyle: {
+              marginLeft: 20,
+            },
+          }, 
+          properties: {
+            roleName: {
+              type: 'string', 
+              'x-component': 'Input',
+              'x-component-props': {
+                placeholder: '角色名称', 
+                allowClear: true, 
+              },
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          }, 
+        },
+      },
+    },
+  },
+};

src/pages/member/schema/auditSchema.ts

-import { ISchema } from '@formily/antd';
-import { FORM_FILTER_PATH } from '@/formSchema/const';
-
-export const auditSchema: ISchema = {
-  type: 'object',
-  properties: {
-    MEGA_LAYOUT: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      properties: {
-        topLayout: {
-          type: 'object',
-          'x-component': 'mega-layout',
-          'x-component-props': {
-            grid: true,
-          },
-          properties: {
-            ctl: {
-              type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
-            },
-            name: {
-              type: 'string',
-              'x-component': 'Search',
-              'x-component-props': {
-                placeholder: '搜索',
-              },
-            },
-          },
-        },
-        [FORM_FILTER_PATH]: {
-          type: 'object',
-          'x-component': 'flex-layout',
-          'x-component-props': {
-            colStyle: {
-              marginLeft: 20,
-            },
-          },
-          properties: {
-            memberTypeId: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员类型(全部)',
-                allowClear: true, 
-              },
-            },
-            // status: {
-            //   type: 'string',
-            //   default: undefined,
-            //   enum: [],
-            //   'x-component-props': {
-            //     placeholder: '会员状态(全部)',
-            //     allowClear: true, 
-            //   },
-            // },
-            roleId: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员角色(全部)', 
-                allowClear: true, 
-              },
-            },
-            level: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '会员等级(全部)', 
-                allowClear: true, 
-              },
-            },
-            source: {
-              type: 'string',
-              default: undefined,
-              enum: [],
-              'x-component-props': {
-                placeholder: '申请来源(全部)',
-                allowClear: true, 
-              },
-            },
-            '[startDate, endDate]': {
-              type: 'string',
-              default: '',
-              'x-component': 'dateSelect', 
-              'x-component-props': {
-                placeholder: '时间范围(全部)', 
-                allowClear: true, 
-              },
-            },
-            submit: {
-              'x-component': 'Submit',
-              'x-mega-props': {
-                span: 1,
-              },
-              'x-component-props': {
-                children: '查询',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-};
-
-export const auditModalSchema: ISchema = {
-  type: 'object',
-  properties: {
-    MEGA_LAYOUT: {
-      type: 'object',
-      'x-component': 'mega-layout',
-      'x-component-props': {
-        labelAlign: 'top',
-      },
-      properties: {
-        agree: {
-          type: 'string',
-          default: 1,
-          enum: [
-            { label: '审核通过', value: 1 },
-            { label: '审核不通过', value: 0 },
-          ],
-          'x-component': 'radio',
-          'x-component-props': {},
-        },
-        reason: {
-          type: 'string',
-          title: '审核不通过原因',
-          'x-component': 'textarea', 
-          required: true, 
-          'x-component-props': {
-            placeholder: '在此输入你的内容，最长120个字符，60个汉字',
-            rows: 5, 
-          },
-          'x-rules': [
-            {
-              limitByte: true,  // 自定义校验规则
-              maxByte: 120, 
-            }
-          ],
-        },
-      },
-    },
-  },
-};
+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+export const auditSchema: ISchema = {
+  type: 'object',
+  properties: {
+    MEGA_LAYOUT: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        topLayout: {
+          type: 'object',
+          'x-component': 'mega-layout',
+          'x-component-props': {
+            grid: true,
+          },
+          properties: {
+            ctl: {
+              type: 'object',
+              'x-component': 'Children',
+              'x-component-props': {
+                children: '{{controllerBtns}}',
+              },
+            },
+            name: {
+              type: 'string',
+              'x-component': 'Search',
+              'x-component-props': {
+                placeholder: '搜索',
+                tip: '输入 会员名称 进行搜索', 
+              },
+            },
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object',
+          'x-component': 'flex-layout',
+          'x-component-props': {
+            colStyle: {
+              marginLeft: 20,
+            },
+          },
+          properties: {
+            memberTypeId: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员类型(全部)',
+                allowClear: true, 
+              },
+            },
+            // status: {
+            //   type: 'string',
+            //   default: undefined,
+            //   enum: [],
+            //   'x-component-props': {
+            //     placeholder: '会员状态(全部)',
+            //     allowClear: true, 
+            //   },
+            // },
+            roleId: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员角色(全部)', 
+                allowClear: true, 
+              },
+            },
+            level: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '会员等级(全部)', 
+                allowClear: true, 
+              },
+            },
+            source: {
+              type: 'string',
+              default: undefined,
+              enum: [],
+              'x-component-props': {
+                placeholder: '申请来源(全部)',
+                allowClear: true, 
+              },
+            },
+            '[startDate, endDate]': {
+              type: 'string',
+              default: '',
+              'x-component': 'dateSelect', 
+              'x-component-props': {
+                placeholder: '时间范围(全部)', 
+                allowClear: true, 
+              },
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-mega-props': {
+                span: 1,
+              },
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export const auditModalSchema: ISchema = {
+  type: 'object',
+  properties: {
+    MEGA_LAYOUT: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      'x-component-props': {
+        labelAlign: 'top',
+      },
+      properties: {
+        agree: {
+          type: 'string',
+          default: 1,
+          enum: [
+            { label: '审核通过', value: 1 },
+            { label: '审核不通过', value: 0 },
+          ],
+          'x-component': 'radio',
+          'x-component-props': {},
+        },
+        reason: {
+          type: 'string',
+          title: '审核不通过原因',
+          'x-component': 'textarea', 
+          required: true, 
+          'x-component-props': {
+            placeholder: '在此输入你的内容，最长120个字符，60个汉字',
+            rows: 5, 
+          },
+          'x-rules': [
+            {
+              limitByte: true,  // 自定义校验规则
+              maxByte: 120, 
+            }
+          ],
+        },
+      },
+    },
+  },
+};

src/pages/platformSettlement/receipt/index.tsx

@@ -118,7 +118,7 @@ const Receipt: React.FC<{}> = () => {
 
   // 删除发票
   const remove = async (id: number | string) => {
-    const res = await PublicApi.postSettleAccountsPlatformConfigDeletePlatformInvoice({id: id.toString()});
+    const res = await PublicApi.postSettleAccountsPlatformConfigDeletePlatformInvoice({dataId: (id as number)});
     if(res.code == 1000) {
       const newList = list.filter((item) => item.id !== id);
       setList(newList);
@@ -136,7 +136,7 @@ const Receipt: React.FC<{}> = () => {
               </Col>
             )
           })
-        }        
+        }
 
         <Col span={8} className={styles.margin}>
           <div className={styles.add} onClick={handleRouterAdd}>
@@ -151,4 +151,4 @@ const Receipt: React.FC<{}> = () => {
   )
 }
 
-export default Receipt
\ No newline at end of file
+export default Receipt

src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx

@@ -145,7 +145,7 @@ const MemberSettleAdd: React.FC = () => {
 
   // 提交
   const handleSubmit = (value) => {
-    const memberList = value.someLists.map((item) => (
+    const memberList = value.someLists && value.someLists.map((item) => (
         {
           memberId: item.memberId,
           roleId: item.roleId,
@@ -309,7 +309,7 @@ const MemberSettleAdd: React.FC = () => {
           }
         />
       </Card>
-      <Prompt when={unsaved} message="内容还没保存，确定离开吗？"/>
+      <Prompt when={unsaved && (isAdd || isEdit)} message="内容还没保存，确定离开吗？"/>
     </PageHeaderWrapper>
   )
 }

src/pages/ruleSettingManage/platformSettlementStrategy/info/schema.tsx

@@ -102,7 +102,7 @@ export const addSchema: ISchema = {
                       type: 'value:visible',
                       target: '*(someLists)',
                       condition: '{{$value === 0}}'
-                    }
+                    },
                   ]
                 }
               }
@@ -118,7 +118,13 @@ export const addSchema: ISchema = {
                 prefix: "{{tableAddButton}}",
                 columns: "{{tableColumns}}"
                 // columns: "{{tableColumns}}",
-              }
+              },
+              "x-rules": [
+                {
+                  required: true,
+                  message: '请选择适用会员'
+                }
+              ]
             }
           }
         }