Commit 9e6f2e72 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:

parent 0005f5eb
...@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => { ...@@ -24,7 +24,7 @@ const UserHeader: React.FC<UserHeaderProps> = (props) => {
const getRouteName = () => { const getRouteName = () => {
switch (pathname) { switch (pathname) {
case '/user/login': case '/user/login':
setTitle("欢迎登陆") setTitle("欢登录")
break break
case '/user/register': case '/user/register':
setTitle("欢迎注册") setTitle("欢迎注册")
......
...@@ -182,7 +182,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => { ...@@ -182,7 +182,7 @@ const QuickNav: React.FC<QuickNavPropsType> = (props) => {
<span className={styles.welcome_text}>Hi, 欢迎来到{name}</span> <span className={styles.welcome_text}>Hi, 欢迎来到{name}</span>
</div> </div>
<div className={styles.btn_group}> <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 className={styles.btn_item}><a href="/user/register">注册</a></div>
</div> </div>
......
...@@ -246,7 +246,6 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => { ...@@ -246,7 +246,6 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
const shopType = addSchemaAction.getFieldValue('shopType'); const shopType = addSchemaAction.getFieldValue('shopType');
// 当商城类型为 渠道商城、渠道自由商城和渠道积分商城时,需要带上下面两个参数 // 当商城类型为 渠道商城、渠道自由商城和渠道积分商城时,需要带上下面两个参数
const { channelMemberIdList, channelMemberRoleId } = productState; const { channelMemberIdList, channelMemberRoleId } = productState;
const data = { const data = {
...params, ...params,
shopType: shopType, shopType: shopType,
......
...@@ -80,7 +80,7 @@ export const useSelfTable = () => { ...@@ -80,7 +80,7 @@ export const useSelfTable = () => {
width: 200 width: 200
}, },
{ {
title: '供应会员', title: '采购会员',
align: 'left', align: 'left',
dataIndex: 'supplyMembersName', dataIndex: 'supplyMembersName',
key: 'supplyMembersName', key: 'supplyMembersName',
......
...@@ -91,7 +91,7 @@ const User: React.FC = () => { ...@@ -91,7 +91,7 @@ const User: React.FC = () => {
</div> </div>
<Row className={'thirdLogin'} align='middle' justify='center'> <Row className={'thirdLogin'} align='middle' justify='center'>
<Col>其他方式登录 <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="QQ登录"><img src={qq} alt="QQ登录" /></a>
<a title="支付宝登录"><img src={alipay} alt="支付宝登录" /></a> <a title="支付宝登录"><img src={alipay} alt="支付宝登录" /></a>
</Col> </Col>
......
...@@ -328,7 +328,7 @@ const UserRegistry = () => { ...@@ -328,7 +328,7 @@ const UserRegistry = () => {
</p> </p>
</div> </div>
} }
<p className={'readyLogin'}>已有平台账号? <Link to="/user/login">去登</Link></p> <p className={'readyLogin'}>已有平台账号? <Link to="/user/login">去登</Link></p>
</div> </div>
</div> </div>
</Fragment> </Fragment>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment