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

src/pages/transaction/marketingAbility/merchantCoupon/components/DeliverCoupon/index.tsx

@@ -205,11 +205,11 @@ const DeliverCoupon: React.FC<IProps> = (props) => {
       align: 'center',
     },
     {
-      title: intl.formatMessage({ id: 'merchantCoupon.suitUser' }),
+      title: intl.formatMessage({ id: 'merchantCoupon.suitUsers' }),
       dataIndex: 'suitableMemberTypeName',
     },
     {
-      title: intl.formatMessage({ id: 'merchantCoupon.memberTypeName' }),
+      title: intl.formatMessage({ id: 'merchantCoupon.lfy' }),
       dataIndex: 'memberTypeName',
     },
     {
@@ -252,7 +252,16 @@ const DeliverCoupon: React.FC<IProps> = (props) => {
       return;
     }
     let newData = [...suitableMemberList];
-    newData = newData.concat(RowCtl.selectRow.map((item) => ({ ...item, disabled: false })));
+    for (let i = 0; i < RowCtl.selectRow.length; i++) {
+      const item = RowCtl.selectRow[i];
+      // 防止重复添加
+      if (!newData.find((current) => current.onlyId === item.onlyId)) {
+        newData.push({
+          ...item,
+          disabled: false,
+        });
+      }
+    }
     setSuitableMemberList(newData);
     const filtered = newData.map(({ onlyId, disabled, ...rest }) => ({ ...rest }));
     triggerChange(filtered);