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
b38f99ff
Commit
b38f99ff
authored
Nov 04, 2019
by
chenxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:积分变更小需求
parent
aa9818d9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
4 deletions
+104
-4
ewash.js
src/router/modules/ewash.js
+8
-2
ewashApi.js
src/service/api/ewashApi.js
+2
-0
msgApi.js
src/service/api/msgApi.js
+6
-0
edit.vue
src/views/msg/edit.vue
+9
-2
integral-change.vue
src/views/msg/module/integral-change.vue
+79
-0
No files found.
src/router/modules/ewash.js
View file @
b38f99ff
...
...
@@ -42,7 +42,7 @@ export default {
name
:
'e袋洗账单'
,
component
:
()
=>
import
(
/* webpackChunkName: "ewash" */
'../../views/ewash/statements.vue'
),
meta
:
{
path
:
'/ewash/
list
'
path
:
'/ewash/
store
'
}
},
{
...
...
@@ -50,7 +50,7 @@ export default {
name
:
'e袋洗账单详情'
,
component
:
()
=>
import
(
/* webpackChunkName: "ewash" */
'../../views/ewash/statements-detail.vue'
),
meta
:
{
path
:
'/ewash/
list
'
path
:
'/ewash/
store
'
}
},
{
...
...
@@ -79,6 +79,12 @@ export default {
type
:
'copy'
,
path
:
'/card/record/get'
}
},
{
path
:
'store'
,
name
:
'门店管理'
,
component
:
()
=>
import
(
/* webpackChunkName: "ewash" */
'../../views/ewash/store-list.vue'
),
meta
:
{}
}
]
};
src/service/api/ewashApi.js
View file @
b38f99ff
...
...
@@ -17,3 +17,5 @@ export const edxOrderDetail = params => requests(PREFIX + 'edx-order-detail', pa
export
const
getEdxCategory
=
params
=>
requests
(
PREFIX
+
'edx-category'
,
params
);
// 导出卡券
export
const
exportEdxOrderCsv
=
config
.
api
+
PREFIX
+
'edx-order-csv'
;
// e袋洗 门店列表
export
const
getEdxStoreList
=
params
=>
requests
(
PREFIX
+
'edx-store-list'
,
params
);
src/service/api/msgApi.js
View file @
b38f99ff
...
...
@@ -23,3 +23,9 @@ export const listTemplateVariables = params => requests(PREFIX + 'list-template-
//模板消息--编辑--获取模板变量集合
export
const
updateTempAdvice
=
params
=>
requests
(
PREFIX
+
'update-temp-advice'
,
params
);
//模板消息--企业积分变更通知配置接口
export
const
getIntegralChangeSetting
=
params
=>
requests
(
PREFIX
+
'integral-change-notify-setting'
,
params
);
//模板消息--积分变动通知开关接口
export
const
setIntegralChange
=
params
=>
requests
(
PREFIX
+
'set-integral-change'
,
params
);
src/views/msg/edit.vue
View file @
b38f99ff
...
...
@@ -113,6 +113,11 @@
</el-select>
</el-form-item>
</section>
<!-- 积分变更提现 -->
<section
class=
"dm-form__wrap"
v-if=
"info.triggerCode === 'integralChange'"
>
<h3
class=
"dm-title__label"
>
提醒配置
</h3>
<integral-change
v-if=
"info.triggerCode === 'integralChange'"
/>
</section>
<div
class=
"btn-wrap_fixed"
:class=
"
{ on: asideShow }">
<el-button
type=
"primary"
@
click=
"handleUpdateTempAdvice"
>
保 存
</el-button>
<el-button
@
click=
"$router.go(-1)"
>
返 回
</el-button>
...
...
@@ -126,6 +131,7 @@ import { formatDateTimeByType, checkUrl } from '@/utils/index.js';
import
varDialog
from
'./variables.vue'
;
import
innerUrl
from
'@/components/innerUrl/innerUrl'
;
import
linktoolspage
from
'@/components/linktools/linktoolspage.vue'
;
import
integralChange
from
'./module/integral-change'
;
import
{
enableAccessControl
,
confirmInfo
,
alertInfo
}
from
'@/utils/auth.js'
;
export
default
{
...
...
@@ -170,7 +176,8 @@ export default {
components
:
{
varDialog
,
linktoolspage
,
innerUrl
innerUrl
,
integralChange
},
computed
:
{
asideShow
()
{
...
...
@@ -272,7 +279,7 @@ export default {
this
.
info
.
remarkText
=
this
.
info
.
remark
?
this
.
info
.
remark
.
split
(
'#'
)[
0
]
:
''
;
this
.
info
.
remarkColor
=
this
.
info
.
remark
?
'#'
+
(
this
.
info
.
remark
.
split
(
'#'
)[
1
]
||
'173177'
)
:
'#173177'
;
this
.
options
.
map
(
v
=>
{
console
.
log
(
this
.
info
.
headerText
.
indexOf
(
v
.
value
)
>
-
1
);
//
console.log(this.info.headerText.indexOf(v.value) > -1);
if
(
this
.
info
.
headerText
.
indexOf
(
v
.
value
)
>
-
1
)
{
// console.log(new RegExp((v.label+'/g')))
this
.
info
.
headerText
=
this
.
info
.
headerText
.
replace
(
v
.
value
,
v
.
label
);
...
...
src/views/msg/module/integral-change.vue
0 → 100644
View file @
b38f99ff
<
template
>
<div
class=
"integral-change"
v-loading=
"loading"
>
<p
class=
"pb20"
>
增加积分提醒
</p>
<ul>
<li
v-for=
"item in increaseList"
:key=
"item"
>
<label>
{{
item
.
dictName
}}
</label>
<el-switch
@
change=
"handleSetIntegralChange(item)"
:value=
"item.state"
:active-value=
"1"
:inactive-value=
"0"
/>
<template
v-if=
"item.dictCode == 1101"
>
<i
class=
"ml20 ml20 dm-title__label--icon iconfont icon-xinxixianshi"
></i>
<span
class=
"gray fz13"
>
已有门店消费通知,不建议再开启积分变更提现
</span>
</
template
>
</li>
</ul>
<p
class=
"pb20"
>
减少积分提醒
</p>
<ul>
<li
v-for=
"item in reduceList"
:key=
"item"
>
<label>
{{ item.dictName }}
</label>
<el-switch
@
change=
"handleSetIntegralChange(item)"
:value=
"item.state"
:active-value=
"1"
:inactive-value=
"0"
/>
</li>
</ul>
</div>
</template>
<
script
>
import
{
getIntegralChangeSetting
,
setIntegralChange
}
from
'@/service/api/msgApi.js'
;
export
default
{
name
:
'integral-change'
,
data
()
{
return
{
loading
:
false
,
increaseList
:
[],
// 增加积分提醒
reduceList
:
[]
// 减少积分提醒
};
},
methods
:
{
handleGetIntegralChangeSetting
()
{
this
.
loading
=
true
;
getIntegralChangeSetting
()
.
then
(
res
=>
{
this
.
loading
=
false
;
this
.
increaseList
=
res
.
result
.
increaseList
||
[];
this
.
reduceList
=
res
.
result
.
reduceList
||
[];
})
.
catch
(()
=>
{
this
.
loading
=
false
;
});
},
handleSetIntegralChange
({
id
,
state
})
{
this
.
loading
=
true
;
setIntegralChange
({
id
,
state
:
state
?
0
:
1
})
.
then
(
res
=>
{
this
.
loading
=
false
;
this
.
handleGetIntegralChangeSetting
();
})
.
catch
(()
=>
{
this
.
loading
=
false
;
});
}
},
mounted
()
{
this
.
handleGetIntegralChangeSetting
();
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
.integral-change
{
min-height
:
200px
;
ul
li
{
label
{
min-width
:
150px
;
display
:
inline-block
;
text-align
:
right
;
margin-bottom
:
20px
;
margin-right
:
15px
;
}
}
}
</
style
>
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