Skip to content

M
marketing
Commit 7c74ca35 by zhangmeng
Options

准备发布

parent 00f55b90
Showing with 53 additions and 46 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.bb8a898c94ae11d4608e3c89d85c3c70.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.d0b698b7b2e1419bf4f3.js></script><script type=text/javascript src=/marketing/static/js/app.ea414b016e1326eff3f2.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=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.3bd9e2ca32512fc3b984e2b75abfe3a0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.d0b698b7b2e1419bf4f3.js></script><script type=text/javascript src=/marketing/static/js/app.14dae58fbb6e2a9f8adf.js></script></body></html>
\ No newline at end of file
dist/static/js/app.14dae58fbb6e2a9f8adf.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ea414b016e1326eff3f2.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/card/group-send.vue
......@@ -43,28 +43,24 @@
<h3 class="dm-title__label">卡券通知方式配置</h3>
<el-form-item label="通知方式" class="is-required" prop="noticeType">
<el-radio v-model="form.noticeType" :label="0" :disabled="!isEditTemplate || isInfo">不通知
<el-popover placement="top-start" title="" width="200" trigger="hover"
content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
<i class="el-icon-info pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip class="item" effect="dark" content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）" placement="top-start">
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
<el-radio v-model="form.noticeType" :label="1" :disabled="!isEditTemplate || isInfo">微信群发接口
<el-popover placement="top-start" title="" width="200" trigger="hover"
content="建议大规模发券、智能营销定时计划使用，占用每个会员每月4次的营销次数。">
<i class="el-icon-info pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start" content="建议大规模发券、智能营销定时计划使用，占用每个会员每月4次的营销次数。">
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
<el-radio v-model="form.noticeType" :label="2" :disabled="!isEditTemplate || isInfo || form.templateUseEnable === 0">微信模板消息
<el-popover placement="top-start" title="" width="200" trigger="hover">
<span>建议小规模发券、智能营销实时计划使用，滥用可能导致模板消息被封。参考微信<a target="_blank" href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751288">《模板消息运营规范》</a></span>
<i class="el-icon-info pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start">
<span slot="content">建议小规模发券、智能营销实时计划使用，滥用可能导致模板消息被封。参考微信<a target="_blank" href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751288">《模板消息运营规范》</a></span>
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
</el-form-item>
<!-- 通知非 不通知-->
<el-form-item label="效果预览" v-if="form.noticeType">
<i class="el-icon-info pl5 gray"></i>
<span>若一个智能营销计划中添加多张卡券，{{form.noticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知。</span>
<div class="mt20">
<!-- 通知方式是微信群发接口 -->
<item-card :item="cardInfo" class="mr20" v-if="form.noticeType === 1"></item-card>
......@@ -93,6 +89,10 @@
</div>
</div>
</div>
<div class="ecm-send__tips">
<i class="el-icon-info pl5 gray"></i>
<span class="fz13">若一个智能营销计划中添加多张卡券，{{form.noticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知。</span>
</div>
</el-form-item>
</section>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
......@@ -615,9 +615,7 @@ export default {
overflow: auto;
&--inner {
background: #fff;
width: 565px;
// margin: 15px auto;
// padding: 10px;
width: 566px;
/deep/ .input-suffix{
width: 448px;
height: 40px;
......@@ -629,6 +627,9 @@ export default {
/deep/ .el-textarea__inner{
color: inherit;
}
/deep/ .el-form-item {
margin-bottom:3px;
}
}
}
.ecm-msg__preview{
......@@ -676,4 +677,14 @@ export default {
}
}
}
.ecm-send__tips{
display: inline-block;
border: 1px solid #B3D8FF;
padding: 10px 20px;
background: #ECF5FF;
margin: 10px;
i {
color: #1890ff;
}
}
</style>
src/views/card/partials/status-render.js
......@@ -40,21 +40,17 @@ export default Vue.component('render-temp', {
};
if (this.item.auditingStatus === 0) {
return (<div class="fr"><span class="green">审核中</span></div>)
}else if (this.item.auditingStatus === -1) {
} else if (this.item.auditingStatus === -1) {
return (<div class="fr"><span class="danger-color">审核失败{failMsg}{statusFaildhtml}</span></div>)
}else if (this.item.auditingStatus === -2) {
} else if (this.item.auditingStatus === -2) {
return (<div class="fr"><span class="danger-color">更新失败{failMsg}{_html}</span></div>)
}
else if (this.item.useCustomCode == 1 && this.item.customCodeSync == 1){
} else if (this.item.useCustomCode == 1 && this.item.customCodeSync == 1){
return (<div class="fr"><span class="danger-color">正在上传卡券Code</span></div>)
}
else if (this.item.stock === 0){
} else if (this.item.stock === 0){
return (<div class="fr">{statusNostockhtml}</div>)
}
else if (this.item.cardLimit && this.item.cardLimit == 1){
} else if (this.item.cardLimit && this.item.cardLimit == 1){
return (<div class="fr">{_html}</div>)
}
else {
} else {
return (<div class="fr">{noputonStatushtml}</div>)
}
}
......
src/views/ecm/addEdit.vue
......@@ -92,31 +92,28 @@
<h3 class="dm-title__label">卡券通知方式配置</h3>
<el-form-item label="通知方式" class="is-required" prop="cardNoticeType">
<el-radio v-model="form.cardNoticeType" :label="0">不通知
<el-popover placement="top-start" title="" width="200" trigger="hover"
content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start" content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
<el-radio v-model="form.cardNoticeType" :label="1">微信{{form.effectType?'群发':'客服'}}接口
<el-popover placement="top-start" title="" width="200" trigger="hover"
:content="form.effectType?'建议大规模发券、智能营销定时计划使用，占用每个会员每月4次的营销次数。':'客服接口需要用户在24小时之内与微信公众号互动才能发送成功，不占用每个用户每月4条的群发次数。'">
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start" :content="form.effectType?'建议大规模发券、智能营销定时计划使用，占用每个会员每月4次的营销次数。':'客服接口需要用户在24小时之内与微信公众号互动才能发送成功，不占用每个用户每月4条的群发次数。'">
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
<el-radio v-model="form.cardNoticeType" :label="2" :disabled="form.templateUseEnable === 0">微信模板消息
<el-popover placement="top-start" title="" width="200" trigger="hover">
<span>建议小规模发券、智能营销实时计划使用，滥用可能导致模板消息被封。参考微信<a target="_blank" href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751288">《模板消息运营规范》</a></span>
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start">
<span slot="content">建议小规模发券、智能营销实时计划使用，滥用可能导致模板消息被封。参考微信<a target="_blank" href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751288">《模板消息运营规范》</a></span>
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-radio>
</el-form-item>
<!-- 如果时效是实时（0）并且通知方式是微信群发接口（1） 出现补发设置-->
<el-form-item label="补发设置" prop="templateNoticeFlag" v-if="form.cardNoticeType === 1 && form.effectType === 0">
<el-checkbox v-model="form.templateNoticeFlag" :true-label="1" :false-label="0">发送失败使用微信模板消息补发该通知
<el-popover placement="top-start" title="" width="200" trigger="hover"
content="若微信客服接口调用失败，则使用微信模板消息进行补发卡券领取通知。">
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
<el-tooltip placement="top-start" content="若微信客服接口调用失败，则使用微信模板消息进行补发卡券领取通知。">
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
</el-tooltip>
</el-checkbox>
</el-form-item>
<!-- 通知非 不通知-->
......@@ -151,7 +148,7 @@
</div>
<div class="ecm-send__tips">
<i class="el-icon-info pl5 gray"></i>
<span>若一个智能营销计划中添加多张卡券，{{form.cardNoticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知{{form.templateNoticeFlag?'；使用模板消息补发时只会推送一条模板消息卡券领取通知。':'。'}}</span>
<span class="fz13">若一个智能营销计划中添加多张卡券，{{form.cardNoticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知{{form.templateNoticeFlag?'；使用模板消息补发时只会推送一条模板消息卡券领取通知。':'。'}}</span>
</div>
</el-form-item>
</section>
......@@ -677,6 +674,9 @@ export default {
/deep/ .el-textarea__inner{
color: inherit;
}
/deep/ .el-form-item {
margin-bottom:3px;
}
}
}
.ecm-msg__preview{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment