Commit a28123cb by chenxin

fix:build

parent bd07a422
<!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.1745e3d914d8b6047070f20c029a621b.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.2.12.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.41.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.2.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.f105f3a958e9dc6875cf.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.18ccdba44569570ebf52.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.1190ca89a5955055f1a6dd9230ff915f.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.2.12.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.41.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.2.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.619ed68a691f030abe80.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.18ccdba44569570ebf52.js></script></body></html>
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var f,i,u,s=0,d=[];s<n.length;s++)i=n[s],t[i]&&d.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);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)u=o(o.s=c[s]);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:"message",4:"ewash",5:"evaluation",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"80b5bca04846c73ffe02",1:"f9438825fcc9c8ff3771",2:"2faab81964e12348e9af",3:"75f8c1c5f840e2fdefbb",4:"fb40f5f2c9f696d90bdd",5:"5ff6f4df7f498dc6a8a0",6:"f96b2b2c4bde2ceefbaa",7:"ffc4d6e3b0f6e628f842",8:"c4543ab32e7d1cdad942",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
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var f,i,u,s=0,d=[];s<n.length;s++)i=n[s],t[i]&&d.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);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)u=o(o.s=c[s]);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:"message",4:"ewash",5:"evaluation",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"80b5bca04846c73ffe02",1:"f9438825fcc9c8ff3771",2:"1f2a3adeca7b98fac7ae",3:"276d3ea3b12ac204b219",4:"fb40f5f2c9f696d90bdd",5:"5ff6f4df7f498dc6a8a0",6:"f96b2b2c4bde2ceefbaa",7:"ffc4d6e3b0f6e628f842",8:"c4543ab32e7d1cdad942",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
......@@ -54,3 +54,6 @@ export const importSmsSendPhone = PREFIX + 'import-sms-send-phone';
// 卡券营销--导入短信群发--下载模板
export const downloadOImportSmsTemp = config.api + PREFIX + 'download-import-sms-temp?requestProject=marketing';
// 卡券营销--导入短信群发--导出发送人群
export const exportSmsImportPlanLog = config.api + PREFIX + 'export-sms-import-plan-log';
......@@ -20,7 +20,7 @@
<span class="regular-font-color">{{ info.sendCount }}</span>
</el-col>
<el-col :span="8">
<span class="primary-font-color">发送条数:</span>
<span class="primary-font-color">计费条数:</span>
<span class="regular-font-color">{{ info.totalFeeNum }}</span>
</el-col>
<el-col :span="8">
......@@ -31,10 +31,10 @@
<span class="primary-font-color">模板类型:</span>
<span class="regular-font-color">{{ info.sendType === 0 ? '普通短信' : '营销短信' }}</span>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<span class="primary-font-color">营销场景:</span>
<span class="regular-font-color">{{ info.sceneSettingName || '--' }}</span>
</el-col>
</el-col> -->
<el-col :span="24">
<span class="primary-font-color">短信模板:</span>
<span class="regular-font-color" style="max-width: 100%;overflow: auto;line-height:2;">{{ info.smsContent }}</span>
......@@ -91,7 +91,7 @@
</template>
<script>
// import { getSmsImportPlanDetail, saveImportSmsPlan, importSmsSendPhone, downloadOImportSmsTemp } from '@/service/api/messageApi.js';
import { getSmsImportPlanDetail, smsSmportPlanLogPage, exportSmsExcel } from '@/service/api/messageApi.js';
import { getSmsImportPlanDetail, smsSmportPlanLogPage, exportSmsImportPlanLog } from '@/service/api/messageApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
import errorCodeDialog from './errorCode';
import filterAvatar from '@/mixins/filterAvater.js';
......@@ -127,17 +127,6 @@ export default {
return row.backStatus === 0 && row.backTime === null ? '--' : (row.backStatus ? '接收成功' : '接收失败')
}
}
// {
// label: '上报时间',
// prop: 'backTime',
// minWidth: '100',
// tooltip: true,
// align: 'left',
// formatter: function(row) {
// const date = formatDateTimeByType(row.backTime, 'yyyy-MM-dd-HH-mm-ss', true);
// return row.backTime ? date.y + '\n' + date.h : '';
// }
// },
],
listParams: {
sendStatus: '', // 0成功,1未发送,2失败
......@@ -191,16 +180,9 @@ export default {
this.listParams.currentPage = val;
this.smsSmportPlanLogPage();
},
// exportExcel() {
// let data = { };
// exportSmsExcel(data).then(res => {
// const downLoadUrl = url + res.result;
// window.location = downLoadUrl;
// });
// },
exportExcel() {
this.dialogVisible = true;
this.excelUrl = exportSmsExcel;
this.excelUrl = exportSmsImportPlanLog;
this.params = {
smsId: this.listParams.smsId,
sendStatus: this.listParams.sendStatus,
......
......@@ -2,12 +2,12 @@
<div class="dm-wrap" v-loading="loading">
<p class="title mb30">手工导入群发</p>
<el-form ref="form" :model="ruleForm" label-width="120px" :rules="rules">
<el-form-item label="营销场景">
<!-- <el-form-item label="营销场景">
<span v-if="isInfo">{{ ruleForm.sceneSettingName }}</span>
<el-select v-else class="w250" v-model="ruleForm.sceneSettingId" placeholder="选择营销场景">
<el-option v-for="item in sceneSettingIdOptions" :key="item.sceneSettingId" :label="item.sceneName" :value="item.sceneSettingId"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="发送时间">
<el-select class="w250" v-model="ruleForm.sendType">
<el-option v-for="(v, i) in sendTypeOptions" :key="i" :value="v.value" :label="v.label"></el-option>
......@@ -21,7 +21,7 @@
<!-- <el-button icon="el-icon-upload2" class="dash-btn">点击上传</el-button> -->
<el-button type="text" class="ml10" @click="download">点击下载文件模板</el-button>
</div>
<p style="margin-top:8px;color:#909399;font-size:12px;line-height:1;">券码数量单次最多不超过5000条</p>
<p style="margin-top:8px;color:#909399;font-size:12px;line-height:1;">手机号数量单次最多不超过5000条,填写示例:'123456'(英文单引号'+券码编号文本形式)</p>
</el-form-item>
</el-form>
<p class="title mb15 mt40">短信模板设置</p>
......@@ -57,6 +57,11 @@ export default {
fileId: '',
uploadUrl: importSmsSendPhone,
rules: {},
pickerOptions: {
disabledDate(val) {
return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
}
},
sceneSettingIdOptions: [],
sendTypeOptions: [{ value: 0, label: '立即发送' }, { value: 1, label: '选择时间发送' }], // eslint-disable-line
};
......
......@@ -34,7 +34,7 @@
<el-table-column :show-overflow-tooltip="true" min-width="170" align="left" prop="smsContent" label="模板内容"></el-table-column>
<el-table-column min-width="120" align="left" prop="importCount" label="计划人数"></el-table-column>
<el-table-column min-width="120" align="left" prop="sendCount" label="送达人数"></el-table-column>
<el-table-column min-width="120" align="left" prop="totalFeeNum" label="计费数"></el-table-column>
<el-table-column min-width="120" align="left" prop="totalFeeNum" label="计费数"></el-table-column>
<el-table-column min-width="120" align="left" label="状态">
<template slot-scope="scope">
<span v-html="filterStatus(scope.row)"></span>
......
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