Skip to content

M
marketing
Commit 4bc2b181 by zhangmeng
Options

fix:拼图游戏，门槛默认值

parent 6038fe4a
Showing with 61 additions and 73 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.694ceb6f3477f57a2a2e34d413890b5d.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.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.5e0469c7d1a7c0033209.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.aad51c2a49dee0a8c451bd2955129c0d.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.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.b59989a3f5fe74b70a44.js></script></body></html>
\ No newline at end of file
dist/static/js/app.5e0469c7d1a7c0033209.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.b59989a3f5fe74b70a44.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/wx-text/index.vue
......@@ -62,12 +62,11 @@ export default {
value:{
handler(val) {
if (val) {
debugger
// debugger
console.log(val)
this.textarea = val;
this.computedTextLength();
}
console.log(this.jumpUrlInfo,this.isSupportVar);
},
immediate:true
}
......@@ -87,15 +86,26 @@ export default {
methods:{
// 添加链接
addLink() {
this.dialogShow = true;
this.getTextValue();
this.$nextTick(_ => {
console.log(this.$refs.myTextarea.innerHTML)
this.hasATag(this.$refs.myTextarea.innerHTML,flag => {
if (flag) {
this.dialogShow = true;
}
});
});
},
textInput(v,e){ // 控制微信文本的文字
var textContent = this.$refs.myTextarea.innerText;
textContent = strLength.getByteVal2(e.target.innerText);
// this.textarea = textContent;
this.textNum = strLength.getZhLen(textContent);
this.computedTextLength();
if(this.textNum>=300){
console.log(textContent);
// textContent = strLength.getByteVal2(textContent);
// // this.textarea = textContent;
// this.textNum = strLength.getZhLen(textContent);
// this.computedTextLength();
this.textLength = textContent.length;
console.log(this.getTextValue().length,textContent.length);
if(this.textLength >= 300){
this.$message.error('最多300个字符');
}
},
......@@ -104,14 +114,8 @@ export default {
const reg = /<(?!(a|\/a|div|\/div|br)).*?>/img ; // 只保留a 和 div 标签
let text = this.$refs.myTextarea.innerHTML.replace(reg,"");
text = text.replace(/<\/div>|&nbsp;/g,"").replace(/<((div)).*?>/g,"<br>").split('<br>').filter(v=>v).join('<br>');
// this.hasATag(text,flag => {
// if (flag) {
// var href = text.match(hrefReg)[0];
// text = text.replace(/<((a)).*?>/g,'<a '+href+'">'); // 获取 <a> 并替代
// }
// });
console.log(text)
this.$emit('update:value',text);
return text;
},
getUrlInfo(obj) {
console.log(obj)
......@@ -120,14 +124,11 @@ export default {
if (obj.isWxApp) {
this.textarea += `<a href="${obj.url}" data-miniprogram-appid="${this.appid}" data-miniprogram-path="${obj.url}">${obj.name}</a>`
} else {
this.textarea += '<a href="'+obj.url+'">'+obj.name+'</a>';
this.textarea += `<a href="${obj.url}">${obj.name}</a>`;
}
this.$emit('update:urlType',obj.urlType);
this.$emit('update:jumpUrlInfo',{name:obj.name,url:obj.url});
this.$emit('update:value',this.textarea);
// this.$nextTick(_ => {
// this.getTextValue();
// })
}
})
},
......
src/views/game/dzp/addEdit.vue
......@@ -68,7 +68,7 @@
</ul>
</el-form-item>
<el-form-item label="奖品设置" class="el-form-item__margin-top14">
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" row-key="key">
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" row-click="key">
<el-table-column prop="awardName" label="序号" align="left" width="90">
<template slot-scope="scope">
{{scope.$index+1}}
......@@ -152,7 +152,7 @@ export default {
{label:'随机',value:null}],
tableList:Array(8).fill({
"prizeId": "", "prizeType": 3,"prizeCount": null,"prizeIntegral": null,"prizeCardId": "","gameId": "","prizeStatus": 0,"prizeSort":null,"prizeRate": 0,"cardName": "","cardType": null,"cardDenomination": null,"cardImageUrl": "","cardStock": null,"wechatCardId": null,"winRecordCode": 0,"receiveCount": 0
}),
}).map((v,i) => ({...v,key:i})),
prizeIndex:0,
showCardDialog:false,
rules:{
......
src/views/game/ptyx/addEdit.vue
......@@ -25,7 +25,8 @@
<el-input-number controls-position="right" v-model="form.usedIntegral" :precision="0" :min="1" class="w300" placeholder="请输入正整数" @blur="nonnegative(form.usedIntegral)" :disabled="isInfo">
</el-input-number> 积分
</el-form-item>
<el-form-item label="奖品设置" class="el-form-item__margin-top14 pt20">
<el-form-item label="奖品设置" class="pt20">
<p class="gray fz13">用户按游戏得分由高到低依次获得奖项。</p>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column prop="awardName" label="奖项" align="left" width="90">
<template slot-scope="scope">
......@@ -102,10 +103,10 @@
</el-form-item>
<div class="width60 fl">
<el-form-item label="提示图片" prop="tipsImg">
<dm-upload-avatar :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：高度200px*200px" :disabled="isInfo"></dm-upload-avatar>
<dm-upload-avatar :model.sync="form.tipsImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸，600*600，格式为PNG\JPG\GIF,大小不超过2MB" :disabled="isInfo"></dm-upload-avatar>
</el-form-item>
<el-form-item label="提示文字" prop="tipTitle">
<dm-input v-model="form.tipTitle" type="textarea" :maxlength="60" class="w400" :rows="6"></dm-input>
<dm-input v-model="form.tipTitle" type="textarea" placeholder="最多输入60个字" :maxlength="60" class="w400" :rows="6"></dm-input>
</el-form-item>
</div>
<div class="width40 fr">
......@@ -125,16 +126,16 @@
<el-form-item label="游戏背景音乐">
<el-switch v-model="form.musicFlag" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="默认播放">
<el-form-item label="默认播放" v-if="form.musicFlag">
<el-switch v-model="form.musicAutoPlay" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="音乐设置">
<el-form-item label="音乐设置" v-if="form.musicFlag">
<el-radio-group v-model="form.musicType" >
<el-radio :label="0">预设</el-radio>
<el-radio :label="1">自定义</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="预设音乐选择">
<el-form-item label="预设音乐选择" v-if="form.musicFlag && !form.musicType">
<ul>
<li v-for="(v,i) in gameMusicOptions" :key="i">
<el-radio v-model="form.gameMusicId" class="w100" :label="v.gameMusicSystemId">{{v.musicName}}</el-radio>
......@@ -142,14 +143,13 @@
</li>
</ul>
</el-form-item>
<el-form-item label="自定义音乐上传">
<el-form-item label="自定义音乐上传" v-if="form.musicFlag && form.musicType">
<audio-upload tips="只能上传mp3文件，且大小不超过3MB，时长不超过90s" @sendAduioList="setAudioList"></audio-upload>
<ul>
<li v-for="(v,i) in audioOptions" :key="i">
<el-radio v-model="form.gameMusicId" class="w100" :label="v.code">{{v.name}}</el-radio>
<i class="iconfont vertical-middle cursor-pointer" :class="v.isPlay?'icon-xinxixianshi1':'icon-xinxixianshi2'" @click="playMusic(i)"></i>
<i class="iconfont vertical-middle cursor-pointer" :class="v.isPlay?'icon-xinxixianshi1':'icon-xinxixianshi2'" @click="playCustomMusic(i)"></i>
</li>
</ul>
</el-form-item>
</section>
......@@ -227,13 +227,12 @@ export default {
gameActivityPuzzleAccessId:'',
gameActivityPuzzleShareId:'',
gameActivityPuzzleStartId:'',
tipTitle:'',
tipsImg:{imgUrl:'',code:''},
tipTitle:'尚未满足游戏参与条件，请多多努力。',
tipsImg:{imgUrl:require('./img/common/default-attention.png'),
code:''},
// 皮肤模板
skinType:0,
},
rules:{
gameName:{required:true, message: '请输入游戏名', trigger: 'blur' },
dateTime:{required:true,type:'array', message: '请选择游戏时间', trigger: 'blur' },
......@@ -252,7 +251,7 @@ export default {
projectName: '', // 当前项目名
sceneValue: 'member', // 场景值
useId: '', // 模板id
hasSearchData: '' , // 当前页回显的数据(接口返回)
hasSearchData: `{"list":[{"type":"or","list":[{"type":"data","data":{"key":"authStatus","compute":"=","value":"1"}}]}],"type":"and"}`, // 当前页回显的数据(接口返回)
toggleTag: false, // 控制按钮显示的参数,仅供参考,可自行修改
getSaveData:'',
saveTag:false,
......@@ -368,7 +367,7 @@ export default {
this.form.gameActivityAttendConditionId = attendCondition.gameActivityAttendConditionId;
this.form.tipTitle = attendCondition.tipTitle;
this.form.searchParams = attendCondition.searchParams;
// this.form.hasSearchData = attendCondition.searchParams;
this.form.hasSearchData = attendCondition.searchParams;
this.getSaveData = attendCondition.searchJson || '';
this.form.tipsImg = {imgUrl:attendCondition.tipImageUrl,code:attendCondition.tipImageFieldCode};
}
......@@ -559,6 +558,22 @@ export default {
}
});
},
//播放自定义音乐
playCustomMusic(index) {
let currentMusic = this.audioOptions[index];
music.src = currentMusic.url || '';
this.audioOptions.map((v,i) => {
if (index === i && currentMusic.isPlay) {
music.pause();
v.isPlay = false;
} else if (index === i && !currentMusic.isPlay){
music.play();
v.isPlay = true;
} else {
v.isPlay = false;
}
});
},
downloadPtyxSkinPsd() {
window.location = downloadPtyxSkinPsd;
},
......
src/views/game/ptyx/partials/audio-upload.vue
......@@ -11,7 +11,7 @@
<script>
import axios from 'axios';
import config from '@/config'
const maxSize = 2 * 1024 * 1024; //5M
const maxSize = 3 * 1024 * 1024; //3M
axios.defaults.withCredentials = true
const reqUrl = '/api-marketing/upload-game-music';
export default {
......@@ -44,7 +44,7 @@ export default {
el.addEventListener("change", function() {
_vm.loading = true
if (el.files[0].size > maxSize) {
_vm.$tips({ type: 'warning', message: '上传图片不能大于2M' });
_vm.$tips({ type: 'warning', message: '上传不能大于3M' });
return;
}
let formData = new FormData();
......
src/views/message/addRecord.vue
......@@ -146,7 +146,7 @@ export default {
this.$confirm(`<div>
<div class="inline-block w300 vertical-middle ">
<p>短信按67字/条分割成多条并按条计费</p>
<p>合计发送${res.result}人，已过滤无手机号码会员</p>
<p>合计发送${res.result}人</p>
<p>是否发送?</p>
</div>
</div>`, '提示', {
......
src/views/wechat/addRecord.vue
......@@ -269,37 +269,9 @@ export default {
this.$tips({type:'warning',message:'会员分组不能为空'});
return;
}
if (this.info.contentType === 1 ) {
console.log(this.info.textNum)
if(this.info.textNum >= 300) {
this.$tips({type:'warning',message:'最多300个字符哦'});
return;
}
var reg = /<(?!(a|\/a|div|\/div|br)).*?>/img ; // 只保留a 和 div 标签
var str = this.info.content.replace(reg,"");
var str1 = str.replace(/<\/div>|&nbsp;/g,"");
var str2 = str1.replace(/<((div)).*?>/g,"<br>");
var str3 = str2.split('<br>').filter(v=>v).join('<br>');
var hrefReg = /href=['"]([^"]*)['"].*?/g
// var hrefReg = /(?<=href=\").*?(?=\")/img; // 获取a标签的href值
if(hrefReg.test(str3)){
var hrefArr = str3.match(hrefReg);
if(hrefArr.length>1){
this.$tips({type:'warning',message:'只能添加一个链接'});
return
}
var href = str3.match(hrefReg)[0];
str3 = str3.replace(/<((a)).*?>/g,'<a '+href+'">'); // 获取 <a> 并替代
}
if(str3 == '' ){
this.$tips({type:'warning',message:'请输入回复内容'});
return;
}else{
this.info.content = str3
}
}
// if (this.info.contentType === 1 ) {
// this.info.content = str3
// }
this.checkMessageSendCount();
},
......
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