Skip to content

J
jinfa-platform
Commit 7cfc6c1f authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

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

parents db303938 a5fc35ff
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 109 deletions
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @ 7cfc6c1f
......@@ -339,7 +339,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
},
proofFileList: proofFileList.filter(item => item.status === 'done').map(item => ({
fileName: item.name,
filePath: item.data,
filePath: item.data.url,
})),
replaceGoodsList: replaceGoodsList.map(({
id,
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @ 7cfc6c1f
......@@ -193,7 +193,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
repairAddress: repairAddress ? JSON.stringify(repairAddress) : '',
faultFileList: faultFileList.filter(item => item.status === 'done').map(item => ({
fileName: item.name,
filePath: item.data,
filePath: item.data.url,
})),
repairGoodsList: repairGoodsList.map(({
id,
......
src/pages/editor/channelEdit/index.tsx
View file @ 7cfc6c1f
......@@ -26,7 +26,7 @@ interface ChannelPreviewPropsType {
}
}
let TemplateList = ['science']
const TemplateList = ['science']
const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
const { query: { id, template } } = props.location
......@@ -45,11 +45,11 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
const findFirstAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 1
}
//@ts-ignore
PublicApi.getTemplateChannelFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -62,11 +62,11 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
const findSecondAdvertsByType = () => {
return new Promise((resolve) => {
let params = {
const params: any = {
templateId: id,
type: 2
}
//@ts-ignore
PublicApi.getTemplateChannelFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
......@@ -95,12 +95,11 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
*/
const fetchCategoryById = (categoryId) => {
return new Promise((resolve) => {
let param = {
const param: any = {
templateId: id,
categoryId
}
// @ts-ignore
PublicApi.getTemplateChannelFindFirstCategoryDetail(param).then(res => {
resolve(res.data)
})
......@@ -126,13 +125,15 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
*/
const fetchLeadNews = () => {
return new Promise((resolve) => {
//@ts-ignore
PublicApi.getManageContentInformationFindAllByRecommendLabel({ recommendLabel: 1 }).then(res => {
const param: any = {
recommendLabel: 1
}
PublicApi.getManageContentInformationFindAllByRecommendLabel(param).then(res => {
if (res.code === 1000) {
let leadNewsList: any = res.data || []
const leadNewsList: any = res.data || []
if (leadNewsList.length >= 2) {
let leftList = leadNewsList.slice(0, Math.round(leadNewsList.length / 2))
let rightList = leadNewsList.slice(Math.round(leadNewsList.length / 2), leadNewsList.length)
const leftList = leadNewsList.slice(0, Math.round(leadNewsList.length / 2))
const rightList = leadNewsList.slice(Math.round(leadNewsList.length / 2), leadNewsList.length)
resolve({
leadLeftNews: leftList,
leadRightNews: rightList
......@@ -157,10 +158,10 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
PublicApi.getManageContentColumnAll().then(res => {
if (res.code === 1000) {
let result = ""
let allColumn = res.data
const allColumn = res.data
if (allColumn && allColumn.length > 0) {
let labelList = allColumn.map((item: any) => item.name)
let showCount = 4
const showCount = 4
if (labelList.length <= showCount) {
result = labelList.join(' | ')
} else {
......@@ -185,8 +186,8 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
// 二号位广告
serviceAdvertConfig[serviceAdvertConfig.key].props.advertList = await findSecondAdvertsByType()
//店铺信息
//店铺信息
const channelInfo: any = await fetchShopInfo()
AboutUsConfig[AboutUsConfig.key].props.shopInfo = channelInfo
......@@ -199,17 +200,17 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
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": {
......@@ -219,7 +220,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
}
}
let Category = {
const Category = {
[String(initIndex + 2)]: {
"componentName": "ShopFloorLine.Category",
"props": {
......@@ -231,7 +232,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
},
}
let Goods = {
const Goods = {
[String(initIndex + 3)]: {
"componentName": "ShopFloorLine.Goods",
"props": {
......@@ -249,7 +250,7 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
mallLayoutConfig["0"].childNodes = [...mallLayoutConfig["0"].childNodes, ...floorLineKeys, serviceAdvertConfig.key, CommonTitle2Config.key, AboutUsConfig.key, InformationConfig.key, FooterConfig.key]
let config = {
const config = {
...mallLayoutConfig,
...topBarConfig,
...topAdvertConfig,
......@@ -284,4 +285,4 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
) : <Loading />
}
export default ChannelPreview
\ No newline at end of file
export default ChannelPreview
src/pages/editor/shopEdit/index.tsx
View file @ 7cfc6c1f
......@@ -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/commodityDetail/components/ProductDescription/components/Introduction/index.tsx
View file @ 7cfc6c1f
......@@ -25,7 +25,7 @@ const Introduction: React.FC<IntroductionPropsType> = (props) => {
}, [commodityTemplateInfo])
const renderIntroduction = () => {
let templateName = commodityTemplateInfo.fileName || 'science'
const templateName = commodityTemplateInfo ? commodityTemplateInfo.fileName || 'science' : 'science'
switch (templateName) {
case 'science':
return <ScienceTemplate {...commodityDetail?.commodityRemark} />
......
src/pages/lxMall/purchaseOnline/index.tsx
View file @ 7cfc6c1f
......@@ -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 @ 7cfc6c1f
......@@ -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 @ 7cfc6c1f
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/member/memberLevel/components/DetailInfo/index.less
View file @ 7cfc6c1f
......@@ -112,7 +112,7 @@
&-main {
position: relative;
width: 128px;
width: 328px;
height: 38px;
padding-bottom: 8px;
......
src/pages/payandSettle/creditApplication/components/QuotaApplicationInfo/index.tsx
View file @ 7cfc6c1f
......@@ -80,7 +80,16 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
applyQuota: +applyQuota,
billDay: +billDay,
repayPeriod: +repayPeriod,
fileList: fileList.filter(item => item.status === 'done'),
fileList:
fileList
.filter(item => item.status === 'done')
.map(item => {
const { data, ...rest } = item;
return {
data: data.url,
...rest,
}
}),
...rest,
});
setModalVisible(false);
......
src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/index.tsx
View file @ 7cfc6c1f
......@@ -274,7 +274,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
...repaymentValues,
payProveList: payProveList.map(item => ({
name: item.name,
proveUrl: item.data,
proveUrl: item.data.url,
})),
}).then(res => {
if (res.code === 1000) {
......
src/pages/payandSettle/creditApplication/quotaMenage/index.tsx
View file @ 7cfc6c1f
......@@ -142,7 +142,10 @@ const QuotaMenage: React.FC = () => {
record.quota === 0 &&
record.status === CREDIT_STATUS_NOT_APPLIED
) ||
!!record.isCanApply
(
!!record.isCanApply &&
record.status === CREDIT_STATUS_NORMAL
)
) && (
<Button
type="link"
......
src/pages/preview/shopPreview/index.tsx
View file @ 7cfc6c1f
......@@ -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
src/pages/transaction/purchaserEvaluation/received/detail/index.tsx
View file @ 7cfc6c1f
......@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api';
import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
import { normalizeFiledata, isJSONStr } from '@/utils';
import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm';
import { normalizeUnevaluatedList } from '../../utils';
......@@ -35,7 +35,7 @@ interface Unevaluated {
};
star: number;
comment: string;
picture: string[];
picture: FileData[];
smile: number;
};
......
src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx
View file @ 7cfc6c1f
......@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => {
dealCount: good.purchaseCount,
price: good.price,
totalPrice: orderInfo.sumPrice,
pics: picture.map(item => item.status === 'done' && item.data).filter(Boolean),
pics: picture.map(item => item.status === 'done' && item.data.url).filter(Boolean),
};
});
......
src/pages/transaction/supplierEvaluation/received/detail/index.tsx
View file @ 7cfc6c1f
......@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api';
import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
import { normalizeFiledata, isJSONStr } from '@/utils';
import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm';
import { normalizeUnevaluatedList } from '../../utils';
......@@ -35,7 +35,7 @@ interface Unevaluated {
};
star: number;
comment: string;
picture: string[];
picture: FileData[];
smile: number;
};
......
src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx
View file @ 7cfc6c1f
......@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => {
dealCount: good.purchaseCount,
price: good.price,
totalPrice: orderInfo.sumPrice,
pics: picture.map(item => item.status === 'done' && item.data).filter(Boolean),
pics: picture.map(item => item.status === 'done' && item.data.url).filter(Boolean),
};
});
......
src/store/site/index.ts
View file @ 7cfc6c1f
......@@ -24,8 +24,11 @@ class SiteStore implements ISiteModule {
this.mallTemplateId = this.mallTemplateInfo.id
return
}
//@ts-ignore
const res = await PublicApi.getTemplatePlatformFindUseTemplateBySite({ siteId: this.siteId })
const param: any = {
siteId: this.siteId
}
const res = await PublicApi.getTemplatePlatformFindUseTemplateBySite(param)
runInAction(() => {
this.mallTemplateInfo = res.data || {}
this.mallTemplateId = this.mallTemplateInfo.id
......@@ -43,11 +46,15 @@ class SiteStore implements ISiteModule {
this.commodityTemplateInfo = JSON.parse(tempCommodityTemplateInfo)
return
}
//@ts-ignore
const res = await PublicApi.getTemplateGoodsFindUseGoodsTemplate({ siteId: this.siteId })
const param: any = {
siteId: this.siteId
}
const res = await PublicApi.getTemplateGoodsFindUseGoodsTemplate(param)
runInAction(() => {
this.commodityTemplateInfo = res.data
sessionStorage.setItem("commodityTemplateInfo", JSON.stringify(this.commodityTemplateInfo))
if(res.code === 1000) {
this.commodityTemplateInfo = res.data
sessionStorage.setItem("commodityTemplateInfo", JSON.stringify(this.commodityTemplateInfo))
}
})
}
}
......
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