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

src/layouts/components/UserHeader.tsx

@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => {
   const getRouteName = () => {
     switch (pathname) {
       case '/user/login':
-        setTitle("欢迎登陆")
+        setTitle("欢登录")
         break
       case '/user/register':
         setTitle("欢迎注册")

src/pages/commodity/products/addChannelItem/selectChannel.tsx

@@ -221,6 +221,8 @@ const SelectChannel:React.FC<IProps> = (props) => {
   const roleChange = (value: number, option: IOption) => {
     setSelectedOption(option)
     setSelectedRole(option)
+    setMemberTableData([])
+    setSelectedMemberRowKeys([])
   }
 
   const clickSearchChannel = (value: string) => {
@@ -243,12 +245,6 @@ const SelectChannel:React.FC<IProps> = (props) => {
             colon={false}
             initialValues={{childMemberRoleId: memberRoleList[0].roleId}}
           >
-            {/* <Form.Item name="channelMemberRoleId">
-              <Radio.Group buttonStyle="solid" defaultValue={1} className={styles.customizeRadio}>
-                <Radio.Button key={1} value={1}>渠道采购商</Radio.Button>
-                <Radio.Button key={2} value={2}>渠道自有采购商</Radio.Button>
-              </Radio.Group>
-            </Form.Item> */}
             <Form.Item
               label="选择渠道角色"
               name="childMemberRoleId"
@@ -308,6 +304,7 @@ const SelectChannel:React.FC<IProps> = (props) => {
       columns={columnsSetMember}
       rowSelection={memberRowSelection}
       fetchTableData={params => fetchMemberData(params)}
+      forceRender={true}
       formilyProps={
         {
           ctx: { 
@@ -329,6 +326,9 @@ const SelectChannel:React.FC<IProps> = (props) => {
       tableProps={{
         rowKey: 'memberId',
       }}
+      resetModal={{
+        destroyOnClose: true
+      }}
     />
   </>)
 }

src/pages/lxMall/components/QuickNav/index.tsx

@@ -182,7 +182,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => {
                     <span className={styles.welcome_text}>Hi, 欢迎来到{name}</span>
                   </div>
                   <div className={styles.btn_group}>
-                    <div className={cx(styles.btn_item, styles.primary)}><a href={`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`}>登陆</a></div>
+                    <div className={cx(styles.btn_item, styles.primary)}><a href={`/user/login?redirect=${btoa(encodeURIComponent(String(window.location)))}`}>登录</a></div>
                     <div className={styles.btn_item}><a href="/user/register">注册</a></div>
                   </div>
 

src/pages/repositories/components/PositionSetting.tsx

@@ -246,7 +246,6 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
     const shopType = addSchemaAction.getFieldValue('shopType');
     // 当商城类型为 渠道商城、渠道自由商城和渠道积分商城时，需要带上下面两个参数
     const { channelMemberIdList, channelMemberRoleId } = productState;
-    
     const data = {
       ...params,
       shopType: shopType,

src/pages/transaction/electronicContracts/template/index.tsx

@@ -180,7 +180,7 @@ const Template: React.FC<{}> = () => {
                         type: 'string',
                         'x-component': 'Search',
                         'x-component-props': {
-                          placeholder: '搜索',
+                          placeholder: '合同模板名称',
                           advanced: false,
                         },
                       },

src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx

@@ -80,7 +80,7 @@ export const useSelfTable = () => {
       width: 200
     },
     {
-      title: '供应会员',
+      title: '采购会员',
       align: 'left',
       dataIndex: 'supplyMembersName',
       key: 'supplyMembersName',

src/pages/user/index.tsx

@@ -91,7 +91,7 @@ const User: React.FC = () => {
           </div>
           <Row className={'thirdLogin'} align='middle' justify='center'>
             <Col>其他方式登录
-            <a title="微信登陆"><img src={wechat} alt="微信登录" /></a>
+            <a title="微登录"><img src={wechat} alt="微信登录" /></a>
               <a title="QQ登录"><img src={qq} alt="QQ登录" /></a>
               <a title="支付宝登录"><img src={alipay} alt="支付宝登录" /></a>
             </Col>

src/pages/user/register.tsx

@@ -328,7 +328,7 @@ const UserRegistry = () => {
               </p>
             </div>
           }
-          <p className={'readyLogin'}>已有平台账号? <Link to="/user/login">去登陆</Link></p>
+          <p className={'readyLogin'}>已有平台账号? <Link to="/user/login">去登录</Link></p>
         </div>
       </div>
     </Fragment>