Skip to content

M
marketing
Commit e910672c by chenxin
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !32
parents 3c2b35ef 0134d4c4
Showing with 73 additions and 12 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.9cb66f4997a76a2858e7.js></script><script type=text/javascript src=/marketing/static/js/vendor.210a1a642e9c8aa3ce9e.js></script><script type=text/javascript src=/marketing/static/js/main.3ad190b85abd2e5d02a9.js></script></body></html>
\ No newline at end of file
dist/static/js/card.13f1281c8a63b1823ccd.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.1a606c5eb5bc4957c065.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/ecm.473acba75d1871062e41.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.7e86f78a71685dfde625.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/evaluation.050296879188ef53023e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/evaluation.c59c0098bd52da5edb26.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.512107bbe5a951fc40a1.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.6cd2948a8139b3139e8b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.d02e26cd263e61babbe5.js → dist/static/js/manifest.9cb66f4997a76a2858e7.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,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:"6cd2948a8139b3139e8b",1:"13f1281c8a63b1823ccd",2:"0dc1d23575b8326f2f45",3:"050296879188ef53023e",4:"9a09a2ca69a10dd4b1cb",5:"473acba75d1871062e41",6:"3a1253a9f8300faf72c0",7:"f7da77cd12f974cc2d9a",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
dist/static/js/recharge.3a1253a9f8300faf72c0.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.bb4c60b1af82de26c84a.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/vendor.210a1a642e9c8aa3ce9e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.33cafa0134aa152d9bdc.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.0dc1d23575b8326f2f45.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.8fc3343f7aea01c1bedb.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/router/modules/game.js
/*
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-05 09:30:51
* @LastEditTime: 2019-08-12 09:19:55
* @LastEditors: Please set LastEditors
*/
//游戏营销
// import game from '../../views/game';
......
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/index.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:16:58
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -18,7 +25,7 @@
<el-table-column label="操作" align="left" width="220px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 1)">链接</el-button>
<el-button type="text" @click="$router.push('/game/dzp/record/' + scope.row.gameId)">记录</el-button>
<el-button type="text" @click="$router.push('/game/dzp/record/' + scope.row.gameId)">中奖记录</el-button>
<el-button type="text" @click="$router.push('/game/dzp/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="$router.push('/game/dzp/detail/' + scope.row.gameId)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
......
src/views/game/dzp/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:19:29
* @LastEditors: Please set LastEditors
-->
<template>
<div v-loading="loading" class="dm-wrap">
<div class="pb22 clearfix">
......
src/views/game/ggk/index.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:17:06
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -18,7 +25,7 @@
<el-table-column label="操作" align="left" width="220px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 2)">链接</el-button>
<el-button type="text" @click="$router.push('/game/ggk/record/' + scope.row.gameId)">记录</el-button>
<el-button type="text" @click="$router.push('/game/ggk/record/' + scope.row.gameId)">中奖记录</el-button>
<el-button type="text" @click="$router.push('/game/ggk/edit/' + scope.row.gameId)" v-if="scope.row.gameStatus != '3'">编辑</el-button>
<el-button type="text" @click="$router.push('/game/ggk/detail/' + scope.row.gameId)" v-if="scope.row.gameStatus == '3'">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
......
src/views/game/ggk/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:18:43
* @LastEditors: Please set LastEditors
-->
<template>
<div v-loading="loading" class="dm-wrap">
<div class="pb22 clearfix">
......@@ -7,7 +14,7 @@
<el-date-picker :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" class="w300" v-model="dateTime" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="loadLotteryRecordList"></el-date-picker>
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="loadLotteryRecordList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox border class="pl10" v-model="listParams.freeFlag" :true-label="1" :false-label="0" @change="loadLotteryRecordList">免费抽奖</el-checkbox>
<el-button icon="iconfont icon-icon_yunxiazai fz14" type="primary" class="fr" @click="exportLotteryExcel"> 下载Excel</el-button>
<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="中奖时间">
......
src/views/game/klfl/index.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:17:17
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -20,7 +27,7 @@
<el-table-column label="操作" align="left" width="220px" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="setLinks(scope.row, 5)">链接</el-button>
<el-button type="text" v-if="scope.row.sendStatus !== 0" @click="$router.push('/game/klfl/record/' + scope.row.gameActivityId)">记录</el-button>
<el-button type="text" v-if="scope.row.sendStatus !== 0" @click="$router.push('/game/klfl/record/' + scope.row.gameActivityId)">中奖记录</el-button>
<el-button type="text" v-if="scope.row.activityStatus === 0 || scope.row.activityStatus === 1" @click="$router.push('/game/klfl/edit/' + scope.row.gameActivityId)">编辑</el-button>
<el-button type="text" v-else @click="$router.push('/game/klfl/info/' + scope.row.gameActivityId)">详情</el-button>
<dm-delete @confirm="delData(scope.row)" tips="是否删除该游戏?">
......
src/views/game/klfl/record.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:19:03
* @LastEditors: Please set LastEditors
-->
<template>
<section class="dm-wrap">
<div class="pb22 clearfix">
......@@ -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