Skip to content

M
marketing
Commit c914e110 by chenxin
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !85
parents 7fa9ec1b b58dedbe
Showing with 173 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/fonts/iconfont.css><link rel=stylesheet type=text/css href=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.54d12f21d34dbbed7d8b0867e8ff2bd8.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.36.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.12.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.2.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.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.20.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.2.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.53fceaf7bf6b6e9900c7.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.3c58594923662ae24d78.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/fonts/iconfont.css><link rel=stylesheet type=text/css href=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.460e4554f117cac2bcfebadbc75840cb.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.36.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.12.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.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.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.20.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.2.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.8a9c6d3fbbd8c8fe3267.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.3c58594923662ae24d78.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.53fceaf7bf6b6e9900c7.js → dist/static/js/manifest.8a9c6d3fbbd8c8fe3267.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,d=0,s=[];d<t.length;d++)u=t[d],n[u]&&s.push(n[u][0]),n[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=o(o.s=a[d]);return f};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"a3874639c8bc4f6904a6",1:"4e4a9dc6c93676249324",2:"306ee775683f06877d11",3:"933ec7d0c60e1ac1ed98",4:"1343aacbbc19705f2e09",5:"4a4cd673936b7a9fe084",6:"a69c5c6513644d0f2537",7:"eeb506934d60615dcdbd",8:"cc81505df4e6d8d06e69",9:"42e94f0ad107f4564295",10:"02cb948d4fe0b121b72b"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},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(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],n[u]&&l.push(n[u][0]),n[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var t={},n={13:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"09f75406b014a14fdce8",1:"4e4a9dc6c93676249324",2:"2a8e523c0449ab3e20e1",3:"3729e6e1b77305892d6e",4:"1343aacbbc19705f2e09",5:"18d7873206009149c251",6:"a69c5c6513644d0f2537",7:"c9e4106934931698098b",8:"cc81505df4e6d8d06e69",9:"90074b9c03d73987b75f",10:"02cb948d4fe0b121b72b"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},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
dist/static/js/msg.42e94f0ad107f4564295.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/msg.90074b9c03d73987b75f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -26,7 +26,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.12.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.2.16.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js"></script>
......
src/assets/style/base/index.scss
......@@ -332,4 +332,9 @@
.member-block {
display: block;
height: 50px;
}
.tooltip-icon {
font-weight: inherit;
padding: 2px 0;
border-bottom: 1px dashed #1890ff;
}
\ No newline at end of file
src/components/libs/smsTemp/index.vue
......@@ -2,6 +2,7 @@
<section class="sms-lib">
<div :class="pbSize">
<span class="pr10">选择短信模板(共{{ total }}条)</span><el-input clearable v-model="listParams.search" class="w200" placeholder="请输入名称/内容" @change="LoadTempList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<slot name="tips" />
</div>
<el-table tooltipEffect="light" :data="smsTempList" style="width: 100%" v-loading="loading" @row-click="rowClick">
<el-table-column :show-overflow-tooltip="false" :width="60" align="center" prop="gicSmsTemplateId">
......
src/views/activity/data-view.vue
......@@ -82,7 +82,7 @@
<div class="iik f7" :class="fade">
<div class="iik-item-03"><span>卡券</span></div>
<el-row class="card-row">
<el-col :span="6"><view-item text="使用卡券" :num="dataView.activityCoup.useCnt" numBlue run></view-item></el-col>
<el-col :span="6"><view-item text="活动涉及母券数" :num="dataView.activityCoup.useCnt" numBlue run></view-item></el-col>
<el-col :span="6"><view-item text="投放张数" :num="dataView.activityCoup.volumesCnt"></view-item></el-col>
<el-col :span="6"><view-item text="领取张数" :num="dataView.activityCoup.getCnt"></view-item></el-col>
<el-col :span="6"><view-item text="核销订单数" :num="dataView.activityCoup.cardOrderCnt"></view-item></el-col>
......
src/views/activity/form.vue
......@@ -10,6 +10,15 @@
<el-date-picker :disabled="disabled" :picker-options="pickerOptions" v-model="ruleForm.endDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-tooltip slot="label" open-delay="200" placement="top">
<div slot="content">可选内容，详细使用内容详见《营销活动运营复盘流程》</div>
<span class="tooltip-icon">会员分组</span>
</el-tooltip>
<div style="width:600px">
<vue-gic-member-group :readonly="disabled" onlyFixedType v-if="initMemberGroup" :defaltSelected="defaltSelected" :height="500" projectName="marketing" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">确认{{ isAdd ? '新建' : '保存' }}</el-button>
</el-form-item>
</el-form>
......@@ -50,7 +59,8 @@ export default {
ruleForm: {
name: '',
beginDate: '',
endDate: ''
endDate: '',
memberGroup: ''
},
rules: {
name: [{ required: true, message: '请输入活动名称', trigger: 'change' }],
......@@ -61,6 +71,9 @@ export default {
return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
}
},
// 会员分组
defaltSelected: [],
initMemberGroup: false,
isAdd: this.$route.meta.type === 'add',
isEdit: this.$route.meta.type === 'edit'
};
......@@ -102,19 +115,47 @@ export default {
getActivityInfo({ marketingActivityId: this.marketingActivityId })
.then(res => {
const result = res.result || {};
const { name, beginDate, endDate } = result;
const { activityInfo, tagGroupList } = result;
const { name, beginDate, endDate, memberGroup } = activityInfo;
this.ruleForm.name = name;
this.ruleForm.beginDate = formatDateTimeByType(beginDate, 'yyyy-MM-dd-HH-mm-ss');
this.ruleForm.endDate = formatDateTimeByType(endDate, 'yyyy-MM-dd-HH-mm-ss');
this.ruleForm.memberGroup = memberGroup;
this.defaltSelected = tagGroupList;
this.ruleForm.name = name;
this.loading = false;
this.$nextTick(() => {
this.initMemberGroup = true;
});
})
.catch(() => {
this.loading = false;
});
},
// *********会员分组**********
handleDataTransferred(data) {
// 会员分组 情况下 memberSearchDTO 传数组字符串
this.ruleForm.memberGroup = data
.map(v => v.memberTagGroupId)
.filter(v => v)
.join(',');
},
handleDataLeft(selectedData, selectionToRemove) {
// 不可编辑
if (!this.disabled) {
this.ruleForm.memberGroup = selectedData
.map(v => v.memberTagGroupId)
.filter(v => v)
.join(',');
} else {
this.$message.warning('营销活动已生效，分组数据编辑无效');
}
}
},
mounted() {
if (this.isAdd) {
this.initMemberGroup = true;
}
if (this.isEdit) {
this.getInfo();
}
......@@ -130,3 +171,10 @@ export default {
}
};
</script>
<style lang="scss" scoped>
/deep/ .group-set-transfer {
margin: 0;
padding: 0;
}
</style>
src/views/card/destroy-list.vue
......@@ -9,7 +9,13 @@
<el-button class="fr" type="danger" @click="showDialog('add', {})">卡券销毁</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<el-tooltip effect="dark" open-delay="200" :content="scope.row.cardId" placement="top-start">
<span style="line-height:22px;">{{ scope.row.cardName }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="100" align="left" prop="createTime" label="销毁时间">
<template slot-scope="scope">
<p class="cell-time">
......
src/views/card/give-list.vue
......@@ -36,7 +36,13 @@
<p>{{ scope.row.cardType === 0 ? '抵金券' : scope.row.cardType === 1 ? '折扣券' : '兑换券' }}</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardName" label="卡券名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<el-tooltip effect="dark" open-delay="200" :content="scope.row.cardId" placement="top-start">
<span style="line-height:22px;">{{ scope.row.cardName }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="fromCardCode" label="转赠卡券代码"></el-table-column>
<el-table-column :show-overflow-tooltip="true" width="140" align="left" prop="cardType" label="转赠状态">
<template slot-scope="scope">
......
src/views/card/record-cache.vue
......@@ -27,7 +27,13 @@
</template>
</el-table-column>
<el-table-column width="120" align="left" prop="cardTypeExcel" label="卡券类型"> </el-table-column>
<el-table-column min-width="120" align="left" prop="cardName" label="卡券名称"> </el-table-column>
<el-table-column min-width="120" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<el-tooltip effect="dark" open-delay="200" :content="scope.row.cardId" placement="top-start">
<span style="line-height:22px;">{{ scope.row.cardName }}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column min-width="120" align="left" prop="cardCode" label="卡券券号"> </el-table-column>
<el-table-column min-width="120" align="left" prop="dictName" label="卡券来源"> </el-table-column>
<el-table-column min-width="120" align="left" prop="attentionStatus" label="关注状态"> </el-table-column>
......
src/views/card/record-get.vue
......@@ -59,14 +59,16 @@
</el-table-column>
<el-table-column min-width="100" align="left" prop="receiveTime" label="卡券名称">
<template slot-scope="scope">
<template v-if="scope.row.gicCouponType === 1">
<router-link :to="`/ewash/info/${scope.row.coupCardId}`" target="_blank">{{ scope.row.cardName }}</router-link>
<!-- <p class="blue" @click="$router.push('/ewash/info/' + scope.row.coupCardId)">{{ scope.row.cardName }}</p> -->
</template>
<template v-else>
<router-link :to="`/card/info/${scope.row.coupCardId}`" target="_blank">{{ scope.row.cardName }}</router-link>
<!-- <p class="blue" @click="$router.push('/card/info/' + scope.row.coupCardId)">{{ scope.row.cardName }}</p> -->
</template>
<el-tooltip effect="dark" open-delay="200" :content="scope.row.coupCardId" placement="top-start">
<template v-if="scope.row.gicCouponType === 1">
<router-link :to="`/ewash/info/${scope.row.coupCardId}`" target="_blank">{{ scope.row.cardName }}</router-link>
<!-- <p class="blue" @click="$router.push('/ewash/info/' + scope.row.coupCardId)">{{ scope.row.cardName }}</p> -->
</template>
<template v-else>
<router-link :to="`/card/info/${scope.row.coupCardId}`" target="_blank">{{ scope.row.cardName }}</router-link>
<!-- <p class="blue" @click="$router.push('/card/info/' + scope.row.coupCardId)">{{ scope.row.cardName }}</p> -->
</template>
</el-tooltip>
</template>
</el-table-column>
<el-table-column width="125" align="left" prop="receiveTime" label="卡券代码">
......
src/views/card/record-send.vue
......@@ -15,7 +15,10 @@
</el-table-column>
<el-table-column min-width="120" align="left" prop="cardName" label="卡券名称">
<template slot-scope="scope">
<p style="line-height:22px;">{{ scope.row.cardName }}</p>
<el-tooltip effect="dark" open-delay="200" :content="scope.row.coupCardId" placement="top-start">
<span style="line-height:22px;">{{ scope.row.cardName }}</span>
</el-tooltip>
<br />
<p class="fz13 gray" style="line-height:20px;">{{ scope.row.subName }}</p>
</template>
</el-table-column>
......
src/views/ecm/current-list.vue
......@@ -119,21 +119,21 @@ export default {
return row.title || '--';
}
},
// {
// label: '发送时间',
// prop: 'createTime',
// minWidth: '120',
// align: 'left',
// formatter(row) {
// const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm', true);
// return date.y + '\n' + date.h;
// }
// },
{ label: '会员信息', prop: 'marketingType', minWidth: '120', align: 'left', component: 'member-info' },
{ label: '手机号码', prop: 'phoneNumber', minWidth: '120', align: 'left' },
{ label: '主门店', prop: 'mainStoreName', minWidth: '120', align: 'left' },
{ label: '专属导购', prop: 'mainClerkName', minWidth: '120', align: 'left' },
{
label: '触发时间',
prop: 'createTime',
minWidth: '120',
align: 'left',
formatter(row) {
const date = formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true);
return date.y + '\n' + date.h;
}
},
{
label: '状态',
prop: 'errCode',
width: '100',
......
src/views/message/importSendForm.vue
......@@ -26,7 +26,9 @@
</el-form>
<p class="title mb15 mt40">短信模板设置</p>
<div class="dm-title__label--tips" style="margin-top:15px;margin-bottom:20px;"><i class="el-icon-warning pr8 warning-color"></i>短信运营商限制：为避免骚扰用户，营销短信只允许在8点到22点发送</div>
<sms-temp pbSize="pb15" :activeId.sync="ruleForm.gicSmsTemplateId" @emitSmsItemInfo="onSmsItemInfo"></sms-temp>
<sms-temp pbSize="pb15" :activeId.sync="ruleForm.gicSmsTemplateId" @emitSmsItemInfo="onSmsItemInfo">
<span slot="tips" class="fz12 gray">* 请注意若发送的短信模板中包含会员变量，但发送对象无该变量时则显示横杆“-”</span>
</sms-temp>
<div class="text-center">
<el-button type="primary" @click="submitForm">提 交</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
......
src/views/msg/edit.vue
......@@ -435,7 +435,7 @@ export default {
.then(res => {
if (res.errorCode === 0) {
this.$router.go(-1);
this.$tips({ type: 'warning', message: '提交成功' });
this.$tips({ type: 'success', message: '提交成功' });
} else {
this.$tips({ type: 'error', message: '提交失败' });
}
......
src/views/wechat/record.vue
......@@ -18,6 +18,7 @@
<el-button v-else class="fr" type="primary" @click="$router.push('/wechat/record/add')">新建群发</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" row-key="sendTime">
<el-table-column min-width="100" align="left" prop="clerkName" label="用户名称" fixed="left"></el-table-column>
<el-table-column :min-width="100" align="left" label="时间" prop="createTime">
<template slot-scope="scope">
<p class="cell-time">
......@@ -25,6 +26,24 @@
</p>
</template>
</el-table-column>
<el-table-column :min-width="120" align="left" label="标题">
<template slot-scope="{ row }">
<template v-if="row.content && row.content.length > 10">
<el-popover placement="top-start" width="200" open-delay="200" trigger="hover">
<span class="word-break-all" v-html="row.content"></span>
<div class="ellipsis" slot="reference" v-html="row.content"></div>
</el-popover>
</template>
<template v-else-if="row.mediaUrl">
<p v-if="row.couponType === 1">
<i class="iconfont icon-qiapian- blue" />
<a :href="row.mediaUrl" target="_blank">{{ row.content }}</a>
</p>
<a v-else :href="row.mediaUrl" target="_blank">{{ row.content }}</a>
</template>
<span v-else>{{ row.content }}</span>
</template>
</el-table-column>
<el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed" :render-header="v.renderHeader"></el-table-column>
<el-table-column label="状态" align="left" prop="timesStatus" width="160px">
<template slot-scope="scope">
......@@ -88,49 +107,48 @@ export default {
// return date.y + '\n' + date.h;
// }
// },
{ label: '用户名称', prop: 'clerkName', align: 'left', fixed: 'left', minWidth: '100' },
{
label: '标题',
prop: 'content',
tooltip: false,
align: 'left',
formatter: function(row, column, cellValue, index) {
let temp = null;
if (row.mediaUrl) {
if (row.couponType === 1) {
temp = (
<p>
<i class="iconfont icon-qiapian- blue" />
<a href={row.mediaUrl} target="_blank">
{' '}
{row.content}
</a>
</p>
);
} else {
temp = (
<a href={row.mediaUrl} target="_blank">
{row.content}
</a>
);
}
} else {
temp = <span>{row.content}</span>;
}
if (row.content && row.content.length > 10) {
return (
<el-popover placement="top-start" width="200" trigger="hover">
<span class="word-break-all">{row.content}</span>
<div class="ellipsis" slot="reference">
{temp}
</div>
</el-popover>
);
} else {
return temp;
}
}
},
// {
// label: '标题',
// prop: 'content',
// tooltip: false,
// align: 'left',
// formatter: function(row, column, cellValue, index) {
// let temp = null;
// if (row.mediaUrl) {
// if (row.couponType === 1) {
// temp = (
// <p>
// <i class="iconfont icon-qiapian- blue" />
// <a href={row.mediaUrl} target="_blank">
// {' '}
// {row.content}
// </a>
// </p>
// );
// } else {
// temp = (
// <a href={row.mediaUrl} target="_blank">
// {row.content}
// </a>
// );
// }
// } else {
// temp = <span>{row.content}</span>;
// }
// if (row.content && row.content.length > 10) {
// return (
// <el-popover placement="top-start" width="200" trigger="hover">
// <span class="word-break-all">{row.content}</span>
// <div class="ellipsis" slot="reference">
// {temp}
// </div>
// </el-popover>
// );
// } else {
// return temp;
// }
// }
// },
{
label: '营销活动',
prop: 'marketingActivityName',
......
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