Skip to content

J
jinfa-admin
Commit 21439ef9 authored by 前端-许佳敏's avatar 前端-许佳敏
Browse files
Options

merge

parents a3d9dfdf d6e273e5
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 64 deletions
scripts/services/index.js
View file @ 21439ef9
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-08-10 14:41:27
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-20 19:07:46
* @LastEditTime: 2020-08-18 14:55:46
*/
/**
* 用于在项目开始前获取所有的配置
......@@ -57,7 +57,7 @@ async function batchAxiosHttps() {
for (const subItem in serviceConfig[item]) {
try {
const data = await axios(serviceConfig[item][subItem])
asyncHttpQueue[item][subItem] = data.data
asyncHttpQueue[item][subItem] = data.data.data
} catch(err) {
console.log(serviceConfig[item][subItem].url)
console.log(err.response.data)
......
src/global/styles/reset.less
View file @ 21439ef9
......@@ -30,4 +30,9 @@
margin-right: 24px;
}
}
// 处理PageHeaderWrapper外边距冲突
.ant-pro-basicLayout-content .ant-pro-page-header-wrap {
margin: 0;
}
}
\ No newline at end of file
src/pages/commodity/productWillCheck/index.tsx
View file @ 21439ef9
......@@ -26,7 +26,7 @@ interface paramItem {
}
const Products: React.FC<{}> = () => {
const ref = useRef({})
const ref = useRef<any>({})
let [isHighSearch, setIsHighSearch] = useState(false)
const [filterParams, setFilterParams] = useState<paramItem>({
name: '',
......@@ -169,49 +169,36 @@ const Products: React.FC<{}> = () => {
ref.current.reload(restObj)
}
const handleBrandSearch = (value:any) => { // end value
console.log(value, 'handleBrandSearch')
if (value) {
PublicApi.getProductSelectGetSelectBrand({name: value}).then(res=>{
if(res.code === 1000)
setBrandData(res.data)
})
} else {
setBrandData([])
}
const handleBrandSearch = (value?:any) => { // end value
PublicApi.getProductSelectGetSelectBrand({name: value}).then(res=>{
if(res.code === 1000)
setBrandData(res.data)
})
}
const handleBrandChange = (value:any) => {
setBrandValue(value)
console.log(value, 'handleBrandChange')
let obj = {...filterParams, brandId: value}
setFilterParams(obj)
}
const handleClassSearch = (value:any) => {
console.log(value, 'handleClassSearch')
if (value) {
PublicApi.getProductSelectGetSelectCustomerCategory({name: value}).then(res=>{
if(res.code === 1000)
setClassData(res.data)
})
} else {
setClassData([])
}
const handleClassSearch = (value?:any) => {
PublicApi.getProductSelectGetSelectCustomerCategory({name: value}).then(res=>{
if(res.code === 1000)
setClassData(res.data)
})
}
const handleClassChange = (value:any) => {
setClassValue(value)
let obj = {...filterParams, customerCategoryId: value}
setFilterParams(obj)
console.log(value, 'handleClassChange')
}
const handleSearch = (val: string) => {
const handleSearch = (val?: string) => {
console.log(val)
let obj = val ? {...filterParams, name: val} : { ...filterParams }
setFilterParams(obj)
//@ts-ignore
ref.current.reload(obj)
}
......@@ -264,6 +251,7 @@ const Products: React.FC<{}> = () => {
filterOption={false}
onSearch={handleBrandSearch}
onChange={handleBrandChange}
onFocus={()=>handleBrandSearch(null)}
notFoundContent={null}
style={{width:'100%'}}
>
......@@ -280,6 +268,7 @@ const Products: React.FC<{}> = () => {
filterOption={false}
onSearch={handleClassSearch}
onChange={handleClassChange}
onFocus={()=>handleClassSearch(null)}
notFoundContent={null}
style={{width:'100%'}}
>
......
src/pages/commodity/products/checkProducts.tsx
View file @ 21439ef9
......@@ -402,7 +402,7 @@ const viewProducts: React.FC<{}> = () => {
<Col span={20}>
<p>
{
productDetail?.commodityAreaList.map(_item => <p>{_item.provinceName+'/'+_item.cityName}</p>)
productDetail?.commodityAreaList.map(_item => <p>{_item.provinceName+'/'+(_item.cityName||'')}</p>)
}
</p>
</Col>
......@@ -571,7 +571,8 @@ const viewProducts: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="商品图片">
{
productDetail?.unitPriceAndPicList[0].attributeAndValueList.length === 0 ? <>
// productDetail?.unitPriceAndPicList[0].attributeAndValueList.length === 0 ? <>
productDetail?.isAllAttributePic ? <>
<Row>
<Col span={3}>
<p>设置方式：</p>
......@@ -641,7 +642,7 @@ const viewProducts: React.FC<{}> = () => {
{/* 图片区块 */}
<div className={styles.descriptionBox}>
{
productDetail?.commodityRemark?.image.length>0 ? productDetail?.commodityRemark?.image.map((_item, _index)=> <div key={_index} className={styles.imgItem}>
productDetail?.commodityRemark?.image?.length>0 ? productDetail?.commodityRemark?.image.map((_item, _index)=> <div key={_index} className={styles.imgItem}>
<img src={_item} />
</div>) : <p>暂无数据</p>
}
......
src/pages/commodity/products/index.tsx
View file @ 21439ef9
......@@ -39,7 +39,7 @@ interface paramItem {
}
const Products: React.FC<{}> = () => {
const ref = useRef({})
const ref = useRef<any>({})
let [isHighSearch, setIsHighSearch] = useState(false)
const [filterParams, setFilterParams] = useState<paramItem>({
name: '',
......@@ -168,53 +168,39 @@ const Products: React.FC<{}> = () => {
setFilterParams(restObj)
setBrandValue(undefined)
setClassValue(undefined)
//@ts-ignore
ref.current.reload(restObj)
}
const handleBrandSearch = (value:any) => { // end value
console.log(value, 'handleBrandSearch')
if (value) {
PublicApi.getProductSelectGetSelectBrand({name: value}).then(res=>{
if(res.code === 1000)
setBrandData(res.data)
})
} else {
setBrandData([])
}
const handleBrandSearch = (value?:any) => { // end value
PublicApi.getProductSelectGetSelectBrand({name: value}).then(res=>{
if(res.code === 1000)
setBrandData(res.data)
})
}
const handleBrandChange = (value:any) => {
setBrandValue(value)
console.log(value, 'handleBrandChange')
let obj = {...filterParams, brandId: value}
setFilterParams(obj)
}
const handleClassSearch = (value:any) => {
console.log(value, 'handleClassSearch')
if (value) {
PublicApi.getProductSelectGetSelectCustomerCategory({name: value}).then(res=>{
if(res.code === 1000)
setClassData(res.data)
})
} else {
setClassData([])
}
const handleClassSearch = (value?:any) => {
PublicApi.getProductSelectGetSelectCustomerCategory({name: value}).then(res=>{
if(res.code === 1000)
setClassData(res.data)
})
}
const handleClassChange = (value:any) => {
setClassValue(value)
let obj = {...filterParams, customerCategoryId: value}
setFilterParams(obj)
console.log(value, 'handleClassChange')
}
const handleSearch = (val?: string) => {
console.log(val)
let obj = val ? {...filterParams, name: val} : { ...filterParams }
setFilterParams(obj)
//@ts-ignore
ref.current.reload(obj)
}
......@@ -267,6 +253,7 @@ const Products: React.FC<{}> = () => {
filterOption={false}
onSearch={handleBrandSearch}
onChange={handleBrandChange}
onFocus={()=>handleBrandSearch(null)}
notFoundContent={null}
style={{width:'100%'}}
>
......@@ -283,6 +270,7 @@ const Products: React.FC<{}> = () => {
filterOption={false}
onSearch={handleClassSearch}
onChange={handleClassChange}
onFocus={()=>handleClassSearch(null)}
notFoundContent={null}
style={{width:'100%'}}
>
......
src/pages/commodity/products/viewProducts.tsx
View file @ 21439ef9
......@@ -369,7 +369,7 @@ const viewProducts: React.FC<{}> = () => {
<Col span={20}>
<p>
{
productDetail?.commodityAreaList.map(_item => <p>{_item.provinceName+'/'+_item.cityName}</p>)
productDetail?.commodityAreaList.map(_item => <p>{_item.provinceName+'/'+(_item.cityName||'')}</p>)
}
</p>
</Col>
......@@ -538,7 +538,8 @@ const viewProducts: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="商品图片">
{
productDetail?.unitPriceAndPicList[0].attributeAndValueList.length === 0 ? <>
// productDetail?.unitPriceAndPicList[0].attributeAndValueList.length === 0 ? <>
productDetail?.isAllAttributePic ? <>
<Row>
<Col span={3}>
<p>设置方式：</p>
......@@ -598,7 +599,7 @@ const viewProducts: React.FC<{}> = () => {
{/* 视频区块 */}
<div className={styles.descriptionBox}>
{
productDetail?.commodityRemark?.video.length>0 ? productDetail?.commodityRemark?.video.map((_item, _index)=> <div key={_index} className={styles.videoItem}>
productDetail?.commodityRemark?.video?.length>0 ? productDetail?.commodityRemark?.video.map((_item, _index)=> <div key={_index} className={styles.videoItem}>
<video src={_item} controls={true}>
您的浏览器不支持视频标签，请及时升级。
</video>
......@@ -608,7 +609,7 @@ const viewProducts: React.FC<{}> = () => {
{/* 图片区块 */}
<div className={styles.descriptionBox}>
{
productDetail?.commodityRemark?.image.length>0 ? productDetail?.commodityRemark?.image.map((_item, _index)=> <div key={_index} className={styles.imgItem}>
productDetail?.commodityRemark?.image?.length>0 ? productDetail?.commodityRemark?.image.map((_item, _index)=> <div key={_index} className={styles.imgItem}>
<img src={_item} />
</div>) : <p>暂无数据</p>
}
......
src/pages/ruleSettingManage/paySetting/settingIndex.tsx
View file @ 21439ef9
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-08-13 09:50:41
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-20 20:09:43
* @LastEditTime: 2020-08-21 15:05:26
*/
import React, { useEffect, useState, useRef } from 'react'
import { Card, Button, Tabs, Radio, Space, Row, Col, Table,Popconfirm } from 'antd'
......@@ -22,7 +22,8 @@ import '../components/PayForm/components/index.less'
const payActions = createFormActions()
const { TabPane } = Tabs
const { onFieldValueChange$ } = FormEffectHooks
const TabList:any = GlobalConfig.payConfig.payPlatformPayConfig.data || []
const TabList:any = GlobalConfig.payConfig.payPlatformPayConfig || []
console.log('初始化payConfig',GlobalConfig.payConfig.payPlatformPayConfig)
const PaySetting: React.FC<{}> = () => {
const ref = useRef<any>({})
const [mode, setmode] = useState<number>(0)
......
src/pages/ruleSettingManage/schema/index.tsx
View file @ 21439ef9
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-08-06 11:12:18
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-20 19:18:53
* @LastEditTime: 2020-08-21 15:08:14
*/
import React, { useState, useEffect } from 'react'
import { ISchema } from '@formily/antd'
......@@ -17,9 +17,9 @@ let currentTab;
export const strategyDetailTab = (props: any, usePageStatus: any) => {
//新增时候就初始化
let baseList: any = GlobalConfig.payConfig.payInitializeConfig.data
let baseList: any = GlobalConfig.payConfig.payInitializeConfig || []
console.log('baseList', JSON.stringify(baseList))
console.log('初始化', JSON.stringify(baseList))
// baseList[2].ruleConfigurations = [{value:1,label:"1",platformType:1}]
let tabItem = {}, Tab1 = {}, arr = []
baseList.map((item, index) => {
......
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