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

src/app.tsx

@@ -90,6 +90,10 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
     return;
   }
 
+  if (whiteLists.includes(location.pathname)) {
+    return
+  }
+
   // 是否登录
   if (getAuth()) {
     const { query, pathname } = location

src/constants/index.ts

@@ -137,3 +137,21 @@ export const MEMBER_OUTER_STATUS = {
   [MEMBER_OUTER_STATUS_FAILED]: '审核不通过',
   [MEMBER_OUTER_STATUS_SUCCESS]: '审核通过',
 };
+
+// 会员申请来源
+export const MEMBER_SOURCE_WEB_ENTERPRISE = 1;         // Web企业商城
+export const MEMBER_SOURCE_H5_ENTERPRISE = 2;          // H5企业商城
+export const MEMBER_SOURCE_WEB_CHANNEL = 3;            // Web渠道商城
+export const MEMBER_SOURCE_H5_CHANNEL = 4;             // H5渠道商城
+export const MEMBER_SOURCE_PLATFORM = 5;               // 平台代录入
+export const MEMBER_SOURCE_MERCHANTS = 6;              // 商户代录入
+export const MEMBER_SOURCE_CHANNEL = 7;                // 渠道代录入
+export const MEMBER_source = {
+  [MEMBER_SOURCE_WEB_ENTERPRISE]: 'Web企业商城',
+  [MEMBER_SOURCE_H5_ENTERPRISE]: 'H5企业商城',
+  [MEMBER_SOURCE_WEB_CHANNEL]: 'Web渠道商城',
+  [MEMBER_SOURCE_H5_CHANNEL]: 'H5渠道商城',
+  [MEMBER_SOURCE_PLATFORM]: '平台代录入',
+  [MEMBER_SOURCE_MERCHANTS]: '商户代录入',
+  [MEMBER_SOURCE_CHANNEL]: '渠道代录入',
+};
\ No newline at end of file

src/pages/commodity/productWillCheck/index.tsx

@@ -97,10 +97,18 @@ const Products: React.FC<{}> = () => {
       dataIndex: 'min',
       key: 'min',
       render: (text:any, reocrd:any) => {
-        if(reocrd.priceType === 1)
-          return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
-        if(reocrd.priceType === 3)
-          return <>{reocrd.min} ~ {reocrd.max}</>
+        if(reocrd.priceType === 1){
+          if(reocrd.max === reocrd.min)
+            return <>￥{reocrd.min}</>
+          else
+            return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
+        }
+        if(reocrd.priceType === 3){
+          if(reocrd.max === reocrd.min)
+            return <>{reocrd.min}</>
+          else
+            return <>{reocrd.min} ~ {reocrd.max}</>
+        }
         if(reocrd.priceType === 2)
           return null
       }

src/pages/commodity/products/index.tsx

@@ -111,10 +111,18 @@ const Products: React.FC<{}> = () => {
       dataIndex: 'min',
       key: 'min',
       render: (text:any, reocrd:any) => {
-        if(reocrd.priceType === 1)
-          return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
-        if(reocrd.priceType === 3)
-          return <>{reocrd.min} ~ {reocrd.max}</>
+        if(reocrd.priceType === 1){
+          if(reocrd.max === reocrd.min)
+            return <>￥{reocrd.min}</>
+          else
+            return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
+        }
+        if(reocrd.priceType === 3){
+          if(reocrd.max === reocrd.min)
+            return <>{reocrd.min}</>
+          else
+            return <>{reocrd.min} ~ {reocrd.max}</>
+        }
         if(reocrd.priceType === 2)
           return null
       }

src/pages/member/memberMaintain/index.tsx

@@ -34,6 +34,7 @@ import {
   MEMBER_OUTER_STATUS_SUCCESS, 
   MEMBER_INNER_STATUS_UNCOMMITTED, 
   MEMBER_INNER_STATUS_FAILED, 
+  MEMBER_SOURCE_PLATFORM, 
 } from '@/constants';
 import { importSchema, auditModalSchema } from './schema';
 import { 
@@ -171,10 +172,10 @@ const memberMaintain: React.FC<[]> = () => {
               </Button>
             </Link>
           )}
-          {/* 外部审核状态等于 待提交 或者 审核失败 可进行编辑操作 */}
+          {/* 平台代录入的会员资料才可以修改、删除 */}
           {(
-            record.outerStatus === MEMBER_INNER_STATUS_UNCOMMITTED || 
-            record.outerStatus === MEMBER_INNER_STATUS_FAILED 
+            record.source === MEMBER_SOURCE_PLATFORM && 
+            record.outerStatus !== MEMBER_OUTER_STATUS_SUCCESS
           ) && (
             <>
               <Button
@@ -185,23 +186,20 @@ const memberMaintain: React.FC<[]> = () => {
               >
                 编辑
               </Button>
-            </>
-          )}
-          {/* 外部审核状态不等于 审核通过 可进行删除操作 */}
-          {record.outerStatus !== MEMBER_OUTER_STATUS_SUCCESS && (
-            <Popconfirm 
-              title="确定要删除吗？" 
-              okText="是" 
-              cancelText="否"
-              onConfirm={() => handleDelete(record.memberId, record.validateId)}
-            >
-              <Button 
-                type="link"
-                danger
+              <Popconfirm 
+                title="确定要删除吗？" 
+                okText="是" 
+                cancelText="否"
+                onConfirm={() => handleDelete(record.memberId, record.validateId)}
               >
-                删除
-              </Button>
-            </Popconfirm>
+                <Button 
+                  type="link"
+                  danger
+                >
+                  删除
+                </Button>
+              </Popconfirm>
+            </>
           )}
         </>
       ),

src/pages/member/memberPrConfirm/auditPrComfirm.tsx

@@ -19,7 +19,7 @@ import TabTree, { createTreeActions } from '@/components/TabTree';
 import CheckboxTree from '@/components/CheckBoxTree';
 import MellowCard from '@/components/MellowCard';
 import NiceForm from '@/components/NiceForm';
-import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
+import { createAsyncFormActions, FormEffectHooks, FormPath } from '@formily/antd';
 import { useTreeTabs, FormState } from '@/hooks/useTreeTabs';
 import { MEMBER_INNER_STATUS_SUCCESS } from '@/constants';
 import { 
@@ -36,10 +36,11 @@ import styles from './index.less';
 import { values } from 'mobx';
 
 const treeActions = createTreeActions();
-const modalFormActions = createFormActions();
+const modalFormActions = createAsyncFormActions();
 const { 
   onFieldValueChange$, 
   onFieldInputChange$, 
+  onFieldInit$, 
 } = FormEffectHooks;
 
 interface QueryProps {
@@ -62,6 +63,8 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
   const [powerLoading, setPowerLoading] = useState(false); 
   const [confirmLoading, setConfirmLoading] = useState(false);
 
+  const infoRef = useRef<any>({});
+
   const getBasicInfo = () => {
     if (!id || !validateId) {
       return;
@@ -75,22 +78,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
         return;
       }
       setBasicInfo(res.data);
-
-      // 内部状态为 审核通过 才能选择 审核通过选项
-      if (res.data.innerStatus !== MEMBER_INNER_STATUS_SUCCESS) {
-        modalFormActions.setFieldState('agree', (state: any) => {
-          const newMenu = 
-            state.props.enum.map(
-              (item: { label: string, value: any }) => ({ 
-                ...item, 
-                disabled: item.value === 1, 
-              })
-            );
-          FormPath.setIn(state, 'props.enum', newMenu);
-          FormPath.setIn(state, 'value', 0);
-        });
-      }
-      
+      infoRef.current.info = res.data; 
     }).finally(() => {
       setInfoLoading(false);
     });
@@ -237,7 +225,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
     return PublicApi.postMemberValidateCommitUpdatemenu({
       memberId: id, 
       validateId,
-      checkIds: menuIds,
+      menuIds,
     }, {
       ctlType: 'none',
     });
@@ -397,6 +385,22 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
         >
           <NiceForm
             effects={($, { setFieldState }) => {
+              onFieldInit$().subscribe(() => {
+                // 内部状态为 审核通过 才能选择 审核通过选项
+                if (infoRef.current.info.innerStatus !== MEMBER_INNER_STATUS_SUCCESS) {
+                  modalFormActions.setFieldState('agree', (state: any) => {
+                    const newEnum = 
+                      state.props.enum.map(
+                        (item: { label: string, value: any }) => ({ 
+                          ...item, 
+                          disabled: item.value === 1, 
+                        })
+                      );
+                    FormPath.setIn(state, 'props.enum', newEnum);
+                    FormPath.setIn(state, 'value', 0);
+                  });
+                }
+              })
               onFieldValueChange$('agree').subscribe(fieldState => {
                 setFieldState('reason', state => {
                   state.visible = !fieldState.value;

src/pages/trademark/trademarkSearch/index.tsx

@@ -48,7 +48,7 @@ const Trademark: React.FC<{}> = () => {
       key: 'memberName',
     },
     {
-      title: '申请时间',
+      title: '申请审核时间',
       dataIndex: 'applyTime',
       key: 'applyTime',
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss'),

src/pages/trademark/trademarkWillCheck/index.tsx

@@ -50,7 +50,7 @@ const Trademark: React.FC<{}> = () => {
       key: 'memberName',
     },
     {
-      title: '申请时间',
+      title: '申请审核时间',
       dataIndex: 'applyTime',
       key: 'applyTime',
       render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss'),