Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mongo-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
mongo-ui
Commits
dae547e1
Commit
dae547e1
authored
Sep 04, 2020
by
郝聪敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/update_url' into 'master'
fix: 修改头像ui、百年跳转问题 See merge request
!225
parents
f826dedd
b1a5081d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
25 deletions
+29
-25
router.mixin.js
src/views/Policy/mixin/router.mixin.js
+23
-23
PolicyItem.vue
src/views/Policy/modules/PolicyItem.vue
+1
-1
index.less
src/views/User/index.less
+4
-0
UserFamily.vue
src/views/User/modules/UserFamily.vue
+1
-1
No files found.
src/views/Policy/mixin/router.mixin.js
View file @
dae547e1
export
default
{
mounted
()
{
if
(
window
.
history
&&
window
.
history
.
pushState
)
{
// 向历史记录中插入了当前页
history
.
pushState
(
null
,
null
,
document
.
URL
);
window
.
addEventListener
(
"
popstate
"
,
this
.
goBack
,
false
);
}
},
destroyed
()
{
window
.
removeEventListener
(
"
popstate
"
,
this
.
goBack
,
false
);
},
methods
:
{
goBack
()
{
console
.
log
(
"
popstate
"
,
history
,
this
.
$route
);
// 点击了浏览器的返回按钮
if
(
this
.
$route
.
name
===
"
PolicyDetail
"
)
{
this
.
$router
.
replace
(
"
/policy
"
);
}
else
if
(
this
.
$route
.
name
===
"
Sucess
"
)
{
this
.
$router
.
replace
(
"
/policy
"
);
}
else
if
(
this
.
$route
.
name
===
"
Policy
"
)
{
this
.
$router
.
replace
(
"
/user
"
);
}
}
}
//
mounted() {
//
if (window.history && window.history.pushState) {
//
// 向历史记录中插入了当前页
//
history.pushState(null, null, document.URL);
//
window.addEventListener("popstate", this.goBack, false);
//
}
//
},
//
destroyed() {
//
window.removeEventListener("popstate", this.goBack, false);
//
},
//
methods: {
//
goBack() {
//
console.log("popstate", history, this.$route);
//
// 点击了浏览器的返回按钮
//
if (this.$route.name === "PolicyDetail") {
//
this.$router.replace("/policy");
//
} else if (this.$route.name === "Sucess") {
//
this.$router.replace("/policy");
//
} else if (this.$route.name === "Policy") {
//
this.$router.replace("/user");
//
}
//
}
//
}
};
src/views/Policy/modules/PolicyItem.vue
View file @
dae547e1
...
...
@@ -133,7 +133,7 @@ export default {
},
async
goNext
(
text
,
item
)
{
if
([
"
为家人投保
"
,
"
重新投保
"
].
includes
(
text
))
{
if
(
item
.
id
===
"
BNZJX001
"
)
{
if
(
item
.
productNo
===
"
BNZJX001
"
)
{
const
{
url
}
=
await
getLink
();
window
.
location
.
href
=
url
;
return
;
...
...
src/views/User/index.less
View file @
dae547e1
...
...
@@ -156,6 +156,10 @@
background: #fff;
}
}
.Ufi-item-img {
width: 40px;
height: 40px;
}
&::-webkit-scrollbar {
display: none;
}
...
...
src/views/User/modules/UserFamily.vue
View file @
dae547e1
...
...
@@ -8,7 +8,7 @@
v-for=
"(item, index) in familyList"
:key=
"index"
>
<cr-image
round
width=
"40px"
height=
"40px
"
fit=
"cover"
:src=
"item.avatar"
/>
<cr-image
round
class=
"Ufi-item-img"
width=
""
height=
"
"
fit=
"cover"
:src=
"item.avatar"
/>
<span
class=
"user-family-info-item-name"
>
{{
item
.
nameMask
}}
</span>
<div
class=
"user-family-info-item-divider"
v-show=
"index === activeIndex"
></div>
</div>
...
...
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