Commit 18eea6ff by chenxin

fix:build

parent b277f07c
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=/marketing/static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=/marketing/static/fonts/iconfont.css><link rel=stylesheet type=text/css href=/marketing/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.deb33a6ab9f6afb9f9d787716f6b999d.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.33.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.09.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.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.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.38.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.00.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.1.95.js></script><script type=text/javascript src=/marketing/static/js/manifest.ef5210ea92d1ed8ce3eb.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.b45ac7c1c0231c1ff1be.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=/marketing/static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=/marketing/static/fonts/iconfont.css><link rel=stylesheet type=text/css href=/marketing/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.5c4340e373c2a6cd069c887f7b50f1ad.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.33.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.09.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.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.13.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.38.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.00.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.1.95.js></script><script type=text/javascript src=/marketing/static/js/manifest.cf127f2576a2c2138bf6.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.b45ac7c1c0231c1ff1be.js></script></body></html>
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,f){for(var a,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(r&&r(n,c,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[d]);return u};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"785e61848f8a7c2dd623",1:"2f1fedd4c6e5f9de3fec",2:"6f2f4f7ce0a8b3573406",3:"0444b9db07ec19d54c80",4:"9e33a69becd19ed70f7f",5:"f16518fe3f77fe8df6cb",6:"e3c7f38f1d6b90da8e8f",7:"ffc4d6e3b0f6e628f842",8:"49966f129261addbcf67",9:"0227f7c8f0a9a9fe5817"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},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(n,a,c){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[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(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"785e61848f8a7c2dd623",1:"2f1fedd4c6e5f9de3fec",2:"6f2f4f7ce0a8b3573406",3:"0444b9db07ec19d54c80",4:"9e33a69becd19ed70f7f",5:"ce0ed3809801a93baba7",6:"16751e3cd868e91f747b",7:"ffc4d6e3b0f6e628f842",8:"49966f129261addbcf67",9:"0227f7c8f0a9a9fe5817"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},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
......@@ -4,10 +4,10 @@
<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>
</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="smsTemplateId">
<el-table-column :show-overflow-tooltip="false" :width="60" align="center" prop="gicSmsTemplateId">
<template slot-scope="scope">
<div class="sms-record_left label-hidden">
<el-radio v-model="activeSmsId" :label="scope.row.smsTemplateId" class="pr10"></el-radio>
<el-radio v-model="activeSmsId" :label="scope.row.gicSmsTemplateId" class="pr10"></el-radio>
</div>
</template>
</el-table-column>
......@@ -59,8 +59,8 @@ export default {
},
methods: {
rowClick(row) {
this.activeSmsId = row.smsTemplateId;
this.$emit('update:activeId', row.smsTemplateId);
this.activeSmsId = row.gicSmsTemplateId;
this.$emit('update:activeId', row.gicSmsTemplateId);
this.$emit('emitSmsItemInfo', row);
},
handleSizeChange(val) {
......
......@@ -259,7 +259,7 @@ export default {
//7.短信
if (val.comName === 'message') {
params.title = val.title;
params.relationId = val.smsTemplateId;
params.relationId = val.gicSmsTemplateId;
}
//8.积分
......
......@@ -83,7 +83,8 @@ export default {
title: '',
type: '',
content: '',
remark: ''
remark: '',
gicSmsTemplateId: ''
},
typeOptions: [{ value: 0, label: '普通短信' }, { value: 1, label: '营销短信' }, { value: 2, label: '验证码短信' }], // eslint-disable-line
rules: {
......@@ -132,13 +133,14 @@ export default {
},
async LoadTempInfo() {
this.loading = true;
let res = await LoadTempInfo({ smsTemplateId: this.$route.params.id });
let res = await LoadTempInfo({ gicSmsTemplateId: this.$route.params.id });
this.form = {
smsTemplateId: res.result.smsTemplateId,
type: res.result.type,
content: res.result.content,
remark: res.result.remark,
title: res.result.title
title: res.result.title,
gicSmsTemplateId: res.result.gicSmsTemplateId
};
this.loading = false;
}
......
......@@ -38,7 +38,7 @@
<div class="dm-title__label--tips"><i class="el-icon-info pr8 blue"></i>短信运营商限制:为避免骚扰用户,营销短信只允许在8点到22点发送</div>
</h3>
<div class="border-radius2" style="padding:15px;">
<sms-temp pbSize="pb15" :activeId.sync="info.smsTemplateId" @emitSmsItemInfo="onSmsItemInfo"></sms-temp>
<sms-temp pbSize="pb15" :activeId.sync="info.gicSmsTemplateId" @emitSmsItemInfo="onSmsItemInfo"></sms-temp>
</div>
</section>
<div class="btn-wrap_fixed" :class="{ on: asideShow }">
......@@ -103,7 +103,8 @@ export default {
sendType: 0,
memberSearchDTO: '',
openIds: '',
smsTemplateId: ''
smsTemplateId: '',
gicSmsTemplateId: ''
},
smsType: 0, // 短信类型 1为营销短信 营销短信要做判断
......@@ -184,12 +185,12 @@ export default {
const params = {
sceneSettingId: this.info.sceneSettingId,
memberType: this.info.memberType,
smsTemplateId: this.info.smsTemplateId,
smsTemplateId: this.info.gicSmsTemplateId,
gicSmsTemplateId: this.info.gicSmsTemplateId,
sendType: this.info.sendType,
memberSearchDTO: this.info.memberSearchDTO,
searchJson: this.getSaveData
};
console.log(params);
// return;
if (this.info.memberType === 1) {
params.openIds = this.info.openIds;
......@@ -248,7 +249,7 @@ export default {
this.$tips({ type: 'warning', message: '人群筛选未保存条件' });
return;
}
if (!this.info.smsTemplateId) {
if (!this.info.gicSmsTemplateId) {
this.$tips({ type: 'warning', message: '请选择短信模板' });
return;
}
......
......@@ -28,7 +28,7 @@
<span>创建于 {{ formatDateTimeByType(v.createTime, 'yyyy-MM-dd-HH-mm-ss') }}</span>
</div>
<div class="fr">
<el-button type="text" v-if="v.status === 2" @click="$router.push('/message/temp/edit/' + v.smsTemplateId)">修改</el-button>
<el-button type="text" v-if="v.status === 2" @click="$router.push('/message/temp/edit/' + v.gicSmsTemplateId)">修改</el-button>
<dm-delete @confirm="delData(v)" tips="是否删除该短信模板?">
<el-button type="text">删除</el-button>
</dm-delete>
......@@ -132,8 +132,8 @@ export default {
this.$router.push('/message/temp/add');
}
},
delData(row) {
delTempService({ templateId: row.templateId, smsTemplateId: row.smsTemplateId }).then(res => {
delData({ gicSmsTemplateId }) {
delTempService({ gicSmsTemplateId }).then(res => {
if (res.errorCode === 0) {
this.$tips({ type: 'success', message: '删除成功!' });
this.LoadLibList();
......
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