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
a8d49b75
Commit
a8d49b75
authored
Jan 19, 2020
by
Z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Z: Dot: PC: Change Homepage's router.
parent
092a1124
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
132 additions
and
119 deletions
+132
-119
store.js
ybf_admin/src/api/in/store.js
+10
-0
bar.js
ybf_admin/src/api/task/bar.js
+10
-0
header.js
ybf_admin/src/menu/header.js
+5
-5
store.vue
ybf_admin/src/pages/in/contact/store.vue
+72
-86
index.vue
ybf_admin/src/pages/task/bar/index.vue
+2
-7
routes.js
ybf_admin/src/router/routes.js
+11
-10
page.vue
ybf_admin/src/views/system/login/page.vue
+2
-3
home.vue
ybf_wx/src/views/home.vue
+2
-2
index.vue
ybf_wx/src/views/sideNav/discount/index.vue
+18
-6
No files found.
ybf_admin/src/api/in/store.js
0 → 100644
View file @
a8d49b75
import
request
from
'@/utils/request'
import
qs
from
'qs'
export
function
ApiStoreGetMainList
(
inData
)
{
return
request
({
url
:
'/admin/auth/stall/stallPage'
,
method
:
'get'
,
params
:
inData
})
}
ybf_admin/src/api/task/bar.js
0 → 100644
View file @
a8d49b75
import
request
from
'@/utils/request'
import
qs
from
'qs'
export
function
ApiContactSync
(
inData
)
{
return
request
({
url
:
'/admin/auth/addressbook/synchronization'
,
method
:
'get'
,
params
:
inData
})
}
ybf_admin/src/menu/header.js
View file @
a8d49b75
...
@@ -11,11 +11,11 @@ export default [
...
@@ -11,11 +11,11 @@ export default [
// { path: '/page-demo', title: '新建示例' }
// { path: '/page-demo', title: '新建示例' }
// ]
// ]
// },
// },
{
//
{
path
:
'/home/main'
,
//
path: '/home/main',
title
:
'首页'
,
//
title: '首页',
icon
:
''
//
icon: ''
},
//
},
{
{
path
:
'/in/contact'
,
path
:
'/in/contact'
,
title
:
'进件管理'
,
title
:
'进件管理'
,
...
...
ybf_admin/src/pages/in/contact/store.vue
View file @
a8d49b75
...
@@ -8,12 +8,7 @@
...
@@ -8,12 +8,7 @@
</div>
</div>
<!-- 搜索区 -->
<!-- 搜索区 -->
<el-form
<el-form
class=
"searchzone"
:inline=
"true"
:model=
"data.search"
label-width=
"auto"
>
class=
"searchzone"
:inline=
"true"
:model=
"data.search"
label-width=
"auto"
>
<el-form-item
label=
"关键词"
>
<el-form-item
label=
"关键词"
>
<el-input
<el-input
size=
"small"
size=
"small"
...
@@ -22,16 +17,11 @@
...
@@ -22,16 +17,11 @@
placeholder=
"请输入关键词"
placeholder=
"请输入关键词"
/>
/>
</el-form-item>
</el-form-item>
<el-button
<el-button
class=
"button buttondark"
size=
"small"
style=
"margin-top:4px;"
>
搜索
</el-button>
class=
"button buttondark"
size=
"small"
style=
"margin-top:4px;"
>
搜索
</el-button
>
</el-form>
</el-form>
</div>
</div>
<div
class=
"lists"
>
<div
class=
"lists"
>
<el-table
<
!--
<
el-table
stripe
stripe
class=
"list"
class=
"list"
ref=
"multipleTable"
ref=
"multipleTable"
...
@@ -42,57 +32,44 @@
...
@@ -42,57 +32,44 @@
height=
"calc(100vh - 360px)"
height=
"calc(100vh - 360px)"
>
>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
<el-table-column
prop=
"taskName"
label=
"门店名称"
align=
"center"
></el-table-column>
prop=
"taskName"
<el-table-column
prop=
"taskType"
label=
"门店类型"
align=
"center"
width=
"120"
></el-table-column>
label=
"门店名称"
<el-table-column
prop=
"bar"
label=
"门店负责人"
align=
"center"
width=
"120"
></el-table-column>
align=
"center"
<el-table-column
prop=
"bar"
label=
"所属柜组"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"位置"
align=
"center"
width=
"120"
></el-table-column>
></el-table-column>
<el-table-column
prop=
"bar"
label=
"门牌号"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"taskType"
label=
"门店类型"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"门店负责人"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"所属柜组"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"位置"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"门牌号"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"200"
>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"200"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<el-button
type=
"text"
class=
"btn"
@
click=
"handleDetail(scope.row)"
<el-button
type=
"text"
class=
"btn"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
>
详情
</el-button
<el-button
type=
"text"
class=
"btn"
@
click=
"testButtonClick(scope.row)"
>
编辑
</el-button>
>
<el-button
type=
"text"
@
click=
"testButtonClick(scope.row)"
class=
"listButtonRed"
>
删除
</el-button>
<el-button
type=
"text"
class=
"btn"
@
click=
"testButtonClick(scope.row)"
</
template
>
>
编辑
</el-button
</el-table-column>
>
</el-table>
-->
<el-button
<el-table
type=
"text"
stripe
@
click=
"testButtonClick(scope.row)"
class=
"list"
class=
"listButtonRed"
ref=
"multipleTable"
>
删除
</el-button
:data=
"list.main"
tooltip-effect=
"dark"
style=
"width: 100%"
@
selection-change=
"listPick"
height=
"calc(100vh - 360px)"
>
>
<el-table-column
type=
"selection"
width=
"60"
></el-table-column>
<el-table-column
prop=
"taskName"
label=
"门店名称"
align=
"center"
></el-table-column>
<el-table-column
prop=
"taskType"
label=
"门店类型"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"门店负责人"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"所属柜组"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"位置"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
prop=
"bar"
label=
"门牌号"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
fixed=
"right"
width=
"200"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
class=
"btn"
@
click=
"handleDetail(scope.row)"
>
详情
</el-button>
<el-button
type=
"text"
class=
"btn"
@
click=
"testButtonClick(scope.row)"
>
编辑
</el-button>
<el-button
type=
"text"
@
click=
"testButtonClick(scope.row)"
class=
"listButtonRed"
>
删除
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -103,17 +80,18 @@
...
@@ -103,17 +80,18 @@
:current-page=
"page.currentPage"
:current-page=
"page.currentPage"
:page-size=
"page.size"
:page-size=
"page.size"
layout=
"total, prev, pager, next, jumper"
layout=
"total, prev, pager, next, jumper"
:total=
"page.total"
>
:total=
"page.total"
</el-pagination>
>
</el-pagination>
</div>
</div>
<add-store
ref=
"addStore"
></add-store>
<add-store
ref=
"addStore"
></add-store>
<store-detail
ref=
"storeDetail"
></store-detail>
<store-detail
ref=
"storeDetail"
></store-detail>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
AddStore
from
'./components/addStore'
import
AddStore
from
"./components/addStore"
;
import
StoreDetail
from
'./components/storeDetail'
import
StoreDetail
from
"./components/storeDetail"
;
import
{
ApiStoreGetMainList
}
from
"@api/in/store"
;
export
default
{
export
default
{
components
:
{
components
:
{
AddStore
,
AddStore
,
...
@@ -121,10 +99,10 @@ export default {
...
@@ -121,10 +99,10 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
page
:{
page
:
{
currentPage
:
1
,
currentPage
:
1
,
size
:
20
,
size
:
20
,
total
:
100
total
:
100
},
},
list
:
{
list
:
{
main
:
[
main
:
[
...
@@ -208,7 +186,7 @@ export default {
...
@@ -208,7 +186,7 @@ export default {
]
]
}
}
},
},
tableHeight
:
window
.
innerHeight
*
0.5
,
tableHeight
:
window
.
innerHeight
*
0.5
,
data
:
{
data
:
{
search
:
{
search
:
{
bar
:
""
,
bar
:
""
,
...
@@ -222,8 +200,16 @@ export default {
...
@@ -222,8 +200,16 @@ export default {
}
}
};
};
},
},
created
()
{},
created
()
{
this
.
ApiStoreGetMainList
();
},
methods
:
{
methods
:
{
storeGetMainList
()
{
ApiGetStoreList
().
then
(
res
=>
{
this
.
list
.
main
=
res
.
data
.
adminStalls
;
});
},
listPick
()
{},
listPick
()
{},
testButtonClick
()
{},
testButtonClick
()
{},
pagesSizeChange
()
{},
pagesSizeChange
()
{},
...
@@ -232,26 +218,26 @@ export default {
...
@@ -232,26 +218,26 @@ export default {
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;"
;
}
else
{
}
else
{
return
""
return
""
;
}
}
},
},
addStore
()
{
addStore
()
{
this
.
$refs
.
addStore
.
addStoreDialog
=
true
this
.
$refs
.
addStore
.
addStoreDialog
=
true
;
},
},
handleDetail
()
{
handleDetail
()
{
this
.
$refs
.
storeDetail
.
detailDialog
=
true
this
.
$refs
.
storeDetail
.
detailDialog
=
true
;
},
},
handleCurrentChange
(
val
)
{
handleCurrentChange
(
val
)
{
console
.
log
(
`当前页:
${
val
}
`
);
console
.
log
(
`当前页:
${
val
}
`
);
}
,
}
}
}
};
};
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.btn
{
.btn
{
font-size
:
14px
;
font-size
:
14px
;
font-weight
:bold
;
font-weight
:
bold
;
color
:
rgba
(
102
,
102
,
102
,
1
)
;
color
:
rgba
(
102
,
102
,
102
,
1
);
}
}
.main
{
.main
{
position
:
relative
;
position
:
relative
;
...
@@ -299,7 +285,7 @@ export default {
...
@@ -299,7 +285,7 @@ export default {
margin-top
:
20px
;
margin-top
:
20px
;
}
}
.listButtonRed
{
.listButtonRed
{
color
:
#
D0021B
;
color
:
#
d0021b
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.pages
{
.pages
{
...
...
ybf_admin/src/pages/task/bar/index.vue
View file @
a8d49b75
...
@@ -327,7 +327,7 @@
...
@@ -327,7 +327,7 @@
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
Api
LoginSubmit
}
from
"@api/login/main
"
;
import
{
Api
ContactSync
}
from
"@api/task/bar
"
;
import
md5
from
"js-md5"
;
import
md5
from
"js-md5"
;
export
default
{
export
default
{
...
@@ -567,12 +567,7 @@ export default {
...
@@ -567,12 +567,7 @@ export default {
},
},
searchsSend
()
{},
searchsSend
()
{},
searchsDels
()
{
searchsDels
()
{
let
postData
=
{
ApiContactSync
().
then
(
res
=>
{});
loginName
:
"Alice"
,
loginPwd
:
"AlicePwd"
};
ApiLoginSubmit
(
postData
).
then
(
res
=>
{});
},
},
searchsSearch
()
{},
searchsSearch
()
{},
...
...
ybf_admin/src/router/routes.js
View file @
a8d49b75
...
@@ -9,7 +9,8 @@ const frameIn = [
...
@@ -9,7 +9,8 @@ const frameIn = [
{
{
path
:
'/'
,
path
:
'/'
,
// redirect: { name: 'index' },
// redirect: { name: 'index' },
redirect
:
{
name
:
'homeMain'
},
// redirect: { name: 'homeMain' },
redirect
:
{
name
:
'inContact'
},
component
:
layoutHeaderAside
,
component
:
layoutHeaderAside
,
children
:
[
children
:
[
// 首页
// 首页
...
@@ -22,15 +23,15 @@ const frameIn = [
...
@@ -22,15 +23,15 @@ const frameIn = [
component
:
_import
(
'system/index'
)
component
:
_import
(
'system/index'
)
},
},
// Z-首页-首页
// Z-首页-首页
{
//
{
path
:
'/home/main'
,
//
path: '/home/main',
name
:
'homeMain'
,
//
name: 'homeMain',
component
:
()
=>
import
(
'@/pages/home/main'
),
//
component: () => import('@/pages/home/main'),
meta
:
{
//
meta: {
auth
:
true
,
//
auth: true,
title
:
'首页'
//
title: '首页'
}
//
}
},
//
},
// Z-进件管理-通讯录管理
// Z-进件管理-通讯录管理
{
{
path
:
'/in/contact'
,
path
:
'/in/contact'
,
...
...
ybf_admin/src/views/system/login/page.vue
View file @
a8d49b75
...
@@ -158,9 +158,8 @@ export default {
...
@@ -158,9 +158,8 @@ export default {
})
})
.
then
(()
=>
{
.
then
(()
=>
{
// 重定向对象不存在则返回顶层路径
// 重定向对象不存在则返回顶层路径
// this.$router.replace(this.$route.query.redirect || '/homeMain')
// this.$router.replace(this.$route.query.redirect || '/home/main')
// this.$router.replace(this.$route.query.redirect || '/homeMain')
this
.
$router
.
replace
(
this
.
$route
.
query
.
redirect
||
'/in/contact'
)
this
.
$router
.
replace
(
this
.
$route
.
query
.
redirect
||
'/home/main'
)
})
})
}
else
{
}
else
{
// 登录表单校验失败
// 登录表单校验失败
...
...
ybf_wx/src/views/home.vue
View file @
a8d49b75
...
@@ -17,8 +17,8 @@
...
@@ -17,8 +17,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<
button
class=
"testButton"
>
Test0606
</button
>
<
!--
<button
class=
"testButton"
>
Test0606
</button>
--
>
<
button
class=
"testButton"
>
Test0606
</button
>
<
!--
<button
class=
"testButton"
>
Test0606
</button>
--
>
</div>
</div>
...
...
ybf_wx/src/views/sideNav/discount/index.vue
View file @
a8d49b75
...
@@ -82,24 +82,36 @@ export default {
...
@@ -82,24 +82,36 @@ export default {
methods
:
{
methods
:
{
// testEaPost() {
// testEaPost() {
// let postData = {
// let postData = {
// appCode: "0606",
// appCode: '0603',
// crmActionDate: "2020-01-10"
// condType: 1,
// condValue: '138069094',
// };
// };
// ApiEaPost(postData).then(res => {
// ApiEaPost(postData).then(res => {
// console.log(res);
// console.log(res);
// });
// });
// },
// },
testEaPost
()
{
testEaPost
()
{
let
postData
=
{
let
postData
=
{
appCode
:
'0603'
,
appCode
:
'0606'
,
condType
:
1
,
crmActionDate
:
'2019-12-12'
condValue
:
'138069094'
,
};
};
ApiEaPost
(
postData
).
then
(
res
=>
{
ApiEaPost
(
postData
).
then
(
res
=>
{
console
.
log
(
res
);
//
console.log(res);
});
});
},
},
// testEaPost() {
// let postData = {
// appCode: '0608',
// content: 'text',
// phone: '18801342762',
// };
// ApiEaPost(postData).then(res => {
// // console.log(res);
// });
// },
buttonSingleMarketingClick
()
{
buttonSingleMarketingClick
()
{
// this.$router.push("");
// this.$router.push("");
},
},
...
...
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