Skip to content

M
marketing
Commit 60cb70e6 by chenxin
Options

fix: 营销活动改为数据对话；ecm折扣打开

parent 3a020496
Showing with 98 additions and 92 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.3b21de5261a22e77ba44ac5d920c6362.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.22.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.13.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.b9366a4612ec476f61c7.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.ff3c70b453293f159d37.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.03a76ccbd23a84a4bdf909b48541f376.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.22.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.13.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.160498a6fdca7550a369.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.d0229b111e517d4750dc.js></script></body></html>
\ No newline at end of file
dist/static/fonts/demo_index.html
......@@ -5024,23 +5024,26 @@
</div>
</div>
<script>
$(document).ready(function () {
$('.tab-container .content:first').show()
$(document).ready(function() {
$('.tab-container .content:first').show();
$('#tabs li').click(function (e) {
var tabContent = $('.tab-container .content')
var index = $(this).index()
$('#tabs li').click(function(e) {
var tabContent = $('.tab-container .content');
var index = $(this).index();
if ($(this).hasClass('active')) {
return
} else {
$('#tabs li').removeClass('active')
$(this).addClass('active')
if ($(this).hasClass('active')) {
return;
} else {
$('#tabs li').removeClass('active');
$(this).addClass('active');
tabContent.hide().eq(index).fadeIn()
}
})
})
tabContent
.hide()
.eq(index)
.fadeIn();
}
});
});
</script>
</body>
</html>
dist/static/js/ecm.262833045cc7cef37f62.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.6fcac3a9988d7df0963d.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/game.0bc91669b9c935d83206.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.ebb087efe5af7ce1168a.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/manifest.160498a6fdca7550a369.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,a){for(var f,i,u,d=0,s=[];d<t.length;d++)i=t[d],n[i]&&s.push(n[i][0]),n[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var t={},n={14:0};function c(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,c),n.l=!0,n.exports}c.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,c){r=n[e]=[t,c]});r[2]=t;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"07a8e2ec0f2b6160bdfe",1:"0bc91669b9c935d83206",2:"980bd21768f1ce6c39e9",3:"11aec7ea16f3f8b81a7e",4:"391130c8f773cb8775d6",5:"262833045cc7cef37f62",6:"6178547f1a240cc6cd6a",7:"a8fe9fe66e916b28df76",8:"c6e93bfcf1cc0a21f2fd",9:"d0c7fdeaae259a8befad",10:"0d4820f42ef1fa47e4cc",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),t},c.m=e,c.c=t,c.d=function(e,r,t){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.b9366a4612ec476f61c7.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,c){for(var f,i,d,u=0,s=[];u<t.length;u++)i=t[u],n[i]&&s.push(n[i][0]),n[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)d=a(a.s=c[u]);return d};var t={},n={14:0};function a(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,a),n.l=!0,n.exports}a.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,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"dd3ac859900ae743db61",1:"ebb087efe5af7ce1168a",2:"5b984ee3ad792f2dac05",3:"09ad5a1095e8730e681b",4:"391130c8f773cb8775d6",5:"6fcac3a9988d7df0963d",6:"6178547f1a240cc6cd6a",7:"7dff17be9d8729078f5a",8:"a0320997bd02f35ab20b",9:"d0c7fdeaae259a8befad",10:"0d4820f42ef1fa47e4cc",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/wechat.5b984ee3ad792f2dac05.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/wechat.980bd21768f1ce6c39e9.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/activity-select/index.vue
......@@ -2,16 +2,16 @@
<div v-loading="readOnly && loading" :class="{ 'inline-block': onlySelect }">
<template v-if="!onlySelect">
<div v-if="!readOnly">
<el-select remote filterable clearable v-loadmore="getMore" :remote-method="remoteMethod" @change="updateActId" class="w250 act-select" size="small" v-model="marketingActivityId" :disabled="readOnly || disabled" placeholder="选择营销活动">
<el-select remote filterable clearable v-loadmore="getMore" :remote-method="remoteMethod" @change="updateActId" class="w250 act-select" size="small" v-model="marketingActivityId" :disabled="readOnly || disabled" placeholder="选择数据对话">
<el-option v-for="item in tableList" :key="item.marketingActivityId" :label="item.name" :value="item.marketingActivityId"></el-option>
</el-select>
<el-button type="text" class="ml10" @click="toAdd">去新建</el-button>
</div>
<div v-else>
<p class="inline-block">{{ info.name || '--' }} <span v-if="info.status === 0" class="fz12 gray ml10">当前计划使用的营销活动已删除</span></p>
<p class="inline-block">{{ info.name || '--' }} <span v-if="info.status === 0" class="fz12 gray ml10">当前计划使用的数据对话已删除</span></p>
</div>
</template>
<el-select v-else remote filterable clearable v-loadmore="getMore" :remote-method="remoteMethod" @change="updateActId" size="small" v-model="marketingActivityId" :disabled="readOnly" placeholder="选择营销活动">
<el-select v-else remote filterable clearable v-loadmore="getMore" :remote-method="remoteMethod" @change="updateActId" size="small" v-model="marketingActivityId" :disabled="readOnly" placeholder="选择数据对话">
<el-option v-for="item in tableList" :key="item.marketingActivityId" :label="item.name" :value="item.marketingActivityId"></el-option>
</el-select>
</div>
......
src/router/modules/activity.js
// 营销活动
// 数据对话
export default {
path: 'activity',
name: '营销活动管理',
name: '数据对话管理',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/index.vue'),
redirect: '/activity/list',
children: [
{
path: 'list',
name: '营销活动列表',
name: '数据对话',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/list.vue'),
meta: {
path: '/activity/list'
......@@ -15,7 +15,7 @@ export default {
},
{
path: 'edit/:id',
name: '营销活动编辑',
name: '数据对话编辑',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/form.vue'),
meta: {
type: 'edit',
......@@ -24,7 +24,7 @@ export default {
},
{
path: 'add',
name: '营销活动新增',
name: '数据对话新增',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/form.vue'),
meta: {
type: 'add',
......@@ -33,7 +33,7 @@ export default {
},
{
path: 'history-list',
name: '历史营销活动列表',
name: '历史数据对话',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/history-list.vue'),
meta: {
path: '/activity/list'
......@@ -41,7 +41,7 @@ export default {
},
{
path: 'data-view/:id',
name: '营销活动数据概览',
name: '数据对话数据概览',
component: () => import(/* webpackChunkName: "activity" */ '../../views/activity/data-view.vue'),
meta: {
path: '/activity/list'
......
src/router/routes.js
......@@ -25,9 +25,9 @@ import evaluation from './modules/evaluation';
import recharge from './modules/recharge';
//e袋洗
import ewash from './modules/ewash';
//营销活动
//数据对话
import activity from './modules/activity';
//营销活动
//兑换码
import cdKey from './modules/cdKey';
export default [
......
src/service/api/activityApi.js
......@@ -4,20 +4,20 @@ const PREFIX = 'api-marketing/';
import config from '@/config';
export const url = config.api + PREFIX;
// 营销活动分页列表
// 数据对话分页列表
export const activityList = params => requests(PREFIX + 'marketing-activity-page', params);
// 营销活动-- 删除
// 数据对话-- 删除
export const delActivity = params => requests(PREFIX + 'del-marketing-activity', params);
// 营销活动-- 删除
// 数据对话-- 删除
export const stopActivity = params => requests(PREFIX + 'expire-marketing-activity', params);
// 营销活动 - 获取详情
// 数据对话 - 获取详情
export const getActivityInfo = params => requests(PREFIX + 'get-marketing-activity-detail', params);
// 营销活动-- 新建/修改 [保存]计划信息
// 数据对话-- 新建/修改 [保存]计划信息
export const saveActivity = params => requests(PREFIX + 'save-edit-marketing-activity', params);
// 营销活动-- 查看数据概览
// 数据对话-- 查看数据概览
export const activityViewData = params => requests(PREFIX + 'marketing-activity-statistics', params);
src/views/activity/data-view.vue
......@@ -54,7 +54,7 @@
</div>
<div class="view-content">
<div class="left f5" :class="fade">
<p>营销活动内容</p>
<p>数据对话内容</p>
<div><view-item text="微信群发计划" :num="dataView.activityStat.wechatCnt" invert></view-item></div>
<div><view-item text="短信群发计划" :num="dataView.activityStat.smsCnt" invert></view-item></div>
<div><view-item text="卡券投放计划" :num="dataView.activityStat.cardCnt" invert></view-item></div>
......@@ -121,7 +121,7 @@ export default {
animate: false,
loading: false,
isHistory: false,
info: {}, // 营销活动详情
info: {}, // 数据对话详情
dataView: {
activityStat: {},
activitySms: {},
......@@ -141,10 +141,10 @@ export default {
viewItem
},
methods: {
// 获取营销活动数据概览
// 获取数据对话数据概览
async getData() {
this.loading = true;
// 获取营销活动详情
// 获取数据对话详情
let info = await getActivityInfo({ marketingActivityId: this.marketingActivityId });
const result = info.result.activityInfo || {};
const { name, beginDate, endDate } = result;
......@@ -155,7 +155,7 @@ export default {
if (new Date(result.endDate) < new Date()) {
// 历史数据
this.isHistory = true;
this.$store.commit('mutations_breadcrumb', [{ name: '营销活动列表', path: '/activity/list' }, { name: '历史数据概览', path: '' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话厅', path: '/activity/list' }, { name: '历史数据概览', path: '' }]); // eslint-disable-line
}
activityViewData({ marketingActivityId: this.marketingActivityId })
.then(res => {
......@@ -179,7 +179,7 @@ export default {
},
created() {
this.$store.commit('aside_handler', false);
this.$store.commit('mutations_breadcrumb', [{ name: '营销活动列表', path: '/activity/list' }, { name: '数据概览', path: '' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话', path: '/activity/list' }, { name: '数据概览', path: '' }]); // eslint-disable-line
}
};
</script>
......
src/views/activity/form.vue
......@@ -11,8 +11,8 @@
</el-form-item>
<el-form-item>
<el-tooltip slot="label" open-delay="200" placement="top">
<!-- <div slot="content">可选内容，详细使用内容详见<a target="_blank" style="color:#1890ff" href="https://demogic.udesk.cn/hc/articles/226671">《营销活动运营复盘流程》</a></div> -->
<div slot="content">可选内容，详细使用内容详见《营销活动运营复盘流程》</div>
<!-- <div slot="content">可选内容，详细使用内容详见<a target="_blank" style="color:#1890ff" href="https://demogic.udesk.cn/hc/articles/226671">《数据对话运营复盘流程》</a></div> -->
<div slot="content">可选内容，详细使用内容详见《数据对话运营复盘流程》</div>
<span class="tooltip-icon">会员分组</span>
</el-tooltip>
<div style="width:600px">
......@@ -24,7 +24,7 @@
</el-form-item>
</el-form>
<ul style="padding-bottom:400px;margin-left:140px;color:#909399;font-size:14px;line-height:22px;">
<li>* 应用中新建计划时可以使用营销活动：微信营销、短信营销、卡券营销、智能营销、游戏营销</li>
<li>* 应用中新建计划时可以使用数据对话：微信营销、短信营销、卡券营销、智能营销、游戏营销</li>
<li>* 营销数据统计分析维度为：营销人次、活动覆盖人数、活动相关订单、活动销售额</li>
</ul>
</div>
......@@ -149,7 +149,7 @@ export default {
.filter(v => v)
.join(',');
} else {
this.$message.warning('营销活动已生效，分组数据编辑无效');
this.$message.warning('数据对话已生效，分组数据编辑无效');
}
}
},
......@@ -163,12 +163,12 @@ export default {
},
created() {
// 设置面包屑
let breadcrumbName = '智能营销编辑';
let breadcrumbName = '数据对话编辑';
if (this.isAdd) {
breadcrumbName = '智能营销新增';
breadcrumbName = '数据对话新增';
}
this.$store.commit('aside_handler', false);
this.$store.commit('mutations_breadcrumb', [{ name: '营销活动列表', path: '/activity/list' }, { name: breadcrumbName, path: '' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话厅', path: '/activity/list' }, { name: breadcrumbName, path: '' }]); // eslint-disable-line
}
};
</script>
......
src/views/activity/history-list.vue
......@@ -2,7 +2,7 @@
<section class="dm-wrap" v-loading="loading">
<div class="clearfix pb22">
<el-date-picker class="w400" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input v-model="listParams.search" class="w300" placeholder="请输入活动名称/创建人" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input v-model="listParams.search" class="w300" placeholder="请输入数据对话/创建人" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column v-for="(v, i) in tableHeader" :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">
......@@ -15,7 +15,7 @@
<template slot-scope="scope">
<el-button type="text" @click="$router.push(`/activity/data-view/${scope.row.marketingActivityId}`)">历史数据概览</el-button>
<!-- <el-button type="text" @click="$router.push(`/activity/edit/${scope.row.marketingActivityId}`)">编辑</el-button> -->
<dm-delete @confirm="delData(scope.row)" tips="是否删除该营销活动？">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该数据对话？">
<el-button type="text">删除</el-button>
</dm-delete>
</template>
......@@ -37,7 +37,7 @@ export default {
tableList: [],
dateTime: '',
tableHeader: [
{ label: '活动名称', prop: 'name', minWidth: '150', tooltip: true, align: 'left' },
{ label: '数据对话', prop: 'name', minWidth: '150', tooltip: true, align: 'left' },
{
label: '创建时间',
minWidth: '100',
......@@ -78,7 +78,7 @@ export default {
mixins: [talbeMethods],
created() {
this.$store.commit('aside_handler', false);
this.$store.commit('mutations_breadcrumb', [{ name: '营销活动列表', path: '/activity/list' }, { name: '历史营销活动列表' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话厅', path: '/activity/list' }, { name: '历史数据对话' }]); // eslint-disable-line
this.getTableList();
},
methods: {
......
src/views/activity/list.vue
......@@ -2,9 +2,9 @@
<section class="dm-wrap" v-loading="loading">
<div class="clearfix pb22">
<el-date-picker class="w400" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input v-model="listParams.search" class="w300" placeholder="请输入活动名称/创建人" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/activity/add')">新建营销活动</el-button>
<el-button class="fr mr10" @click="$router.push('/activity/history-list')">查看历史活动</el-button>
<el-input v-model="listParams.search" class="w300" placeholder="请输入数据对话/创建人" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" type="primary" @click="$router.push('/activity/add')">新建数据对话</el-button>
<el-button class="fr mr10" @click="$router.push('/activity/history-list')">查看历史数据对话</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column v-for="(v, i) in tableHeader" :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">
......@@ -17,10 +17,10 @@
<template slot-scope="scope">
<el-button type="text" @click="$router.push(`/activity/data-view/${scope.row.marketingActivityId}`)">数据概览</el-button>
<el-button type="text" @click="$router.push(`/activity/edit/${scope.row.marketingActivityId}`)">编辑</el-button>
<dm-delete @confirm="stopData(scope.row)" tips="是否下线该营销活动？">
<dm-delete @confirm="stopData(scope.row)" tips="是否下线该数据对话？">
<el-button type="text">下线</el-button>
</dm-delete>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该营销活动？">
<dm-delete @confirm="delData(scope.row)" tips="是否删除该数据对话？">
<el-button type="text">删除</el-button>
</dm-delete>
</template>
......@@ -42,7 +42,7 @@ export default {
tableList: [],
dateTime: '',
tableHeader: [
{ label: '活动名称', prop: 'name', minWidth: '150', tooltip: true, align: 'left' },
{ label: '数据对话', prop: 'name', minWidth: '150', tooltip: true, align: 'left' },
{
label: '创建时间',
minWidth: '100',
......@@ -85,7 +85,7 @@ export default {
mixins: [talbeMethods],
created() {
this.$store.commit('aside_handler', false);
this.$store.commit('mutations_breadcrumb', [{ name: '营销活动列表', path: '' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话厅', path: '' }]); // eslint-disable-line
this.getTableList();
},
methods: {
......
src/views/card/group-send.vue
......@@ -17,7 +17,7 @@
<el-form-item label="营销场景" v-if="!isAdd && form.sceneSettingName">
<el-input class="w250" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
</div>
......
src/views/card/merge-form.vue
......@@ -15,7 +15,7 @@
<br />
<el-date-picker v-if="ruleForm.effectiveMode" class="w250 mt10" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select v-if="!ruleForm.marketingActivityId" :actId.sync="ruleForm.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
<activity-select v-else ref="actSelect" :actId.sync="ruleForm.marketingActivityId" :readOnly="isInfo"></activity-select>
</el-form-item>
......
src/views/card/merge-list.vue
......@@ -27,7 +27,7 @@
</p>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="marketingActivityName" label="营销活动">
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="marketingActivityName" label="数据对话">
<template slot-scope="scope">{{ scope.row.marketingActivityName || '--' }}</template>
</el-table-column>
<el-table-column label="操作" align="left" width="120px" fixed="right">
......
src/views/card/merge-record-list.vue
......@@ -28,7 +28,7 @@
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="cardPackageName" label="卡券包名称"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="receivePositionName" label="领取位置"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="receiveName" label="投放渠道"></el-table-column>
<!-- <el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="marketingActivityName" label="营销活动">
<!-- <el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="marketingActivityName" label="数据对话">
<template slot-scope="scope">{{ scope.row.marketingActivityName || '--' }}</template>
</el-table-column> -->
</el-table>
......
src/views/cdkey/form.vue
......@@ -4,7 +4,7 @@
<el-form-item label="兑换码名称" prop="cdkeyName">
<dm-input :disabled="!canEdit" class="w400" v-model="ruleForm.cdkeyName" placeholder="请输入兑换码名称" :byteType="1" :maxlength="24"></dm-input>
</el-form-item>
<el-form-item label="营销活动" prop="marketingActivityId">
<el-form-item label="数据对话" prop="marketingActivityId">
<activity-select class="activity" :actId.sync="ruleForm.marketingActivityId" :readOnly="!canEdit"></activity-select>
</el-form-item>
<el-form-item prop="dateTime" label="有效期">
......
src/views/ecm/form.vue
......@@ -52,7 +52,7 @@
<el-form-item label="营销场景" v-if="!isAdd && form.sceneSettingName">
<el-input class="w400" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="!isAdd"></activity-select>
</el-form-item>
</section>
......@@ -92,7 +92,7 @@
</div>
</div>
</el-form-item>
<!-- <el-form-item>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" v-model="discount_limit.flag" :disabled="!isAdd">适用商品折扣</el-checkbox>
<div>
......@@ -110,7 +110,7 @@
<div v-if="discount_limit.flag" class="fz12 gray">* 商品折扣=订单实付/订单总金额</div>
</div>
</div>
</el-form-item> -->
</el-form-item>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.cost">消费金额</el-checkbox>
......
src/views/ecm/list.vue
......@@ -84,7 +84,7 @@ export default {
},
{ label: '营销方式', prop: 'marketingType', minWidth: '160', align: 'left' },
{
label: '营销活动',
label: '数据对话',
prop: 'marketingActivityName',
width: '160',
align: 'left',
......
src/views/game/dzp/form.vue
......@@ -6,7 +6,7 @@
<el-form-item label="游戏名称" prop="gameName">
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="游戏时间" prop="dateTime">
......
src/views/game/ggk/form.vue
......@@ -6,7 +6,7 @@
<el-form-item label="游戏名称" class="width50" prop="gameName">
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="游戏时间" class="width50" prop="dateTime">
......
src/views/game/klfl/form.vue
......@@ -5,7 +5,7 @@
<el-form-item label="游戏名称" prop="gameName" class="width50">
<dm-input v-model="form.gameName" class="w400" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="游戏背景" class="clearfix">
......
src/views/game/ptyx/form.vue
......@@ -5,7 +5,7 @@
<el-form-item label="游戏名称" prop="gameName" class="width50">
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="游戏时间" prop="dateTime" class="width50">
......
src/views/game/znm/form.vue
......@@ -5,7 +5,7 @@
<el-form-item label="游戏名称" prop="gameName" class="width50">
<dm-input v-model="form.gameName" class="w400" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="LOGO上传" prop="logoImg" class="width50">
......
src/views/message/detail.vue
......@@ -29,7 +29,7 @@
<span class="regular-font-color">{{ info.sceneSettingName }}</span>
</el-col>
<el-col :span="8">
<span class="primary-font-color">营销活动：</span>
<span class="primary-font-color">数据对话：</span>
<activity-select style="display:inline-block" :actId.sync="info.marketingActivityId" readOnly></activity-select>
</el-col>
<el-col :span="24">
......
src/views/message/form.vue
......@@ -2,7 +2,7 @@
<el-form v-loading="loading">
<section class="dm-form__wrap">
<h3 class="dm-title__label">场景设置</h3>
<el-form-item label="营销活动">
<el-form-item label="数据对话">
<activity-select :actId.sync="info.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</el-form-item>
<el-form-item label="发送时间">
......
src/views/wechat/form.vue
......@@ -2,7 +2,7 @@
<div v-loading="loading">
<section class="dm-form__wrap">
<div class="mb20">
<span class="dm-input_label mr8">营销活动：</span>
<span class="dm-input_label mr8">数据对话：</span>
<activity-select class="inline-block" :actId.sync="info.marketingActivityId" :readOnly="isEdit || isInfo"></activity-select>
</div>
<div class="mb20" v-if="!isAdd && info.sceneSettingName">
......
src/views/wechat/record.vue
......@@ -152,7 +152,7 @@ export default {
// }
// },
{
label: '营销活动',
label: '数据对话',
prop: 'marketingActivityName',
width: '160',
align: 'left',
......
static/fonts/demo_index.html
......@@ -5024,23 +5024,26 @@
</div>
</div>
<script>
$(document).ready(function () {
$('.tab-container .content:first').show()
$(document).ready(function() {
$('.tab-container .content:first').show();
$('#tabs li').click(function (e) {
var tabContent = $('.tab-container .content')
var index = $(this).index()
$('#tabs li').click(function(e) {
var tabContent = $('.tab-container .content');
var index = $(this).index();
if ($(this).hasClass('active')) {
return
} else {
$('#tabs li').removeClass('active')
$(this).addClass('active')
if ($(this).hasClass('active')) {
return;
} else {
$('#tabs li').removeClass('active');
$(this).addClass('active');
tabContent.hide().eq(index).fadeIn()
}
})
})
tabContent
.hide()
.eq(index)
.fadeIn();
}
});
});
</script>
</body>
</html>
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