Skip to content

J
jinfa-platform
Commit 05ffc693 authored by GuanHua's avatar GuanHua
Browse files
Options

🐞fix: 修改店铺装修接口传参

parent e566f995
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 64 deletions
src/pages/editor/shopEdit/index.tsx
View file @ 05ffc693
......@@ -10,6 +10,7 @@ import { menuData } from './defaultMenu'
import Loading from '../components/Loading'
import { PublicApi } from '@/services/api'
import { GlobalConfig } from '@/global/config'
import { getAuth } from '@/utils/auth'
import styles from './index.less'
interface ShopEditPropsType {
......@@ -27,13 +28,14 @@ interface ShopEditPropsType {
}
}
let TemplateList = ['science']
const TemplateList = ['science']
const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const { query: { id, template } } = props.location
const [loading, setLoading] = useState<boolean>(true)
const [theme, setTheme] = useState<string>('theme-shop-science')
const [componentConfigs, setComponentConfigs] = useState({})
const { memberId, memberRoleId } = getAuth() || {}
useEffect(() => {
if (!TemplateList.includes(template)) {
......@@ -46,11 +48,13 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const findFirstAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 1
type: 1,
memberId,
roleId: memberRoleId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -63,11 +67,13 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const findSecondAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 2
type: 2,
memberId,
roleId: memberRoleId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -83,7 +89,11 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
*/
const fetchFirstCategory = () => {
return new Promise((resolve) => {
PublicApi.getTemplateShopFindAllFirstCategory().then(res => {
const param: any = {
memberId,
roleId: memberRoleId
}
PublicApi.getTemplateShopFindAllFirstCategory(param).then(res => {
if (res.code === 1000) {
resolve(res.data)
}
......@@ -96,12 +106,13 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
*/
const fetchCategoryById = (categoryId) => {
return new Promise((resolve) => {
let param = {
const param: any = {
templateId: id,
categoryId
categoryId,
memberId,
roleId: memberRoleId
}
// @ts-ignore
PublicApi.getTemplateShopFindFirstCategoryDetail(param).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -139,24 +150,24 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
const shopInfo = await fetchShopInfo()
headerConfig[headerConfig.key].props.shopInfo = shopInfo
const shopList = GlobalConfig.web.shopInfo
let webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
const webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
AboutUsConfig[AboutUsConfig.key].props.shopInfo = shopInfo
let initIndex = 100
let floorLineConfig: any = {}
let floorLineKeys: any = []
const floorLineKeys: any = []
let firstCategory: any = await fetchFirstCategory()
const firstCategory: any = await fetchFirstCategory()
for (let item of firstCategory) {
let categoryDetail: any = await fetchCategoryById(item.id)
for (const item of firstCategory) {
const categoryDetail: any = await fetchCategoryById(item.id)
let floorLineConfigItem = {}
floorLineKeys.push(String(initIndex + 1))
let FloorLine = {
const FloorLine = {
[String(initIndex + 1)]: {
"componentName": "ShopFloorLine",
"props": {
......@@ -166,7 +177,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
}
}
let Category = {
const Category = {
[String(initIndex + 2)]: {
"componentName": "ShopFloorLine.Category",
"props": {
......@@ -177,7 +188,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
},
}
let Goods = {
const Goods = {
[String(initIndex + 3)]: {
"componentName": "ShopFloorLine.Goods",
"props": {
......@@ -194,7 +205,7 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
}
mallLayoutConfig["0"].childNodes = [...mallLayoutConfig["0"].childNodes, ...floorLineKeys, serviceAdvertConfig.key, FooterConfig.key]
let config = {
const config = {
...mallLayoutConfig,
...topBarConfig,
...topAdvertConfig,
......@@ -227,4 +238,4 @@ const ShopEdit: React.FC<ShopEditPropsType> = (props) => {
) : <Loading />
}
export default ShopEdit
\ No newline at end of file
export default ShopEdit
src/pages/lxMall/purchaseOnline/index.tsx
View file @ 05ffc693
......@@ -64,7 +64,6 @@ const PurchaseOnline: React.FC<PurchaseOnlinePropsType> = (props) => {
}
setLoading(true)
//@ts-ignore
PublicApi.getOrderRequisitionFormOnlineShoppingList(param).then(res => {
setLoading(false)
if (res.code === 1000) {
......
src/pages/lxMall/purchaseOnline/list.tsx
View file @ 05ffc693
......@@ -19,7 +19,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
const showRequisitionFormAddress = (list: any) => {
if (list) {
let result = list.map(item => `${item.province}/${item.city}`).join('、')
const result = list.map(item => `${item.province}/${item.city}`).join('、')
return result
}
return ""
......
src/pages/lxMall/shop/index.tsx
View file @ 05ffc693
import React, { useEffect, useMemo, useState } from 'react'
import Information from '../components/Information'
import FloorAnchor from '../components/FloorAnchor'
import CommonTitle from '../components/CommonTitle'
import FloorSkeleton from '../components/FloorSkeleton'
......@@ -41,12 +40,13 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
}, [shopInfo])
const findFirstAdvertsByType = () => {
let params = {
const params: any = {
templateId: shopInfo.templateId,
type: 1,
memberId
memberId,
roleId: shopInfo.roleId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
setFirstAdvertList(res.data)
......@@ -55,12 +55,12 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
}
const findSecondAdvertsByType = () => {
let params = {
const params: any = {
templateId: shopInfo.templateId,
type: 2,
memberId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
setSecondAdvertList(res.data)
......@@ -73,8 +73,11 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
*/
const fetchFirstCategory = () => {
return new Promise((resolve) => {
//@ts-ignore
PublicApi.getTemplateShopFindAllFirstCategory({ memberId }).then(res => {
const param: any = {
memberId,
roleId: shopInfo.roleId
}
PublicApi.getTemplateShopFindAllFirstCategory(param).then(res => {
if (res.code === 1000) {
setCategoryList(res.data)
resolve(res.data)
......@@ -88,13 +91,13 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
*/
const fetchCategoryById = (categoryId) => {
return new Promise((resolve) => {
let param = {
const param: any = {
templateId: shopInfo.templateId,
categoryId,
memberId
memberId,
roleId: shopInfo.roleId
}
// @ts-ignore
PublicApi.getTemplateShopFindFirstCategoryDetail(param).then(res => {
if(res.code === 1000) {
resolve(res.data)
......@@ -104,11 +107,11 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
}
const getCategoryComponents = async () => {
let result = []
let firstCategory: any = await fetchFirstCategory()
const result = []
const firstCategory: any = await fetchFirstCategory()
if (firstCategory && firstCategory.length > 0) {
for (let item of firstCategory) {
let categoryDetail: any = await fetchCategoryById(item.id)
for (const item of firstCategory) {
const categoryDetail: any = await fetchCategoryById(item.id)
result.push(
<ShopFloorLine
anchor={`floorline_${item.id}`}
......@@ -126,8 +129,6 @@ const ShopIndex: React.FC<ChannelIndexPropsType> = (props) => {
)
}
setCategoryComponents(result)
} else {
}
setLoading(false)
}
......
src/pages/preview/shopPreview/index.tsx
View file @ 05ffc693
......@@ -9,6 +9,7 @@ import { menuData } from './defaultMenu'
import Loading from '../../editor/components/Loading'
import { PublicApi } from '@/services/api'
import { GlobalConfig } from '@/global/config'
import { getAuth } from '@/utils/auth'
import styles from './index.less'
interface ShopPreviewPropsType {
......@@ -26,13 +27,14 @@ interface ShopPreviewPropsType {
}
}
let TemplateList = ['science']
const TemplateList: string[] = ['science']
const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
const { query: { id, template } } = props.location
const [loading, setLoading] = useState<boolean>(true)
const [theme, setTheme] = useState<string>('theme-shop-science')
const [componentConfigs, setComponentConfigs] = useState({})
const { memberId, memberRoleId} = getAuth() || {}
useEffect(() => {
if (!TemplateList.includes(template)) {
......@@ -45,11 +47,13 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
const findFirstAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 1
type: 1,
memberId,
roleId: memberRoleId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -62,11 +66,13 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
const findSecondAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 2
type: 2,
memberId,
roleId: memberRoleId
}
//@ts-ignore
PublicApi.getTemplateShopFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -82,8 +88,11 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
*/
const fetchFirstCategory = () => {
return new Promise((resolve) => {
console.log(111)
PublicApi.getTemplateShopFindAllFirstCategory().then(res => {
const param: any = {
memberId,
roleId: memberRoleId
}
PublicApi.getTemplateShopFindAllFirstCategory(param).then(res => {
if (res.code === 1000) {
resolve(res.data)
} else {
......@@ -100,12 +109,13 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
*/
const fetchCategoryById = (categoryId) => {
return new Promise((resolve) => {
let param = {
const param: any = {
templateId: id,
categoryId
categoryId,
memberId,
roleId: memberRoleId
}
// @ts-ignore
PublicApi.getTemplateShopFindFirstCategoryDetail(param).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -143,24 +153,24 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
const shopInfo = await fetchShopInfo()
headerConfig[headerConfig.key].props.shopInfo = shopInfo
const shopList = GlobalConfig.web.shopInfo
let webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
const webMallInfo = shopList.filter(item => item.environment === 1 && item.type === 1)[0]
headerConfig[headerConfig.key].props.logoUrl = webMallInfo.logoUrl
topBarConfig[topBarConfig.key].props.shopname = webMallInfo.name
AboutUsConfig[AboutUsConfig.key].props.shopInfo = shopInfo
let initIndex = 100
let floorLineConfig: any = {}
let floorLineKeys: any = []
const floorLineKeys: any = []
let firstCategory: any = await fetchFirstCategory()
const firstCategory: any = await fetchFirstCategory()
for (let item of firstCategory) {
let categoryDetail: any = await fetchCategoryById(item.id)
for (const item of firstCategory) {
const categoryDetail: any = await fetchCategoryById(item.id)
let floorLineConfigItem = {}
floorLineKeys.push(String(initIndex + 1))
let FloorLine = {
const FloorLine = {
[String(initIndex + 1)]: {
"componentName": "ShopFloorLine",
"props": {
......@@ -170,7 +180,7 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
}
}
let Category = {
const Category = {
[String(initIndex + 2)]: {
"componentName": "ShopFloorLine.Category",
"props": {
......@@ -181,7 +191,7 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
},
}
let Goods = {
const Goods = {
[String(initIndex + 3)]: {
"componentName": "ShopFloorLine.Goods",
"props": {
......@@ -198,7 +208,7 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
}
mallLayoutConfig["0"].childNodes = [...mallLayoutConfig["0"].childNodes, ...floorLineKeys, serviceAdvertConfig.key, FooterConfig.key]
let config = {
const config = {
...mallLayoutConfig,
...topBarConfig,
...topAdvertConfig,
......@@ -230,4 +240,4 @@ const ShopPreview: React.FC<ShopPreviewPropsType> = (props) => {
) : <Loading />
}
export default ShopPreview
\ No newline at end of file
export default ShopPreview
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