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

src/locales/en-US/purchase.ts

@@ -887,6 +887,7 @@ export default {
   'table.purchase.shurutuijianzhong': 'Enter the recommended bid-winning member',
   'table.purchase.shurutuijianren': 'Enter recommender',
   'table.purchase.zaicishuruni100': 'Enter your reason here, up to 100 characters',
+  'table.purchase.zaicishuruni50': 'Enter your reasons here in up to 50 characters',
   'table.purchase.tijiaobaogao': 'Submit report',
   'table.purchase.tijiaopinggubao': 'Submit evaluation report',
   'table.purchase.toubiaobianhao': 'Bid number',

src/locales/en-US/transaction_components.ts

@@ -297,12 +297,12 @@ export default {
   'transaction_components.youhuijuanshiyongjilu': 'Use record of coupons',
   'transaction_components.dangqiandingdanshangpinid': 'Current order item id',
   'transaction_components.qingtianxiedanjia': 'Please fill in the unit price',
-  'transaction_components.danjiajinxiansanweixiaoshu': 'Unit price is limited to three decimal places',
+  'transaction_components.danjiajinxiansanweixiaoshu': 'The unit price cannot be less than 0 and is limited to three decimal places',
   'transaction_components.zaicishurunideyuanyin1': 'Enter your reason here, up to 50 Chinese characters',
   'transaction_components.quxiaoyuanyin': 'Cancellation reason',
   'transaction_components.qingshuruquxiaoyuanyin': 'Please enter the reason for cancellation',
   'transaction_components.qingzhengqueshurushuzijin': 'Please enter the digital amount correctly',
-  'transaction_components.yunfeijinxianliangweixiaoshu': 'Shipping shipping is limited to two decimal places',
+  'transaction_components.yunfeijinxianliangweixiaoshu': 'The freight must not be less than 0 and two decimal places only',
   'transaction_components.xinzengdingdan': 'New order',
   'transaction_components.yijishenhezhong': 'First level review in progress',
   'transaction_components.erjishenhezhong': 'Secondary review in progress',

src/locales/ko-KR/purchase.ts

@@ -887,6 +887,7 @@ export default {
   'table.purchase.shurutuijianzhong': '추천 낙찰 회원 입력',
   'table.purchase.shurutuijianren': '추천인 입력',
   'table.purchase.zaicishuruni100': '여기에 당신의 이유를 최대 100자까지 입력하십시오',
+  'table.purchase.zaicishuruni50': '최대 50 글자로 이유를 입력하십시오',
   'table.purchase.tijiaobaogao': '보고서를 제출하다',
   'table.purchase.tijiaopinggubao': '평가 보고서 제출',
   'table.purchase.toubiaobianhao': '입찰 번호',

src/locales/ko-KR/transaction_components.ts

@@ -297,12 +297,12 @@ export default {
   'transaction_components.youhuijuanshiyongjilu': '쿠폰 사용 기록',
   'transaction_components.dangqiandingdanshangpinid': '현재 주문 상품 id',
   'transaction_components.qingtianxiedanjia': '단가를 기입해 주십시오',
-  'transaction_components.danjiajinxiansanweixiaoshu': '단가는 세 자리 소수에 불과하다',
+  'transaction_components.danjiajinxiansanweixiaoshu': '단가가 0보다 작으면 안 되며 세 자리 소수에만 제한해야 한다',
   'transaction_components.zaicishurunideyuanyin1': '여기에 최대 50개의 한자를 입력하십시오',
   'transaction_components.quxiaoyuanyin': '취소 원인',
   'transaction_components.qingshuruquxiaoyuanyin': '취소 이유를 입력하십시오.',
   'transaction_components.qingzhengqueshurushuzijin': '숫자 금액을 정확하게 입력하세요.',
-  'transaction_components.yunfeijinxianliangweixiaoshu': '운임은 단지 두 자리 소수로 제한된다',
+  'transaction_components.yunfeijinxianliangweixiaoshu': '운송비는 0보다 작으면 안 되고 단지 두 소수여야 한다',
   'transaction_components.xinzengdingdan': '신규 주문',
   'transaction_components.yijishenhezhong': '1급 심사 중',
   'transaction_components.erjishenhezhong': '2급 심사 중',

src/locales/zh-CN/purchase.ts

@@ -888,6 +888,7 @@ export default {
   'table.purchase.shurutuijianzhong': '输入推荐中标会员',
   'table.purchase.shurutuijianren': '输入推荐人',
   'table.purchase.zaicishuruni100': '在此输入你的理由, 最多100个字符',
+  'table.purchase.zaicishuruni50': '在此输入你的理由, 最多50个字符',
   'table.purchase.tijiaobaogao': '提交报告',
   'table.purchase.tijiaopinggubao': '提交评估报告',
   'table.purchase.toubiaobianhao': '投标编号',

src/locales/zh-CN/transaction_components.ts

@@ -297,12 +297,12 @@ export default {
   'transaction_components.youhuijuanshiyongjilu': '优惠劵使用记录',
   'transaction_components.dangqiandingdanshangpinid': '当前订单商品id',
   'transaction_components.qingtianxiedanjia': '请填写单价',
-  'transaction_components.danjiajinxiansanweixiaoshu': '单价仅限三位小数',
+  'transaction_components.danjiajinxiansanweixiaoshu': '单价不能小于0并仅限三位小数',
   'transaction_components.zaicishurunideyuanyin1': '在此输入你的原因, 最多50个汉字',
   'transaction_components.xiugaiyuanyin': '修改原因',
   'transaction_components.qingshuruxiugaiyuanyin': '请输入修改原因',
   'transaction_components.qingzhengqueshurushuzijin': '请正确输入数字金额',
-  'transaction_components.yunfeijinxianliangweixiaoshu': '运费仅限两位小数',
+  'transaction_components.yunfeijinxianliangweixiaoshu': '运费不能小于0并仅限两位小数',
   'transaction_components.xinzengdingdan': '新增订单',
   'transaction_components.yijishenhezhong': '一级审核中',
   'transaction_components.erjishenhezhong': '二级审核中',

src/pages/member/memberImport/index.tsx

@@ -280,7 +280,7 @@ const MemberMaintain: React.FC<[]> = () => {
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
             components={{
-              ControllerBtns,
+              MemberControllerBtns: ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/memberImport/schema/index.tsx

@@ -20,7 +20,7 @@ export const importSchema: ISchema = {
           properties: {
             ctl: {
               type: 'object',
-              'x-component': 'ControllerBtns',
+              'x-component': 'MemberControllerBtns',
             },
             name: {
               type: 'string',

src/pages/mobileTemplate/shopTemplateEdit/marketing_config.ts

@@ -418,7 +418,6 @@ export const marketingConfig_11 = {
     canEdit: true,
     canHide: false,
     componentName: 'MarketingCard.VerticalContainer',
-    maxLength: 3,
     props: {
       type: 8,
     },

src/pages/procurement/callForBids/callForBidsSearch/index.tsx

@@ -229,7 +229,7 @@ const callForBidsSearch: React.FC<{}> = () => {
                   type: 'textarea',
                   "x-component-props": {
                     rows: 4,
-                    placeholder: intl.formatMessage({ id: 'table.purchase.zaicishuruni' })
+                    placeholder: intl.formatMessage({ id: 'table.purchase.zaicishuruni100' })
                   },
                   title: intl.formatMessage({ id: 'table.purchase.feibiaoyuanyin' }),
                   "x-rules": [

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/bidConfirm/components/totalAmount/index.tsx

@@ -34,7 +34,7 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
           </div>
           <div className={style['card-list']}>
             <Row>
-              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
               <Col><p>{index - 1}</p></Col>
             </Row>
           </div>

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/bidConfirm/index.tsx

@@ -240,7 +240,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({ cardTitle }) => {
                         </div>
                         <div className={style['card-list']}>
                           <Row>
-                            <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+                            <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
                             <Col><p>{index - 1}</p></Col>
                           </Row>
                         </div>

src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/bidConfirm/components/totalAmount/index.tsx

@@ -35,7 +35,7 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
           </div>
           <div className={style['card-list']}>
             <Row>
-              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
               <Col><p>{index - 1}</p></Col>
             </Row>
           </div>

src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/bidConfirm/index.tsx

@@ -241,7 +241,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       </div>
                       <div className={style['card-list']}>
                         <Row>
-                          <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+                          <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
                           <Col><p>{index - 1}</p></Col>
                         </Row>
                       </div>

src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/components/totalAmount/index.tsx

@@ -47,7 +47,7 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
           </div>
           <div className={style['card-list']}>
             <Row>
-              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
               <Col><p>{index - 1}</p></Col>
             </Row>
           </div>

src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/index.tsx

@@ -215,7 +215,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                     </div>
                     <div className={style['card-list']}>
                       <Row>
-                        <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+                        <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
                         <Col><p>{index - 1}</p></Col>
                       </Row>
                     </div>

src/pages/procurement/callForBids/readyConfirmBid/constant/index.tsx

@@ -125,7 +125,7 @@ export const submitSchema = {
           type: 'textarea',
           "x-component-props": {
             rows: 4,
-            placeholder: intl.formatMessage({ id: 'table.purchase.zaicishuruni' })
+            placeholder: intl.formatMessage({ id: 'table.purchase.zaicishuruni50' })
           },
           title: intl.formatMessage({ id: 'detail.purchase.label1' }),
           "x-rules": [

src/pages/procurement/callForBids/readyPassBid/components/bidConfirm/components/totalAmount/index.tsx

@@ -35,7 +35,7 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
           </div>
           <div className={style['card-list']}>
             <Row>
-              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
               <Col><p>{index - 1}</p></Col>
             </Row>
           </div>

src/pages/procurement/callForBids/readyPassBid/components/bidConfirm/index.tsx

@@ -243,7 +243,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       </div>
                       <div className={style['card-list']}>
                         <Row>
-                          <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+                          <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
                           <Col><p>{index - 1}</p></Col>
                         </Row>
                       </div>

src/pages/procurement/components/bidConfirm/components/totalAmount/index.tsx

@@ -35,7 +35,7 @@ export const TotalAmount:React.FC<TotalAmountProps> = ({
           </div>
           <div className={style['card-list']}>
             <Row>
-              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRan' })}:</p></Col>
+              <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.offerRank' })}:</p></Col>
               <Col><p>{index - 1}</p></Col>
             </Row>
           </div>