Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
intel_promotion_manage
Project
Project
Details
Activity
Releases
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
张伯涛
intel_promotion_manage
Commits
da936156
Commit
da936156
authored
Jun 14, 2024
by
刘帅阳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
e74dc9fb
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
30 additions
and
27 deletions
+30
-27
common.scss
src/styles/themeA/common.scss
+3
-0
index.vue
src/views/brandAmbassador/index.vue
+2
-2
index.vue
src/views/contentManagement/banner/index.vue
+5
-5
index.vue
src/views/contentManagement/clickManagement/index.vue
+2
-2
index.vue
src/views/contentManagement/newsInformation/index.vue
+2
-2
index.vue
src/views/contentManagement/videoInformation/index.vue
+3
-3
index.vue
src/views/merchantManagement/index.vue
+4
-4
data.vue
src/views/system/dict/data.vue
+2
-2
index.vue
src/views/system/dict/index.vue
+1
-1
index.vue
src/views/system/role/index.vue
+3
-3
index.vue
src/views/system/user/index.vue
+3
-3
No files found.
src/styles/themeA/common.scss
View file @
da936156
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
.el-tree
{
.el-tree
{
font-size
:
14px
;
font-size
:
14px
;
}
}
.el-switch__core
{
width
:
40px
!
important
;
}
//登录验证码popover位置
//登录验证码popover位置
.verifyPopover
{
.verifyPopover
{
left
:
576px
!
important
;
left
:
576px
!
important
;
...
...
src/views/brandAmbassador/index.vue
View file @
da936156
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
style=
"padding-right: 10px"
style=
"padding-right: 10px"
:data=
"userList"
:data=
"userList"
>
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
9
0"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
10
0"
/>
<el-table-column
label=
"所属商家"
prop=
"deptName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"所属商家"
prop=
"deptName"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"姓名"
prop=
"name"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"姓名"
prop=
"name"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"操作"
label=
"操作"
width=
"
2
50"
width=
"
3
50"
class-name=
"small-padding fixed-width"
class-name=
"small-padding fixed-width"
>
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
...
src/views/contentManagement/banner/index.vue
View file @
da936156
...
@@ -62,8 +62,8 @@
...
@@ -62,8 +62,8 @@
<div
class=
"placeholder"
/>
<div
class=
"placeholder"
/>
<div
style=
"padding:5px 10px"
>
<div
style=
"padding:5px 10px"
>
<el-table
v-loading=
"loading"
border
:data=
"cmsBannerList"
>
<el-table
v-loading=
"loading"
border
:data=
"cmsBannerList"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
6
0px"
align=
"center"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
10
0px"
align=
"center"
/>
<el-table-column
label=
"图片"
prop=
"bannerPicture"
width=
"150px"
>
<el-table-column
label=
"图片"
prop=
"bannerPicture"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div
:id=
"step(scope.$index)"
>
<div
:id=
"step(scope.$index)"
>
<el-image
<el-image
...
@@ -102,12 +102,12 @@
...
@@ -102,12 +102,12 @@
{{
scope
.
row
.
type
===
'0'
?
'是'
:
'否'
}}
{{
scope
.
row
.
type
===
'0'
?
'是'
:
'否'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"排序"
prop=
"weight"
:show-overflow-tooltip=
"true"
width=
"80px"
>
<el-table-column
label=
"排序"
prop=
"weight"
:show-overflow-tooltip=
"true"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
weight
||
'-'
}}
{{
scope
.
row
.
weight
||
'-'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"120"
label=
"状态"
prop=
"flag"
>
<el-table-column
label=
"状态"
prop=
"flag"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-switch
<el-switch
v-model=
"scope.row.flag"
v-model=
"scope.row.flag"
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
<!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"
2
50px"
>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"
3
50px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
:class=
"commonField.updateClass"
:class=
"commonField.updateClass"
...
...
src/views/contentManagement/clickManagement/index.vue
View file @
da936156
...
@@ -67,13 +67,13 @@
...
@@ -67,13 +67,13 @@
<div
class=
"tableTitle"
>
推广次数管理
</div>
<div
class=
"tableTitle"
>
推广次数管理
</div>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<el-table-column
align=
"left"
prop=
"id"
label=
"序号"
width=
"
5
0px"
>
<el-table-column
align=
"left"
prop=
"id"
label=
"序号"
width=
"
10
0px"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
align=
"left"
prop=
"title"
label=
"标题"
show-overflow-tooltip
/>
<el-table-column
align=
"left"
prop=
"title"
label=
"标题"
show-overflow-tooltip
/>
<el-table-column
align=
"left"
prop=
"title"
label=
"类型"
width=
"80px"
show-overflow-tooltip
>
<el-table-column
align=
"left"
prop=
"title"
label=
"类型"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
type
===
'1'
?
'视频'
:
'新闻'
}}
{{
scope
.
row
.
type
===
'1'
?
'视频'
:
'新闻'
}}
</
template
>
</
template
>
...
...
src/views/contentManagement/newsInformation/index.vue
View file @
da936156
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
<div
class=
"tableTitle"
>
文章列表
</div>
<div
class=
"tableTitle"
>
文章列表
</div>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
style=
"text-align: left;"
>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
style=
"text-align: left;"
>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<el-table-column
align=
"left"
prop=
"id"
label=
"编号"
width=
"
55
px"
>
<el-table-column
align=
"left"
prop=
"id"
label=
"编号"
width=
"
100
px"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</
template
>
...
@@ -156,7 +156,7 @@
...
@@ -156,7 +156,7 @@
<span>{{ scope.row.nickName }}</span>
<span>{{ scope.row.nickName }}</span>
</template>
</template>
</el-table-column>-->
</el-table-column>-->
<el-table-column
align=
"center"
label=
"操作"
width=
"
27
0"
>
<el-table-column
align=
"center"
label=
"操作"
width=
"
35
0"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
v-has-permi=
"hasDetailPerm"
v-has-permi=
"hasDetailPerm"
...
...
src/views/contentManagement/videoInformation/index.vue
View file @
da936156
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
<div
class=
"tableTitle"
>
视频列表
</div>
<div
class=
"tableTitle"
>
视频列表
</div>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
style=
"text-align: left;"
>
<el-table
v-loading=
"fullscreenLoading"
:data=
"tableData"
border
sortable=
"true"
style=
"text-align: left;"
>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<span
slot=
"empty"
>
{{
tableDataTips
}}
</span>
<el-table-column
align=
"left"
prop=
"id"
label=
"编号"
width=
"
55
px"
>
<el-table-column
align=
"left"
prop=
"id"
label=
"编号"
width=
"
100
px"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
$index
+
1
}}
</span>
<span>
{{
scope
.
$index
+
1
}}
</span>
</
template
>
</
template
>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
<!-- <span>{{ scope.row.isForntPage === 1 ? '是' : '否' }}</span>-->
<!-- <span>{{ scope.row.isForntPage === 1 ? '是' : '否' }}</span>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
align=
"left"
prop=
"isRecommended"
width=
"150"
label=
"是否为推荐视频"
show-overflow-tooltip
>
<el-table-column
align=
"left"
prop=
"isRecommended"
label=
"是否为推荐视频"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
homeDisplay
===
'1'
?
'是'
:
'否'
}}
</span>
<span>
{{
scope
.
row
.
homeDisplay
===
'1'
?
'是'
:
'否'
}}
</span>
</
template
>
</
template
>
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
<span>{{ scope.row.nickName }}</span>
<span>{{ scope.row.nickName }}</span>
</template>
</template>
</el-table-column>-->
</el-table-column>-->
<el-table-column
align=
"center"
label=
"操作"
width=
"
2
70"
>
<el-table-column
align=
"center"
label=
"操作"
width=
"
3
70"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
v-has-permi=
"hasDetailPerm"
v-has-permi=
"hasDetailPerm"
...
...
src/views/merchantManagement/index.vue
View file @
da936156
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<div
style=
"padding:5px 10px"
>
<div
style=
"padding:5px 10px"
>
<div
class=
"tableTitle"
>
商家管理列表
</div>
<div
class=
"tableTitle"
>
商家管理列表
</div>
<el-table
v-loading=
"loading"
class=
"unitTable"
border
:data=
"shopList"
>
<el-table
v-loading=
"loading"
class=
"unitTable"
border
:data=
"shopList"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
55
"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
100
"
/>
<!--
<el-table-column
label=
"商家编号"
prop=
"businessId"
width=
"100"
align=
"center"
:show-overflow-tooltip=
"true"
>
<!--
<el-table-column
label=
"商家编号"
prop=
"businessId"
width=
"100"
align=
"center"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
businessId
}}
{{
scope
.
row
.
businessId
}}
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
<!-- {{ scope.row.unitNumber || '-' }}-->
<!-- {{ scope.row.unitNumber || '-' }}-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
label=
"商家管理员账号"
width=
"150"
prop=
"unitNumber"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"商家管理员账号"
prop=
"unitNumber"
:show-overflow-tooltip=
"true"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
unitNumber
||
'-'
}}
{{
scope
.
row
.
unitNumber
||
'-'
}}
</
template
>
</
template
>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
<!-- <span>{{ scope.row.createDate }}</span>-->
<!-- <span>{{ scope.row.createDate }}</span>-->
<!-- </template>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
width=
"70"
label=
"状态"
prop=
"flag"
>
<el-table-column
label=
"状态"
prop=
"flag"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-switch
<el-switch
v-model=
"scope.row.flag"
v-model=
"scope.row.flag"
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
/>
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"
1
50px"
>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"
2
50px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
<el-button
:class=
"commonField.updateClass"
:class=
"commonField.updateClass"
...
...
src/views/system/dict/data.vue
View file @
da936156
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
{{
isNaN
(
scope
.
row
.
dictSort
)
?
'-'
:
scope
.
row
.
dictSort
}}
{{
isNaN
(
scope
.
row
.
dictSort
)
?
'-'
:
scope
.
row
.
dictSort
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"状态"
align=
"center"
prop=
"flag"
>
<el-table-column
label=
"状态"
align=
"center"
width=
"200"
prop=
"flag"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-switch
<el-switch
v-model=
"scope.row.flag"
v-model=
"scope.row.flag"
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
/>
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:show-overflow-tooltip=
"true"
label=
"备注"
prop=
"remarks"
>
<el-table-column
:show-overflow-tooltip=
"true"
width=
"400"
label=
"备注"
prop=
"remarks"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
remarks
||
'-'
}}
{{
scope
.
row
.
remarks
||
'-'
}}
</
template
>
</
template
>
...
...
src/views/system/dict/index.vue
View file @
da936156
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<div
style=
"min-height: 445px;padding:5px 10px"
>
<div
style=
"min-height: 445px;padding:5px 10px"
>
<div
class=
"tableTitle"
>
字典管理列表
</div>
<div
class=
"tableTitle"
>
字典管理列表
</div>
<el-table
v-loading=
"loading"
border
:data=
"typeList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
border
:data=
"typeList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
55
"
align=
"center"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
100
"
align=
"center"
/>
<!--
<el-table-column
label=
"字典编号"
align=
"center"
prop=
"businessId"
/>
-->
<!--
<el-table-column
label=
"字典编号"
align=
"center"
prop=
"businessId"
/>
-->
<el-table-column
label=
"字典名称"
prop=
"dictName"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"字典名称"
prop=
"dictName"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
...
...
src/views/system/role/index.vue
View file @
da936156
...
@@ -73,14 +73,14 @@
...
@@ -73,14 +73,14 @@
<div
style=
"padding:5px 10px"
>
<div
style=
"padding:5px 10px"
>
<div
class=
"tableTitle"
>
角色管理列表
</div>
<div
class=
"tableTitle"
>
角色管理列表
</div>
<el-table
v-loading=
"loading"
border
:data=
"roleList"
@
selection-change=
"handleSelectionChange"
>
<el-table
v-loading=
"loading"
border
:data=
"roleList"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
5
0"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
10
0"
/>
<el-table-column
label=
"角色编号"
prop=
"number"
/>
<el-table-column
label=
"角色编号"
prop=
"number"
/>
<el-table-column
label=
"角色名称"
prop=
"roleName"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"角色名称"
prop=
"roleName"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
roleName
||
'-'
}}
{{
scope
.
row
.
roleName
||
'-'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"角色状态"
align=
"center"
width=
"100"
>
<el-table-column
label=
"角色状态"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-switch
<el-switch
v-model=
"scope.row.flag"
v-model=
"scope.row.flag"
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
<span>
{{
scope
.
row
.
updateDate
|
transformDateByFormat
(
'YYYY-MM-DD HH:mm'
)
}}
</span>
<span>
{{
scope
.
row
.
updateDate
|
transformDateByFormat
(
'YYYY-MM-DD HH:mm'
)
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"2
0
0px"
>
<el-table-column
label=
"操作"
class-name=
"small-padding fixed-width"
width=
"2
5
0px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<!-- //修改-->
<!-- //修改-->
<el-button
<el-button
...
...
src/views/system/user/index.vue
View file @
da936156
...
@@ -110,7 +110,7 @@
...
@@ -110,7 +110,7 @@
style=
"padding-right: 10px"
style=
"padding-right: 10px"
:data=
"userList"
:data=
"userList"
>
>
<el-table-column
type=
"index"
label=
"序号"
width=
"
9
0"
/>
<el-table-column
type=
"index"
label=
"序号"
width=
"
10
0"
/>
<el-table-column
label=
"登录名"
prop=
"username"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"登录名"
prop=
"username"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
username
||
'-'
}}
{{
scope
.
row
.
username
||
'-'
}}
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
{{
scope
.
row
.
phone
||
'-'
}}
{{
scope
.
row
.
phone
||
'-'
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
width=
"120"
label=
"用户状态"
prop=
"flag"
>
<el-table-column
label=
"用户状态"
prop=
"flag"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-switch
<el-switch
v-model=
"scope.row.flag"
v-model=
"scope.row.flag"
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"操作"
label=
"操作"
width=
"
2
50"
width=
"
3
50"
class-name=
"small-padding fixed-width"
class-name=
"small-padding fixed-width"
>
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
...
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