Skip to content

M
marketing
Commit 1e6d6ff8 by chenxin
Options

fix:ecm-实时发送记录 memberInfo为下面列表的listparams；游戏列表里：中奖改为游戏

parent 4404b0cf
Showing with 57 additions and 17 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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.0527117cfaca8b38f2ac6a42db2881f2.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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.23.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.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.03.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.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.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.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.d02e26cd263e61babbe5.js></script><script type=text/javascript src=/marketing/static/js/vendor.33cafa0134aa152d9bdc.js></script><script type=text/javascript src=/marketing/static/js/main.f6c96c61c0ecf8dae639.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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.0527117cfaca8b38f2ac6a42db2881f2.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/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.23.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.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.03.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.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.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.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.33f97bf78a3c0e2561a2.js></script><script type=text/javascript src=/marketing/static/js/vendor.33cafa0134aa152d9bdc.js></script><script type=text/javascript src=/marketing/static/js/main.61600c119d1e5c841c0c.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.d02e26cd263e61babbe5.js → dist/static/js/manifest.33f97bf78a3c0e2561a2.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)f=o(o.s=c[d]);return f};var n={},t={11: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:"game",1:"card",2:"wechat",3:"evaluation",4:"message",5:"ecm",6:"recharge",7:"msg",8:"calllog"}[e]||e)+"."+{0:"512107bbe5a951fc40a1",1:"1a606c5eb5bc4957c065",2:"8fc3343f7aea01c1bedb",3:"c59c0098bd52da5edb26",4:"9a09a2ca69a10dd4b1cb",5:"7e86f78a71685dfde625",6:"bb4c60b1af82de26c84a",7:"78d26db17068eec22a7c",8:"5eed9786deb616aedcf4"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,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 i,u,d,f=0,s=[];f<n.length;f++)u=n[f],t[u]&&s.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(f=0;f<c.length;f++)d=o(o.s=c[f]);return d};var n={},t={11: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:"game",1:"card",2:"wechat",3:"evaluation",4:"message",5:"ecm",6:"recharge",7:"msg",8:"calllog"}[e]||e)+"."+{0:"4751baa2f69fe5596d12",1:"1a606c5eb5bc4957c065",2:"8fc3343f7aea01c1bedb",3:"c59c0098bd52da5edb26",4:"9a09a2ca69a10dd4b1cb",5:"239c5d30d646a21a1e00",6:"bb4c60b1af82de26c84a",7:"78d26db17068eec22a7c",8:"5eed9786deb616aedcf4"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,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
src/router/modules/game.js
/*
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-05 09:30:51
* @LastEditTime: 2019-08-09 11:39:07
* @LastEditors: Please set LastEditors
*/
//游戏营销
// import game from '../../views/game';
......@@ -64,7 +71,7 @@ export default {
},
{
path: 'dzp/record/:id',
name: '大转盘中奖记录',
name: '大转盘游戏记录',
component: () => import(/* webpackChunkName: "game" */ '../../views/game/dzp/record.vue'),
meta: {
path: '/game/dzp'
......@@ -107,7 +114,7 @@ export default {
},
{
path: 'ggk/record/:id',
name: '刮刮卡中奖记录',
name: '刮刮卡游戏记录',
component: () => import(/* webpackChunkName: "game" */ '../../views/game/ggk/record.vue'),
meta: {
path: '/game/ggk'
......@@ -236,7 +243,7 @@ export default {
},
{
path: 'klfl/record/:id',
name: '口令福利中奖记录',
name: '口令福利游戏记录',
component: () => import(/* webpackChunkName: "game" */ '../../views/game/klfl/record.vue'),
meta: {
path: '/game/klfl'
......
src/views/ecm/current-list.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-09 11:36:08
* @LastEditors: Please set LastEditors
-->
<template>
<section>
<div class="dm-wrap clearfix">
......@@ -5,7 +12,6 @@
<el-select class="dm-select" clearable v-model="listParams.success" placeholder="所有条件" @change="search">
<el-option v-for="(v, i) in successOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.memberInfo" class="w250" placeholder="输入会员昵称/名字/手机号" clearable @change="search"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button icon="iconfont icon-icon_yunxiazai" class="fr" type="primary" @click="exportCurrentSendDetails"> 导出列表</el-button>
</div>
<div class="dm-wrap">
......@@ -30,6 +36,7 @@
</el-table>
</div>
<div class="dm-wrap">
<el-input v-model="userMemberInfo" class="w250 mb10" placeholder="输入会员昵称/名字/手机号" clearable @change="searchUnder"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<el-table-column type="index" width="50" label="序号"></el-table-column>
<el-table-column v-for="(v, i) in tableHeader" :fixed="v.fixed" :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">
......@@ -64,11 +71,11 @@ export default {
ecmMarketingTypeRelationIds: '',
currentPage: 1,
pageSize: 20,
memberInfo: '',
success: '',
beginTime: '',
endTime: ''
},
userMemberInfo: '', // 下面列表搜索
total: 0,
loading: false,
infoHeader: [
......@@ -160,6 +167,10 @@ export default {
this.ecmCurrentSendInfos();
// this.ecmCurrentSendDetails();
},
searchUnder() {
this.listParams.currentPage = 1;
this.ecmCurrentSendDetails();
},
handleSizeChange(val) {
this.listParams.pageSize = val;
this.ecmCurrentSendDetails();
......@@ -194,7 +205,8 @@ export default {
async ecmCurrentSendDetails() {
this.loading = true;
this.formatterTimeFunc();
let res = await ecmCurrentSendDetails(this.listParams);
let params = { ...this.listParams, ...{ memberInfo: this.userMemberInfo } };
let res = await ecmCurrentSendDetails(params);
this.tableList = res.result.result || [];
this.total = res.result.totalCount || 0;
this.loading = false;
......
src/views/game/dzp/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-09 11:38:14
* @LastEditors: Please set LastEditors
-->
<template>
<div v-loading="loading" class="dm-wrap">
<div class="pb22 clearfix">
......@@ -10,7 +17,7 @@
<el-button type="primary" class="fr" icon="iconfont icon-icon_yunxiazai fz14" @click="exportLotteryExcel"> 下载Excel</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
<el-table-column :min-width="150" align="left" label="中奖时间">
<el-table-column :min-width="150" align="left" label="游戏时间">
<template slot-scope="scope">
<p class="cell-time">
{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
......@@ -99,7 +106,7 @@ export default {
},
created() {
this.loadLotteryRecordList();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '大转盘', path: '/game/dzp' }, { name: '大转盘中奖记录', path: '' }]);
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '大转盘', path: '/game/dzp' }, { name: '大转盘游戏记录', path: '' }]);
},
methods: {
async loadLotteryRecordList() {
......
src/views/game/ggk/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-06-04 11:49:47
* @LastEditors: your name
-->
<template>
<div v-loading="loading" class="dm-wrap">
<div class="pb22 clearfix">
......@@ -10,7 +17,7 @@
<el-button icon="iconfont icon-icon_yunxiazai fz14" type="primary" class="fr" @click="exportLotteryExcel"> 下载Excel</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width:100%" v-loading="loading">
<el-table-column :min-width="150" align="left" label="中奖时间">
<el-table-column :min-width="150" align="left" label="游戏时间">
<template slot-scope="scope">
<p class="cell-time">
{{ formatDateTimeByType(scope.row.winDate, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
......@@ -103,7 +110,7 @@ export default {
},
created() {
this.loadLotteryRecordList();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '刮刮卡', path: '/game/ggk' }, { name: '刮刮卡中奖记录', path: '' }]);
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '刮刮卡', path: '/game/ggk' }, { name: '刮刮卡游戏记录', path: '' }]);
},
methods: {
async loadLotteryRecordList() {
......
src/views/game/klfl/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-09 11:39:32
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -22,7 +29,7 @@
</a>
</template>
</el-table-column>
<el-table-column :min-width="100" align="left" label="中奖时间" prop="createTime">
<el-table-column :min-width="100" align="left" label="游戏时间" prop="createTime">
<template slot-scope="scope">
<p class="cell-time">
{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
......@@ -44,7 +51,7 @@ export default {
mixins: [filterAvatar],
created() {
this.klflReportList();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '口令福利', path: '/game/klfl' }, { name: '口令福利中奖记录', path: '' }]);
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '/game' }, { name: '口令福利', path: '/game/klfl' }, { name: '口令福利游戏记录', path: '' }]);
},
data() {
return {
......@@ -54,7 +61,7 @@ export default {
rankList: [],
rankHeader: [
// {
// label: '中奖时间',
// label: '游戏时间',
// prop: 'createTime',
// align: 'left',
// formatter: function(row) {
......
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