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
shenshaokai
jinfa-admin
Commits
036a0c11
Commit
036a0c11
authored
Dec 10, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:查询品牌详情参数id变更为审核品牌后的返回最新id
parent
a6fd8a0b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletion
+7
-1
app.tsx
src/app.tsx
+4
-0
index.ts
src/constants/index.ts
+2
-0
index.tsx
src/pages/commodity/effect/index.tsx
+0
-0
checkBrand.tsx
src/pages/trademark/trademarkWillCheck/checkBrand.tsx
+1
-1
No files found.
src/app.tsx
View file @
036a0c11
...
...
@@ -86,6 +86,10 @@ export function render(oldRender:Function) {
* @param {*} { routes, matchedRoutes, location, action }
*/
export
function
onRouteChange
({
routes
,
matchedRoutes
,
location
,
action
})
{
console
.
log
(
'onRouteChange'
)
// 路由切换时, 自动回到顶部
document
.
body
.
scrollTop
=
document
.
documentElement
.
scrollTop
=
0
;
if
(
isDev
)
{
console
.
log
(
'dev'
)
return
;
...
...
src/constants/index.ts
View file @
036a0c11
...
...
@@ -586,6 +586,7 @@ export const PurchaseOrderOutWorkStateTexts = {
export
const
PurchaseOrderInsideWorkStateTexts
=
{
"-1"
:
'取消订单'
,
0
:
'订单完成'
,
1
:
'新增采购订单'
,
2
:
'一级审核订单'
,
3
:
'二级审核订单'
,
...
...
@@ -605,6 +606,7 @@ export const PurchaseOrderInsideWorkStateTexts = {
// 销售订单内部显示文案
export
const
SaleOrderInsideWorkStateTexts
=
{
0
:
'订单完成'
,
1
:
'待审核订单'
,
2
:
'一级审核订单'
,
3
:
'二级审核订单'
,
...
...
src/pages/commodity/effect/index.tsx
View file @
036a0c11
src/pages/trademark/trademarkWillCheck/checkBrand.tsx
View file @
036a0c11
...
...
@@ -166,7 +166,7 @@ const CheckBrand: React.FC<{}> = () => {
if
(
res
.
code
=
1000
){
handleCancel
()
setDisableCheck
(
true
)
loadPageData
(
brandInfo
.
id
)
loadPageData
(
res
.
data
)
}
})
})
...
...
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