Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
前端-黄佳鑫
jinfa-platform
Commits
07c98310
Commit
07c98310
authored
Aug 18, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
fix
parents
23305643
50944c57
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
32 additions
and
27 deletions
+32
-27
base.config.json
config/base.config.json
+1
-1
app.tsx
src/app.tsx
+0
-1
CustomInputSearch.tsx
src/components/NiceForm/components/CustomInputSearch.tsx
+2
-0
global.d.ts
src/global/config/global.d.ts
+1
-12
reset.less
src/global/styles/reset.less
+5
-0
productDescFormOne.tsx
...commodity/products/addProductsItem/productDescFormOne.tsx
+2
-2
productImageForm.tsx
...s/commodity/products/addProductsItem/productImageForm.tsx
+2
-2
directChannel.tsx
src/pages/commodity/products/directChannel.tsx
+5
-3
index.tsx
src/pages/member/memberImport/schema/index.tsx
+1
-1
index.tsx
src/pages/member/memberMaintain/schema/index.tsx
+1
-1
addBrand.tsx
src/pages/trademark/addBrand.tsx
+2
-2
register.tsx
src/pages/user/register.tsx
+10
-2
index.ts
src/services/index.ts
+0
-0
No files found.
config/base.config.json
View file @
07c98310
{
"userRegister"
:{
"useType"
:{
"memberType"
:[{
"id"
:
1
,
"typeName"
:
"企业会员"
},{
"id"
:
3
,
"typeName"
:
"渠道企业会员"
},{
"id"
:
4
,
"typeName"
:
"渠道个人会员"
},{
"id"
:
2
,
"typeName"
:
"个人会员"
}],
"businessType"
:[{
"id"
:
1
,
"typeName"
:
"采购"
},{
"id"
:
39
,
"typeName"
:
"供货"
}
]}},
"web"
:{
"shopInfo"
:[{
"id"
:
302
,
"name"
:
"云鲜采企业商城"
,
"type"
:
1
,
"environment"
:
1
,
"logoUrl"
:
"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/5b19a059530a4060984fc045125da1f81597395561658.png"
,
"describe"
:
null
,
"state"
:
1
,
"url"
:
"/"
},{
"id"
:
303
,
"name"
:
"云鲜采渠道商城"
,
"type"
:
3
,
"environment"
:
1
,
"logoUrl"
:
"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a63c8c81e74947f88c64d4c72bfb565c1597395598958.png"
,
"describe"
:
null
,
"state"
:
1
,
"url"
:
"/shop"
}]},
"global"
:{
"siteId"
:
55
2
,
"siteUrl"
:
"http://localhost:4396"
,
"logo"
:
"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png"
,
"countryList"
:[{
"name"
:
"简体中文-ZH"
,
"key"
:
"zh-CN"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"
},{
"name"
:
"English-EN"
,
"key"
:
"en-US"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"
},{
"name"
:
"日本語-JP"
,
"key"
:
"jp"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"
},{
"name"
:
"한국어-KO"
,
"key"
:
"ko"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"
}]}}
{
"userRegister"
:{
"useType"
:{
"memberType"
:[{
"id"
:
1
,
"typeName"
:
"企业会员"
},{
"id"
:
3
,
"typeName"
:
"渠道企业会员"
},{
"id"
:
4
,
"typeName"
:
"渠道个人会员"
},{
"id"
:
2
,
"typeName"
:
"个人会员"
}],
"businessType"
:[{
"id"
:
1
,
"typeName"
:
"采购"
},{
"id"
:
39
,
"typeName"
:
"供货"
}
,{
"id"
:
40
,
"typeName"
:
"供货商消费者"
},{
"id"
:
41
,
"typeName"
:
"供货商消费者渠道会员"
}]}},
"web"
:{
"shopInfo"
:[]},
"global"
:{
"siteId"
:
60
2
,
"siteUrl"
:
"http://localhost:4396"
,
"logo"
:
"https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png"
,
"countryList"
:[{
"name"
:
"简体中文-ZH"
,
"key"
:
"zh-CN"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"
},{
"name"
:
"English-EN"
,
"key"
:
"en-US"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"
},{
"name"
:
"日本語-JP"
,
"key"
:
"jp"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"
},{
"name"
:
"한국어-KO"
,
"key"
:
"ko"
,
"icon"
:
"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"
}]}}
src/app.tsx
View file @
07c98310
...
...
@@ -76,7 +76,6 @@ export function render(oldRender: Function) {
oldRender
()
})
}
else
{
history
.
push
(
'/user/login'
)
oldRender
()
}
}
...
...
src/components/NiceForm/components/CustomInputSearch.tsx
View file @
07c98310
...
...
@@ -32,6 +32,8 @@ const CustomInputSearch = props => {
}
}
// 只能在组件中获取对应的值
return
(
<
Space
size=
{
20
}
style=
{
{
justifyContent
:
justifyAlign
,
width
:
'100%'
}
}
>
<
Select
...
...
src/global/config/global.d.ts
View file @
07c98310
...
...
@@ -17,19 +17,8 @@ export interface UserRegister {
useType
:
UseType
;
}
export
interface
ShopInfo
{
id
:
number
;
name
:
string
;
type
:
number
;
environment
:
number
;
logoUrl
:
string
;
describe
?:
any
;
state
:
number
;
url
:
string
;
}
export
interface
Web
{
shopInfo
:
ShopInfo
[];
shopInfo
:
any
[];
}
export
interface
CountryList
{
...
...
src/global/styles/reset.less
View file @
07c98310
...
...
@@ -95,6 +95,11 @@
height: 32px;
line-height: 32px;
margin: 8px 0;
border-top-width: 1px;
border-left-width: 1px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
& label:nth-child(odd) {
...
...
src/pages/commodity/products/addProductsItem/productDescFormOne.tsx
View file @
07c98310
...
...
@@ -37,7 +37,7 @@ const ProductDescFormOne: React.FC<Iprops> = (props) => {
name
:
'file'
,
action
:
'/api/file/file/upload'
,
showUploadList
:
false
,
data
:
{
fileType
:
2
},
data
:
{
fileType
:
UPLOAD_TYPE
},
onChange
(
info
)
{
if
(
info
.
file
.
status
!==
'uploading'
)
{
console
.
log
(
info
.
file
,
info
.
fileList
,
'image files'
);
...
...
@@ -72,7 +72,7 @@ const ProductDescFormOne: React.FC<Iprops> = (props) => {
name
:
'file'
,
action
:
'/api/file/file/upload'
,
showUploadList
:
false
,
data
:
{
fileType
:
2
},
data
:
{
fileType
:
UPLOAD_TYPE
},
onChange
(
info
)
{
if
(
info
.
file
.
status
!==
'uploading'
)
{
console
.
log
(
info
.
file
,
info
.
fileList
,
'video files'
);
...
...
src/pages/commodity/products/addProductsItem/productImageForm.tsx
View file @
07c98310
...
...
@@ -206,7 +206,7 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
beforeUpload=
{
beforeUpload
}
onPreview=
{
handlePreview
}
onChange=
{
(
files
)
=>
handleChange
(
files
,
index
)
}
data=
{
{
fileType
:
2
}
}
data=
{
{
fileType
:
UPLOAD_TYPE
}
}
>
{
item
.
commodityPic
.
length
>=
6
?
null
:
uploadButton
}
</
Upload
>
...
...
@@ -234,7 +234,7 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
beforeUpload=
{
beforeUpload
}
onPreview=
{
handlePreview
}
onChange=
{
(
files
)
=>
handleChange
(
files
,
-
1
)
}
data=
{
{
fileType
:
2
}
}
data=
{
{
fileType
:
UPLOAD_TYPE
}
}
>
{
commonImageList
.
length
>=
6
?
null
:
uploadButton
}
</
Upload
>
...
...
src/pages/commodity/products/directChannel.tsx
View file @
07c98310
...
...
@@ -20,6 +20,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
import
{
channelSchema
}
from
'./schema/channelSchema'
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
// 定义选择的行数据的类型
interface
Item
{
...
...
@@ -319,10 +320,11 @@ const DirectChannel: React.FC<{}> = () => {
'name'
,
FORM_FILTER_PATH
,
);
FormEffectHooks
.
onFieldValueChange$
(
'brandId'
).
subscribe
(
state
=>
{
console
.
log
(
state
,
'state'
)
FormEffectHooks
.
onFieldChange$
(
'brandId'
).
subscribe
(
state
=>
{
actions
.
setFieldState
(
'brandId'
,
state
=>
{
console
.
log
(
state
)
})
})
// useAsyncInitSelect(
// ['memberType', 'roleId', 'level', 'source'],
// fetchSearchItems,
...
...
src/pages/member/memberImport/schema/index.tsx
View file @
07c98310
...
...
@@ -137,7 +137,7 @@ const getCompnentValue = (elements: any) => {
:
{
listType
:
'card'
,
action
:
'/api/file/file/upload'
,
data
:
{
fileType
:
2
},
data
:
{
fileType
:
UPLOAD_TYPE
},
fileList
:
[],
onChange
:
file
=>
console
.
log
(
file
),
};
...
...
src/pages/member/memberMaintain/schema/index.tsx
View file @
07c98310
...
...
@@ -130,7 +130,7 @@ const getCompnentValue = (elements: any) => {
:
{
listType
:
'card'
,
action
:
'/api/file/file/upload'
,
data
:
{
fileType
:
2
},
data
:
{
fileType
:
UPLOAD_TYPE
},
fileList
:
[],
onChange
:
file
=>
console
.
log
(
file
),
};
...
...
src/pages/trademark/addBrand.tsx
View file @
07c98310
...
...
@@ -248,7 +248,7 @@ const AddBrand: React.FC<{}> = () => {
action=
"/api/file/file/upload"
beforeUpload=
{
beforeLogoUpload
}
onChange=
{
handleUploadLogoChange
}
data=
{
{
fileType
:
2
}
}
data=
{
{
fileType
:
UPLOAD_TYPE
}
}
>
{
logoUrl
?
<
img
src=
{
logoUrl
}
alt=
"avatar"
style=
{
{
width
:
'100%'
}
}
/>
:
uploadLogoButton
}
</
Upload
>
...
...
@@ -274,7 +274,7 @@ const AddBrand: React.FC<{}> = () => {
fileList=
{
fileList
}
beforeUpload=
{
beforeUpload
}
onChange=
{
handleChange
}
data=
{
{
fileType
:
2
}
}
data=
{
{
fileType
:
UPLOAD_TYPE
}
}
showUploadList=
{
{
showPreviewIcon
:
false
}
}
>
{
fileList
.
length
>=
20
?
null
:
uploadButton
}
...
...
src/pages/user/register.tsx
View file @
07c98310
...
...
@@ -41,7 +41,7 @@ const CustomCheckbox = props => {
return
(
<
Radio
.
Group
value=
{
props
.
value
}
onChange=
{
props
.
onChange
}
className=
{
layout
===
'column'
?
'identityRadio'
:
'businessRadio'
}
name=
{
props
.
name
}
>
{
props
.
dataSource
&&
props
.
dataSource
.
map
((
v
,
i
)
=>
<
Radio
.
Button
value=
{
v
.
value
}
key=
{
v
.
value
+
i
}
>
{
v
.
label
}
</
Radio
.
Button
>)
props
.
dataSource
&&
props
.
dataSource
.
map
((
v
,
i
)
=>
<
Tooltip
title=
{
v
.
label
}
placement=
'leftTop'
key=
{
v
.
value
+
i
}
><
Radio
.
Button
value=
{
v
.
value
}
>
{
v
.
label
}
</
Radio
.
Button
></
Tooltip
>)
}
</
Radio
.
Group
>
)
...
...
@@ -280,7 +280,15 @@ const UserRegistry = () => {
name=
{
field
.
fieldName
}
key=
{
field
.
fieldName
}
title=
{
field
.
fieldCNName
}
x
-
component
-
props=
{
{
listType
:
'text'
}
}
x
-
component
-
props=
{
{
name
:
'file'
,
listType
:
'text'
,
actions
:
"/api/file/file/upload"
,
data
:
{
fileType
:
1
},
showUploadList
:
false
,
}
}
x
-
component=
'Upload'
>
</
Field
>
...
...
src/services/index.ts
View file @
07c98310
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment