Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.education.frontend
pica.cloud.web-education-admin
提交
47b24e1f
提交
47b24e1f
编写于
7月 02, 2020
作者:
yi.li
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev-advert-0629' into 'release'
教培项目新增广告位管理 code reviewer:李祎 See merge request !176
上级
266cab21
5820e7a4
变更
6
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
771 行增加
和
5 行删除
+771
-5
router.js
src/router/router.js
+11
-3
fetch.js
src/utils-o/fetch.js
+1
-1
fetch.js
src/utils/fetch.js
+1
-1
advert-simple-manage.vue
src/views/education/advert/advert-simple-manage.vue
+250
-0
edit-simple-advert.vue
src/views/education/advert/edit-simple-advert.vue
+501
-0
slidebar.vue
src/views/layout/slidebar.vue
+7
-0
未找到文件。
src/router/router.js
浏览文件 @
47b24e1f
...
...
@@ -39,7 +39,6 @@ const reviewAccessManage = r => require.ensure([], () => r(require('../views/cme
const
creditSendManage
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/cme/credit-send-manage.vue'
)),
'credit-send-manage'
)
const
applyDetail
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/cme/apply-detail.vue'
)),
'apply-detail'
)
const
templateManager
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/template-manager.vue'
)),
'ctemplate-manager'
)
const
templateEditor
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/template-editor.vue'
)),
'template-editor'
)
const
templateOpen
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/template-open.vue'
)),
'templateOpen'
)
...
...
@@ -47,7 +46,8 @@ const eduRole = r => require.ensure([], () => r(require('../views/education/edu-
const
editCustom
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/edit-custom.vue'
)),
'templateOpen'
)
const
externalResourceManage
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/external-resource-manage.vue'
)),
'external-resource-manage'
)
const
auditCustomCourse
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/audit-custom-course.vue'
)),
'audit-custom-course'
)
const
advertSimpleManage
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/advert/advert-simple-manage.vue'
)),
'advert-simple-manage'
)
const
editSimpleAdvert
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/advert/edit-simple-advert.vue'
)),
'edit-simple-advert'
)
const
noticeEditor
=
r
=>
require
.
ensure
([],
()
=>
r
(
require
(
'../views/education/notice-editor.vue'
)),
'notice-editor'
)
...
...
@@ -229,11 +229,19 @@ export default [{
{
path
:
'/external-resource-manage'
,
component
:
externalResourceManage
,
},
},
{
path
:
'/audit-custom-course'
,
component
:
auditCustomCourse
,
},
{
path
:
'/advert-simple-manage'
,
component
:
advertSimpleManage
,
},
{
path
:
'/edit-simple-advert'
,
component
:
editSimpleAdvert
,
},
// {
// path: '/followup',
// name: 'followUp',
...
...
src/utils-o/fetch.js
浏览文件 @
47b24e1f
...
...
@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
// config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
config
.
headers
[
'token'
]
=
'
3167CD6495A14C14AEF28AB99F69984D
'
;
config
.
headers
[
'token'
]
=
'
F64D5633857D4E16B3C2CCE5E48B0D1E
'
;
}
else
{
config
.
headers
[
'token'
]
=
localStorage
.
getItem
(
'storageToken'
)
}
...
...
src/utils/fetch.js
浏览文件 @
47b24e1f
...
...
@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
}
if
(
process
.
env
.
BUILD_ENV
==
"development"
){
// 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config
.
headers
[
'token'
]
=
'
C43C516E69594935B8583EDB243BB797
'
;
config
.
headers
[
'token'
]
=
'
F64D5633857D4E16B3C2CCE5E48B0D1E
'
;
// config.headers['token'] = localStorage.getItem('storageToken')
}
else
{
config
.
headers
[
'token'
]
=
localStorage
.
getItem
(
'storageToken'
)
...
...
src/views/education/advert/advert-simple-manage.vue
0 → 100644
浏览文件 @
47b24e1f
<
template
>
<div
class=
"advert-simple-wrap"
>
<bread-crumb
:curmbFirst=
"curmbFirst"
:curmbSecond=
"curmbSecond"
></bread-crumb>
<div
class=
"review-access screenSet"
id=
"screenSet"
>
<div
class=
"header-title"
>
广告位管理
</div>
<el-form
ref=
"form"
:model=
"searchForm"
label-width=
"100px"
class=
"search-form-wrap"
>
<el-row>
<el-form-item
label=
"所属项目:"
class=
"search-item"
>
<el-input
v-model=
"searchForm.projectName"
size=
"small"
class=
"form-width"
placeholder=
"请输入项目名称"
></el-input>
</el-form-item>
<el-form-item
label=
"状态:"
class=
"search-item"
>
<el-select
v-model=
"searchForm.status"
placeholder=
"请选择"
size=
"small"
class=
"form-width"
>
<el-option
v-for=
"(item, index) in statusList"
:key=
"index"
:label=
"item.name"
:value=
"item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item
class=
"btn-list"
>
<el-button
@
click=
"search(true)"
type=
"primary"
size=
"small"
>
查 询
</el-button>
<el-button
@
click=
"reset"
size=
"small"
>
重 置
</el-button>
</el-form-item>
</el-row>
<el-row
style=
"float: right;"
>
<el-button
@
click=
"addAdvert()"
type=
"primary"
size=
"small"
>
新建广告位
</el-button>
</el-row>
</el-form>
<el-table
:data=
"tableList"
border
style=
"width: 100%"
>
<el-table-column
align=
"center"
prop=
"id"
label=
"广告位编号"
></el-table-column>
<el-table-column
align=
"center"
prop=
"pageType"
label=
"页面类型"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
pageType
==
0
?
'项目列表页'
:
'项目详情页'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"projectName"
label=
"所属项目"
></el-table-column>
<el-table-column
align=
"center"
prop=
"position"
label=
"页面位置"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
position
==
0
?
'顶部广告位'
:
'底部广告位'
}}
</span>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
prop=
"status"
label=
"审核状态"
>
<
template
slot-scope=
"scope"
>
<span
v-html=
"getHtmlStatus(scope.row.status)"
></span>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"editAdvert(scope.row)"
type=
"text"
size=
"small"
>
<span
style=
"color: #449284;"
>
编辑
</span>
</el-button>
</
template
>
</el-table-column>
<div
slot=
"empty"
>
<div
class=
"table-empty"
>
<img
src=
"../../../assets/image/no-content1.png"
/>
<p>
没有查询到数据
</p>
</div>
</div>
</el-table>
<div
class=
"pagination"
>
<el-pagination
class=
"pagination-style"
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:total=
"totalRows"
:current-page=
"searchForm.pageNo"
:page-sizes=
"[15, 30, 50, 100]"
:page-size=
"searchForm.pageSize"
layout=
"total, sizes, prev, pager, next, jumper"
></el-pagination>
</div>
</div>
</div>
</template>
<
script
>
import
{
openLoading
,
closeLoading
}
from
"../../../utils/utils"
;
import
BreadCrumb
from
"../../../components/breadcrumb.vue"
;
import
*
as
commonUtil
from
"../../../utils/utils"
;
import
{
handleDeleteReq
}
from
"@/utils/cme/cmeApi"
;
export
default
{
data
()
{
return
{
curmbFirst
:
"教培项目"
,
curmbSecond
:
"广告位管理"
,
totalRows
:
0
,
searchForm
:
{
projectName
:
""
,
status
:
-
1
,
pageNo
:
1
,
pageSize
:
15
},
statusList
:
[
{
name
:
"全部"
,
value
:
-
1
},
{
name
:
"未发布"
,
value
:
0
},
{
name
:
"已发布"
,
value
:
1
},
{
name
:
"已下线"
,
value
:
2
}
],
tableList
:
[]
};
},
components
:
{
BreadCrumb
},
created
()
{
this
.
search
();
},
mounted
()
{
commonUtil
.
resizeHeight
();
},
methods
:
{
//
getHtmlStatus
(
status
)
{
if
(
status
==
0
)
{
return
`<span style="color:#666666;">未发布</span>`
;
}
else
if
(
status
==
1
)
{
return
`<span style="color:#417505;">已发布</span>`
;
}
else
if
(
status
==
2
)
{
return
`<span style="color:#D0021B;">已下线</span>`
;
}
else
{
return
""
;
}
},
// 查询列表
search
(
needResetPage
)
{
// let searchForm = Object.assign({}, this.searchForm);
needResetPage
&&
(
this
.
searchForm
.
pageNo
=
1
);
this
.
GET
(
"portal/jump/list"
,
this
.
searchForm
).
then
(
res
=>
{
if
(
res
.
code
==
"000000"
)
{
this
.
tableList
=
(
res
.
data
&&
res
.
data
.
list
)
||
[];
this
.
totalRows
=
res
.
data
.
totalSize
||
0
;
}
});
},
// 重置
reset
()
{
this
.
searchForm
=
{
projectId
:
""
,
status
:
-
1
,
pageNo
:
1
,
pageSize
:
15
};
},
// 新增
addAdvert
()
{
this
.
$router
.
push
({
path
:
"edit-simple-advert"
,
query
:
{
id
:
null
}
});
},
// 查看
editAdvert
(
row
)
{
this
.
$router
.
push
({
path
:
"edit-simple-advert"
,
query
:
{
id
:
row
.
id
}
});
},
// 切换每页个数
handleSizeChange
(
val
)
{
this
.
searchForm
.
pageSize
=
val
;
this
.
search
();
},
// 切换当前页
handleCurrentChange
(
val
)
{
this
.
searchForm
.
pageNo
=
val
;
this
.
search
();
}
}
};
</
script
>
<
style
lang=
"scss"
>
.advert-simple-wrap
{
.review-access
{
padding
:
10px
;
background
:
#fff
;
.el-button--small
{
font-size
:
14px
;
}
.header-title
{
padding
:
10px
12px
20px
;
font-size
:
14px
;
color
:
#606266
;
border-bottom
:
1px
solid
#efefef
;
}
.search-form-wrap
{
padding
:
25px
0
20px
;
overflow
:
hidden
;
// border-bottom: 1px dashed #efefef;
}
.search-item
{
float
:
left
;
}
.btn-list
{
float
:
right
;
.el-form-item__content
{
margin-left
:
0
!
important
;
}
}
.new-add
{
float
:
right
;
margin
:
10px
0
20px
;
}
.table-empty
{
img
{
width
:
100px
;
}
p
{
margin-top
:
-50px
;
}
}
}
}
</
style
>
\ No newline at end of file
src/views/education/advert/edit-simple-advert.vue
0 → 100644
浏览文件 @
47b24e1f
此差异已折叠。
点击以展开。
src/views/layout/slidebar.vue
浏览文件 @
47b24e1f
...
...
@@ -404,6 +404,12 @@
icon
:
'el-icon-setting'
,
index
:
'template-manager'
};
const
advertSimpleManage
=
{
title
:
'教培项目广告位管理'
,
icon
:
'el-icon-setting'
,
index
:
'advert-simple-manage'
};
const
eduRole
=
{
title
:
'角色权限'
,
icon
:
'el-icon-menu'
,
...
...
@@ -467,6 +473,7 @@
vm
.
items
[
1
].
subs
.
push
(
itemComponent
);
vm
.
items
[
1
].
subs
.
push
(
templateManager
);
vm
.
items
[
1
].
subs
.
push
(
followSider
);
vm
.
items
[
1
].
subs
.
push
(
advertSimpleManage
);
vm
.
items
.
push
(
eduRole
);
vm
.
items
.
push
(
cme
);
vm
.
items
.
push
(
yqRange
);
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录