Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
ybf
Project
Project
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
xulili
ybf
Commits
7a594803
Commit
7a594803
authored
5 years ago
by
xd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改优惠券样式
parent
6a318166
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
detail.vue
wx_application/src/views/coupon/detail.vue
+3
-3
list.vue
wx_application/src/views/coupon/list.vue
+6
-2
index copy.vue
ybf_wx/src/views/sideNav/discount/index copy.vue
+3
-5
No files found.
wx_application/src/views/coupon/detail.vue
View file @
7a594803
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
background-color
:
#F39B00
;
background-color
:
#F39B00
;
height
:
60%
;
height
:
60%
;
display
:
flex
;
display
:
flex
;
padding
:
2
0px
;
padding
:
1
0px
;
align-items
:
center
;
align-items
:
center
;
margin-bottom
:
38px
;
margin-bottom
:
38px
;
}
}
...
@@ -123,13 +123,13 @@ export default {
...
@@ -123,13 +123,13 @@ export default {
.left
{
.left
{
display
:
flex
;
display
:
flex
;
align-items
:
center
;
align-items
:
center
;
width
:
35%
;
height
:
100%
;
height
:
100%
;
border-right
:
1px
dashed
#f0f0f0
;
border-right
:
1px
dashed
#f0f0f0
;
}
}
.price
{
.price
{
font-size
:
3
2
px
;
font-size
:
3
0
px
;
font-weight
:
800
;
font-weight
:
800
;
margin-right
:
8px
;
}
}
.right
{
.right
{
width
:
65%
;
width
:
65%
;
...
...
This diff is collapsed.
Click to expand it.
wx_application/src/views/coupon/list.vue
View file @
7a594803
...
@@ -36,15 +36,18 @@ export default {
...
@@ -36,15 +36,18 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
deptId
=
sessionStorage
.
getItem
(
'oyStallCode'
)
this
.
deptId
=
sessionStorage
.
getItem
(
'oyStallCode'
)
// this.deptId = 3
this
.
getList
()
this
.
getList
()
},
},
methods
:
{
methods
:
{
getList
()
{
getList
()
{
console
.
log
(
11
);
let
params
=
{
let
params
=
{
deptId
:
this
.
deptId
deptId
:
10
}
}
getCouponList
(
params
).
then
(
res
=>
{
getCouponList
(
params
).
then
(
res
=>
{
console
.
log
(
2
);
this
.
list
=
res
.
data
this
.
list
=
res
.
data
res
.
data
.
forEach
(
item
=>
{
res
.
data
.
forEach
(
item
=>
{
item
.
begin_date
=
item
.
begin_date
.
substr
(
0
,
4
)
+
'-'
+
item
.
begin_date
.
substr
(
4
,
2
)
+
'-'
+
item
.
begin_date
.
substr
(
6
,
2
)
item
.
begin_date
=
item
.
begin_date
.
substr
(
0
,
4
)
+
'-'
+
item
.
begin_date
.
substr
(
4
,
2
)
+
'-'
+
item
.
begin_date
.
substr
(
6
,
2
)
...
@@ -74,6 +77,7 @@ export default {
...
@@ -74,6 +77,7 @@ export default {
flex-direction
:
column
;
flex-direction
:
column
;
justify-content
:
flex-start
;
justify-content
:
flex-start
;
align-items
:
center
;
align-items
:
center
;
min-height
:
100%
;
}
}
.left
,
.right
{
.left
,
.right
{
font-size
:
16px
;
font-size
:
16px
;
...
...
This diff is collapsed.
Click to expand it.
ybf_wx/src/views/sideNav/discount/index copy.vue
View file @
7a594803
...
@@ -122,8 +122,6 @@ export default {
...
@@ -122,8 +122,6 @@ export default {
// console.log(this.zlist.voucher,'111')
// console.log(this.zlist.voucher,'111')
// })
// })
let
arr
=
res
.
data
.
map
(
item
=>
{
let
arr
=
res
.
data
.
map
(
item
=>
{
return
this
.
getVoucherList
(
item
.
oyStallCode
)
return
this
.
getVoucherList
(
item
.
oyStallCode
)
})
})
console
.
log
();
console
.
log
();
...
@@ -134,10 +132,10 @@ export default {
...
@@ -134,10 +132,10 @@ export default {
return
obj
return
obj
})
})
])
])
console
.
log
(
promiseAll
,
'promiseAll'
)
;
console
.
log
(
promiseAll
,
'promiseAll'
)
promiseAll
.
then
(
res
=>
{
promiseAll
.
then
(
res
=>
{
console
.
log
(
res
,
'sss'
)
;
console
.
log
(
res
,
'sss'
)
})
})
...
...
This diff is collapsed.
Click to expand it.
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