解决冲突

.npmrc

-registry="http://10.0.0.19:4873"
+registry="http://npm.shushangyun.com"
 # registry = "https://registry.npmjs.org/"

config/config.ts

@@ -64,8 +64,8 @@ const config: any = {
     ],
     [
       'import',
-      { libraryName: 'god', libraryDirectory: 'es', style: true },
-      'god',
+      { libraryName: '@linkseeks/god', libraryDirectory: 'es', style: true },
+      '@linkseeks/god',
     ],
     [
       'import',
@@ -100,6 +100,9 @@ const config: any = {
     logLevel: 'info',
     defaultSizes: 'parsed', // stat  // gzip
   },
+  plugins: [
+    "@linkseeks/umi-plugin-yapi"
+  ],
   inlineLimit: 10000,
   // chunks: isProduction && ['styles', 'vendors', 'umi', 'services'],
   chainWebpack: function(config, { webpack }) {

package.json

@@ -70,6 +70,9 @@
     "@linkseeks/design-react": "^1.0.0",
     "@linkseeks/design-react-web": "^1.0.0",
     "@linkseeks/design-ui": "^1.0.5",
+    "@linkseeks/babel-plugin-yapi-import": "^1.0.0",
+    "@linkseeks/umi-plugin-yapi": "1.0.1",
+    "@linkseeks/god": "^1.0.0",
     "@turf/turf": "^6.4.0",
     "@types/crypto-js": "^4.0.1",
     "@types/js-cookie": "^2.2.6",
@@ -81,14 +84,12 @@
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "antd-img-crop": "^3.12.0",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-yapi-import": "1.0.4",
     "bignumber.js": "^9.0.1",
     "bizcharts": "^4.1.10",
     "braft-editor": "^2.3.9",
     "copy-to-clipboard": "^3.3.1",
     "crypto-js": "^4.0.0",
     "dayjs": "^1.10.7",
-    "god": "0.2.17",
     "immutability-helper": "^3.1.1",
     "js-cookie": "^2.2.1",
     "lint-staged": "^10.0.7",
@@ -114,7 +115,6 @@
     "sortablejs": "^1.12.0",
     "typescript": "^4.1.0",
     "umi": "3.5.20",
-    "umi-plugin-yapi": "1.7.0",
     "video-react": "^0.14.1",
     "yorkie": "^2.0.0"
   },
@@ -137,8 +137,8 @@
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
-    "god-upload-scp": "1.0.1",
-    "god-yapi2ts": "1.11.0",
+    "@linkseeks/god-upload-scp": "^1.0.0",
+    "@linkseeks/god-yapi2ts": "^1.0.0",
     "gulp": "^4.0.2",
     "gulp-git": "^2.10.1",
     "hard-source-webpack-plugin": "^0.13.1",

scripts/build.js

@@ -5,7 +5,7 @@
 const git = require('gulp-git')
 const Logs = require('./utils/log')
 const cmd = require('node-cmd')
-const scpRun = require('god-upload-scp')
+const scpRun = require('@linkseeks/god-upload-scp')
 
 const connectSSH = (done) => {
   const sshInfo = JSON.parse(process.env.ssh)

src/components/NiceForm/components/Phone.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react'
 import { Row, Input, Col, Button, Result, message, Modal } from 'antd';
 import useCountDown from '@/utils/hooks';
 import godEvent from '@/utils/event'
-import { RiskCheck } from 'god';
+import { RiskCheck } from '@linkseeks/god';
 import { decryptedByAES, encryptedByAES } from '@/utils/cryptoAes';
 import { getMemberCaptcha, getMemberRegisterPhoneCheck, postMemberRegisterPswSms, postMemberRegisterSms } from '@/services/MemberV2Api';
 import { useIntl } from 'umi';

src/components/NiceForm/components/SliderValidate.tsx

 import React, { useState } from 'react'
 import { Tag, Row } from 'antd'
 import { useFormEffects, ISchemaFieldComponentProps } from '@formily/antd'
-import { RiskCheck } from 'god'
+import { RiskCheck } from '@linkseeks/god'
 
 const SliderValidate = (props: ISchemaFieldComponentProps) => {
   const { value = [], mutators } = props

src/components/TableDrawer/index.tsx

 import React, { ReactText, useRef, useEffect } from 'react'
-import { StandardTable } from 'god'
+import { StandardTable } from '@linkseeks/god'
 import NestTable from '@/components/NestTable'
 import { IStandardTableProps } from 'god/dist/src/standard-table'
 import { Row, Col, Drawer, Button, Input } from 'antd'

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -20,7 +20,7 @@ import {
   Card,
   Tag,
 } from 'antd';
-import { IntegrateTree } from 'god';
+import { IntegrateTree } from '@linkseeks/god';
 import { history, useIntl, getIntl } from 'umi';
 import { historyContainer } from '@/hooks/useHistoryContainer';
 import NiceForm from '@/components/NiceForm';

src/pages/balance/businessReconciliation/detail/index.tsx

@@ -3,7 +3,7 @@ import { Badge, Popconfirm, Button } from 'antd';
 import { getIntl, history } from 'umi';
 import { CheckCircleOutlined } from '@ant-design/icons';
 import { ColumnType } from 'antd/lib/table/interface';
-import { StandardTable } from 'god';
+import { StandardTable } from '@linkseeks/god';
 
 import { GlobalConfig } from '@/global/config'
 import { formatTimeString } from '@/utils'

src/pages/balance/businessReconciliationCollaboration/detail/index.tsx

@@ -3,7 +3,7 @@ import { Badge, Popconfirm, Button } from 'antd';
 import { getIntl, history } from 'umi';
 import { CheckCircleOutlined } from '@ant-design/icons';
 import { ColumnType } from 'antd/lib/table/interface';
-import { StandardTable } from 'god';
+import { StandardTable } from '@linkseeks/god';
 
 import { GlobalConfig } from '@/global/config'
 import { formatTimeString } from '@/utils'

src/pages/balance/businessRequestFunds/components/contractDrawer/index.tsx

+import React, { useRef, useState } from 'react';
+import { Drawer, Button } from 'antd';
+import { ColumnType } from 'antd/lib/table/interface';
+import StandardTable from '@/components/StandardTable';
+import { createFormActions } from '@formily/antd'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+// import { getSettleAccountsBusinessReconciliationToReconciliationList } from '@/services/SettleV2Api'
+import Submit from '@/components/NiceForm/components/Submit'
+import NiceForm from '@/components/NiceForm'
+import { getIntl } from 'umi';
+
+interface ContractDrawerProps {
+  visible: boolean,
+  onClose?: () => void,
+}
+const intl = getIntl();
+const formActions = createFormActions();
+
+const ContractDrawer: React.FC<ContractDrawerProps> = (props: ContractDrawerProps) => {
+  const { visible, onClose } = props;
+  const ref = useRef<any>({})
+  const [selectedRowKeys, setSelectedRowKeys] = useState<any>([])
+
+  const loadingTableData = async (params) => {
+    const _params = { ...params }
+    const { data } = await getSettleAccountsBusinessReconciliationToReconciliationList(_params)
+    return data;
+  }
+
+  const columns: ColumnType<any>[] = [{
+    title: '合同编号',
+    key: 'memberId',
+    dataIndex: 'memberId',
+  }, {
+    title: '合同摘要',
+    key: 'memberName',
+    dataIndex: 'memberName',
+  }, {
+    title: '合同生效时间',
+    key: 'memberType',
+    dataIndex: 'memberType',
+  }, {
+    title: '合同失效时间',
+    key: 'memberRole',
+    dataIndex: 'memberRole',
+  }, {
+    title: '合同金额',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }, {
+    title: '合同剩余金额',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }];
+
+  const handleSelectChange = (record, selected, selectedRow, nativeEvent) => {
+    setSelectedRowKeys([record.id]);
+  };
+
+
+  return (
+    <Drawer
+      title={'选择采购合同'}
+      placement={'right'}
+      onClose={onClose}
+      visible={visible}
+      key={'right'}
+      width={'50%'}
+      footer={
+        <div style={{ textAlign: 'right' }}>
+          <Button onClick={onClose} style={{ marginRight: 8 }}>
+            {intl.formatMessage({ id: 'balance.quxiao' })}
+          </Button>
+          <Button onClick={onClose} type="primary">
+            {'确定'}
+          </Button>
+        </div>
+      }
+    >
+      <StandardTable
+        keepAlive={false}
+        // fetchTableData={params => loadingTableData(params)}
+        columns={columns}
+        currentRef={ref}
+        rowKey="id"
+        rowSelection={{
+          type: 'radio',
+          selectedRowKeys: selectedRowKeys,
+          onSelect: handleSelectChange,
+        }}
+        controlRender={
+          <NiceForm
+            actions={formActions}
+            onSubmit={values => ref.current.reload(values)}
+            effects={($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'applyNo',
+                FORM_FILTER_PATH,
+              )
+            }}
+            schema={{
+              type: 'object',
+              properties: {
+                mageLayout: {
+                  type: 'object',
+                  'x-component': 'mega-layout',
+                  "x-component-props": {
+                    grid: true
+                  },
+                  properties: {
+                    memberName: {
+                      type: 'string',
+                      "x-component": 'Search',
+                      'x-component-props': {
+                        placeholder: '请输入会员名称',
+                        align: 'flex-start',
+                      },
+                    },
+                  }
+                },
+                [FORM_FILTER_PATH]: {
+                  type: 'object',
+                  'x-component': 'flex-layout',
+                  'x-component-props': {
+                    rowStyle: {
+                      flexWrap: 'nowrap',
+                      justifyContent: 'flex-end'
+                    },
+                    colStyle: {
+                      marginRight: 16,
+                    },
+                  },
+                  properties: {
+                    "applyAbstract": {
+                      type: 'string',
+                      'x-component-props': {
+                        placeholder: intl.formatMessage({ id: 'balance.qingshuruqingkuandanzhaiyao' }),
+                        allowClear: true,
+                      }
+                    },
+                    "[expectPayTimeStart,expectPayTimeEnd]": {
+                      type: 'string',
+                      "x-component": "daterange",
+                      "x-component-props": {
+                        placeholder: [intl.formatMessage({ id: 'balance.yujifukuankaishishijian' }), intl.formatMessage({ id: 'balance.yujifukuanjieshushijian' })],
+                        allowClear: true,
+                      }
+                    },
+                    submit: {
+                      'x-component': 'Submit',
+                      'x-component-props': {
+                        children: intl.formatMessage({ id: 'balance.chaxun' }),
+                      },
+                    },
+                  },
+                }
+              }
+            }}
+            components={{
+              Submit,
+            }}
+          />
+        }
+      />
+    </Drawer>
+  );
+}
+
+export default ContractDrawer;

src/pages/balance/businessRequestFunds/components/requestFundsDrawer/index.tsx

+import React, { useRef, useState } from 'react';
+import { Drawer, Button } from 'antd';
+import { ColumnType } from 'antd/lib/table/interface';
+import StandardTable from '@/components/StandardTable';
+import { createFormActions } from '@formily/antd'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+// import { getSettleAccountsBusinessReconciliationToReconciliationList } from '@/services/SettleV2Api'
+import Submit from '@/components/NiceForm/components/Submit'
+import NiceForm from '@/components/NiceForm'
+import { getIntl } from 'umi';
+
+interface RequestFundsDrawerProps {
+  visible: boolean,
+  onClose?: () => void,
+}
+const intl = getIntl();
+const formActions = createFormActions();
+
+const RequestFundsDrawer: React.FC<RequestFundsDrawerProps> = (props: RequestFundsDrawerProps) => {
+  const { visible, onClose } = props;
+  const ref = useRef<any>({})
+  const [selectedRowKeys, setSelectedRowKeys] = useState<any>([])
+
+  const loadingTableData = async (params) => {
+    const _params = { ...params }
+    const { data } = await getSettleAccountsBusinessReconciliationToReconciliationList(_params)
+    return data;
+  }
+
+  const columns: ColumnType<any>[] = [{
+    title: '单据号',
+    key: 'memberId',
+    dataIndex: 'memberId',
+  }, {
+    title: '单据摘要',
+    key: 'memberName',
+    dataIndex: 'memberName',
+  }, {
+    title: '单据类型',
+    key: 'memberType',
+    dataIndex: 'memberType',
+  }, {
+    title: '单据时间',
+    key: 'memberRole',
+    dataIndex: 'memberRole',
+  }, {
+    title: '单据状态',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }, {
+    title: '单据金额',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }, {
+    title: '已付款',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }, {
+    title: '已请款待付款',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }, {
+    title: '待请款',
+    key: 'memberLevel',
+    dataIndex: 'memberLevel',
+  }];
+
+  const handleSelectChange = (record, selected, selectedRow, nativeEvent) => {
+    setSelectedRowKeys([record.id]);
+  };
+
+
+  return (
+    <Drawer
+      title={'选择待请款单据'}
+      placement={'right'}
+      onClose={onClose}
+      visible={visible}
+      key={'right'}
+      width={'50%'}
+      footer={
+        <div style={{ textAlign: 'right' }}>
+          <Button onClick={onClose} style={{ marginRight: 8 }}>
+            {intl.formatMessage({ id: 'balance.quxiao' })}
+          </Button>
+          <Button onClick={onClose} type="primary">
+            {'确定'}
+          </Button>
+        </div>
+      }
+    >
+      <StandardTable
+        keepAlive={false}
+        // fetchTableData={params => loadingTableData(params)}
+        columns={columns}
+        currentRef={ref}
+        rowKey="id"
+        rowSelection={{
+          type: 'radio',
+          selectedRowKeys: selectedRowKeys,
+          onSelect: handleSelectChange,
+        }}
+        controlRender={
+          <NiceForm
+            actions={formActions}
+            onSubmit={values => ref.current.reload(values)}
+            effects={($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'applyNo',
+                FORM_FILTER_PATH,
+              )
+            }}
+            schema={{
+              type: 'object',
+              properties: {
+                mageLayout: {
+                  type: 'object',
+                  'x-component': 'mega-layout',
+                  "x-component-props": {
+                    grid: true
+                  },
+                  properties: {
+                    memberName: {
+                      type: 'string',
+                      "x-component": 'Search',
+                      'x-component-props': {
+                        placeholder: '请输入单据号',
+                        align: 'flex-start',
+                      },
+                    },
+                  }
+                },
+                [FORM_FILTER_PATH]: {
+                  type: 'object',
+                  'x-component': 'flex-layout',
+                  'x-component-props': {
+                    rowStyle: {
+                      flexWrap: 'nowrap',
+                      justifyContent: 'flex-end'
+                    },
+                    colStyle: {
+                      marginRight: 16,
+                    },
+                  },
+                  properties: {
+                    "applyAbstract": {
+                      type: 'string',
+                      'x-component-props': {
+                        placeholder: '请输入单据摘要',
+                        allowClear: true,
+                      }
+                    },
+                    "[expectPayTimeStart,expectPayTimeEnd]": {
+                      type: 'string',
+                      "x-component": "daterange",
+                      "x-component-props": {
+                        placeholder: [intl.formatMessage({ id: 'balance.yujifukuankaishishijian' }), intl.formatMessage({ id: 'balance.yujifukuanjieshushijian' })],
+                        allowClear: true,
+                      }
+                    },
+                    submit: {
+                      'x-component': 'Submit',
+                      'x-component-props': {
+                        children: intl.formatMessage({ id: 'balance.chaxun' }),
+                      },
+                    },
+                  },
+                }
+              }
+            }}
+            components={{
+              Submit,
+            }}
+          />
+        }
+      />
+    </Drawer>
+  );
+}
+export default RequestFundsDrawer;

src/pages/balance/businessRequestFunds/detail/index.tsx

@@ -3,7 +3,7 @@ import { Badge, Popconfirm, Button } from 'antd';
 import { getIntl, history, Link } from 'umi';
 import { CheckCircleOutlined } from '@ant-design/icons';
 import { ColumnType } from 'antd/lib/table/interface';
-import { StandardTable } from 'god';
+import { StandardTable } from '@linkseeks/god';
 
 import { GlobalConfig } from '@/global/config'
 import { formatTimeString } from '@/utils'

src/pages/commodity/products/checkProduct.tsx

@@ -2,7 +2,7 @@ import React, { useRef, ReactNode } from 'react'
 import { history, useIntl } from 'umi'
 import { Button, Card } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { StandardTable } from 'god'
+import { StandardTable } from '@linkseeks/god'
 import { ColumnType } from 'antd/lib/table/interface'
 import moment from 'moment'
 import EyePreview from '@/components/EyePreview'

src/pages/trademark/checkBrand.tsx

@@ -2,7 +2,7 @@ import React, { ReactNode, useMemo, useRef } from 'react'
 import { history, useIntl } from 'umi'
 import { Button, Card } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { StandardTable } from 'god'
+import { StandardTable } from '@linkseeks/god'
 import { ColumnType } from 'antd/lib/table/interface'
 import moment from 'moment'
 import EyePreview from '@/components/EyePreview'

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/ActivityItem/index.tsx

@@ -59,7 +59,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
       <div className={styles.infoContainer}>
         <div className={styles.info}>
           <div className={styles.header}>
-            <Link to={`/memberCenter/marketingAbility/activityPage/management/view?id=${id}`}>{title}</Link></div>
+            <Link to={`/memberCenter/marketingAbility/activityPages/management/view?id=${id}`}>{title}</Link></div>
           <div className={styles.tags}>
             <Space>
               <StatusTag type="default" title={templateName} />

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/index.tsx

@@ -10,10 +10,11 @@ import styles from './index.less';
 import SwapCoupon from './swapCoupon';
 import SwapProduct from './swapProduct';
 import { getIntl } from 'umi'
+import { GetMarketingAdornActivityGoodsAdornResponse } from '@/services/MarketingV2Api';
 
 const intl = getIntl();
 const { TabPane } = Tabs;
-interface Iprops {
+interface Iprops extends GetMarketingAdornActivityGoodsAdornResponse {
   className: string,
   children: React.ReactNode,
   title: string,
@@ -108,11 +109,16 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
   const {
     productName: name, productImgUrl: image, mode = "horizontal",
     price: originalPrice,
+    /** 折扣（如85折，输入85，9折输入90） */
     discount,
+    // 活动价格团购价格秒杀价格单位定金砍价底价
     activityPrice,
     activityList,
     activityId,
+    /** 直降价格起始价格 */
     plummetPrice,
+    /** 定金抵扣单价 */
+    deductionPrice,
     ...otherRestProps
   } = rest as any;
   const activityLabel = activityList?.find((_item) => _item.id === activityId);
@@ -123,14 +129,14 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
     mode,
     ...withLabel,
     originalPrice: originalPrice,
-    discountPrice: discount || activityPrice || plummetPrice
+    discountPrice: activityPrice || plummetPrice || plummetPrice || deductionPrice
   };
 
   const verticalData = {
     name,
     image,
     mode,
-    discountPrice:  discount || activityPrice || plummetPrice,
+    discountPrice:  activityPrice || plummetPrice || plummetPrice || deductionPrice,
     buyBtn: false,
     ...withLabel,
     sold: 0

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.tsx

@@ -124,8 +124,8 @@ const ActivePage = () => {
                       templateName={_item.templateName}
                       statusName={_item.statusName}
                       shopName={_item.shopName}
-                      startTime={_item.startTime}
-                      endTime={_item.endTime}
+                      startTime={_item.startTime as unknown as string}
+                      endTime={_item.endTime as unknown as string}
                       environment={_item.environment}
                       status={_item.status}
                       onRemove={handleRemove}