Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

src/pages/transaction/purchaseAbility/onlineBid/readySignUp/schema/index.ts

@@ -32,7 +32,7 @@ export const formSchema: ISchema = {
                   type: 'string',
                   title: '竞价单摘要',
                   readOnly: true,
-                  visible: false,
+                  visible: true,
                 },
                 biddingNo: {
                   type: 'string',
@@ -92,7 +92,7 @@ export const formSchema: ISchema = {
               properties: {
                 '[startSignUp, endSignUp]': {
                   type: 'string',
-                  title: '报名时间要求',
+                  title: '报名要求时间',
                   "x-component": 'daterange',
                   "x-component-props": {
                     showTime: true,
@@ -156,7 +156,7 @@ export const formSchema: ISchema = {
                   type: 'object',
                   'x-component': 'Mega-Layout',
                   'x-component-props': {
-                    label: '注册手机',
+                    label: '联系人电话',
                     required: true,
                     wrapperCol: 24,
                   },

src/pages/transaction/purchaseAbility/onlineBid/readySignUp/signUp.tsx

@@ -22,7 +22,6 @@ const addSchemaAction = createFormActions()
 
 const SignUpForm = () => {
   const { number } = history.location.query;
-  const { memberId, memberRoleId, name } = JSON.parse(localStorage.getItem('auth'));
 
   const {
     id,
@@ -34,7 +33,7 @@ const SignUpForm = () => {
   const [btnLoading, setBtnLoading] = useState(false);
   const [refundDisabled, setRefundDisabled] = useState(false);
   const [formValue, setFormValue] = useState<any>({ areas: [] });
-  const { token } = getAuth() || {}
+  const { token, name } = getAuth() || {}
 
 
   const getCountryCodeId = async () => {
@@ -150,4 +149,4 @@ const SignUpForm = () => {
     </PageHeaderWrapper>
   )
 }
-export default SignUpForm
+export default SignUpForm
\ No newline at end of file

src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/add.tsx

@@ -6,6 +6,7 @@ import { Tabs, Card, Button, Badge } from 'antd';
 
 import ReutrnEle from '@/components/ReturnEle';
 import { PublicApi } from '@/services/api';
+import { getAuth } from '@/utils/auth';
 
 import Material from '../../purchaseInquiry/addInquiry/components/material';
 import Demand from '../../purchaseInquiry/addInquiry/components/demand';
@@ -34,7 +35,7 @@ const AddForm = () => {
       number
     },
     pathname, } = history.location;
-  const { memberId, memberRoleId, name } = JSON.parse(localStorage.getItem('auth'));
+  const { memberId, memberRoleId, name } = getAuth();
   const [path] = useState(pathname.split('/')[pathname.split('/').length - 1]);
   console.log(path)
   /** 基本信息 */
@@ -266,4 +267,4 @@ const AddForm = () => {
     </PageHeaderWrapper>
   )
 }
-export default AddForm
+export default AddForm
\ No newline at end of file