Skip to content

J
jinfa-platform
Commit 44e2ec5b authored by GuanHua's avatar GuanHua
Browse files
Options

Merge branch 'test' into dev

parents 05888a15 69c25960
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 196 deletions
config/channelRoutes/index.ts
View file @ 44e2ec5b
import BASE_CONFIG from '../base.config.json'
import { MALL_ROUTE_USE_CONFIG } from '../config'
const shopInfo = BASE_CONFIG.web.shopInfo
let webChannelInfo = shopInfo.filter(item => item.environment === 1 && item.type === 3)[0] // 渠道商城
let webChannelPointInfo = shopInfo.filter(item => item.environment === 1 && item.type === 5)[0] // 渠道积分商城
const defaultChannelRoute = '/channelmall' // 默认渠道商城根路径
const defaultIChannelPointRoute = '/pointsMall' // 默认渠道积分商城路径
const rootRoute = MALL_ROUTE_USE_CONFIG ? webChannelInfo.url || defaultChannelRoute : defaultChannelRoute
const pointMallRoute = MALL_ROUTE_USE_CONFIG ? webChannelPointInfo.url || defaultIChannelPointRoute : defaultIChannelPointRoute
const ChannelRoute = {
path: '/channelmall',
path: rootRoute,
component: '@/pages/lxMall/layouts/LXChannelLayout',
routes: [
{
// 店铺（渠道商城）
path: `/channelmall`,
path: rootRoute,
name: 'shopHome',
key: 'shopHome',
component: '@/pages/lxMall/channel',
},
{
// 商品商城
path: `/channelmall/commodity`,
path: `${rootRoute}/commodity`,
name: 'shopCommodity',
key: 'shopCommodity',
component: '@/pages/lxMall/commodity',
},
{
// 商品详情
path: `/channelmall/commodity/detail`,
path: `${rootRoute}/commodity/detail`,
name: 'channelCommodityDetail',
key: 'channelCommodityDetail',
hide: true,
......@@ -28,7 +39,7 @@ const ChannelRoute = {
},
{
// 商品搜索
path: `/channelmall/commodity/search`,
path: `${rootRoute}/commodity/search`,
name: 'channelmallCommoditySearch',
key: 'channelmallCommoditySearch',
hide: true,
......@@ -36,21 +47,21 @@ const ChannelRoute = {
},
{
// 积分商城
path: `/channelmall/pointsMall`,
path: `${rootRoute}${pointMallRoute}`,
name: 'shopPointsMall',
key: 'channelmallPointsMall',
component: '@/pages/lxMall/pointsMall',
},
{
// 资讯
path: `/channelmall/infomation`,
path: `${rootRoute}/infomation`,
name: 'shopInfomation',
key: 'channelmallInfomation',
component: '@/pages/lxMall/information',
},
{
// 资讯详情
path: '/channelmall/infomation/detail',
path: `${rootRoute}/infomation/detail`,
name: 'infomationDetail',
key: 'infomationDetail',
hide: true,
......@@ -58,7 +69,7 @@ const ChannelRoute = {
},
{
// 资讯详情搜索
path: '/channelmall/infomation/search',
path: `${rootRoute}/infomation/search`,
name: 'infomationSearch',
key: 'infomationSearch',
hide: true,
......@@ -66,14 +77,14 @@ const ChannelRoute = {
},
{
// 关于我们
path: `/channelmall/about`,
path: `${rootRoute}/about`,
name: 'shopAbout',
key: 'channelmallAbout',
component: '@/pages/lxMall/shopAbout',
},
{
// 进货单
path: '/channelmall/purchaseOrder',
path: `${rootRoute}/purchaseOrder`,
name: 'purchaseOrder',
key: 'purchaseOrder',
hide: true,
......@@ -82,7 +93,7 @@ const ChannelRoute = {
},
{
// 渠道订单
path: `/channelmall/order`,
path: `${rootRoute}/order`,
name: 'order',
key: 'order',
hide: true,
......
config/config.ts
View file @ 44e2ec5b
......@@ -3,7 +3,9 @@ import routes from './router'
import proxy from './proxy'
import theme from './lingxi.theme.config'
export const MALL_ROUTE_USE_CONFIG = process.env.USE_ROUTE_CONFIG || true // 是否使用pass平台配置的商城子域名
const OPEN_THEME_BUILD = process.env.NODE_ENV === 'production' ? true : false // 是否开启动态主题
const config: any = {
// 如需写入环境变量 需在config中先写入
define: {
......@@ -23,7 +25,7 @@ const config: any = {
},
routes,
extraBabelPlugins: [
['import', {
['import', {
libraryName: 'bizcharts',
camel2DashComponentName: false,
customName: require('path').resolve(__dirname, './utils/customBitchartsName.js')
......
config/mallRoutes/index.ts
View file @ 44e2ec5b
import shopRoute from '../shopRoutes'
import channelRoute from '../channelRoutes'
import ichannelRoute from '../selfchannelRoutes'
import { MALL_ROUTE_USE_CONFIG } from '../config'
import BASE_CONFIG from '../base.config.json'
const shopInfo = BASE_CONFIG.web.shopInfo
// let webMallInfo = shopInfo.filter(item => item.environment === 1 && item.type === 1)[0] // 企业商城
let webPointMallInfo = shopInfo.filter(item => item.environment === 1 && item.type === 2)[0] // 积分商城
const defaultPointMallRoute = '/pointsMall' // 积分商城默认路径
const pointMallRoute = MALL_ROUTE_USE_CONFIG ? webPointMallInfo.url || defaultPointMallRoute : defaultPointMallRoute
const mallRoute = {
path: '/',
......@@ -69,7 +81,7 @@ const mallRoute = {
},
{
// 积分商城
path: `/pointsMall`,
path: pointMallRoute,
name: 'pointsMall',
key: 'pointsMall',
component: '@/pages/lxMall/pointsMall',
......@@ -107,4 +119,9 @@ const mallRoute = {
],
}
export default mallRoute
\ No newline at end of file
export default [
shopRoute,
channelRoute,
ichannelRoute,
mallRoute
]
config/router.ts
View file @ 44e2ec5b
import memberCenterRoute from './routes'
import mallRoute from './mallRoutes'
import shopRoute from './shopRoutes'
import channelRoute from './channelRoutes'
import ichannelRoute from './selfchannelRoutes'
/**
* @description 路由配置页, 更多配置可查看 https://umijs.org/zh-CN/docs/routing#routes
......@@ -57,10 +54,7 @@ const router = [
component: '@/pages/preview/shopPreview',
},
memberCenterRoute,
shopRoute,
channelRoute,
ichannelRoute,
mallRoute,
...mallRoute,
{
component: '@/pages/404',
},
......@@ -68,9 +62,4 @@ const router = [
}
]
export const asyncRouterLists = {
memberCenterRoute,
shopRoute
}
export default router
\ No newline at end of file
config/selfchannelRoutes/index.ts
View file @ 44e2ec5b
import BASE_CONFIG from '../base.config.json'
import { MALL_ROUTE_USE_CONFIG } from '../config'
const shopInfo = BASE_CONFIG.web.shopInfo
let webIChannelInfo = shopInfo.filter(item => item.environment === 1 && item.type === 4)[0] // 渠道自有商城
let webChannelPointInfo = shopInfo.filter(item => item.environment === 1 && item.type === 5)[0] // 渠道积分商城
const defaultIChannelRoute = '/ichannelmall' // 默认渠道商城根路径
const defaultIChannelPointRoute = '/pointsMall' // 默认渠道积分商城路径
const rootRoute = MALL_ROUTE_USE_CONFIG ? webIChannelInfo.url || defaultIChannelRoute : defaultIChannelRoute
const pointMallRoute = MALL_ROUTE_USE_CONFIG ? webChannelPointInfo.url || defaultIChannelPointRoute : defaultIChannelPointRoute
const selfChannelRoute = {
path: '/ichannelmall',
path: rootRoute,
component: '@/pages/lxMall/layouts/LXIChannelLayout',
routes: [
{
// 店铺（渠道商城）
path: `/ichannelmall`,
path: rootRoute,
name: 'shopHome',
key: 'shopHome',
component: '@/pages/lxMall/channel',
},
{
// 商品商城
path: `/ichannelmall/commodity`,
path: `${rootRoute}/commodity`,
name: 'shopCommodity',
key: 'shopCommodity',
component: '@/pages/lxMall/commodity',
},
{
// 商品详情
path: `/ichannelmall/commodity/detail`,
path: `${rootRoute}/commodity/detail`,
name: 'channelCommodityDetail',
key: 'channelCommodityDetail',
hide: true,
......@@ -28,7 +38,7 @@ const selfChannelRoute = {
},
{
// 商品搜索
path: `/ichannelmall/commodity/search`,
path: `${rootRoute}/commodity/search`,
name: 'channelmallCommoditySearch',
key: 'channelmallCommoditySearch',
hide: true,
......@@ -36,21 +46,21 @@ const selfChannelRoute = {
},
{
// 积分商城
path: `/ichannelmall/pointsMall`,
path: `${rootRoute}${pointMallRoute}`,
name: 'shopPointsMall',
key: 'channelmallPointsMall',
component: '@/pages/lxMall/pointsMall',
},
{
// 资讯
path: `/ichannelmall/infomation`,
path: `${rootRoute}/infomation`,
name: 'shopInfomation',
key: 'channelmallInfomation',
component: '@/pages/lxMall/information',
},
{
// 资讯详情
path: '/ichannelmall/infomation/detail',
path: `${rootRoute}/infomation/detail`,
name: 'infomationDetail',
key: 'infomationDetail',
hide: true,
......@@ -58,7 +68,7 @@ const selfChannelRoute = {
},
{
// 资讯详情搜索
path: '/ichannelmall/infomation/search',
path: `${rootRoute}/infomation/search`,
name: 'infomationSearch',
key: 'infomationSearch',
hide: true,
......@@ -66,14 +76,14 @@ const selfChannelRoute = {
},
{
// 关于我们
path: `/ichannelmall/about`,
path: `${rootRoute}/about`,
name: 'shopAbout',
key: 'channelmallAbout',
component: '@/pages/lxMall/shopAbout',
},
{
// 进货单
path: '/ichannelmall/purchaseOrder',
path: `${rootRoute}/purchaseOrder`,
name: 'purchaseOrder',
key: 'purchaseOrder',
hide: true,
......@@ -82,7 +92,7 @@ const selfChannelRoute = {
},
{
// 渠道订单
path: `/ichannelmall/order`,
path: `${rootRoute}/order`,
name: 'order',
key: 'order',
hide: true,
......
package.json
View file @ 44e2ec5b
......@@ -18,9 +18,9 @@
"prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
"test": "umi-test",
"test:coverage": "umi-test --coverage",
"start:cross": "cross-env SITE_ID=352 yarn start",
"start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com yarn start",
"start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 yarn start"
"start:cross": "cross-env SITE_ID=352 USE_ROUTE_CONFIG=true yarn start",
"start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=true yarn start",
"start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=true yarn start"
},
"lint-staged": {
"*.{js,jsx,less,md,json}": [
......
src/app.tsx
View file @ 44e2ec5b
......@@ -14,6 +14,7 @@ import { getRouters, getAuth, asyncRouter, setAuth, setRouters, removeAuth, remo
import { PublicApi } from './services/api';
// 全局注册虚拟组件
import '@/components/NiceForm/public'
import { GlobalConfig } from '@/global/config'
setup()
......@@ -49,28 +50,28 @@ const mallLists = [
'/shop/infomation/search',
'/shop/infomation/detail',
'/shop/about',
'/channelmall',
'/channelmall/commodity',
'/channelmall/commodity/search',
'/channelmall/commodity/detail',
'/channelmall/pointsMall',
'/channelmall/infomation',
'/channelmall/infomation/detail',
'/channelmall/infomation/search',
'/channelmall/about',
'/channelmall/purchaseOrder',
'/channelmall/order',
'/ichannelmall',
'/ichannelmall/commodity',
'/ichannelmall/commodity/search',
'/ichannelmall/commodity/detail',
'/ichannelmall/pointsMall',
'/ichannelmall/infomation',
'/ichannelmall/infomation/detail',
'/ichannelmall/infomation/search',
'/ichannelmall/about',
'/ichannelmall/purchaseOrder',
'/ichannelmall/order',
`${GlobalConfig.channelRootRoute}`,
`${GlobalConfig.channelRootRoute}/commodity`,
`${GlobalConfig.channelRootRoute}/commodity/search`,
`${GlobalConfig.channelRootRoute}/commodity/detail`,
`${GlobalConfig.channelRootRoute}/pointsMall`,
`${GlobalConfig.channelRootRoute}/infomation`,
`${GlobalConfig.channelRootRoute}/infomation/detail`,
`${GlobalConfig.channelRootRoute}/infomation/search`,
`${GlobalConfig.channelRootRoute}/about`,
`${GlobalConfig.channelRootRoute}/purchaseOrder`,
`${GlobalConfig.channelRootRoute}/order`,
`${GlobalConfig.ichannelRootRoute}`,
`${GlobalConfig.ichannelRootRoute}/commodity`,
`${GlobalConfig.ichannelRootRoute}/commodity/search`,
`${GlobalConfig.ichannelRootRoute}/commodity/detail`,
`${GlobalConfig.ichannelRootRoute}/pointsMall`,
`${GlobalConfig.ichannelRootRoute}/infomation`,
`${GlobalConfig.ichannelRootRoute}/infomation/detail`,
`${GlobalConfig.ichannelRootRoute}/infomation/search`,
`${GlobalConfig.ichannelRootRoute}/about`,
`${GlobalConfig.ichannelRootRoute}/purchaseOrder`,
`${GlobalConfig.ichannelRootRoute}/order`,
]
// let routeAuthUrls: any[] = []
......
src/global/config/index.ts
View file @ 44e2ec5b
......@@ -8,5 +8,18 @@
import SELF_CONFIG from '../../../config/base.config.json'
import { RootObject } from './global'
const MALL_ROUTE_USE_CONFIG = process.env.USE_ROUTE_CONFIG || true
let webChannelInfo = SELF_CONFIG.web.shopInfo.filter(item => item.environment === 1 && item.type === 3)[0] // 渠道商城
let webIChannelInfo = SELF_CONFIG.web.shopInfo.filter(item => item.environment === 1 && item.type === 4)[0] // 渠道自有商城
const defaultChannelRoute = '/channelmall' // 默认渠道商城根路径
const defaultIChannelRoute = '/ichannelmall' // 默认渠道自有商城根路径
const channelRootRoute = MALL_ROUTE_USE_CONFIG ? webChannelInfo.url || defaultChannelRoute : defaultChannelRoute
const ichannelRootRoute = MALL_ROUTE_USE_CONFIG ? webIChannelInfo.url || defaultIChannelRoute : defaultIChannelRoute
SELF_CONFIG.channelRootRoute = channelRootRoute // 渠道商城路由根路径
SELF_CONFIG.ichannelRootRoute = ichannelRootRoute // 渠道自有商城路由根路径
export const GlobalConfig: RootObject = SELF_CONFIG
src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/outerLog/index.tsx deleted 100644 → 0
View file @ 05888a15
import React from 'react'
import { Table } from 'antd'
interface outerLogPropsType {
dataSource: []
}
const outerLog: React.FC<outerLogPropsType> = (props) => {
const { dataSource } = props
const columns = [
{
title: '序号',
dataIndex: 'step',
ellipsis: true,
},
{
title: '操作角色',
dataIndex: 'roleName',
ellipsis: true,
},
{
title: '状态',
dataIndex: 'status',
ellipsis: true,
},
{
title: '操作',
dataIndex: 'operate',
ellipsis: true,
},
{
title: '操作时间',
dataIndex: 'operateTime',
ellipsis: true,
},
{
title: '审核意见',
dataIndex: 'opinion',
ellipsis: true,
},
]
return (
<div>
<Table
className="common_tb"
dataSource={dataSource}
rowClassName={(_, index) => (index === 0 || (index % 2) === 0) && "tb_bg"}
columns={columns}
/>
</div>
)
}
export default outerLog
src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/innerLog/index.tsx → src/pages/afterService/exchangeGoods/waitSubmitOrderList/components/taskLog/index.tsx
View file @ 44e2ec5b
......@@ -3,11 +3,11 @@ import { Table } from 'antd'
import styles from '../../../../common/styles.less'
interface innerLogPropsType {
interface TaskLogPropsType {
dataSource: []
}
const innerLog: React.FC<innerLogPropsType> = (props) => {
const TaskLog: React.FC<TaskLogPropsType> = (props) => {
const { dataSource } = props
const columns = [
......@@ -66,4 +66,4 @@ const innerLog: React.FC<innerLogPropsType> = (props) => {
)
}
export default innerLog
export default TaskLog
src/pages/afterService/exchangeGoods/waitSubmitOrderList/detail.tsx
View file @ 44e2ec5b
......@@ -9,8 +9,7 @@ import ExchangeGoods from './components/exchangeGoods'
import ProofFile from './components/proofFile'
import ReplaceAddress from './components/replaceAddress'
import ReturnAddress from './components/returnAddress'
import OuterLog from './components/outerLog'
import InnerLog from './components/innerLog'
import TaskLog from './components/taskLog'
import styles from './detail.less'
interface OrderDetailProps {
......@@ -25,7 +24,7 @@ const OrderDetail: React.FC<OrderDetailProps> = (props) => {
const [form] = Form.useForm()
const [type, setType] = useState<'add' | 'edit' | 'detail'>()
const [btnLoading, setBtnLoading] = useState<boolean>(false)
const [tabActiveKey, setTabActiveKey] = useState<string>('outerLog')
const [tabActiveKey, setTabActiveKey] = useState<string>('basicInfo')
const [replaceApplyInfo, setReplaceApplyInfo] = useState<any>({})
useEffect(() => {
......@@ -106,11 +105,8 @@ const OrderDetail: React.FC<OrderDetailProps> = (props) => {
<TabPane tab="换货收货地址" key="replaceAddress">
<ReplaceAddress />
</TabPane>
<TabPane tab="外部单据流转记录" key="outerLog">
<OuterLog dataSource={[]} />
</TabPane>
<TabPane tab="内部单据流转记录" key="innerLog">
<InnerLog dataSource={[]} />
<TabPane tab="流转记录" key="taskLog">
<TaskLog dataSource={[]} />
</TabPane>
</Tabs>
</Form>
......
src/pages/lxMall/commodity/list.less
View file @ 44e2ec5b
......@@ -189,6 +189,16 @@
font-weight: 400;
}
}
.inquiry_price {
color: #FFF;
background-color: var(--mall_main_color);
font-size: 14px;
height: 18px;
line-height: 14px;
padding: 2px 8px;
display: inline-block;
}
}
}
\ No newline at end of file
src/pages/lxMall/commodity/list.tsx
View file @ 44e2ec5b
......@@ -29,7 +29,7 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
// 价格需要询价
case 2:
return (
<div className={styles.goods_price}>
<div className={styles.inquiry_price}>
<label>在线询价</label>
</div>
)
......@@ -107,7 +107,19 @@ const CommodityList: React.FC<CommodityListPropsType> = (props) => {
<div className={styles.info_box}>
<div className={styles.info_box_content}>
<div className={styles.name}>{item.name}</div>
<div className={styles.price}><span>￥</span>{priceFormat(item.min)}</div>
<div className={styles.price}>
{
item.priceType === 1 ? (
<>
<span>￥</span>{priceFormat(item.min)}
</>
) : (
<div className={styles.inquiry_price}>
<label>在线询价</label>
</div>
)
}
</div>
<div className={styles.count}>已售: {numFormat(item.sold) || 0} {item.unitName}</div>
</div>
<ul className={styles.tags_list}>
......
src/pages/lxMall/components/FindMore/components/shoppingNews/index.tsx
View file @ 44e2ec5b
import React from 'react'
import React, { useEffect, useState, useRef } from 'react'
import { LeftOutlined, RightOutlined } from '@ant-design/icons'
import cx from 'classnames'
import { Link } from 'umi'
import { Carousel } from 'antd'
import { arrayGroupsByCount } from '@/utils'
import { PublicApi } from '@/services/api'
import moment from 'moment'
import styles from '../../index.less'
const buy_dynamic_list = [
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
]
interface ShoppingNewsPropsType {
const ShoppingNews: React.FC = () => {
const [list, setList] = useState<any>([])
const actionRef = useRef<any>()
}
const ShoppingNews: React.FC<ShoppingNewsPropsType> = (props) => {
useEffect(() => {
fetchData()
}, [])
const buy_dynamic_list = [
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 0,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
{
title: '黑色头层牛皮自然摔纹',
state: 1,
content: '2000平方英尺',
date: '09/09 09:00'
},
]
const fetchData = () => {
PublicApi.getOrderRequisitionFormShoppingNews().then(res => {
if (res.code === 1000) {
setList(arrayGroupsByCount(res.data, 6))
}
})
}
return (
<div className={styles.popular_buy_dynamic}>
......@@ -55,26 +69,34 @@ const ShoppingNews: React.FC<ShoppingNewsPropsType> = (props) => {
<label className={styles.blue}>求购动态</label>
<span>买家求购，卖家快速报价</span>
<div className={styles.find_more_title_page}>
<div className={cx(styles.page_item, styles.prev)}><LeftOutlined /></div>
<div className={cx(styles.page_item, styles.next)}><RightOutlined /></div>
<div className={cx(styles.page_item, styles.prev)} onClick={() => actionRef.current.prev()}><LeftOutlined /></div>
<div className={cx(styles.page_item, styles.next)} onClick={() => actionRef.current.next()}><RightOutlined /></div>
</div>
</div>
<div className={styles.popular_buy_dynamic_list}>
<Carousel ref={actionRef} autoplaySpeed={5000} autoplay dots={false}>
{
buy_dynamic_list.map((item, index) => (
<div className={styles.popular_buy_dynamic_list_item} key={`popular_buy_dynamic_list_item_${index}`}>
<div className={styles.popular_buy_dynamic_list_item_header}>
<span>{item.title}</span>
<div className={cx(styles.status_tag, item.state === 1 ? styles.success : '')}>{item.state === 1 ? '已完成' : '比价中'}</div>
</div>
<div className={styles.popular_buy_dynamic_list_item_content}>
<span className={styles.content_text}>{item.content}</span>
<span className={styles.content_time}>{item.date}</span>
list && list.map((item, index) => (
<div key={`popular_buy_dynamic_list_${index}`} >
<div className={styles.popular_buy_dynamic_list}>
{
item.map((item, index) => (
<div className={styles.popular_buy_dynamic_list_item} key={`popular_buy_dynamic_list_item_${index}`}>
<div className={styles.popular_buy_dynamic_list_item_header}>
<Link to={`/memberCenter/tranactionAbility/enquirySubmit/viewEnquiryDetail?id=${item.id}`}>{item.details}</Link>
<div className={cx(styles.status_tag, item.state === 1 ? styles.success : '')}>{item.state === 1 ? '已完成' : '比价中'}</div>
</div>
<div className={styles.popular_buy_dynamic_list_item_content}>
<span className={styles.content_text}>{item.count || 0}条回应</span>
<span className={styles.content_time}>{moment(item.deliveryTime).format("MM/DD HH:mm")}</span>
</div>
</div>
))
}
</div>
</div>
))
}
</div>
</Carousel>
</div>
)
}
......
src/pages/lxMall/components/FindMore/index.less
View file @ 44e2ec5b
......@@ -16,9 +16,6 @@
.find_more_main {
display: flex;
}
}
}
......@@ -128,6 +125,7 @@
.popular_buy_dynamic {
flex: 1;
width: 0;
margin: 0 20px;
background: #ffffff;
......@@ -143,7 +141,7 @@
display: flex;
align-items: center;
&>span {
&>a {
flex: 1;
display: block;
color: #303133;
......
src/pages/transaction/components/createElectronModal/index.tsx
View file @ 44e2ec5b
import React, { useContext, useRef } from 'react'
import { Modal, Button } from 'antd'
import { Modal, Button, message } from 'antd'
import { createFormActions, ISchema } from '@formily/antd'
import ModalForm from '@/components/ModalForm'
import { history } from 'umi'
......@@ -120,6 +120,10 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
const { run: submitRun, loading: submitLoading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrder)
const createElectron = async () => {
const contractTemplateId = schemaActions.getFieldValue('contractTemplateId')
if (!contractTemplateId) {
message.error('请先选择电子合同模板')
return ;
}
const orderNo = data.orderNo
const signMemberId = data.createMemberId
......
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