Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
clique-web
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
clique
clique-web
Commits
8934b079
Commit
8934b079
authored
Sep 01, 2022
by
曾经
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集团商户 横栏提醒
parent
a8ca127a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
18 deletions
+21
-18
expire-dialog.vue
src/components/notice/expire-dialog.vue
+4
-1
notice.vue
src/components/notice/notice.vue
+11
-10
serviceUtil.js
src/components/notice/serviceUtil.js
+5
-5
index.vue
src/view/index/index.vue
+1
-2
No files found.
src/components/notice/expire-dialog.vue
View file @
8934b079
...
@@ -14,7 +14,10 @@ export default {
...
@@ -14,7 +14,10 @@ export default {
return
{};
return
{};
},
},
props
:
{
props
:
{
visible
:
false
,
visible
:
{
type
:
Boolean
,
default
:
false
},
list
:
[]
list
:
[]
},
},
methods
:
{
methods
:
{
...
...
src/components/notice/notice.vue
View file @
8934b079
...
@@ -2,20 +2,18 @@
...
@@ -2,20 +2,18 @@
<div>
<div>
<el-alert
v-if=
"showNotice"
class=
"notice-box"
type=
"warning"
show-icon
@
close=
"onClose"
>
<el-alert
v-if=
"showNotice"
class=
"notice-box"
type=
"warning"
show-icon
@
close=
"onClose"
>
<div
class=
"notice-content"
slot=
"title"
>
<div
class=
"notice-content"
slot=
"title"
>
<div
<div
class=
"expire-tip"
v-if=
"expireTip.show"
:style=
"
{
class=
"expire-tip"
'max-width': rechargeTip.show ? 'calc(100% - 500px)' : '100%'
v-if=
"expireTip.show"
}">
:style=
"
{
'max-width': rechargeTip.show ? 'calc(100% - 500px)' : '100%'
}"
>
{{
expireTip
.
content
}}
{{
expireTip
.
content
}}
<el-button
type=
"text"
class=
"more-btn"
@
click=
"showDialog = true"
v-if=
"expireTip.showButton"
>
更多到期时间
<i
class=
"iconfont-components3 icon-cp-right"
></i></el-button>
<el-button
type=
"text"
class=
"more-btn"
@
click=
"showDialog = true"
v-if=
"expireTip.showButton"
>
更多到期时间
<i
class=
"iconfont-components3 icon-cp-right"
></i></el-button>
</div>
</div>
<div
v-if=
"expireTip.show && rechargeTip.show"
class=
"separator"
></div>
<div
v-if=
"expireTip.show && rechargeTip.show"
class=
"separator"
></div>
<div
v-if=
"rechargeTip.show"
class=
"recharge-tip"
>
<div
v-if=
"rechargeTip.show"
class=
"recharge-tip"
>
当前账户已欠费,为不影响正常的通讯业务,请及时充值。
当前账户已欠费,为不影响正常的通讯业务,请及时充值。
<el-button
type=
"text"
class=
"rechange-btn"
@
click=
"toRecharge"
>
前往充值中心
<i
class=
"iconfont-components3 icon-cp-right"
></i></el-button>
<el-button
type=
"text"
class=
"rechange-btn"
@
click=
"toRecharge"
>
前往充值中心
<i
class=
"iconfont-components3 icon-cp-right"
></i></el-button>
</div>
</div>
</div>
</div>
</el-alert>
</el-alert>
...
@@ -76,7 +74,6 @@ export default {
...
@@ -76,7 +74,6 @@ export default {
getExpireData
({
getExpireData
({
serviceType
serviceType
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
console
.
log
(
res
);
const
{
errorCode
,
result
}
=
res
.
data
||
{};
const
{
errorCode
,
result
}
=
res
.
data
||
{};
if
(
errorCode
!=
0
)
return
;
if
(
errorCode
!=
0
)
return
;
let
{
otherExpireServices
,
expireStatus
,
expireDayStr
,
allExpire
,
clique
}
=
result
;
let
{
otherExpireServices
,
expireStatus
,
expireDayStr
,
allExpire
,
clique
}
=
result
;
...
@@ -130,6 +127,7 @@ export default {
...
@@ -130,6 +127,7 @@ export default {
.notice-box
/
deep
/
.el-alert__content
{
.notice-box
/
deep
/
.el-alert__content
{
width
:
100%
;
width
:
100%
;
}
}
.notice-box
.notice-content
{
.notice-box
.notice-content
{
display
:
flex
;
display
:
flex
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
...
@@ -151,10 +149,12 @@ export default {
...
@@ -151,10 +149,12 @@ export default {
font-weight
:
500
;
font-weight
:
500
;
color
:
#fa8c16
;
color
:
#fa8c16
;
}
}
.notice-box
.recharge-tip
.rechange-btn
/
deep
/
span
{
.notice-box
.recharge-tip
.rechange-btn
/
deep
/
span
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
}
}
.notice-box
.separator
{
.notice-box
.separator
{
margin
:
0
25px
;
margin
:
0
25px
;
width
:
2px
;
width
:
2px
;
...
@@ -168,6 +168,7 @@ export default {
...
@@ -168,6 +168,7 @@ export default {
white-space
:
nowrap
;
white-space
:
nowrap
;
font-weight
:
600
;
font-weight
:
600
;
}
}
.notice-box
.more-btn
{
.notice-box
.more-btn
{
margin-left
:
12px
;
margin-left
:
12px
;
font-weight
:
500
;
font-weight
:
500
;
...
...
src/components/notice/serviceUtil.js
View file @
8934b079
...
@@ -19,18 +19,18 @@ const config = {
...
@@ -19,18 +19,18 @@ const config = {
'/gic-web/#/memberCardSet'
:
{
'/gic-web/#/memberCardSet'
:
{
serviceName
:
'付费会员'
,
serviceName
:
'付费会员'
,
serviceType
:
7
serviceType
:
7
}
,
}
}
}
;
const
defaultService
=
{
const
defaultService
=
{
serviceType
:
11
,
serviceType
:
11
,
serviceName
:
'商户'
serviceName
:
'商户'
}
}
;
function
getService
(
key
)
{
function
getService
(
key
)
{
return
config
[
key
]
||
defaultService
return
config
[
key
]
||
defaultService
;
}
}
export
function
getCurrentService
()
{
export
function
getCurrentService
()
{
return
getService
(
window
.
location
.
pathname
+
window
.
location
.
hash
)
return
getService
(
window
.
location
.
pathname
+
window
.
location
.
hash
)
;
}
}
src/view/index/index.vue
View file @
8934b079
...
@@ -69,8 +69,7 @@ export default {
...
@@ -69,8 +69,7 @@ export default {
log
(
'pathname:'
,
that
.
pathName
,
this
.
$route
.
path
);
log
(
'pathname:'
,
that
.
pathName
,
this
.
$route
.
path
);
that
.
contentHeight
=
(
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
)
-
64
+
'px'
;
that
.
contentHeight
=
(
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
)
-
64
+
'px'
;
},
}
components
:
{
Notice
}
};
};
</
script
>
</
script
>
<
style
lang=
"less"
>
<
style
lang=
"less"
>
...
...
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