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
6d835a73
Commit
6d835a73
authored
Jan 19, 2020
by
xd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
f2301172
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
19 deletions
+30
-19
jinjian.js
ybf_admin/src/api/jinjian.js
+6
-0
history.vue
ybf_admin/src/pages/in/contact/components/history.vue
+8
-4
createBigWheelActive.vue
ybf_wx/src/views/active/createBigWheelActive.vue
+16
-15
No files found.
ybf_admin/src/api/jinjian.js
View file @
6d835a73
...
@@ -18,3 +18,9 @@ export function getOrgTree(data) {
...
@@ -18,3 +18,9 @@ export function getOrgTree(data) {
data
:
data
data
:
data
})
})
}
}
export
function
getHistoryList
()
{
return
request
({
url
:
'/admin/auth/addressbook/synchronization'
,
method
:
'get'
,
})
}
\ No newline at end of file
ybf_admin/src/pages/in/contact/components/history.vue
View file @
6d835a73
...
@@ -60,7 +60,9 @@
...
@@ -60,7 +60,9 @@
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getHistoryList
}
from
"@/api/jinjian"
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
list
:
{
list
:
{
...
@@ -182,10 +184,12 @@ export default {
...
@@ -182,10 +184,12 @@ export default {
},
},
created
()
{},
created
()
{},
methods
:
{
methods
:
{
listPick
()
{},
getList
()
{
testButtonClick
()
{},
getHistoryList
().
then
(
res
=>
{
pagesSizeChange
()
{},
console
.
log
(
res
,
"res"
);
pagesNowPageChange
()
{},
})
},
setListsHeadStyle
({
row
,
column
,
rowIndex
,
columnIndex
})
{
setListsHeadStyle
({
row
,
column
,
rowIndex
,
columnIndex
})
{
if
(
rowIndex
===
0
)
{
if
(
rowIndex
===
0
)
{
return
"background-color: #0B0F32; border-right: 1px solid white;color: white;"
;
return
"background-color: #0B0F32; border-right: 1px solid white;color: white;"
;
...
...
ybf_wx/src/views/active/createBigWheelActive.vue
View file @
6d835a73
...
@@ -272,7 +272,7 @@
...
@@ -272,7 +272,7 @@
v-model=
"prizeList[index].startTime"
v-model=
"prizeList[index].startTime"
type=
"date"
type=
"date"
@
cancel=
"prizeList[index].startShow = false"
@
cancel=
"prizeList[index].startShow = false"
@
confirm=
"
handlePSTime(index)
"
@
confirm=
"
prizeList[index].startShow = false
"
@
change=
"startTimeChange2(prizeList[index].startTime, index)"
@
change=
"startTimeChange2(prizeList[index].startTime, index)"
/>
/>
</van-popup>
</van-popup>
...
@@ -298,7 +298,7 @@
...
@@ -298,7 +298,7 @@
v-model=
"prizeList[index].endTime"
v-model=
"prizeList[index].endTime"
type=
"date"
type=
"date"
@
cancel=
"prizeList[index].endShow = false"
@
cancel=
"prizeList[index].endShow = false"
@
confirm=
"
handlePETime(index)
"
@
confirm=
"
prizeList[index].endShow = false
"
@
change=
"endTimeChange2(prizeList[index].endTime, index)"
@
change=
"endTimeChange2(prizeList[index].endTime, index)"
/>
/>
</van-popup>
</van-popup>
...
@@ -406,7 +406,7 @@ export default {
...
@@ -406,7 +406,7 @@ export default {
fullMoney
:
""
,
fullMoney
:
""
,
fullShow
:
false
,
fullShow
:
false
,
validity
:
""
,
validity
:
""
,
startTime
:
new
Date
()
,
startTime
:
""
,
startTime1
:
""
,
startTime1
:
""
,
startShow
:
false
,
startShow
:
false
,
endTime
:
""
,
endTime
:
""
,
...
@@ -441,12 +441,8 @@ export default {
...
@@ -441,12 +441,8 @@ export default {
this
.
prizeList
[
index
].
startTime1
=
this
.
timeFormat
(
e
);
this
.
prizeList
[
index
].
startTime1
=
this
.
timeFormat
(
e
);
},
},
handlePSTime
(
index
)
{
handlePSTime
(
index
)
{
this
.
prizeList
[
index
].
startShow
=
false
this
.
prizeList
[
index
].
startTime1
=
this
.
timeFormat
(
this
.
confirmTime
)
this
.
prizeList
[
index
].
startTime1
=
this
.
timeFormat
(
this
.
confirmTime
)
},
this
.
prizeList
[
index
].
startShow
=
false
handlePETime
(
index
)
{
this
.
prizeList
[
index
].
endShow
=
false
this
.
prizeList
[
index
].
endTime1
=
this
.
timeFormat
(
this
.
confirmTime
)
},
},
timeFormat
(
time
)
{
timeFormat
(
time
)
{
let
year
=
1900
+
time
.
getYear
();
let
year
=
1900
+
time
.
getYear
();
...
@@ -458,10 +454,18 @@ export default {
...
@@ -458,10 +454,18 @@ export default {
endTimeChange
(
e
)
{
endTimeChange
(
e
)
{
let
endTimeArr
=
e
.
getValues
();
let
endTimeArr
=
e
.
getValues
();
this
.
basicInfo
.
endTime1
=
`
${
endTimeArr
[
0
]}
-
${
endTimeArr
[
1
]}
-
${
endTimeArr
[
2
]}
`
;
this
.
basicInfo
.
endTime1
=
`
${
endTimeArr
[
0
]}
-
${
endTimeArr
[
1
]}
-
${
endTimeArr
[
2
]}
`
;
},
handleBasicETime
(
value
)
{
this
.
basicInfo
.
endShow
=
false
this
.
basicInfo
.
endTime1
=
this
.
timeFormat
(
value
)
},
},
endTimeChange2
(
e
,
index
)
{
endTimeChange2
(
e
,
index
)
{
this
.
prizeList
[
index
].
endTime1
=
this
.
timeFormat
(
e
);
this
.
prizeList
[
index
].
endTime1
=
this
.
timeFormat
(
e
);
},
},
handlePETime
(
index
)
{
this
.
prizeList
[
index
].
endTime1
=
this
.
timeFormat
(
this
.
confirmTime
)
this
.
prizeList
[
index
].
endShow
=
false
},
// 数字大写转小写
// 数字大写转小写
numberToUpperCase
(
textIndex
)
{
numberToUpperCase
(
textIndex
)
{
let
newString
=
""
;
let
newString
=
""
;
...
@@ -544,10 +548,7 @@ export default {
...
@@ -544,10 +548,7 @@ export default {
this
.
basicInfo
.
startShow
=
false
this
.
basicInfo
.
startShow
=
false
this
.
basicInfo
.
startTime1
=
this
.
timeFormat
(
value
)
this
.
basicInfo
.
startTime1
=
this
.
timeFormat
(
value
)
},
},
handleBasicETime
(
value
)
{
this
.
basicInfo
.
endShow
=
false
this
.
basicInfo
.
endTime1
=
this
.
timeFormat
(
value
)
},
},
},
mounted
()
{
mounted
()
{
this
.
pTime
=
this
.
timeFormat
(
this
.
pTime
)
this
.
pTime
=
this
.
timeFormat
(
this
.
pTime
)
...
...
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