Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
polysoft-nafmii
/
polysoft-h5
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 9d65e741
authored
Jun 01, 2021
by
李新
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
fixed conflict
2 parents
7e94ccdf
a461f2c1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
11 deletions
src/assets/css/sprite.less
src/assets/images/sprite.png
src/views/member/progress/join.vue
src/views/member/progress/quit.vue
src/assets/css/sprite.less
View file @
9d65e74
...
@@ -13,13 +13,16 @@
...
@@ -13,13 +13,16 @@
.icon-center-setting { width: 36px; height: 36px; background-position: -1577px -670px; }
.icon-center-setting { width: 36px; height: 36px; background-position: -1577px -670px; }
.icon-center-study { width: 36px; height: 36px; background-position: -1633px -670px; }
.icon-center-study { width: 36px; height: 36px; background-position: -1633px -670px; }
.icon-change-member { width: 90px; height: 90px; background-position: -1514px -526px; }
.icon-change-member { width: 90px; height: 90px; background-position: -1514px -526px; }
.icon-change-membership { width: 90px; height: 90px; background-position: -1624px -526px; }
.icon-change-name { width: 90px; height: 90px; background-position: -1734px -526px; }
.icon-change-representive { width: 90px; height: 90px; background-position: -1844px -526px; }
.icon-email { width: 36px; height: 36px; background-position: -1689px -670px; }
.icon-email { width: 36px; height: 36px; background-position: -1689px -670px; }
.icon-empty { width: 36px; height: 36px; background-position: -1745px -670px; }
.icon-empty { width: 36px; height: 36px; background-position: -1745px -670px; }
.icon-filter { width: 44px; height: 50px; background-position: -1910px -981px; }
.icon-filter { width: 44px; height: 50px; background-position: -1910px -981px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2050px -737px; }
.icon-icon-arrow-right { width: 10px; height: 18px; background-position: -2050px -737px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -2030px -981px; }
.icon-icon-classify { width: 30px; height: 30px; background-position: -2030px -981px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1874px -1055px; }
.icon-icon-clock { width: 30px; height: 30px; background-position: -1874px -1055px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1
62
4px -526px; }
.icon-join-member { width: 90px; height: 90px; background-position: -1
95
4px -526px; }
.icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; }
.icon-logo-2 { width: 118px; height: 112px; background-position: -1376px -526px; }
.icon-logo { width: 224px; height: 224px; background-position: -1696px -737px; }
.icon-logo { width: 224px; height: 224px; background-position: -1696px -737px; }
.icon-message { width: 50px; height: 50px; background-position: -1770px -981px; }
.icon-message { width: 50px; height: 50px; background-position: -1770px -981px; }
...
@@ -27,18 +30,15 @@
...
@@ -27,18 +30,15 @@
.icon-password { width: 36px; height: 36px; background-position: -1801px -670px; }
.icon-password { width: 36px; height: 36px; background-position: -1801px -670px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1696px -1055px; }
.icon-pdf { width: 46px; height: 60px; background-position: -1696px -1055px; }
.icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; }
.icon-photo-default { width: 124px; height: 124px; background-position: -1232px -526px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1857px -670px; }
.icon-progress-act { width: 36px; height: 36px; background-position: -1857px -670px; }
.icon-quit-member { width: 90px; height: 90px; background-position: -1734px -526px; }
.icon-progress-normal { width: 36px; height: 36px; background-position: -1913px -670px; }
.icon-question-icon { width: 36px; height: 36px; background-position: -1969px -670px; }
.icon-quit-member { width: 90px; height: 90px; background-position: -1940px -737px; }
.icon-shtyxydm { width: 54px; height: 54px; background-position: -1696px -981px; }
.icon-shtyxydm { width: 54px; height: 54px; background-position: -1696px -981px; }
.icon-tel { width: 36px; height: 36px; background-position: -19
13px -670
px; }
.icon-tel { width: 36px; height: 36px; background-position: -19
74px -981
px; }
.icon-time-update { width: 45px; height: 45px; background-position: -1232px -670px; }
.icon-time-update { width: 45px; height: 45px; background-position: -1232px -670px; }
.icon-trash { width: 50px; height: 50px; background-position: -1840px -981px; }
.icon-trash { width: 50px; height: 50px; background-position: -1840px -981px; }
.icon-user-question { width: 32px; height: 36px; background-position: -2025px -670px; }
.icon-user-question { width: 32px; height: 36px; background-position: -2025px -670px; }
.icon-user { width: 36px; height: 36px; background-position: -1
969px -670
px; }
.icon-user { width: 36px; height: 36px; background-position: -1
762px -1055
px; }
.icon-verification { width: 36px; height: 36px; background-position: -1
974px -981
px; }
.icon-verification { width: 36px; height: 36px; background-position: -1
818px -1055
px; }
.icon-wechat { width: 80px; height: 78px; background-position: -1940px -847px; }
.icon-wechat { width: 80px; height: 78px; background-position: -1940px -847px; }
\ No newline at end of file
\ No newline at end of file
.icon-progress-act { width: 36px; height: 36px; background-position: -1762px -1055px; }
.icon-progress-normal { width: 36px; height: 36px; background-position: -1818px -1055px; }
.icon-change-name { width: 90px; height: 90px; background-position: -1844px -526px; }
.icon-change-representive { width: 90px; height: 90px; background-position: -1954px -526px; }
.icon-change-membership { width: 90px; height: 90px; background-position: -1940px -737px; }
\ No newline at end of file
\ No newline at end of file
src/assets/images/sprite.png
View file @
9d65e74
710 KB
|
W:
|
H:
711 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/views/member/progress/join.vue
View file @
9d65e74
...
@@ -29,6 +29,7 @@ export default {
...
@@ -29,6 +29,7 @@ export default {
}
}
</
script
>
</
script
>
<<<<<<
< HEAD
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.join_container {
.join_container {
width: 100%;
width: 100%;
...
@@ -38,3 +39,5 @@ export default {
...
@@ -38,3 +39,5 @@ export default {
</style>
</style>
=======
>>>>>>> a461f2c16c56d28a6dbe476c3a3e56bbd7f10e88
src/views/member/progress/quit.vue
View file @
9d65e74
...
@@ -29,6 +29,7 @@ export default {
...
@@ -29,6 +29,7 @@ export default {
}
}
</
script
>
</
script
>
<<<<<<
< HEAD
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
>
.quit_container {
.quit_container {
width: 100%;
width: 100%;
...
@@ -36,3 +37,5 @@ export default {
...
@@ -36,3 +37,5 @@ export default {
background-color: #fafafa;
background-color: #fafafa;
}
}
</style>
</style>
=======
>>>>>>> a461f2c16c56d28a6dbe476c3a3e56bbd7f10e88
Write
Preview
Markdown
is supported
Attach a file
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 post a comment
