Commit 5a7eadae by 黑潮

Merge branch 'feature/销售线索3' into dev

parents 1dabfc75 8bb64c4f
<!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.f252ec1ed395caf01cb5bc8f4f65378e.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.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.32.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/material.1.0.9.js></script><script type=text/javascript src=/marketing/static/js/manifest.3d5ff3d61b52bcf38db2.js></script><script type=text/javascript src=/marketing/static/js/vendor.f9f292eb91cca2c0fcc1.js></script><script type=text/javascript src=/marketing/static/js/main.e2be9ed70498c3543c62.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.900b7282e46cb30f61e2d560ba4bdbc1.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.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.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.32.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/material.1.0.9.js></script><script type=text/javascript src=/marketing/static/js/manifest.eb432a5598647892eb83.js></script><script type=text/javascript src=/marketing/static/js/vendor.f9f292eb91cca2c0fcc1.js></script><script type=text/javascript src=/marketing/static/js/main.e2be9ed70498c3543c62.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var d,f,i,u=0,s=[];u<r.length;u++)f=r[u],t[f]&&s.push(t[f][0]),t[f]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(n&&n(r,a,o);s.length;)s.shift()();if(o)for(u=0;u<o.length;u++)i=c(c.s=o[u]);return i};var r={},t={17:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"pop",12:"signIn",13:"msg",14:"calllog"}[e]||e)+"."+{0:"cd064bcd577ccae8ddaf",1:"c032f6afec587a11f2bc",2:"3c70e9241bbdb8aa4cd2",3:"ecd0ecd653a44788e5f2",4:"575833b70aa0ddc559e9",5:"499510114acac6860134",6:"4250897b0c6285a34fd1",7:"6f650fda68f6dd28ecea",8:"5ddb72b68fcdf6943011",9:"b3526e4ba66763fb822c",10:"50521f679ec2f27197c1",11:"b378842144bad01c35f1",12:"d31a431660000260acb5",13:"02883278bc559b7084a0",14:"67177b0729dc4ddc6d2c"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=f,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)u=c(c.s=o[d]);return u};var r={},t={17:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"pop",12:"signIn",13:"msg",14:"calllog"}[e]||e)+"."+{0:"d8ec70a525b66805225f",1:"1b92c0c94b803ef7ae97",2:"3f04ab3f20219ff8b5d9",3:"e6ce4e4b9676c55ef074",4:"db647ff1aa771017a36c",5:"499510114acac6860134",6:"23ee07ea8cc6771af6e2",7:"6f650fda68f6dd28ecea",8:"5ddb72b68fcdf6943011",9:"1e9ce432c3656fb230bf",10:"50521f679ec2f27197c1",11:"b378842144bad01c35f1",12:"d31a431660000260acb5",13:"02883278bc559b7084a0",14:"67177b0729dc4ddc6d2c"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -37,7 +37,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.26.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js"></script><!-- 数据对话 -->
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.3.js"></script><!-- 数据对话 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.21.js"></script><!-- 卡券弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.13.js"></script><!-- 单选穿梭框 -->
......
......@@ -18,6 +18,12 @@
<el-input class="w250" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
</div>
......@@ -534,8 +540,8 @@ export default {
console.log(this.cardInfo);
if (this.cardInfo.manualGetFlag == 0) {
// 自动领取的卡券需要添加如下文案
html += `<div class="fz16">当前群发人数为${sumPerson}人,是否进行投放?</div><div class="regular-font-color fz13 mt10">用户在领取卡券后需要<b class="bold">同步至ERP</b>,如果关闭用户<b class="bold">手动领取</b>,卡券在<b class="bold">批量投放</b>时会需要将卡券信息批量同步至ERP。
该过程可能需要持续一段时间(具体同步时间和同步卡券张数以及ERP性能有关,参考同步时间为1万张卡券1个小时)。
html += `<div class="fz16">当前群发人数为${sumPerson}人,是否进行投放?</div><div class="regular-font-color fz13 mt10">用户在领取卡券后需要<b class="bold">同步至ERP</b>,如果关闭用户<b class="bold">手动领取</b>,卡券在<b class="bold">批量投放</b>时会需要将卡券信息批量同步至ERP。
该过程可能需要持续一段时间(具体同步时间和同步卡券张数以及ERP性能有关,参考同步时间为1万张卡券1个小时)。
当前支持不需要用户手动领取的卡券库存最大值为<b class="bold">${this.couponAutoGetStock}</b>张。</div>`;
} else {
html = `<div>当前群发人数为${sumPerson}人,是否进行投放?</div>`;
......
......@@ -17,6 +17,12 @@
</el-form-item>
<el-form-item label="数据对话">
<!-- 只能新增不能改 -->
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="ruleForm.marketingActivityId" :readOnly="isInfo || isEdit"></dm-activity-select>
</el-form-item>
<el-form-item prop="cardIds" label="新增卡券">
......
......@@ -5,6 +5,12 @@
<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">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select class="activity" :actId.sync="ruleForm.marketingActivityId" :readOnly="!canEdit"></dm-activity-select>
</el-form-item>
<el-form-item prop="dateTime" label="有效期">
......
......@@ -64,7 +64,7 @@
import { ecmCurrentSendInfos, ecmCurrentSendDetails, exportCurrentSendDetails } from '@/service/api/ecmApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
import memberInfo from '@/components/member-info/index.vue';
const typeOptions = [{ value: '', label: '所有类型' }, { value: 'teletext', label: '图文' }, { value: 'text', label: '文本' }, { value: 'image', label: '图片' }, { value: 'card', label: '卡券' }, { value: 'wxa', label: '小程序' }, { value: 'message', label: '短信' }, { value: 'teltask', label: '话务' }, { value: 'integral', label: '积分' }, { value: 'qywx', label: '企微任务' }, { value: 'qfxx', label: '群发消息' }, { value: 'grade', label: '会员卡升级' }]; // eslint-disable-line
const typeOptions = [{ value: '', label: '所有类型' }, { value: 'teletext', label: '图文' }, { value: 'text', label: '文本' }, { value: 'image', label: '图片' }, { value: 'card', label: '卡券' }, { value: 'wxa', label: '小程序' }, { value: 'message', label: '短信' }, { value: 'teltask', label: '话务' }, { value: 'integral', label: '积分' }, { value: 'qywx', label: '企微任务' }, { value: 'qfxx', label: '群发消息' }, { value: 'grade', label: '会员卡升级' }, { value: 'teltask-fail', label: '群发失败-话务' }, { value: 'message-fail', label: '群发失败-短信' }]; // eslint-disable-line
export default {
name: 'ecm-current-list',
components: {
......
......@@ -89,6 +89,12 @@
<el-input class="w400" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="!isAdd"></dm-activity-select>
</el-form-item>
</section>
......
......@@ -52,9 +52,12 @@
<!-- <dm-delete v-if="scope.row.effectType !== 2 && scope.row.onlineStatus === 1 && scope.row.canEdit !== false" @confirm="offlineEcmPlan(scope.row)" tips="是否下线该计划?">
<el-button type="text">下线</el-button>
</dm-delete> -->
<dm-delete v-if="scope.row.putonStatus !== 2 && scope.row.canEdit !== false" @confirm="delData(scope.row)" tips="是否删除该计划?">
<el-button type="text">删除</el-button>
</dm-delete>
<template v-if="scope.row.putonStatus !== 2 && scope.row.canEdit !== false">
<el-button v-if="xsxsFlag && isOpenFlag(scope.row.analyseJson)" type="text" @click="onDelete(scope.row)">删除</el-button>
<dm-delete v-else @confirm="delData(scope.row)" tips="是否删除该计划?">
<el-button type="text">删除</el-button>
</dm-delete>
</template>
<!-- <el-button type="text" @click="toRecord(scope.row)">记录</el-button>
<el-button type="text" @click="toTouch(scope.row)" v-if="xsxsFlag && isOpenFlag(scope.row.analyseJson)">触达效果</el-button> -->
<el-dropdown style="margin-left:8px" trigger="click" @command="onCommand($event, scope.row)">
......@@ -349,6 +352,14 @@ export default {
} else if (command == 4) {
this.copyData(row);
}
},
async onDelete(row) {
await this.$confirm('是否删除该计划?删除后触达效果数据会一起被删除', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
});
this.delData(row);
}
},
computed: {
......
......@@ -11,6 +11,12 @@
<el-date-picker :disabled="disabled" default-time="23:59:59" v-model="form.endDate" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="disabled"></dm-activity-select>
</el-form-item>
<h3 class="title mt46">
......
......@@ -7,6 +7,12 @@
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="游戏时间" prop="dateTime">
......
......@@ -7,6 +7,12 @@
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="游戏时间" class="width50" prop="dateTime">
......
......@@ -6,6 +6,12 @@
<dm-input v-model="form.gameName" class="w400" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="游戏背景" class="clearfix">
......
......@@ -6,6 +6,12 @@
<dm-input v-model="form.gameName" class="w400" :disabled="isInfo" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="游戏时间" prop="dateTime" class="width50">
......
......@@ -6,6 +6,12 @@
<dm-input v-model="form.gameName" class="w400" :maxlength="25"></dm-input>
</el-form-item>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="form.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="LOGO上传" prop="logoImg" class="width50">
......
<template>
<el-form v-loading="loading">
<el-form v-loading="loading" label-width="110px">
<section class="dm-form__wrap">
<h3 class="dm-title__label">场景设置</h3>
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
<dm-activity-select :actId.sync="info.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</el-form-item>
<el-form-item label="发送时间">
......
......@@ -2,15 +2,20 @@
<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">
数据对话
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择,选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</span>
<dm-activity-select class="inline-block" :actId.sync="info.marketingActivityId" :readOnly="isEdit || isInfo"></dm-activity-select>
</div>
<div class="mb20" v-if="!isAdd && info.sceneSettingName">
<span class="dm-input_label mr8">营销场景:</span>
<span class="dm-input_label" style="margin-right:12px">营销场景:</span>
{{ info.sceneSettingName }}
</div>
<div>
<span class="dm-input_label mr8">发送时间:</span>
<span class="dm-input_label" style="margin-right:12px">发送时间:</span>
<el-select class="w250" v-model="info.sendType" :disabled="isInfo">
<el-option v-for="(v, i) in sendTypeOptions" :key="i" :value="v.value" :label="v.label"></el-option>
</el-select>
......
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