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

config/config.local.ts

@@ -29,7 +29,7 @@ export default defineConfig({
   //   'http://lingxi-frontend-prod.oss-cn-hangzhou.aliyuncs.com/static/js/lingxi-design-ui.min.js',
   // ],
   chainWebpack(config) {
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     // config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     config.module
       .rule('svg')

config/config.prod.ts

@@ -28,7 +28,7 @@ export default defineConfig({
     // 'http://lingxi-frontend-prod.oss-cn-hangzhou.aliyuncs.com/static/js/lingxi-design-ui.min.js',
   ],
   chainWebpack(config) {
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     // config.merge({
     //   optimization: {

config/config.ts

@@ -103,7 +103,7 @@ const config: any = {
   // chunks: isProduction && ['styles', 'vendors', 'umi', 'services'],
   chainWebpack: function(config, { webpack }) {
     // config.plugin('case-sensitive-paths-webpack-plugin').use(CaseSensitivePathsWebpackPlugins)
-    config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
+    // config.plugin('antd-dayjs-webpack-plugin').use(AntdDayjsWebpackPlugin)
     config.plugin('lodash-webpack-plugin').use(LodashModuleReplacementPlugin)
     config.module
       .rule('svg')

src/pages/transaction/marketingAbility/components/productListLayout/index.tsx

@@ -82,6 +82,7 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
       'productList': newData.filter(item => item.skuId !== key)
     })
     setIdNotInList(idNotInList.filter(item => item !== key));
+    setIdNots(idNots.filter(item => item !== key));
     setDataSource(newData.filter(item => item.skuId !== key))
   }
 

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-29 09:36:25
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-11-15 17:11:36
+ * @LastEditTime: 2021-12-01 09:57:37
  * @Description: 发券明细
  */
 import React, { useState, useMemo } from 'react';
@@ -204,7 +204,7 @@ const DeliverCoupon: React.FC<IProps> = (props) => {
     },
     {
       title: '适用用户',
-      dataIndex: 'memberAgeTypeName',
+      dataIndex: 'suitableMemberTypeName',
     },
     {
       title: '会员类型',

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

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-28 18:06:53
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-08-02 11:16:15
+ * @LastEditTime: 2021-11-30 19:43:45
  * @Description: 执行明细
  */
 import React, { useRef,  } from 'react';
@@ -10,13 +10,13 @@ import { createFormActions } from '@formily/antd';
 import { DatePicker } from '@formily/antd-components';
 import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
+import moment from 'moment';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import NiceForm from '@/components/NiceForm';
 import MellowCard, { MellowCardProps }  from '@/components/MellowCard';
 import { querySchema } from './schema';
-import moment from 'moment';
 import { getMarketingCouponWaiteExecuteDetailPage, getMarketingCouponWaiteExecuteDetailPageCondition } from '@/services/MarketingV2Api';
 
 const formActions = createFormActions();
@@ -175,19 +175,22 @@ const RunningInfo: React.FC<IProps> = (props) => {
     },
     {
       title: '适用用户',
-      dataIndex: 'bransuitableMemberTypeNamed',
+      dataIndex: 'suitableMemberTypeName',
     },
     {
       title: '领(发)放劵时间',
-      dataIndex: 'createTimeStart',
+      dataIndex: 'createTime',
+      render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: '劵有效期起始时间',
-      dataIndex: 'effectiveTimeStart',
+      dataIndex: 'validTimeStart',
+      render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: '券有效期截止时间',
-      dataIndex: 'effectiveTimeEnd',
+      dataIndex: 'validTimeEnd',
+      render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: '关联订单',
@@ -204,7 +207,7 @@ const RunningInfo: React.FC<IProps> = (props) => {
     {
       title: '订单金额',
       dataIndex: 'amount',
-      render: (text) => `¥ ${text || ''}`,
+      render: (text) => `¥ ${text || '0'}`,
     },
     {
       title: '订单状态',

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/components/EditForm/schema.tsx

@@ -40,7 +40,7 @@ const schema: ISchema = {
             },
             disabledDate: (current) => current && current < moment().startOf('day'),
             disabledTime: (current, type) => {
-              if (type === 'start' && moment().isSame(current, 'day')) {
+              if ((type === 'start' || type === 'end') && moment().isSame(current, 'day')) {
                 return {
                   disabledHours: () => range(0, 24).splice(0, moment().get('hour')),
                   disabledMinutes: () => range(0, 60).splice(0, moment().get('minute')),

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/CouponForm/effects/useBusinessEffects.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 14:04:16
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-09-30 16:38:36
+ * @LastEditTime: 2021-11-30 20:07:59
  * @Description: 
  */
 import { FormEffectHooks, FormPath, IFormActions } from '@formily/antd';
@@ -298,17 +298,17 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
   // 领(发)券起始时间
   onFieldValueChange$('[releaseTimeStart, releaseTimeEnd]').subscribe(state => {
     const { value } = state;
-    const releaseTimeStartValue = value?.[0];
+    const releaseTimeEndValue = value?.[1];
     const effectiveTime = getFieldValue('[effectiveTimeStart, effectiveTimeEnd]');  // 券有效期
     const effectiveTimeStartValue = effectiveTime?.[0];
 
     if (
-      releaseTimeStartValue
+      releaseTimeEndValue
       && effectiveTimeStartValue
-      && moment(releaseTimeStartValue) > moment(effectiveTimeStartValue)
+      && moment(releaseTimeEndValue) > moment(effectiveTimeStartValue)
     ) {
       setFieldState('[releaseTimeStart, releaseTimeEnd]', fieldState => {
-        FormPath.setIn(fieldState, 'errors', '领(发)券起始时间应该小于券有效期起始时间');
+        FormPath.setIn(fieldState, 'errors', '领(发)券截止时间应该小于券有效期起始时间');
       });
     } else {
       actions.clearErrors('[releaseTimeStart, releaseTimeEnd]');
@@ -320,15 +320,15 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
     const { value } = state;
     const effectiveTimeStartValue = value?.[0];
     const releaseTime = getFieldValue('[releaseTimeStart, releaseTimeEnd]');  // 券有效期
-    const releaseTimeStartValue = releaseTime?.[0];
+    const releaseTimeEndValue = releaseTime?.[1];
 
     if (
       effectiveTimeStartValue
-      && releaseTimeStartValue
-      && moment(effectiveTimeStartValue) < moment(releaseTimeStartValue)
+      && releaseTimeEndValue
+      && moment(effectiveTimeStartValue) < moment(releaseTimeEndValue)
     ) {
       setFieldState('[effectiveTimeStart, effectiveTimeEnd]', fieldState => {
-        FormPath.setIn(fieldState, 'errors', '券有效期起始时间应该大于等于领(发)券起始时间');
+        FormPath.setIn(fieldState, 'errors', '券有效期起始时间应该大于等于领(发)券截止时间');
       });
     } else {
       actions.clearErrors('[effectiveTimeStart, effectiveTimeEnd]');

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/CouponForm/schema.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 14:05:57
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-11-15 14:20:08
+ * @LastEditTime: 2021-11-30 20:16:53
  * @Description: 
  */
 import { ISchema } from '@formily/antd';
@@ -106,7 +106,7 @@ const schema: ISchema = {
                 showTime: true,
                 disabledDate: (current) => current && current < moment().startOf('day'),
                 disabledTime: (current, type) => {
-                  if (type === 'start' && moment().isSame(current, 'day')) {
+                  if ((type === 'start' || type === 'end') && moment().isSame(current, 'day')) {
                     return {
                       disabledHours: () => range(0, 24).splice(0, moment().get('hour')),
                       disabledMinutes: () => range(0, 60).splice(0, moment().get('minute')),
@@ -303,7 +303,7 @@ const schema: ISchema = {
                     showTime: true,
                     disabledDate: (current) => current && current < moment().startOf('day'),
                     disabledTime: (current, type) => {
-                      if (type === 'start' && moment().isSame(current, 'day')) {
+                      if ((type === 'start' || type === 'end') && moment().isSame(current, 'day')) {
                         return {
                           disabledHours: () => range(0, 24).splice(0, moment().get('hour')),
                           disabledMinutes: () => range(0, 60).splice(0, moment().get('minute')),

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/GoodsDrawer/schema.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 16:19:18
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-30 10:06:32
+ * @LastEditTime: 2021-11-30 19:49:02
  * @Description: 
  */
 import { ISchema } from '@formily/antd';
@@ -15,7 +15,7 @@ export const querySchema: ISchema = {
       type: 'object',
       'x-component': 'mega-layout',
       properties: {
-        name: {
+        commodityName: {
           type: 'string',
           'x-component': 'Search',
           'x-component-props': {