Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
project
jinfa-admin
Commits
635a7965
Commit
635a7965
authored
Aug 20, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:商品
parent
22e211af
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
35 deletions
+28
-35
global.d.ts
src/global/config/global.d.ts
+2
-27
checkProducts.tsx
src/pages/commodity/products/checkProducts.tsx
+13
-4
viewProducts.tsx
src/pages/commodity/products/viewProducts.tsx
+13
-4
No files found.
src/global/config/global.d.ts
View file @
635a7965
...
...
@@ -18,34 +18,9 @@ export interface UserRegister {
useDetail
?:
any
;
}
export
interface
RuleConfiguration
{
value
:
number
;
label
:
string
;
platformType
:
number
;
}
export
interface
PayWayResponse
{
payType
:
number
;
value
:
number
;
label
:
string
;
}
export
interface
PayInitializeConfig
{
payType
:
number
;
ruleConfigurations
:
RuleConfiguration
[];
payWayResponses
:
PayWayResponse
[];
}
export
interface
PayPlatformPayConfig
{
id
:
number
;
payType
:
number
;
way
:
string
;
isPitchOn
:
number
;
}
export
interface
PayConfig
{
payInitializeConfig
:
PayInitializeConfig
[]
;
payPlatformPayConfig
:
PayPlatformPayConfig
[]
;
payInitializeConfig
?:
any
;
payPlatformPayConfig
?:
any
;
}
export
interface
CountryList
{
...
...
src/pages/commodity/products/checkProducts.tsx
View file @
635a7965
...
...
@@ -226,14 +226,23 @@ const viewProducts: React.FC<{}> = () => {
</
Descriptions
>
</>
/* 定价类型 */
//1-现货价格,2-价格需要询价,3-积分兑换商品
const
renderPriceType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'现货价格'
if
(
type
===
2
)
return
'价格需要询价'
if
(
type
===
3
)
return
'积分兑换商品'
}
const
renderDeliveryType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'物流(默认)'
if
(
type
===
2
)
return
'自提'
if
(
type
===
3
)
return
'无需配送'
}
const
renderCarriageType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'卖家承担运费(默认)'
if
(
type
===
2
)
return
'买家承担运费'
}
/* 构建表格数据 */
const
constructTableData
=
(
productName
:
string
,
unitPriceAndPicList
:
GetProductCommodityGetCommodityResponse
[
"unitPriceAndPicList"
])
=>
{
// 构建列
...
...
@@ -407,7 +416,7 @@ const viewProducts: React.FC<{}> = () => {
<
p
>
配送方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
物流(默认)
</
p
>
<
p
>
{
renderDeliveryType
(
productDetail
?.
logistics
?.
deliveryType
)
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
...
...
@@ -415,7 +424,7 @@ const viewProducts: React.FC<{}> = () => {
<
p
>
运送方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
买家承担运费
</
p
>
<
p
>
{
renderCarriageType
(
productDetail
?.
logistics
?.
carriageType
)
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
...
...
src/pages/commodity/products/viewProducts.tsx
View file @
635a7965
...
...
@@ -224,14 +224,23 @@ const viewProducts: React.FC<{}> = () => {
</
Descriptions
>
</>
/* 定价类型 */
//1-现货价格,2-价格需要询价,3-积分兑换商品
const
renderPriceType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'现货价格'
if
(
type
===
2
)
return
'价格需要询价'
if
(
type
===
3
)
return
'积分兑换商品'
}
const
renderDeliveryType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'物流(默认)'
if
(
type
===
2
)
return
'自提'
if
(
type
===
3
)
return
'无需配送'
}
const
renderCarriageType
=
(
type
:
number
)
=>
{
if
(
type
===
1
)
return
'卖家承担运费(默认)'
if
(
type
===
2
)
return
'买家承担运费'
}
/* 构建表格数据 */
const
constructTableData
=
(
productName
:
string
,
unitPriceAndPicList
:
GetProductCommodityGetCommodityResponse
[
"unitPriceAndPicList"
])
=>
{
// 构建列
...
...
@@ -374,7 +383,7 @@ const viewProducts: React.FC<{}> = () => {
<
p
>
配送方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
物流(默认)
</
p
>
<
p
>
{
renderDeliveryType
(
productDetail
?.
logistics
?.
deliveryType
)
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
...
...
@@ -382,7 +391,7 @@ const viewProducts: React.FC<{}> = () => {
<
p
>
运送方式:
</
p
>
</
Col
>
<
Col
span=
{
20
}
>
<
p
>
买家承担运费
</
p
>
<
p
>
{
renderCarriageType
(
productDetail
?.
logistics
?.
carriageType
)
}
</
p
>
</
Col
>
</
Row
>
<
Row
>
...
...
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