Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
Overview
Overview
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
marketing-web
marketing
Commits
f1e17b5d
Commit
f1e17b5d
authored
Feb 18, 2020
by
chenxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:build
parent
bd106065
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
index.html
dist/index.html
+2
-2
card.60e96ea8343e15edc2a4.js
dist/static/js/card.60e96ea8343e15edc2a4.js
+0
-0
manifest.628a5dcadec847fbc104.js
dist/static/js/manifest.628a5dcadec847fbc104.js
+2
-2
merge-list.vue
src/views/card/merge-list.vue
+1
-1
merge-record-list.vue
src/views/card/merge-record-list.vue
+2
-1
No files found.
dist/index.html
View file @
f1e17b5d
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
content=
"width=device-width,initial-scale=1"
><link
rel=
"shortcut icon"
href=
/marketing/static/img/favicon.ico
><title>
GIC后台
</title><link
rel=
stylesheet
type=
text/css
href=
/marketing/static/fonts/iconfont.css
><link
rel=
stylesheet
type=
text/css
href=
/marketing/static/css/common.css
><link
rel=
stylesheet
href=
//web-1251519181.file.myqcloud.com/components/element.2.12.0.css
><link
href=
/marketing/static/css/main.fd1f129b86eb3fbdcc4ef9e37489439f.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
src=
//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/element.2.12.0.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/header.2.0.33.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/card.2.0.08.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/store.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/people.2.0.38.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/input.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js
></script><script
type=
text/javascript
src=
/marketing/static/js/manifest.ad243e48c96fa6d7c4f2.js
></script><script
type=
text/javascript
src=
/marketing/static/js/vendor.810e43468685c3e36778.js
></script><script
type=
text/javascript
src=
/marketing/static/js/main.e1139ccc68c3d3749351.js
></script></body></html>
\ No newline at end of file
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
name=
viewport
content=
"width=device-width,initial-scale=1"
><link
rel=
"shortcut icon"
href=
/marketing/static/img/favicon.ico
><title>
GIC后台
</title><link
rel=
stylesheet
type=
text/css
href=
/marketing/static/fonts/iconfont.css
><link
rel=
stylesheet
type=
text/css
href=
/marketing/static/css/common.css
><link
rel=
stylesheet
href=
//web-1251519181.file.myqcloud.com/components/element.2.12.0.css
><link
href=
/marketing/static/css/main.fd1f129b86eb3fbdcc4ef9e37489439f.css
rel=
stylesheet
></head><body><div
id=
app
></div><script
src=
//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/element.2.12.0.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/header.2.0.33.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/card.2.0.08.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/store.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/people.2.0.38.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/input.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js
></script><script
src=
//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js
></script><script
type=
text/javascript
src=
/marketing/static/js/manifest.628a5dcadec847fbc104.js
></script><script
type=
text/javascript
src=
/marketing/static/js/vendor.810e43468685c3e36778.js
></script><script
type=
text/javascript
src=
/marketing/static/js/main.e1139ccc68c3d3749351.js
></script></body></html>
\ No newline at end of file
dist/static/js/card.
ed36d2b105001c0b3a4e
.js
→
dist/static/js/card.
60e96ea8343e15edc2a4
.js
View file @
f1e17b5d
This source diff could not be displayed because it is too large. You can
view the blob
instead.
dist/static/js/manifest.
ad243e48c96fa6d7c4f2
.js
→
dist/static/js/manifest.
628a5dcadec847fbc104
.js
View file @
f1e17b5d
!
function
(
e
){
var
r
=
window
.
webpackJsonp
;
window
.
webpackJsonp
=
function
(
n
,
a
,
c
){
for
(
var
i
,
f
,
u
,
s
=
0
,
d
=
[];
s
<
n
.
length
;
s
++
)
f
=
n
[
s
],
t
[
f
]
&&
d
.
push
(
t
[
f
][
0
]),
t
[
f
]
=
0
;
for
(
i
in
a
)
Object
.
prototype
.
hasOwnProperty
.
call
(
a
,
i
)
&&
(
e
[
i
]
=
a
[
i
]);
for
(
r
&&
r
(
n
,
a
,
c
);
d
.
length
;)
d
.
shift
()();
if
(
c
)
for
(
s
=
0
;
s
<
c
.
length
;
s
++
)
u
=
o
(
o
.
s
=
c
[
s
]);
return
u
};
var
n
=
{},
t
=
{
12
:
0
};
function
o
(
r
){
if
(
n
[
r
])
return
n
[
r
].
exports
;
var
t
=
n
[
r
]
=
{
i
:
r
,
l
:
!
1
,
exports
:{}};
return
e
[
r
].
call
(
t
.
exports
,
t
,
t
.
exports
,
o
),
t
.
l
=!
0
,
t
.
exports
}
o
.
e
=
function
(
e
){
var
r
=
t
[
e
];
if
(
0
===
r
)
return
new
Promise
(
function
(
e
){
e
()});
if
(
r
)
return
r
[
2
];
var
n
=
new
Promise
(
function
(
n
,
o
){
r
=
t
[
e
]
=
[
n
,
o
]});
r
[
2
]
=
n
;
var
a
=
document
.
getElementsByTagName
(
"head"
)[
0
],
c
=
document
.
createElement
(
"script"
);
c
.
type
=
"text/javascript"
,
c
.
charset
=
"utf-8"
,
c
.
async
=!
0
,
c
.
timeout
=
12
e4
,
o
.
nc
&&
c
.
setAttribute
(
"nonce"
,
o
.
nc
),
c
.
src
=
o
.
p
+
"static/js/"
+
({
0
:
"card"
,
1
:
"game"
,
2
:
"wechat"
,
3
:
"message"
,
4
:
"ewash"
,
5
:
"evaluation"
,
6
:
"ecm"
,
7
:
"recharge"
,
8
:
"msg"
,
9
:
"calllog"
}[
e
]
||
e
)
+
"."
+
{
0
:
"ed36d2b105001c0b3a4e"
,
1
:
"cccfb8478fee7428d453"
,
2
:
"e04323d416b97e80951a"
,
3
:
"acabddaaf6c376dcfc20"
,
4
:
"2e5200ab36d0761c17a9"
,
5
:
"874eba462c04264ff0dc"
,
6
:
"b38fa543459e8bf24733"
,
7
:
"7800a1645705a6640145"
,
8
:
"4b4e327d76f3e16d4b51"
,
9
:
"fecc3d1064e01cef69e9"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
f
,
12
e4
);
function
f
(){
c
.
onerror
=
c
.
onload
=
null
,
clearTimeout
(
i
);
var
r
=
t
[
e
];
0
!==
r
&&
(
r
&&
r
[
1
](
new
Error
(
"Loading chunk "
+
e
+
" failed."
)),
t
[
e
]
=
void
0
)}
return
c
.
onerror
=
c
.
onload
=
f
,
a
.
appendChild
(
c
),
n
},
o
.
m
=
e
,
o
.
c
=
n
,
o
.
d
=
function
(
e
,
r
,
n
){
o
.
o
(
e
,
r
)
||
Object
.
defineProperty
(
e
,
r
,{
configurable
:
!
1
,
enumerable
:
!
0
,
get
:
n
})},
o
.
n
=
function
(
e
){
var
r
=
e
&&
e
.
__esModule
?
function
(){
return
e
.
default
}:
function
(){
return
e
};
return
o
.
d
(
r
,
"a"
,
r
),
r
},
o
.
o
=
function
(
e
,
r
){
return
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
r
)},
o
.
p
=
"/marketing/"
,
o
.
oe
=
function
(
e
){
throw
console
.
error
(
e
),
e
}}([]);
\ No newline at end of file
!
function
(
e
){
var
r
=
window
.
webpackJsonp
;
window
.
webpackJsonp
=
function
(
n
,
a
,
c
){
for
(
var
i
,
f
,
u
,
s
=
0
,
d
=
[];
s
<
n
.
length
;
s
++
)
f
=
n
[
s
],
t
[
f
]
&&
d
.
push
(
t
[
f
][
0
]),
t
[
f
]
=
0
;
for
(
i
in
a
)
Object
.
prototype
.
hasOwnProperty
.
call
(
a
,
i
)
&&
(
e
[
i
]
=
a
[
i
]);
for
(
r
&&
r
(
n
,
a
,
c
);
d
.
length
;)
d
.
shift
()();
if
(
c
)
for
(
s
=
0
;
s
<
c
.
length
;
s
++
)
u
=
o
(
o
.
s
=
c
[
s
]);
return
u
};
var
n
=
{},
t
=
{
12
:
0
};
function
o
(
r
){
if
(
n
[
r
])
return
n
[
r
].
exports
;
var
t
=
n
[
r
]
=
{
i
:
r
,
l
:
!
1
,
exports
:{}};
return
e
[
r
].
call
(
t
.
exports
,
t
,
t
.
exports
,
o
),
t
.
l
=!
0
,
t
.
exports
}
o
.
e
=
function
(
e
){
var
r
=
t
[
e
];
if
(
0
===
r
)
return
new
Promise
(
function
(
e
){
e
()});
if
(
r
)
return
r
[
2
];
var
n
=
new
Promise
(
function
(
n
,
o
){
r
=
t
[
e
]
=
[
n
,
o
]});
r
[
2
]
=
n
;
var
a
=
document
.
getElementsByTagName
(
"head"
)[
0
],
c
=
document
.
createElement
(
"script"
);
c
.
type
=
"text/javascript"
,
c
.
charset
=
"utf-8"
,
c
.
async
=!
0
,
c
.
timeout
=
12
e4
,
o
.
nc
&&
c
.
setAttribute
(
"nonce"
,
o
.
nc
),
c
.
src
=
o
.
p
+
"static/js/"
+
({
0
:
"card"
,
1
:
"game"
,
2
:
"wechat"
,
3
:
"message"
,
4
:
"ewash"
,
5
:
"evaluation"
,
6
:
"ecm"
,
7
:
"recharge"
,
8
:
"msg"
,
9
:
"calllog"
}[
e
]
||
e
)
+
"."
+
{
0
:
"60e96ea8343e15edc2a4"
,
1
:
"cccfb8478fee7428d453"
,
2
:
"e04323d416b97e80951a"
,
3
:
"acabddaaf6c376dcfc20"
,
4
:
"2e5200ab36d0761c17a9"
,
5
:
"874eba462c04264ff0dc"
,
6
:
"b38fa543459e8bf24733"
,
7
:
"7800a1645705a6640145"
,
8
:
"4b4e327d76f3e16d4b51"
,
9
:
"fecc3d1064e01cef69e9"
}[
e
]
+
".js"
;
var
i
=
setTimeout
(
f
,
12
e4
);
function
f
(){
c
.
onerror
=
c
.
onload
=
null
,
clearTimeout
(
i
);
var
r
=
t
[
e
];
0
!==
r
&&
(
r
&&
r
[
1
](
new
Error
(
"Loading chunk "
+
e
+
" failed."
)),
t
[
e
]
=
void
0
)}
return
c
.
onerror
=
c
.
onload
=
f
,
a
.
appendChild
(
c
),
n
},
o
.
m
=
e
,
o
.
c
=
n
,
o
.
d
=
function
(
e
,
r
,
n
){
o
.
o
(
e
,
r
)
||
Object
.
defineProperty
(
e
,
r
,{
configurable
:
!
1
,
enumerable
:
!
0
,
get
:
n
})},
o
.
n
=
function
(
e
){
var
r
=
e
&&
e
.
__esModule
?
function
(){
return
e
.
default
}:
function
(){
return
e
};
return
o
.
d
(
r
,
"a"
,
r
),
r
},
o
.
o
=
function
(
e
,
r
){
return
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
r
)},
o
.
p
=
"/marketing/"
,
o
.
oe
=
function
(
e
){
throw
console
.
error
(
e
),
e
}}([]);
\ No newline at end of file
src/views/card/merge-list.vue
View file @
f1e17b5d
...
...
@@ -25,7 +25,7 @@
~
<br
/>
{{
formatDateTimeByType
(
scope
.
row
.
endDate
,
'yyyy-MM-dd'
)
}}
</span>
<span
v-else
>
--
</span>
<span
v-else
>
不限
</span>
</
template
>
</el-table-column>
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"120"
align=
"left"
prop=
"cardSize"
label=
"卡券数量"
></el-table-column>
...
...
src/views/card/merge-record-list.vue
View file @
f1e17b5d
...
...
@@ -2,7 +2,7 @@
<section
class=
"dm-wrap"
>
<div
class=
"pb22 clearfix"
>
<el-input
v-model=
"listParams.search"
class=
"w300"
placeholder=
"请输入卡券包名称"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<
el-input
v-model=
"listParams.receiveCode"
class=
"w300"
placeholder=
"请输入投放渠道"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input
>
<
!--
<el-input
v-model=
"listParams.receiveCode"
class=
"w300"
placeholder=
"请输入投放渠道"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
--
>
<el-select
class=
"dm-select w160"
v-model=
"listParams.sceneSettingId"
clearable
placeholder=
"所有营销场景"
@
change=
"refresh"
>
<el-option
v-for=
"item in sceneSettingIdOptions"
:key=
"item.sceneSettingId"
:label=
"item.sceneName"
:value=
"item.sceneSettingId"
></el-option>
</el-select>
...
...
@@ -30,6 +30,7 @@
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"120"
align=
"left"
prop=
"cardPackageName"
label=
"卡券包名称"
></el-table-column>
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"120"
align=
"left"
prop=
"receivePositionName"
label=
"领取位置"
></el-table-column>
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"120"
align=
"left"
prop=
"receiveName"
label=
"投放渠道"
></el-table-column>
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"120"
align=
"left"
prop=
"sceneSettingName"
label=
"场景值"
></el-table-column>
</el-table>
<el-pagination
v-show=
"tableList.length"
background
class=
"dm-pagination"
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:current-page=
"listParams.currentPage"
:page-sizes=
"[20, 40, 60, 80]"
:page-size=
"listParams.pageSize"
layout=
"total, sizes, prev, pager, next"
:total=
"total"
></el-pagination>
</section>
...
...
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