Skip to content

M
marketing
Commit 00f55b90 by zhangmeng
Options

提交

parent 8e442e1d
Showing with 69 additions and 75 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.9671a259948d12f536aa86dc23395860.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.c3315d4e750a94a53c72.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.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
dist/static/js/app.c3315d4e750a94a53c72.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ea414b016e1326eff3f2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
......@@ -35,7 +35,7 @@
width: calc(100% + 32px);
padding: 0 0 20px 32px;
font-size: 16px;
font-weight: 700;
font-weight: 500;
margin: 0 0 20px -32px;
}
......@@ -44,7 +44,7 @@
width: calc(100% + 24px);
padding: 0 0 20px 24px;
font-size: 16px;
font-weight: 700;
font-weight: 500;
margin: 0 0 20px -24px;
}
......
src/components/layout/index.vue
......@@ -129,10 +129,13 @@
height: 100%;
// overflow-y: auto;
margin-left:0px;
min-width: 1400px;
&.asideShow{
min-width: 1200px;
margin-left: 200px;
}
&.collapseFlag{
min-width: 1336px;
margin-left: 64px;
}
}
......@@ -145,35 +148,30 @@
font-size:20px;
padding:24px 0;
font-weight:500;
// span{
// color:#303133;
// font-size:20px;
// font-weight:600;
// }
// i{
// font-size:20px;
// color:#c0c4ce;
// cursor: pointer;
// &:hover{
// color:#909399;
// }
// }
}
}
&-content__wrap {
// overflow-y: auto;
position: relative;
top:-1px;
min-height: calc(100% - 200px);
&::-webkit-scrollbar {
display: none;
}
}
&--tips--wrap {
margin-right: 24px;
}
&--tips {
margin-top: 25px;
width: 100%;
// height: 38px;
line-height: 38px;
margin-top: 24px;
padding: 8px 16px;
line-height: 1.5;
font-size: 13px;
border-radius: 2px;
border-radius: 4px;
color: #606266;
background-color: #f4f4f5;
i {
margin: 0 12px;
margin-right: 4px;
color: #1890ff;
}
&__content{
......@@ -185,26 +183,6 @@
}
}
}
&-content__wrap {
overflow-y: auto;
position: relative;
top:-1px;
min-height: calc(100% - 200px);
&::-webkit-scrollbar {
display: none;
}
}
&-content {
// margin-top: 100px;
// min-height: calc(100% - 200px);
min-width: 1400px;
&.asideShow{
min-width: 1200px;
}
&.collapseFlag{
min-width: 1336px;
}
}
}
.dm-breadcrumb{
display: inline-block;
......
src/views/card/card-order.vue
......@@ -23,9 +23,11 @@
</el-dialog>
</template>
<script>
import { listCoupcardOrder,writeOffCard } from '@/service/api/cardApi.js'
export default {
name:'card-order',
props:{
obj:{
type:Object,
......
src/views/card/group-send.vue
......@@ -44,7 +44,7 @@
<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卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
<i class="el-icon-info pl5 gray" slot="reference"></i>
</el-popover>
</el-radio>
......@@ -176,7 +176,7 @@ export default {
cardId:this.$route.params.id,
cardName:this.$route.params.name,
noticeType:0,
noticeType:1,
templateNoticeFlag:0,
// 判断模板消息能否使用
templateUseEnable:1,
......
src/views/card/partials/shelf-add.vue
......@@ -2,7 +2,7 @@
<el-dialog title="选择卡券" :visible.sync="show" width="800px" :before-close="close">
<div class="pb10 clearfix">
<div class="fl">
<el-input v-model="listParams.searchParams" class="w200" placeholder="请输入卡券名/备注名" clearable @change="cardPageList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.searchParam" class="w200" placeholder="请输入卡券名/备注名" clearable @change="cardPageList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<span class="fz12 gray">领取限制>1的卡券不支持选择，系统已过滤，符合条件共{{total}}张。</span>
</div>
<div class="fr">
......
src/views/ecm/addEdit.vue
......@@ -13,14 +13,14 @@
<el-option v-for="(v,i) in dayOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<div class="layout--tips" v-if="form.effectType">
<i class="el-icon-info inline-block"></i>
<!-- <i class="el-icon-info inline-block"></i> -->
<div class="layout--tips__content">
<p>每天发送<b class="bold">图文、文本、图片</b>将使用微信群发接口，占用每个用户每月4条的群发次数</p>
<p>每天发送<b class="bold">小程序</b>使用客服接口，但客服接口需要用户在24小时之内与微信公众号互动才能发送成功，可能导致成功率过低，不占用每个用户每月4条的群发次数。</p>
<p>每天发送<b class="bold">短信、卡券、话务</b>均不占用群发次数。</p></div>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">图文、文本、图片</b>将使用微信群发接口，占用每个用户每月4条的群发次数</p>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">小程序</b>使用客服接口，但客服接口需要用户在24小时之内与微信公众号互动才能发送成功，可能导致成功率过低，不占用每个用户每月4条的群发次数。</p>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">短信、卡券、话务</b>均不占用群发次数。</p></div>
</div>
<div class="layout--tips" v-else>
<i class="el-icon-info"></i>
<span class="dm-status--primary pl10"></span>
实时发送调用微信客服接口，不占用每个用户每月4条的群发次数
</div>
</el-form-item>
......@@ -93,20 +93,20 @@
<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="el-icon-info pl5 gray" slot="reference"></i>
content="不通知用户，但用户可以在GIC卡券包查看到该卡券。建议线下发券使用，或使用其他通知方式代替（如小程序、短信等）">
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
</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="el-icon-info pl5 gray" slot="reference"></i>
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
</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="el-icon-info pl5 gray" slot="reference"></i>
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
</el-radio>
</el-form-item>
......@@ -115,15 +115,13 @@
<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="el-icon-info pl5 gray" slot="reference"></i>
<i class="iconfont icon-xinxixianshi pl5 gray" slot="reference"></i>
</el-popover>
</el-checkbox>
</el-form-item>
<!-- 通知非 不通知-->
<el-form-item label="效果预览" v-if="form.cardNoticeType">
<i class="el-icon-info pl5 gray"></i>
<span>若一个智能营销计划中添加多张卡券，{{form.cardNoticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知{{form.templateNoticeFlag?'；使用模板消息补发时只会推送一条模板消息卡券领取通知。':'。'}}</span>
<div class="mt20">
<div>
<!-- 通知方式是微信群发接口 -->
<item-card :item="currentCard.item" class="mr20" v-if="form.cardNoticeType === 1"></item-card>
<!-- 模板消息预览 -->
......@@ -151,6 +149,10 @@
</div>
</div>
</div>
<div class="ecm-send__tips">
<i class="el-icon-info pl5 gray"></i>
<span>若一个智能营销计划中添加多张卡券，{{form.cardNoticeType === 1?'则会推送多条对话框卡券投放':'只会推送一条模板消息卡券领取'}}通知{{form.templateNoticeFlag?'；使用模板消息补发时只会推送一条模板消息卡券领取通知。':'。'}}</span>
</div>
</el-form-item>
</section>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
......@@ -236,7 +238,7 @@ export default {
memberSearchDTO:'',
beginDate:'',
endDate:'',
cardNoticeType:0,
cardNoticeType:2,
templateNoticeFlag:0,
// 判断模板消息能否使用
......@@ -722,4 +724,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/ecm/marketing-event/components/item-text.vue
<template>
<span class="dm-text__wrap ellipsis-l2 inline-block" v-html="item.content"></span>
<!-- <span class="dm-text__wrap ellipsis-l2 inline-block" v-html="item.content"></span> -->
<span class="dm-text__wrap inline-block" v-html="item.content"></span>
</template>
<script>
export default {
......
src/views/message/addTemp.vue
<template>
<div class="dm-wrap" v-loading="loading">
<el-row :gutter="20" class="sms-temp_tipsT">
<el-col :span="24" class="">
<el-col :span="24">
<p style="color:#1890ff;">1.长度不要超过450字(汉字，字符，数字等可见符号，都按1个字计算)。单条短信长度为70字，超过70字后，按67字/条分割成多条，以长短信的方式发送给用户，即用户收到的是一条长短信，但是按多条计费</p>
<p>2.营销类短信，请在短信内容后面增加<span style="color:#1890ff;">“回T退订”</span></p>
<p>3.短信模板内容不能含有【】符号</p>
......@@ -146,11 +146,10 @@ export default {
</script>
<style lang="scss" scoped>
.sms-temp_tips{
padding: 19px 20px;
line-height: 24px;
padding: 8px 16px;
line-height: 23px;
font-size: 12px;
background: #f5f8fa;
height: 432px;
background: #f4f4f5;
ul{
padding-right: 20px;
li{
......@@ -159,10 +158,10 @@ export default {
}
}
.sms-temp_tipsT{
background: #f5f8fa;
padding: 20px;
background: #f4f4f5;
padding: 8px 16px;
p {
line-height: 20px;
line-height: 1.5;
font-size: 12px;
color: #606266;
}
......
src/views/message/detail.vue
......@@ -44,7 +44,7 @@
<el-table-column min-width="150" align="left" label="会员信息">
<template slot-scope="scope">
<div class="sms-table_info">
<img class="table__avatar--40 vertical-middle" :src="scope.row.thirdImgUrl" alt="" srcset="">
<img class="table__avatar--40 vertical-middle" :src="filterAvatar(scope.row.thirdImgUrl)" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{scope.row.memberName}}</p>
<p class="fz13 gray">{{scope.row.nickname}}</p>
......@@ -79,7 +79,9 @@
import {LoadMessageDetail,LoadMessageDetailList,exportSmsExcel,url} from '@/service/api/messageApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import errorCodeDialog from './errorCode'
import filterAvatar from '@/mixins/filterAvater.js';
export default {
mixins: [filterAvatar],
data() {
return {
formateDateTimeByType,
......
src/views/message/record.vue
......@@ -39,8 +39,7 @@ import {LoadMessageList,invalidsmsRecord} from '@/service/api/messageApi.js';
import {sceneSettingList} from '@/service/api/wechatApi.js';
import {formateDateTimeByType} from '@/utils/index.js'
import timeCounts from '@/components/timeCount/index.vue'
export default {
export default {
name: 'sms-record',
components:{
timeCounts
......
src/views/message/temp.vue
......@@ -119,10 +119,11 @@ export default {
&_body{
height: 70px;
overflow-y: auto;
line-height: 18px;
line-height: 1.5;
margin: 0 15px;
padding: 10px;
background: #f5f8fa;
font-size: 13px;
}
&_bottom{
margin: 0 15px;
......
src/views/msg/list.vue
......@@ -139,9 +139,9 @@ export default {
<style lang="scss" scoped>
.msg-tips{
height: 84px;
// height: 84px;
border: 1px solid #B3D8FF;
padding: 0 20px;
padding: 8px 16px;
background: #ECF5FF;
&__left{
i{
......
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