Skip to content

M
marketing
Commit cc0df411 by crushh
Options

update: dist

parent 78618a24
Showing with 76 additions and 16 deletions
src/views/card/record-get.vue
......@@ -124,7 +124,9 @@
<script>
import { formatDateTimeByType } from '@/utils/index.js';
import cardSelectFilter from '@/components/card-select/filterable';
import { cardRecordPage, coupcardDestroy, exportReceivedRecordExcel } from '@/service/api/cardApi.js';
import { coupcardDestroy, exportReceivedRecordExcel } from '@/service/api/cardApi.js';
import { axios } from '@/service/api/index';
import qs from 'qs';
import cardOrder from './card-order';
import tableMethods from '@/mixins/tableMethods.js';
import filterAvater from '@/mixins/filterAvater.js';
......@@ -331,11 +333,24 @@ export default {
this.listParams.writeOffBeginTime = '';
this.listParams.writeOffEndTime = '';
}
const params = { ...this.listParams };
let res = await cardRecordPage(params);
this.recordList = res.result.result;
this.total = res.result.totalCount;
this.recordLoading = false;
let data = { ...this.listParams };
data = qs.stringify(Object.assign({ requestProject: 'gic-web' }, data));
// let res = await cardRecordPage(data); 60000
axios
.post('/api-marketing/card-record-page', data, { timeout: 60000 })
.then(res => {
if (res.data.errorCode == 0) {
const { result } = res.data;
this.recordList = result.result;
this.total = result.totalCount;
}
})
.catch(_ => {
this.$message.error('查询量过大');
})
.finally(_ => {
this.recordLoading = false;
});
},
// 发送记录操作: 删除
delData(row) {
......
src/views/ewash/analysis.vue
......@@ -6,7 +6,7 @@
渠道分析
<el-date-picker v-model="dateTime2" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="cardChannelAnalysis"></el-date-picker>
</dm-sub-title>
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading">
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column v-for="(v, i) in tableHeader" :key="i" :align="v.align" :width="v.width" :min-width="v.minWidth" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
</el-table>
</div>
......@@ -50,7 +50,11 @@ export default {
listParams: {
type: ''
},
kpiNameOptions: [{ label: '领取次数', value: 'card-puton1' }, { label: '使用次数', value: 'card-puton2' }, { label: '销售额', value: 'card-puton3' }], // eslint-disable-line
kpiNameOptions: [
{ label: '领取次数', value: 'card-puton1' },
{ label: '使用次数', value: 'card-puton2' },
{ label: '销售额', value: 'card-puton3' }
], // eslint-disable-line
tableHeader: [
{ label: '渠道名称', prop: 'receiveName', align: 'left', minWidth: '200' },
{
......@@ -105,7 +109,11 @@ export default {
beginTime: '',
endTime: ''
};
this.kpiNameOptions = [{ label: '领取次数', value: 'shelf-cards1' }, { label: '使用次数', value: 'shelf-cards2' }, { label: '销售额', value: 'shelf-cards3' }]; // eslint-disable-line
this.kpiNameOptions = [
{ label: '领取次数', value: 'shelf-cards1' },
{ label: '使用次数', value: 'shelf-cards2' },
{ label: '销售额', value: 'shelf-cards3' }
]; // eslint-disable-line
this.cardTrendEchart();
} else {
this.chartParams = {
......@@ -115,7 +123,12 @@ export default {
endTime: '',
day: 1
};
(this.kpiNameOptions = [{ label: '领取次数', value: 'card-puton1' }, { label: '使用次数', value: 'card-puton2' }, { label: '销售额', value: 'card-puton3' }]), this.cardChannelAnalysis(); // eslint-disable-line
(this.kpiNameOptions = [
{ label: '领取次数', value: 'card-puton1' },
{ label: '使用次数', value: 'card-puton2' },
{ label: '销售额', value: 'card-puton3' }
]),
this.cardChannelAnalysis(); // eslint-disable-line
this.cardTrendEchart();
}
},
......
src/views/msg/edit.vue
......@@ -38,7 +38,7 @@
</el-form-item>
<el-form-item :label="v.keyName" v-for="(v, i) in templateKeyDataList" :key="i">
<div v-if="v.keyName !== '使用渠道：'">
<span class="vertical-middle">显示接收人{{ v.keyName }}</span>
<span class="vertical-middle">显示接收人{{ v.keyName | keyNameFilter }}</span>
<el-color-picker class="ml10 vertical-middle" v-model="v.color"></el-color-picker>
</div>
<div v-else>
......@@ -67,12 +67,12 @@
<p class="pre-header" :style="'color:' + info.headerColor + ';'">{{ info.headerText }}</p>
<p class="pre-keyName" v-for="(v, i) in templateKeyDataList" :key="i">
{{ v.keyName }}
<span :style="`color:${v.color}`">示例文字</span>
<span :style="`color:${v.color}`">{{ v.keyName | exampleNameFilter }}</span>
</p>
<p class="pre-remark" :style="'color:' + info.remarkColor + ';'">{{ info.remarkText }}</p>
<div class="pre-foot clearfix">
<span class="fz13 fl ">详情</span>
<span class="fz13 fl">详情</span>
<i class="el-icon-arrow-right fr"></i>
</div>
</div>
......@@ -85,7 +85,9 @@
<span class="gray fz13 pl10">同时选择跳转小程序和H5页面，优先跳转小程序页面</span>
</dm-sub-title>
<div class="msg-edit__url">
<p class="pb20"><el-checkbox v-model="checked2">跳转小程序</el-checkbox></p>
<p class="pb20">
<el-checkbox v-model="checked2">跳转小程序</el-checkbox>
</p>
<div v-if="checked2">
<div class="pl20 pb20">
<el-radio v-model="radio2" :label="1">小程序链接</el-radio>
......@@ -96,7 +98,9 @@
<linktoolspage ref="childlinktoolspage" :isWx="true" :showType="2" @linkSelect="linkSelect" />
</div>
</div>
<p class="pt20 pb20"><el-checkbox v-model="checked1">跳转H5页面</el-checkbox></p>
<p class="pt20 pb20">
<el-checkbox v-model="checked1">跳转H5页面</el-checkbox>
</p>
<div v-if="checked1">
<div class="pl20 pb20">
<el-radio v-model="radio1" :label="1" @change="info.h5 = ''">内部链接</el-radio>
......@@ -118,7 +122,7 @@
<span class="gray fz13"> 22点至次日9点为防骚扰时段，通知将在结束后发送</span>
</div>
</dm-sub-title>
<el-form-item label="积分即将过期前" label-width="120px"> <el-input-number :precision="0" controls-position="right" v-model="info.remindDay" :min="1" :max="31"></el-input-number> 天发送该模板消息提醒。 </el-form-item>
<el-form-item label="积分即将过期前" label-width="120px"> <el-input-number :precision="0" controls-position="right" v-model="info.remindDay" :min="1" :max="31"> </el-input-number> 天发送该模板消息提醒。 </el-form-item>
<!-- <el-form-item label="发送时间设置" label-width="120px">
<el-select v-model="info.sendTime" class="w300">
<el-option v-for="(v, i) in dayOptions" :key="i" :value="v.value" :label="v.label"></el-option>
......@@ -529,6 +533,20 @@ export default {
} else {
return '未知时间';
}
},
keyNameFilter(val) {
if (val == '变更类型：') {
val = '变更类型+积分分值：';
}
return val;
},
exampleNameFilter(val) {
if (val != '变更类型：') {
val = '示例文字';
} else {
val = '线上签到增加5积分';
}
return val;
}
}
};
......@@ -540,23 +558,28 @@ export default {
/deep/ .el-col {
padding: 10px 0;
}
padding: 20px 0;
// border-bottom:1px solid #DCDFE6;
}
&__content {
width: 1100px;
}
&__left {
display: inline-block;
vertical-align: top;
width: 613px;
background: #f0f2f5;
overflow: hidden;
&--inner {
background: #fff;
width: 565px;
margin: 15px auto;
padding: 10px;
/deep/ .input-suffix {
width: 448px;
height: 40px;
......@@ -565,11 +588,13 @@ export default {
border-top: none;
border-radius: 0 0 4px 4px;
}
/deep/ .el-textarea__inner {
color: inherit;
}
}
}
&__right {
position: relative;
display: inline-block;
......@@ -579,6 +604,7 @@ export default {
background: url(../../assets/img/msg-preview.png) no-repeat center;
background-size: cover;
vertical-align: top;
&--inner {
border: 1px solid #dcdfe6;
border-radius: 4px;
......@@ -594,28 +620,34 @@ export default {
font-size: 17px;
font-weight: 700;
}
.pre-updateTime {
font-size: 14px;
line-height: 1.5;
}
.pre-header {
font-size: 15px;
margin: 10px 0;
}
.pre-keyName {
font-size: 14px;
line-height: 1.5;
}
.pre-remark {
font-size: 15px;
margin: 20px 0 10px 0;
}
.pre-foot {
border-top: 1px solid #dcdfe6;
padding-top: 5px;
}
}
}
&__url {
&--inner {
padding-bottom: 40px;
......
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