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
shenshaokai
jinfa-platform
Commits
9ac4a889
Commit
9ac4a889
authored
Oct 14, 2020
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
39114c3b
8ff562b6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
index.ts
src/constants/index.ts
+2
-2
commodity.tsx
src/pages/systemSetting/collection/commodity.tsx
+10
-5
index.tsx
src/pages/systemSetting/collection/index.tsx
+1
-1
No files found.
src/constants/index.ts
View file @
9ac4a889
...
@@ -44,8 +44,8 @@ export enum LAYOUT_TYPE {
...
@@ -44,8 +44,8 @@ export enum LAYOUT_TYPE {
}
}
// 本地环境跳过权限校验
// 本地环境跳过权限校验
//
export const isDev = process.env.NODE_ENV === "development"
export
const
isDev
=
process
.
env
.
NODE_ENV
===
"development"
export
const
isDev
=
false
//
export const isDev = false
export
const
Environment_Status
=
{
export
const
Environment_Status
=
{
0
:
"所有"
,
0
:
"所有"
,
...
...
src/pages/systemSetting/collection/commodity.tsx
View file @
9ac4a889
...
@@ -78,13 +78,13 @@ const Commodity: React.FC = () => {
...
@@ -78,13 +78,13 @@ const Commodity: React.FC = () => {
return
(
return
(
<
div
className=
{
styles
.
commodity_price
}
>
<
div
className=
{
styles
.
commodity_price
}
>
<
span
>
¥
</
span
>
<
span
>
¥
</
span
>
<
label
>
{
commodity
.
min
}
</
label
>
<
label
>
{
commodity
.
min
===
commodity
.
max
?
numFormat
(
commodity
.
min
)
:
`${numFormat(commodity.min)}~${numFormat(commodity.max)}`
}
</
label
>
</
div
>
</
div
>
)
)
case
COMMODITY_TYPE
.
integral
:
case
COMMODITY_TYPE
.
integral
:
return
(
return
(
<
div
className=
{
styles
.
commodity_point
}
>
<
div
className=
{
styles
.
commodity_point
}
>
{
numFormat
(
commodity
.
min
)
}
~
{
numFormat
(
commodity
.
max
)
}
积分
{
commodity
.
min
===
commodity
.
max
?
numFormat
(
commodity
.
min
)
:
`${numFormat(commodity.min)}~${numFormat(commodity.max)}`
}
积分
</
div
>
</
div
>
)
)
case
COMMODITY_TYPE
.
inquiry
:
case
COMMODITY_TYPE
.
inquiry
:
...
@@ -104,9 +104,14 @@ const Commodity: React.FC = () => {
...
@@ -104,9 +104,14 @@ const Commodity: React.FC = () => {
content
:
`是否要取消收藏?`
,
content
:
`是否要取消收藏?`
,
onOk
:
()
=>
{
onOk
:
()
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
let
param
=
{
let
param
:
any
=
{
commodityId
:
detail
.
id
commodityId
:
detail
.
commodity
.
id
,
type
:
detail
.
type
}
if
([
3
,
4
,
5
].
includes
(
detail
.
type
))
{
param
.
channelMemberId
=
detail
.
channelMemberId
}
}
console
.
log
(
param
,
"param"
)
PublicApi
.
postSearchShopCommodityCollectDeleteCommodityCollect
(
param
).
then
(
res
=>
{
PublicApi
.
postSearchShopCommodityCollectDeleteCommodityCollect
(
param
).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
fetchCollectCommodityList
()
fetchCollectCommodityList
()
...
@@ -160,7 +165,7 @@ const Commodity: React.FC = () => {
...
@@ -160,7 +165,7 @@ const Commodity: React.FC = () => {
</
div
>
</
div
>
<
div
className=
{
cx
(
styles
.
commodity_list_item_item
)
}
>
<
div
className=
{
cx
(
styles
.
commodity_list_item_item
)
}
>
<
div
className=
{
styles
.
collection_state_wrap
}
>
<
div
className=
{
styles
.
collection_state_wrap
}
>
<
div
className=
{
cx
(
styles
.
collection_state
)
}
onClick=
{
()
=>
handleCancelCollect
(
item
.
commodity
)
}
>
<
div
className=
{
cx
(
styles
.
collection_state
)
}
onClick=
{
()
=>
handleCancelCollect
(
item
)
}
>
<
StarFilled
/>
<
StarFilled
/>
<
label
>
收藏
</
label
>
<
label
>
收藏
</
label
>
</
div
>
</
div
>
...
...
src/pages/systemSetting/collection/index.tsx
View file @
9ac4a889
...
@@ -15,7 +15,7 @@ const Collection: React.FC = () => {
...
@@ -15,7 +15,7 @@ const Collection: React.FC = () => {
return
(
return
(
<
PageHeaderWrapper
>
<
PageHeaderWrapper
>
<
div
className=
{
styles
.
collection_wrap
}
>
<
div
className=
{
styles
.
collection_wrap
}
>
<
Tabs
defaultActiveKey=
"
shops
"
className=
{
styles
.
collection_tabs
}
>
<
Tabs
defaultActiveKey=
"
commodity
"
className=
{
styles
.
collection_tabs
}
>
<
TabPane
tab=
"商品收藏"
key=
"commodity"
>
<
TabPane
tab=
"商品收藏"
key=
"commodity"
>
<
Commodity
/>
<
Commodity
/>
</
TabPane
>
</
TabPane
>
...
...
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