Commit d5470972 authored by GuanHua's avatar GuanHua

feat:修改店铺链接地址和站点域名

parent 37a541c4
......@@ -4,7 +4,7 @@ const mockData = {
data: {
global: {
siteId: 352,
siteUrl: 'http://localhost:4396',
siteUrl: 'http://10.0.0.25:4396',
logo: 'https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png',
countryList: [
{
......
......@@ -117,15 +117,19 @@ export function render(oldRender: Function) {
export function onRouteChange({ routes, matchedRoutes, location, action }) {
console.log('onRouteChange')
if (isDev) {
return;
// if (isDev) {
// return;
// }
if (whiteLists.includes(location.pathname)) {
return
}
// 是否登录
if (getAuth()) {
const routeAuthUrls = getRouters()
const { query, pathname } = location
if (userLoginLists.includes(pathname)) {
// 当登录过, 并且尝试访问登录相关页面, 需重定向到首页
history.replace('/memberCenter/home')
......
......@@ -110,7 +110,7 @@ const MallIndex: React.FC<MallIndexPropsType> = (props) => {
</FloorLine.FloorHeader>
<FloorLine.Horizontal>
<FloorLine.Goods goodsList={categoryDetail.goodsBOList} />
<FloorLine.Shops shopsList={categoryDetail.shopBOList} linkUrl={`/shop?shopId=${btoa(JSON.stringify({ shopId: 3, memberId: 6 }))}`} />
<FloorLine.Shops shopsList={categoryDetail.shopBOList} linkUrl={`/shop`} />
</FloorLine.Horizontal>
</FloorLine.Vertical>
</FloorLine.Horizontal>
......
......@@ -44,8 +44,8 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
}, [])
useEffect(() => {
if (query.memberId) {
fetchShopInfo(query.memberId)
if (query.meberId) {
fetchShopInfo(query.meberId)
}
}, [query])
......@@ -81,7 +81,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
{
layoutType: 'shop',
shopId: query.shopId,
memberId: query.memberId,
memberId: query.meberId,
shopUrlParam: shopId,
shopInfo
},
......
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