Commit 03621ce4 authored by GuanHua's avatar GuanHua

fix: 商城店铺列表链接跳转问题,模板预览问题

parent 918a681b
......@@ -12,7 +12,6 @@ import MainNav from '../components/MainNav'
import SideNav from '../components/SideNav'
import Footer from '../components/Footer'
import { PublicApi } from '@/services/api'
import { GetTemplateShopFindShopResponse } from '@/services/TemplateApi'
import SearchShopResult from '../components/SearchShopResult'
import { LAYOUT_TYPE } from '@/constants'
import { GlobalConfig } from '@/global/config'
......@@ -32,7 +31,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
const { children, location } = props
const [templateName] = useState<string>('theme-shop-science')
const { shopId } = location.query
const [shopInfo, setShopInfo] = useState<GetTemplateShopFindShopResponse>()
const [shopInfo, setShopInfo] = useState<any>()
const [query, setQuery] = useState<any>({})
const [mallInfo, setMallInfo] = useState<any>({})
const [loading, setLoading] = useState<boolean>(true)
......
......@@ -7,7 +7,6 @@ import AboutUs from '../components/AboutUs'
import { inject, observer } from 'mobx-react'
import { PublicApi } from '@/services/api'
import { LAYOUT_TYPE } from '@/constants'
import { GetTemplateShopFindShopResponse, GetTemplatePlatformFindAllFirstCategoryResponse } from '@/services/TemplateApi'
import styles from './index.less'
interface ChannelIndexPropsType {
......@@ -16,12 +15,12 @@ interface ChannelIndexPropsType {
memberId: number;
shopId: number;
shopUrlParam: string;
shopInfo: GetTemplateShopFindShopResponse
shopInfo: any
}
const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
const { memberId, shopUrlParam, shopInfo } = props
const [categoryList, setCategoryList] = useState<GetTemplatePlatformFindAllFirstCategoryResponse>([])
const [categoryList, setCategoryList] = useState<any>([])
const [firstAdvertList, setFirstAdvertList] = useState([])
const [secondAdvertList, setSecondAdvertList] = useState([])
const [categoryComponents, setCategoryComponents] = useState<React.ReactNode>()
......
......@@ -77,8 +77,8 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
</div>
<div className={styles.shop_list_line}>
<label>以上信息已通过会员认证|</label>
<Link to={`/shop/about?shopId=${btoa(JSON.stringify({ memberId: item.memberId }))}`} className={styles.shop_list_line_link}>资质证书 &gt;</Link>
<Link to={`/shop/about?shopId=${btoa(JSON.stringify({ memberId: item.memberId }))}`} className={styles.shop_list_line_link}>公司信息 &gt;</Link>
<Link to={`/shop/about?shopId=${btoa(JSON.stringify({ shopId: item.id, memberId: item.memberId }))}`} className={styles.shop_list_line_link}>资质证书 &gt;</Link>
<Link to={`/shop/about?shopId=${btoa(JSON.stringify({ shopId: item.id, memberId: item.memberId }))}`} className={styles.shop_list_line_link}>公司信息 &gt;</Link>
</div>
</div>
<div className={styles.shop_list_goods}>
......
......@@ -133,7 +133,7 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
memberId,
roleId: memberRoleId
}
PublicApi.getTemplateShopFindShop(param).then(res => {
PublicApi.getTemplateWebMemberShopWebFindByMemberIdAndRoleId(param).then(res => {
if (res.code === 1000) {
if (res.code === 1000) {
resolve(res.data)
......
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