Skip to content

M
marketing
Commit 8919ae03 by chenxin
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !34
parents 2003db4f 4d69b6ad
Showing with 65 additions and 26 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.ee3c43487c709d99da8b.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
<!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.db6bd96939c2b580e050c8d6eb194619.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.ffa97b06ab7081cb3a93.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/game.939ef154a34f1a744ce0.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.fe7978a4305e6a5a2c03.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/manifest.ee3c43487c709d99da8b.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,f,u,d=0,s=[];d<n.length;d++)f=n[d],t[f]&&s.push(t[f][0]),t[f]=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++)u=o(o.s=c[d]);return u};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:"fe7978a4305e6a5a2c03",1:"13f1281c8a63b1823ccd",2:"0dc1d23575b8326f2f45",3:"050296879188ef53023e",4:"9a09a2ca69a10dd4b1cb",5:"473acba75d1871062e41",6:"3a1253a9f8300faf72c0",7:"f7da77cd12f974cc2d9a",8:"5eed9786deb616aedcf4"}[e]+".js";var i=setTimeout(f,12e4);function f(){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=f,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/manifest.ffa97b06ab7081cb3a93.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,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 o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(n,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var n={},t={11:0};function a(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,a),t.l=!0,t.exports}a.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,a){r=t[e]=[n,a]});r[2]=n;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"evaluation",4:"message",5:"ecm",6:"recharge",7:"msg",8:"calllog"}[e]||e)+"."+{0:"939ef154a34f1a744ce0",1:"7211c6a8570594ddaaea",2:"0dc1d23575b8326f2f45",3:"050296879188ef53023e",4:"9a09a2ca69a10dd4b1cb",5:"733ca22ff5da5d948852",6:"3a1253a9f8300faf72c0",7:"f7da77cd12f974cc2d9a",8:"5eed9786deb616aedcf4"}[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,o.appendChild(c),n},a.m=e,a.c=n,a.d=function(e,r,n){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/mixins/selector.js
/*
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-19 16:54:13
* @LastEditors: Please set LastEditors
*/
// 商品选择器方法
export default {
......@@ -29,7 +36,7 @@ export default {
handleXxSyspClick(visible = true) {
this.xxSysp.visible = visible;
// refs.selector放在modal里，初始化的时候并没有渲染
if (!this.xxSysp.isResign && this.isEdit) {
if (!this.xxSysp.isResign && (this.isEdit || this.isInfo)) {
this.$nextTick(() => {
this.$refs.selector.conditions = this.xxSysp.conditionList;
this.xxSysp.isResign = true;
......
src/views/card/form.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-08-06 20:53:23
* @LastEditTime: 2019-08-19 16:49:17
* @LastEditors: Please set LastEditors
-->
<template>
<div>
<el-form class="dm-wrap" :model="form" ref="form" :rules="rules" label-width="120px">
......@@ -87,13 +94,13 @@
<span :key="idx" class="item">{{ item.text }}</span>
</template>
</div>
<template v-if="xxSysp.goodsEnable && ((isEdit && xxSysp.filterAbbrInfo.length) || isAdd || isCopy)">
<el-button type="primary" @click="handleXxSyspClick" class="fl mt5" size="mini">{{ isEdit ? '查看' : '编辑' }}</el-button>
<el-button v-show="xxSysp.filterAbbrInfo.length && !isEdit" @click="handleXxSyspReset" class="fl mt5" size="mini">清空</el-button>
<template v-if="xxSysp.goodsEnable && (((isEdit || isInfo) && xxSysp.filterAbbrInfo.length) || isAdd || isCopy)">
<el-button type="primary" @click="handleXxSyspClick" class="fl mt5" size="mini">{{ isEdit || isInfo ? '查看' : '编辑' }}</el-button>
<el-button v-show="xxSysp.filterAbbrInfo.length && !isEdit && !isInfo" @click="handleXxSyspReset" class="fl mt5" size="mini">清空</el-button>
</template>
<p v-else class="fz14 gray">未选择</p>
</div>
<div v-if="xxSysp.goodsEnable && ((isEdit && xxSysp.filterAbbrInfo.length) || isAdd || isCopy)" class="tips fz12 gray"><span class="w100 pr10 inline-block"></span>* 仅支持第三方api接口核销卡券时使用</div>
<div v-if="xxSysp.goodsEnable && (((isEdit || isInfo) && xxSysp.filterAbbrInfo.length) || isAdd || isCopy)" class="tips fz12 gray"><span class="w100 pr10 inline-block"></span>* 仅支持第三方api接口核销卡券时使用</div>
</div>
<!-- 兑换券 -->
<div v-show="form.cardType === 2" class="mb10"><el-checkbox :disabled="isEdit || isInfo" v-model="sale_limit.flag">消费条件</el-checkbox> <span class="fz12 gray">（至少填写一项）</span></div>
......
src/views/card/group-send.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:42:09
* @LastEditTime: 2019-08-20 10:15:52
* @LastEditors: Please set LastEditors
-->
<template>
<el-form :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
<div class="dm-form__wrap">
......@@ -456,19 +463,22 @@ export default {
// 保存校验
async submit(formName) {
// console.log(this.form.memberSearchDTO)
// // 这里强制获取人群筛选器的配置项
// await this.$refs.peopleFilter.confirmSet();
console.log(this.getSaveData);
if (this.form.memberType === 0 && this.toggleTag && !this.getSaveData) {
this.$tips({ type: 'warning', message: '人群筛选未保存条件' });
return;
}
if (this.form.memberType === 1 && !this.form.openIds) {
this.$tips({ type: 'warning', message: '指定会员不能为空' });
return;
}
if (this.form.memberType === 2 && !this.form.memberGroupIds) {
this.$tips({ type: 'warning', message: '会员分组不能为空' });
return;
}
this.$refs[formName].validate(valid => {
if (valid) {
this.$confirm('是否群发卡券?', '提示', {
......@@ -479,9 +489,7 @@ export default {
.then(() => {
this.sendCard();
})
.catch(() => {
this.$tips({ type: 'info', message: '已取消提交' });
});
.catch(() => {});
} else {
this.$tips({ type: 'warning', message: '表单未填写完整' });
return false;
......
src/views/game/dzp/index.vue
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:16:58
* @LastEditTime: 2019-08-19 17:17:09
* @LastEditors: Please set LastEditors
-->
<template>
......
src/views/game/ggk/index.vue
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:17:06
* @LastEditTime: 2019-08-19 17:11:54
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -54,7 +54,8 @@ export default {
gameType: 2,
searchParam: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
searchType: 1
},
total: 0,
loading: false,
......@@ -130,15 +131,23 @@ export default {
},
methods: {
// 拉取列表
getTableList() {
this.loading = true;
getTableList(noloading = false) {
if (!noloading) {
this.loading = true;
}
loadLotteryList(this.listParams)
.then(res => {
if (res.errorCode === 0) {
this.tableList = res.result.page.result || [];
this.total = res.result.page.totalCount || 0;
}
this.loading = false;
if (this.listParams.searchType === 1) {
this.listParams.searchType = 0;
this.getTableList(true);
}
if (!noloading) {
this.loading = false;
}
})
.catch(err => {
this.loading = false;
......
src/views/game/klfl/index.vue
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:49:47
* @LastEditTime: 2019-08-12 09:17:17
* @LastEditTime: 2019-08-19 17:12:18
* @LastEditors: Please set LastEditors
-->
<template>
......@@ -56,7 +56,8 @@ export default {
gameStatus: -1,
searchParam: '',
currentPage: 1,
pageSize: 20
pageSize: 20,
searchType: 1
},
total: 0,
tableHeader: [
......@@ -113,17 +114,24 @@ export default {
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '游戏营销', path: '' }, { name: '口令福利', path: '/game/klfl' }]);
},
methods: {
async getTableList() {
this.loading = true;
async getTableList(noloading = false) {
if (!noloading) {
this.loading = true;
}
try {
let res = await LoadKlflList(this.listParams);
console.log(res);
this.tableList = res.result.result || [];
this.total = res.result.totalCount;
if (this.listParams.searchType === 1) {
this.listParams.searchType = 0;
this.getTableList(true);
}
} catch (err) {
this.$tips({ type: 'warning', message: '获取列表出错!' });
}
this.loading = false;
if (!noloading) {
this.loading = false;
}
},
async delData(row) {
try {
......
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