Skip to content

M
marketing
Commit ce04cdbf by zhangmeng
Options

fix:游戏

parent 07fd61a4
Showing with 48 additions and 59 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.27f2eafab2c538f56ca8691a6448cf3f.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.dc691f60841a60b0f5d0.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.fb3c085590e7ba52d09fdaeba6bfb4dd.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.761192a4fc8b722548de.js></script></body></html>
\ No newline at end of file
dist/static/js/app.761192a4fc8b722548de.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.dc691f60841a60b0f5d0.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
......@@ -241,6 +241,9 @@
.el-menu.el-menu--popup .el-menu-item.is-active label {
color: #fff;
}
.word-break-all {
word-break: break-all;
}
......
src/components/wx-text/index.vue
......@@ -97,17 +97,14 @@ export default {
});
},
textInput(v,e){ // 控制微信文本的文字
var textContent = this.$refs.myTextarea.innerText;
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个字符');
}
this.computedTextLength();
// var textContent = this.$refs.myTextarea.innerText;
// console.log(textContent);
// this.textLength = textContent.length;
// console.log(this.getTextValue().length,textContent.length);
// if(this.textLength >= 300){
// this.$message.error('最多300个字符');
// }
},
// 获取内容
getTextValue() {
......@@ -163,11 +160,24 @@ export default {
this.$emit('update:value',this.textarea);
},
computedTextLength() {
if (this.$refs.myTextarea) {
this.textLength = this.$refs.myTextarea.innerHTML.length;
} else {
this.textLength = 0;
// if (this.$refs.myTextarea) {
// this.textLength = this.$refs.myTextarea.innerHTML.length;
// } else {
// this.textLength = 0;
// }
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>');
let textContent = this.$refs.myTextarea.innerText;
console.log(text.length,textContent.length);
if(this.textLength >= 300){
this.$message.error('最多300个字符');
}
},
emitValue() {
}
}
}
......
src/views/game/ptyx/addEdit.vue
......@@ -145,12 +145,10 @@
</el-form-item>
<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="playCustomMusic(i)"></i>
</li>
</ul>
<div v-if="customMusic.name">
<span>{{customMusic.name}}</span>
<i class="iconfont vertical-middle cursor-pointer" :class="customMusic.isPlay?'icon-xinxixianshi1':'icon-xinxixianshi2'" @click="playCustomMusic"></i>
</div>
</el-form-item>
</section>
<!-- 分享设置 TODO 待改造 -->
......@@ -262,7 +260,7 @@ export default {
// 系统游戏音乐选项
gameMusicOptions:[],
audioOptions:[],
customMusic:{},
attendCondition: {},
accessGame:{},
startGame:{},
......@@ -402,20 +400,6 @@ export default {
this.$tips({type:'warning',message:'游戏拼图图片不能为空'});
flag = true;
}
if (this.form.shareFlag) {
if (!this.form.shareImg.code) {
this.$tips({type:'warning',message:'分享图不能为空'});
flag = true;
}
if (!this.form.shareTitle) {
this.$tips({type:'warning',message:'分享标题不能为空'});
flag = true;
}
if (!this.form.shareTextInfo) {
this.$tips({type:'warning',message:'分享描述不能为空'});
flag = true;
}
}
if (!this.form.logoImg.code) {
this.$tips({type:'warning',message:'品牌logo不能为空'});
flag = true;
......@@ -563,20 +547,15 @@ 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;
}
});
playCustomMusic() {
music.src = this.customMusic.url || '';
if (this.customMusic.isPlay) {
music.pause();
this.customMusic.isPlay = false;
} else{
music.play();
this.customMusic.isPlay = true;
}
},
downloadPtyxSkinPsd() {
window.location = downloadPtyxSkinPsd;
......@@ -586,11 +565,7 @@ export default {
this.$refs.ptyxSkin.changeDefaultSkin(this.form.skinType);
},
setAudioList(obj) {
console.log(obj);
let length = this.audioOptions.length;
this.$set(this.audioOptions,length,{...obj,isPlay:false});
// this.audioOptions.push = [];
console.log(this.audioOptions)
this.customMusic = {...obj,isPlay:false};
},
/**---------人群筛选器的方法------------- */
getData() {
......
src/views/wechat/record.vue
......@@ -2,7 +2,7 @@
* @Author: zhangmeng
* @Date: 2018-08-14 15:45:36
* @Last Modified by: zhangmeng
* @Last Modified time: 2019-01-01 15:54:21
* @Last Modified time: 2019-01-02 20:48:09
*/
<template>
<section class="dm-wrap">
......@@ -89,7 +89,8 @@ export default {
temp = <span>{row.content}</span>;
}
if (row.content && row.content.length > 10) {
return (<el-popover placement="top-start" width="200" trigger="hover" content={row.content}>
return (<el-popover placement="top-start" width="200" trigger="hover">
<span class="word-break-all">{row.content}</span>
<div class="ellipsis" slot="reference">{temp}</div>
</el-popover>)
} else {
......
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