Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
U
uni-pdtravel
Project
Project
Details
Activity
Releases
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
panyongping
uni-pdtravel
Commits
145d0540
Commit
145d0540
authored
Jul 12, 2023
by
潘永坪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式修改
parent
8832bb6d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
69 additions
and
72 deletions
+69
-72
App.vue
App.vue
+0
-7
orderCoupon.vue
components/orderCoupon.vue
+60
-60
merchantListIndex.vue
pages/indexs/merchantListIndex/merchantListIndex.vue
+2
-2
ourPayment.vue
pages/payment/ourPayment/ourPayment.vue
+1
-1
uni.scss
uni.scss
+6
-2
No files found.
App.vue
View file @
145d0540
...
...
@@ -89,13 +89,6 @@ export default {
8.页面最外层与里面的第一层为padding:0 12px;
9.css单位为rpx
*/
/* 全局变量 */
:root
{
--blue
:
#3688FF
;
--red
:
#FC6703
;
--divider
:
#DBDBDB
;
--grey
:
#999
;
}
page
{
font-size
:
28rpx
;
color
:
#333333
;
...
...
components/orderCoupon.vue
View file @
145d0540
...
...
@@ -69,74 +69,74 @@
<
script
>
export
default
{
props
:[
"couponData"
,
"chooseCouponObj"
],
watch
:
{
couponData
:{
//
handler
(
newValue
,
oldValue
){
if
(
newValue
){
this
.
couponList
=
this
.
couponData
}
},
deep
:
true
,
immediate
:
true
},
chooseCouponObj
:{
//
handler
(
newValue
,
oldValue
){
if
(
newValue
){
this
.
chooseCoupon
=
this
.
chooseCouponObj
}
},
deep
:
true
,
immediate
:
true
},
},
data
(){
return
{
active
:
0
,
//导航栏下标
show
:
false
,
//控制弹窗显示隐藏
current
:
0
,
//控制选项卡默认显示第几个
couponList
:
""
,
//券列表
chooseCoupon
:
""
,
//选中的劵
navTitle
:[
"可用"
,
"不可用"
],
//导航标题
}
},
methods
:{
navClick
(
index
){
//------------------------------------------导航栏点击
this
.
active
=
index
},
showCoupon
(){
//----------------------------------------展示弹窗
this
.
show
=
true
},
//---多选框值变化
checkboxChange
(
evt
){
if
(
evt
.
detail
.
value
.
length
==
2
){
//删除第一个
evt
.
detail
.
value
.
splice
(
0
,
1
)
//获取选中券,传值给父组件
this
.
chooseCoupon
=
this
.
couponList
.
masterSlaveCouponList
.
find
((
item
)
=>
{
return
item
.
couponId
==
evt
.
detail
.
value
[
0
]
})
this
.
$emit
(
"couponChoose"
,
this
.
chooseCoupon
)
}
else
if
(
evt
.
detail
.
value
.
length
==
1
){
export
default
{
props
:[
'couponData'
,
'chooseCouponObj'
],
watch
:
{
couponData
:{
//
handler
(
newValue
,
oldValue
){
if
(
newValue
){
this
.
couponList
=
this
.
couponData
}
},
deep
:
true
,
immediate
:
true
},
chooseCouponObj
:{
//
handler
(
newValue
,
oldValue
){
if
(
newValue
){
this
.
chooseCoupon
=
this
.
chooseCouponObj
}
},
deep
:
true
,
immediate
:
true
},
},
data
(){
return
{
active
:
0
,
//导航栏下标
show
:
false
,
//控制弹窗显示隐藏
current
:
0
,
//控制选项卡默认显示第几个
couponList
:
''
,
//券列表
chooseCoupon
:
''
,
//选中的劵
navTitle
:[
'可用'
,
'不可用'
],
//导航标题
}
},
methods
:{
navClick
(
index
){
//------------------------------------------导航栏点击
this
.
active
=
index
},
showCoupon
(){
//----------------------------------------展示弹窗
this
.
show
=
true
},
//---多选框值变化
checkboxChange
(
evt
){
if
(
evt
.
detail
.
value
.
length
==
2
){
//删除第一个
evt
.
detail
.
value
.
splice
(
0
,
1
)
//获取选中券,传值给父组件
this
.
chooseCoupon
=
this
.
couponList
.
masterSlaveCouponList
.
find
((
item
)
=>
{
return
item
.
couponId
==
evt
.
detail
.
value
[
0
]
})
this
.
$emit
(
'couponChoose'
,
this
.
chooseCoupon
)
}
else
if
(
evt
.
detail
.
value
.
length
==
1
){
this
.
chooseCoupon
=
this
.
couponList
.
masterSlaveCouponList
.
find
((
item
)
=>
{
return
item
.
couponId
==
evt
.
detail
.
value
[
0
]
return
item
.
couponId
==
evt
.
detail
.
value
[
0
]
})
this
.
$emit
(
"couponChoose"
,
this
.
chooseCoupon
)
}
else
if
(
evt
.
detail
.
value
.
length
==
0
){
this
.
$emit
(
"couponChoose"
,
""
)
}
}
}
}
this
.
$emit
(
'couponChoose'
,
this
.
chooseCoupon
)
}
else
if
(
evt
.
detail
.
value
.
length
==
0
){
this
.
$emit
(
'couponChoose'
,
''
)
}
}
}
}
</
script
>
<
style
scoped=
"scoped"
lang=
"scss"
>
.title
{
display
:
flex
;
height
:
80rpx
;}
.titleContent
{
flex
:
1
;
text-align
:
center
;
font-size
:
30rpx
;}
.titleContent.on
{
color
:
$
title-color
;
font-weight
:
bold
;}
.titleContent
view
text
{
width
:
40rpx
;
height
:
6rpx
;
background
:
$
title-color
;
border-radius
:
6rpx
;
display
:inline-block
;
position
:
relative
;
top
:
-10rpx
;}
.titleContent.on
{
color
:
$
blue
;
font-weight
:
bold
;}
.titleContent
view
text
{
width
:
40rpx
;
height
:
6rpx
;
background
:
$
blue
;
border-radius
:
6rpx
;
display
:inline-block
;
position
:
relative
;
top
:
-10rpx
;}
.middle
{
padding
:
24rpx
;
background
:
#f5f5f5
;}
.listBox
{
background
:
#FFFFFF
;
padding
:
24rpx
;
border-radius
:
10rpx
;}
.middle
.listBox
:not
(
:first-child
)
{
margin-top
:
20rpx
;}
...
...
pages/indexs/merchantListIndex/merchantListIndex.vue
View file @
145d0540
...
...
@@ -51,7 +51,7 @@ export default {
}
</
script
>
<
style
scoped
>
<
style
scoped
lang=
"scss"
>
.search
{
padding
:
0
24rpx
;
position
:
relative
;
...
...
@@ -82,6 +82,6 @@ export default {
flex
:
1
;
}
.search-btn
{
background
:
var
(
--blue
)
;
background
:
$blue
;
}
</
style
>
pages/payment/ourPayment/ourPayment.vue
View file @
145d0540
...
...
@@ -596,7 +596,7 @@ export default {
.moneyText
{
color
:
#FF3C00
;
font-size
:
32rpx
;
font-weight
:
bold
;}
.moneyNumber
text
:nth-child
(
2
)
{
font-size
:
62rpx
;
font-weight
:
bold
;
position
:
relative
;
left
:
-6rpx
;}
.moneyNumber
text
:last-child
{
animation
:
dis
1
.5s
infinite
;
transition
:
1s
;
width
:
1px
;
height
:
56rpx
;
display
:
inline-block
;
background
:
#333333
;
position
:
relative
;
top
:
8rpx
;}
.topCoupon
{
display
:
flex
;
height
:
90rpx
;
border-top
:
1px
solid
$divid
ing-ine
;
align-items
:center
;
padding
:
0
24rpx
;
justify-content
:
space-between
;}
.topCoupon
{
display
:
flex
;
height
:
90rpx
;
border-top
:
1px
solid
$divid
er
;
align-items
:center
;
padding
:
0
24rpx
;
justify-content
:
space-between
;}
.couponLeft
{
font-size
:
24rpx
;}
.couponLeft
text
:first-child
{
margin-right
:
10rpx
;
display
:
inline-block
;
width
:
30rpx
;
height
:
30rpx
;
background
:
#f9690e
;
color
:
#FFFFFF
;
text-align
:
center
;
line-height
:
28rpx
;
border-radius
:
4rpx
;}
.couponRight
{
position
:relative
;
left
:
8rpx
;}
...
...
uni.scss
View file @
145d0540
...
...
@@ -13,9 +13,13 @@
* 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
*/
/*分割线颜色*/
$divid
ing-ine
:
#DBDBDB
;
//重要
$divid
er
:
#DBDBDB
;
/*主题颜色*/
$title-color
:
#3688FF
;
//重要
$blue
:
#3688FF
;
/*红色*/
$red
:
#FC6703
;
/*灰色*/
$grey
:
#999
;
/* 颜色变量 */
...
...
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