Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
f2301172
Commit
f2301172
authored
Jan 19, 2020
by
xd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小调整
parent
092a1124
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
40 deletions
+49
-40
addCounter.vue
ybf_admin/src/pages/in/contact/components/addCounter.vue
+3
-4
history.vue
ybf_admin/src/pages/in/contact/components/history.vue
+40
-29
mail.vue
ybf_admin/src/pages/in/contact/mail.vue
+2
-4
index.js
ybf_admin/src/router/index.js
+2
-2
counterMaintain.vue
ybf_wx/src/views/counter/counterMaintain.vue
+2
-1
No files found.
ybf_admin/src/pages/in/contact/components/addCounter.vue
View file @
f2301172
...
...
@@ -209,6 +209,9 @@ export default {
.cs
{
display
:
flex
;
}
.ct
>>>
.el-transfer-panel
{
width
:
180px
;
}
.choose
{
padding
:
16px
;
font-size
:
16px
;
...
...
@@ -220,7 +223,6 @@ export default {
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
/* border-bottom: 1px solid #f8f8f8; */
padding-bottom
:
10px
;
}
.transfer-footer
{
...
...
@@ -233,9 +235,6 @@ export default {
.ct
>>>
.el-dialog__body
{
padding
:
0
;
}
.ct
>>>
.el-transfer-panel
{
width
:
250px
;
}
.circle
{
width
:
30px
;
height
:
30px
;
...
...
ybf_admin/src/pages/in/contact/components/history.vue
View file @
f2301172
...
...
@@ -2,7 +2,9 @@
<div
class=
"main"
>
<div
class=
"titles"
style=
"height:40px;"
>
<span>
同步成员历史
</span>
<el-button
class=
"button buttondark"
size=
"small"
@
click=
"handleCancel"
>
返回
</el-button>
<el-button
class=
"button buttondark"
size=
"small"
@
click=
"handleCancel"
>
返回
</el-button
>
</div>
<div
class=
"lists"
>
<el-table
...
...
@@ -15,7 +17,12 @@
:header-cell-style=
"setListsHeadStyle"
height=
"calc(100vh - 300px)"
>
<el-table-column
label=
"序号"
width=
"70"
type=
"index"
align=
"center"
></el-table-column>
<el-table-column
label=
"序号"
width=
"70"
type=
"index"
align=
"center"
></el-table-column>
<el-table-column
prop=
"taskType"
label=
"姓名"
...
...
@@ -42,20 +49,19 @@
</div>
<div
class=
"pages"
>
<el-pagination
@
size-change=
"pagesSizeChange"
@
current-change=
"pagesNowPageChange"
:current-page=
"currentPage4"
:page-sizes=
"[100, 200, 300, 400]"
:page-size=
"100"
layout=
"prev, pager, next, sizes, jumper"
:total=
"400"
></el-pagination>
@
current-change=
"handleCurrentChange"
:current-page=
"page.currentPage"
:page-size=
"page.size"
layout=
"total, prev, pager, next, jumper"
:total=
"page.total"
>
</el-pagination>
</div>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
data
()
{
return
{
list
:
{
main
:
[
...
...
@@ -166,28 +172,34 @@ export default {
nowPageNum
:
4
}
},
isShow
:
true
}
isShow
:
true
,
page
:
{
currentPage
:
1
,
size
:
20
,
total
:
100
},
};
},
created
()
{},
created
()
{},
methods
:
{
listPick
()
{},
testButtonClick
()
{},
pagesSizeChange
()
{},
pagesNowPageChange
()
{},
setListsHeadStyle
({
row
,
column
,
rowIndex
,
columnIndex
})
{
listPick
()
{},
testButtonClick
()
{},
pagesSizeChange
()
{},
pagesNowPageChange
()
{},
setListsHeadStyle
({
row
,
column
,
rowIndex
,
columnIndex
})
{
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;"
;
}
else
{
return
''
return
""
;
}
},
handleCancel
()
{
this
.
isShow
=
false
this
.
$emit
(
'isShow'
,
false
)
handleCurrentChange
()
{},
handleCancel
()
{
this
.
isShow
=
false
;
this
.
$emit
(
"isShow"
,
false
);
}
}
}
}
;
</
script
>
<
style
lang=
"scss"
scoped
>
.titles
{
...
...
@@ -199,9 +211,9 @@ export default {
border-bottom
:
1px
solid
#f8f8f8
;
}
.btn
{
font-size
:
14px
;
font-weight
:bold
;
color
:
rgba
(
102
,
102
,
102
,
1
)
;
font-size
:
14px
;
font-weight
:
bold
;
color
:
rgba
(
102
,
102
,
102
,
1
);
}
.main
{
width
:
100%
;
...
...
@@ -269,5 +281,4 @@ export default {
justify-content
:
flex-end
;
align-items
:
center
;
}
</
style
>
ybf_admin/src/pages/in/contact/mail.vue
View file @
f2301172
...
...
@@ -351,7 +351,6 @@ export default {
data
.
children
.
push
(
newChild
);
},
edit
(
data
)
{
console
.
log
(
1111
);
},
remove
(
data
)
{
...
...
@@ -374,7 +373,6 @@ export default {
},
handleMove
()
{
this
.
moveDialogShow
=
true
;
console
.
log
(
111111
);
},
removeFinish
()
{
this
.
moveDialogShow
=
false
;
...
...
@@ -389,13 +387,13 @@ export default {
this
.
$refs
.
addStore
.
addStoreDialog
=
true
;
},
getMailList
()
{
let
data
=
{
/*
let data = {
}
getMailList(data).then(res => {
console.log(res,"通讯录表格数据");
})
})
*/
},
handleShopowner
()
{
...
...
ybf_admin/src/router/index.js
View file @
f2301172
...
...
@@ -32,7 +32,7 @@ const router = new VueRouter({
* 路由拦截
* 权限验证
*/
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
// 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
await
store
.
dispatch
(
'd2admin/page/isLoaded'
)
// 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
...
...
@@ -64,7 +64,7 @@ const router = new VueRouter({
// 不需要身份校验 直接通过
next
()
}
})
})
router
.
afterEach
(
to
=>
{
// 进度条
...
...
ybf_wx/src/views/counter/counterMaintain.vue
View file @
f2301172
...
...
@@ -61,7 +61,8 @@ export default {
name
:
""
,
floor
:
""
,
fileList
:
[],
bannerList
:[]
bannerList
:[],
message
:
""
};
}
};
...
...
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