Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
group-buy-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
group-buy-ui
Commits
332a40ab
Commit
332a40ab
authored
Oct 01, 2021
by
Xuguangxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ui error
parent
f3d95023
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
17 deletions
+43
-17
leaderBorder.png
src/assets/images/leaderBorder.png
+0
-0
avatorGroup.vue
src/components/avatorGroup.vue
+39
-6
payWaiting.vue
src/views/pay/payWaiting.vue
+4
-11
No files found.
src/assets/images/leaderBorder.png
View replaced file @
f3d95023
View file @
332a40ab
1.09 KB
|
W:
|
H:
1.2 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/components/avatorGroup.vue
View file @
332a40ab
...
...
@@ -25,6 +25,7 @@
src=
"@/assets/images/leader-name.png"
/>
</div>
<div
class=
"border"
/>
</
template
>
<div
v-if=
"item.userTag && item.userTag.toLowerCase() == 'new'"
class=
"is-new"
>
<cr-image
width=
"25px"
src=
"@/assets/images/new-user.png"
/>
...
...
@@ -49,6 +50,7 @@
src=
"@/assets/images/leader-name.png"
/>
</div>
<div
class=
"border"
/>
</
template
>
<div
class=
"content"
:class=
"{ avator: avators.length == 0 && n == 1 }"
>
?
</div>
</div>
...
...
@@ -164,28 +166,44 @@ export default {
border-radius: 50%;
}
}
.avator {
.border {
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
background: url('../assets/images/leaderBorder.png');
background-size: cover;
z-index: 2;
width: 44px;
height: 100%;
}
.avator {
// background: url('../assets/images/leaderBorder.png');
// border: px solid rgba(255, 212, 0, 0.24);
width: 44px;
height: 44px;
position: relative;
background-size: cover;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
/deep/ img {
width:
37
px;
height:
37
px;
width:
44
px;
height:
44
px;
}
}
.is-new {
position: absolute;
top: 0;
z-index: 3;
right: -@padding-unit;
}
.is-leader {
position: absolute;
right: 4px;
top: -9px;
z-index: 3;
.crown {
width: 22px;
height: 20px;
...
...
@@ -197,6 +215,7 @@ export default {
position: absolute;
left: 50%;
bottom: -6px;
z-index: 3;
transform: translateX(-50%);
&-icon {
width: 100%;
...
...
@@ -226,7 +245,19 @@ export default {
}
.placeholder.leader {
position: relative;
.border {
position: absolute;
top: 0;
left: 50%;
transform: translateX(-50%);
background: url('../assets/images/leaderBorder.png');
background-size: cover;
z-index: 2;
width: 44px;
height: 100%;
}
.is-new {
z-index: 3;
position: absolute;
top: 0;
right: -@padding-unit + 2;
...
...
@@ -235,12 +266,14 @@ export default {
position: absolute;
right: 4px;
top: -9px;
z-index: 3;
.crown {
width: 22px;
height: 20px;
}
}
.leader-name {
z-index: 3;
width: 35px;
height: 17px;
position: absolute;
...
...
@@ -257,7 +290,7 @@ export default {
}
}
.avator {
background: #ffe1e1 url('../assets/images/leaderBorder.png');
//
background: #ffe1e1 url('../assets/images/leaderBorder.png');
// border: px solid rgba(255, 212, 0, 0.24);
background-size: cover;
box-sizing: border-box;
...
...
@@ -266,8 +299,8 @@ export default {
justify-content: center;
border: 0;
/deep/ img {
width:
37
px;
height:
37
px;
width:
44
px;
height:
44
px;
}
}
}
...
...
src/views/pay/payWaiting.vue
View file @
332a40ab
...
...
@@ -17,17 +17,7 @@
努力返回支付结果中,请留心查看!
</p>
<div
:class=
"['actions', !isOrder && 'no-order']"
>
<cr-button
class=
"actions__back"
:plain=
"true"
type=
"primary"
shape=
"circle"
@
click=
"goHome('正在支付')"
>
{{
returnUrl
?
'
返回秒杀
'
:
'
返回首页
'
}}
</cr-button
>
<cr-button
v-if=
"isOrder"
shape=
"circle"
type=
"primary"
@
click=
"goOrderDetail('正在支付')"
>
查看订单
</cr-button
>
<cr-button
type=
"primary"
class=
"btn-primary"
@
click=
"navigateBack"
>
返回
</cr-button>
</div>
</div>
</
template
>
...
...
@@ -78,6 +68,9 @@ export default {
clearInterval
(
this
.
timer
);
},
methods
:
{
navigateBack
()
{
this
.
$router
.
go
(
-
1
);
},
getQuery
()
{
this
.
returnUrl
=
cookies
.
get
(
'
returnUrl
'
)
||
''
;
if
(
localStorage
.
get
(
'
hideOrder
'
))
{
...
...
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