Skip to content

M
marketing
Commit ed2dccfc by zhangmeng
Options

add:迭代4

parent d29ba3ca
Showing with 86 additions and 47 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/app.f6fa1951ad1ac083d8c4137ed22f716c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.66eed37ef79aa0fd6d4f.js></script><script type=text/javascript src=/marketing/static/js/app.7492ee3e26b56fcf8578.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/app.9a693a609744b9953041f61013daf5e1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.66eed37ef79aa0fd6d4f.js></script><script type=text/javascript src=/marketing/static/js/app.b7341a08bda4986edcd4.js></script></body></html>
\ No newline at end of file
dist/static/js/app.7492ee3e26b56fcf8578.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/app.b7341a08bda4986edcd4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/ecm/form.vue
......@@ -17,7 +17,7 @@
<div class="layout--tips__content">
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">图文、文本、图片</b>将使用微信群发接口，占用每个用户每月4条的群发次数</p>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">小程序</b>使用客服接口，但客服接口需要用户在24小时之内与微信公众号互动才能发送成功，可能导致成功率过低，不占用每个用户每月4条的群发次数。</p>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">短信、卡券、话务</b>均不占用群发次数。</p></div>
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">短信、话务</b>均不占用群发次数，卡券详见卡券通知方式配置不同投放方式说明。</p></div>
</div>
<div class="layout--tips" v-else>
<span class="dm-status--primary pl10"></span>
......@@ -620,8 +620,6 @@ export default {
const hasMessageInList = this.$refs.marketingEvent.hasMessageInList();
// 判断是否能发送短信
if(hasMessageInList && this.isMessageForbidden()) return;
// 判断账户是否欠费
if(hasMessageInList && this.checkAccountState()) return;
if (this.form.expireType && (!this.form.beginDate || !this.form.endDate)) {
this.$tips({type:'warning',message:'固定期限不能为空'});
......@@ -879,25 +877,7 @@ export default {
},
handleDataLeft(selectedData, selectionToRemove) {
console.log(selectedData, selectionToRemove)
},
// 账户状态判断
checkAccountState() {
if (localStorage.getItem('accountStatus') == 3) {
this.$alert(`<div>
<i class="el-icon-warning warning-color fz30 vertical-middle mr20"></i>
<p class="inline-block vertical-middle w300">当前账户已欠费，无法正常使用短信服务。为了保障您的权益，请及时充值。</p>
</div>`, '提示', {
dangerouslyUseHTMLString: true,
confirmButtonText:'前往充值中心',
customClass:'message-box--btn-center'
}).then(res => {
if (res === 'confirm') {
this.$router.push('/recharge/do');
}
})
return true;
}
},
}
},
filters:{
filterDate(val) {
......
src/views/ecm/marketing-event/index.vue
......@@ -313,6 +313,8 @@ export default {
this.$message({type:'warning',message:`最多只能添加${this.maxEventCount}个营销事件`});
return;
}
// 判断是否欠费
if (v.value === 'message' && this.checkAccountState()) return;
this.dialogCom = 'lib-' + v.value;
// 新增的时候设置为空对象
this.currentItem = {};
......@@ -337,6 +339,24 @@ export default {
},
/*------------------辅助方法--------------*/
// 账户状态判断
checkAccountState() {
if (localStorage.getItem('accountStatus') == 3) {
this.$alert(`<div>
<i class="el-icon-warning warning-color fz30 vertical-middle mr20"></i>
<p class="inline-block vertical-middle w300">当前账户已欠费，无法正常使用短信服务。为了保障您的权益，请及时充值。</p>
</div>`, '提示', {
dangerouslyUseHTMLString: true,
confirmButtonText:'前往充值中心',
customClass:'message-box--btn-center'
}).then(res => {
if (res === 'confirm') {
this.$router.push('/recharge/do');
}
})
return true;
}
},
// 判断是否大于最大数量
isOverMaxCount() {
return this.list.length >= this.maxEventCount;
......
src/views/game/common/editAlertMixin.js 0 → 100644
export default {
methods: {
//编辑的时候提交
editAlert() {
return new Promise((resolve,reject) => {
if (this.isEdit) {
this.$confirm('若已修改本次游戏奖品，已发放的积分和卡券无法回溯，后果自负?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res => {
console.log(res);
resolve(res === 'cancel');
}).catch(err => {
console.log(err);
});
} else {
resolve(false);
}
})
}
}
}
src/views/game/dzp/form.vue
......@@ -112,11 +112,12 @@
import {detailLottery,saveLottery} from '@/service/api/gameApi.js';
import {numberToChinese,formateDateTimeByType} from '@/utils/index.js';
import dmUploadAvatar from '@/components/upload/avatar';
import nonnegative from '@/mixins/nonnegative.js'
import nonnegative from '@/mixins/nonnegative.js';
import editAlertMixin from '../common/editAlertMixin.js';
let key = Date.now();
let result = {};
export default {
mixins:[nonnegative],
mixins:[nonnegative,editAlertMixin],
data () {
const that = this;
return {
......@@ -270,7 +271,7 @@ export default {
this.loading = false;
},
//提交保存
saveLottery (formName) {
async saveLottery (formName) {
if (this.form.gameLimitCount != -1 && (this.form.gameFreeCount>this.form.gameLimitCount)) {
this.$tips({type:'warning',message:'免费次数不能大于限制次数'});
return;
......@@ -293,6 +294,8 @@ export default {
this.$tips({type:'warning',message:`必须有一个奖项为谢谢参与`});
return;
}
if (await this.editAlert()) return;
this.$refs[formName].validate((valid) => {
if (valid) {
let params = {
......
src/views/game/dzp/index.vue
......@@ -35,7 +35,7 @@
<script>
import {formateDateTimeByType} from '@/utils/index.js'
import {loadLotteryList,delLotteryService} from '@/service/api/gameApi.js';
import linksMixin from '../linksMixin.js';
import linksMixin from '../common/linksMixin.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'game-dzp',
......
src/views/game/ggk/form.vue
......@@ -109,10 +109,11 @@
import {detailLottery,saveLottery} from '@/service/api/gameApi.js';
import {numberToChinese,formateDateTimeByType} from '@/utils/index.js';
import dmUploadAvatar from '@/components/upload/avatar';
import nonnegative from '@/mixins/nonnegative.js'
import nonnegative from '@/mixins/nonnegative.js';
import editAlertMixin from '../common/editAlertMixin.js';
let result = {};
export default {
mixins:[nonnegative],
mixins:[nonnegative,editAlertMixin],
data () {
const that = this;
return {
......@@ -255,7 +256,7 @@ export default {
})
},
//提交保存
saveLottery (formName) {
async saveLottery (formName) {
if (this.form.gameLimitCount != -1 && (this.form.gameFreeCount>this.form.gameLimitCount)) {
this.$tips({type:'warning',message:'免费次数不能大于限制次数'});
return;
......@@ -274,6 +275,9 @@ export default {
}
if (flag) return;
});
// 编辑弹窗提示
if (await this.editAlert()) return;
this.$refs[formName].validate((valid) => {
if (valid) {
let params = {
......
src/views/game/ggk/index.vue
......@@ -34,7 +34,7 @@
<script>
import {formateDateTimeByType} from '@/utils/index.js'
import {loadLotteryList,delLotteryService} from '@/service/api/gameApi.js';
import linksMixin from '../linksMixin.js';
import linksMixin from '../common/linksMixin.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'game-ggk',
......
src/views/game/klfl/form.vue
......@@ -201,12 +201,14 @@ import {formateDateTimeByType} from '@/utils/index.js';
import dmUploadImg from '@/components/upload/img';
import dmUploadAvatar from '@/components/upload/avatar';
import strategy from './strategy';
import calculate from '@/components/calculate'
import codeDialog from './codeDialog'
import calculate from '@/components/calculate';
import codeDialog from './codeDialog';
import editAlertMixin from '../common/editAlertMixin.js';
import axios from 'axios';
import config from '@/config';
let result = {};
export default {
mixins:[editAlertMixin],
data () {
const that = this;
return {
......@@ -521,7 +523,9 @@ export default {
})
},
//提交保存
klflSave (formName) {
async klflSave (formName) {
// 编辑弹窗提示
if (await this.editAlert()) return;
this.$refs[formName].validate((valid) => {
if (valid) {
let params = {
......
src/views/game/klfl/index.vue
......@@ -36,7 +36,7 @@
<script>
import {formateDateTimeByType} from '@/utils/index.js'
import {LoadKlflList,deleteGame,createQrCode,downloadQrCode} from '@/service/api/gameApi.js';
import linksMixin from '../linksMixin.js';
import linksMixin from '../common/linksMixin.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'game-klfl',
......
src/views/game/ptyx/form.vue
......@@ -183,8 +183,9 @@
import {ptyxDetail,savePtyx,getGameSystemMusic,downloadPtyxSkinPsd} from '@/service/api/gameApi.js';
import {numberToChinese,formateDateTimeByType} from '@/utils/index.js';
import dmUploadAvatar from '@/components/upload/avatar';
import nonnegative from '@/mixins/nonnegative.js'
import shareCom from '../components/share';
import nonnegative from '@/mixins/nonnegative.js';
import editAlertMixin from '../common/editAlertMixin.js';
// import shareCom from '../common/share';
import ptyxSkin from './partials/ptyx-skin.vue';
import audioUpload from './partials/audio-upload.vue';
let gameInfo = {};
......@@ -194,11 +195,11 @@ export default {
name:'ptyx-form',
components:{
dmUploadAvatar,
shareCom,
// shareCom,
ptyxSkin,
audioUpload
},
mixins:[nonnegative],
mixins:[nonnegative,editAlertMixin],
data () {
const that = this;
return {
......@@ -410,7 +411,7 @@ export default {
})
},
//提交保存
savePtyx (formName) {
async savePtyx (formName) {
let flag = false;
if (!this.form.puzzleImg.code) {
this.$tips({type:'warning',message:'游戏拼图图片不能为空'});
......@@ -429,7 +430,8 @@ export default {
})
if (flag) return;
// 编辑弹窗提示
if (await this.editAlert()) return;
this.$refs[formName].validate((valid) => {
if (valid) {
......@@ -500,8 +502,6 @@ export default {
attendCondition.gameActivityAttendConditionId = this.form.gameActivityAttendConditionId || '';
}
const params = {
gameData:JSON.stringify(gameInfo),
attendCondition:JSON.stringify(attendCondition),
......
src/views/game/ptyx/index.vue
......@@ -36,7 +36,7 @@
import {formateDateTimeByType} from '@/utils/index.js'
import {LoadPtyxList,deleteGame} from '@/service/api/gameApi.js';
import config from './config';
import linksMixin from '../linksMixin.js';
import linksMixin from '../common/linksMixin.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'game-ptyx',
......
src/views/game/znm/form.vue
......@@ -81,9 +81,11 @@ import {znmDetail,znmSave,znmStrategyList,znmStrategySort,znmStrategyDel} from '
import {numberToChinese,formateDateTimeByType} from '@/utils/index.js';
import dmUploadAvatar from '@/components/upload/avatar';
import strategy from './strategy';
import editAlertMixin from '../common/editAlertMixin.js';
let gameInfo = {};
let cardType = 'firstStrategy'
export default {
mixins:[editAlertMixin],
data () {
const that = this;
return {
......@@ -228,11 +230,14 @@ export default {
}
},
//提交保存
znmSave (formName) {
async znmSave (formName) {
if (!this.firstStrategy.coupCardId || !this.lastStrategy.coupCardId) {
this.$tips({type:'warning',message:'首次奖项和后续奖不能为空'});
return;
}
// 编辑弹窗提示
if (await this.editAlert()) return;
this.$refs[formName].validate((valid) => {
if (valid) {
let params = {
......
src/views/game/znm/index.vue
......@@ -33,7 +33,7 @@
<script>
import { formateDateTimeByType } from '@/utils/index.js'
import { LoadZnmList, deleteGame } from '@/service/api/gameApi.js';
import linksMixin from '../linksMixin.js';
import linksMixin from '../common/linksMixin.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'game-znm',
......
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