Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1
Overview
Overview
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
吴迪
gs1
Commits
ae41b34f
Commit
ae41b34f
authored
Dec 07, 2021
by
林家欣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改条码公共详情页高亮左侧菜单
parent
f6156f62
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
25 deletions
+20
-25
App.vue
src/App.vue
+0
-8
fetch.js
src/axios/fetch.js
+4
-4
index.vue
src/components/layout/header/index.vue
+12
-3
Msg.vue
src/views/Business/Msg.vue
+1
-1
Notice.vue
src/views/Business/Notice.vue
+3
-9
No files found.
src/App.vue
View file @
ae41b34f
...
...
@@ -4,14 +4,6 @@
</div>
</
template
>
<
script
>
export
default
{
created
()
{
console
.
log
(
process
.
env
,
'process.env'
);
},
};
</
script
>
<
style
>
.container-fluid
{
padding
:
0
!important
;
...
...
src/axios/fetch.js
View file @
ae41b34f
...
...
@@ -20,7 +20,7 @@ import {
const
baseUrl
=
process
.
env
.
VUE_APP_API_URL
;
console
.
log
(
process
.
env
,
baseUrl
,
'baseUrl'
);
//
console.log(process.env, baseUrl, 'baseUrl');
function
fetch
(
options
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
instance
=
axios
.
create
({
...
...
@@ -57,12 +57,12 @@ function fetch(options) {
}
})
//响应数据的拦截
instance
().
then
(
res
=>
{
console
.
log
(
res
,
'响应数据的拦截'
);
//
console.log(res, '响应数据的拦截');
const
resData
=
res
.
data
;
const
code
=
String
(
resData
.
code
)
console
.
log
(
resData
,
ResponseCode
.
success
,
'ResponseCode.success'
);
//
console.log(resData, ResponseCode.success, 'ResponseCode.success');
if
(
code
===
ResponseCode
.
success
)
{
console
.
log
(
resData
,
'响应数据的拦截2'
);
//
console.log(resData, '响应数据的拦截2');
resolve
(
resData
)
}
else
if
(
checkResponseCodeTokenError
(
code
))
{
if
(
getToken
())
{
...
...
src/components/layout/header/index.vue
View file @
ae41b34f
...
...
@@ -72,6 +72,10 @@
import
HeaderBtn
from
"./HeaderBtn.vue"
;
import
HeaderDropdown
from
"./HeaderDropdown.vue"
;
import
{
nav
}
from
"./mock"
;
import
Qs
from
"qs"
import
{
cleanObject
,
}
from
"@/axios/parameter"
export
default
{
components
:
{
HeaderBtn
,
HeaderDropdown
},
...
...
@@ -94,14 +98,19 @@ export default {
// nav_.children &&
// nav_.children.length > 0 &&
// this.$store.commit("system/SET_SUB_NAV", nav_.children);
console
.
log
(
nav_
,
this
.
$route
,
'this.$route.path'
);
//
console.log(nav_, this.$route, 'this.$route.path');
if
(
nav_
.
link
===
this
.
$route
.
path
)
{
nav_
.
breadcrumb
&&
this
.
$store
.
commit
(
"system/SET_BREADCRUMB"
,
nav_
.
breadcrumb
);
}
else
{
// TODO 去dropdown里面精确查找当前的路径
const
result
=
this
.
comparePath
(
nav_
.
children
,
this
.
$route
.
path
);
// console.log(result);
let
result
;
result
=
this
.
comparePath
(
nav_
.
children
,
this
.
$route
.
path
);
if
(
!
result
&&
Object
.
keys
(
this
.
$route
.
query
).
length
>
0
)
{
const
queryString
=
Qs
.
stringify
(
cleanObject
(
this
.
$route
.
query
));
let
path
=
`
${
this
.
$route
.
path
}
?
${
queryString
}
`
;
result
=
this
.
comparePath
(
nav_
.
children
,
path
);
}
result
&&
result
.
breadcrumb
&&
this
.
$store
.
commit
(
"system/SET_BREADCRUMB"
,
result
.
breadcrumb
);
...
...
src/views/Business/Msg.vue
View file @
ae41b34f
...
...
@@ -51,7 +51,7 @@
>
{{
msg
.
logoutFlag
}}
</span>
</td>
</tr>
<tr
v-if=
"this.$route.query.
type
"
>
<tr
v-if=
"this.$route.query.
id === 'zhuxiao'
"
>
<th>
注销时间:
</th>
<td>
<span
...
...
src/views/Business/Notice.vue
View file @
ae41b34f
...
...
@@ -114,7 +114,7 @@ export default {
limit
:
this
.
pageParams
.
pageSize
,
logoutFlag
:
this
.
logoutFlag
,
};
console
.
log
(
params
,
"params"
);
//
console.log(params, "params");
const
businessGetEanUpcByConditionRes
=
await
this
.
$api
.
business
.
businessGetEanUpcByCondition
(
params
);
const
{
returnCode
,
data
}
=
businessGetEanUpcByConditionRes
;
...
...
@@ -136,7 +136,7 @@ export default {
}
});
this
.
list
[
key
].
data
=
data
.
list
;
console
.
log
(
this
.
list
,
"this.list"
);
//
console.log(this.list, "this.list");
}
},
// 接收分页子组件传过来的值
...
...
@@ -146,16 +146,10 @@ export default {
},
// 接收列表子组件传过来的值
receiveListChild
(
obj
)
{
let
type
;
if
(
this
.
$route
.
query
.
id
===
"zhuxiao"
)
{
type
=
false
;
}
else
{
type
=
true
;
}
this
.
$router
.
push
({
path
:
"/Business/Msg"
,
query
:
{
type
,
id
:
this
.
$route
.
query
.
id
,
fId
:
obj
.
fid
,
code
:
obj
.
code
,
},
...
...
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