Skip to content

M
marketing
Commit 62be450e by zhangmeng
Options

fix:游戏拼图 人群筛选器bug

parent 6d76bb9c
Showing with 62 additions and 57 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.67af1b4f7a69fa8166bd7206b102010b.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.2524746c73744f18e2e4.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.b37a3627c1e8ed169a62cee8db890a36.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.067e073dcf2d4f060480.js></script></body></html>
\ No newline at end of file
dist/static/js/app.067e073dcf2d4f060480.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.2524746c73744f18e2e4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/upload/img.vue
<template>
<div>
<label class="el-button el-button--primary" :class="{'is-disabled':disabled}" :style="labelStyle">
<label class="el-button el-button--primary" :class="{'is-disabled':copyDisabled}" :style="labelStyle">
<i v-if="icon" :class="icon"></i>
{{disabled?'上传中...':label}}
<input type="file" style="display:none;" :disabled="disabled" accept="image/gif, image/jpeg,image/png" ref="uploader" v-upload='this'>
{{label}}
<input type="file" style="display:none;" :disabled="copyDisabled" accept="image/gif, image/jpeg,image/png" ref="uploader" v-upload='this'>
</label>
<span class="fz12 gray" :style="tipsStyle"> {{tips}}</span>
<img v-if="model.imgUrl && showImg" :src="model.imgUrl || ''" :width="width" :class="className" class="upload-show-img"/>
......@@ -59,6 +59,10 @@ export default {
icon:{
type:String,
default:''
},
disabled:{
type:Boolean,
default:false
}
},
watch:{
......@@ -66,13 +70,14 @@ export default {
handler(val) {
this.$emit('update:model',this.model);
this.$emit('backImg',this.model);
this.copyDisabled = this.disabled;
},
deep:true
}
},
data(){
return{
disabled:false,
copyDisabled:false,
loading:false
}
}
......
src/components/wx-text/index.vue
......@@ -62,6 +62,7 @@ export default {
value:{
handler(val) {
if (val) {
debugger
this.textarea = val;
this.computedTextLength();
}
......@@ -109,10 +110,6 @@ export default {
// text = text.replace(/<((a)).*?>/g,'<a '+href+'">'); // 获取 <a> 并替代
// }
// });
console.log(text)
this.$emit('update:value',text);
},
......@@ -127,6 +124,7 @@ export default {
}
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/router/modules/card.js
......@@ -7,7 +7,7 @@ import cardRecordGet from '../../views/card/record-get'
import cardRecordCache from '../../views/card/record-cache'
import cardGroupSend from '../../views/card/group-send'
import cardAnalysis from '../../views/card/analysis'
import cardInfo from '../../views/card/card-info'
import cardForm from '../../views/card/form.vue'
import cardShelf from '../../views/card/shelf'
import cardManager from '../../views/card/manager'
import cardCheck from '../../views/card/check'
......@@ -95,7 +95,7 @@ export default {
{
path: 'edit/:id',
name: '卡券编辑',
component: cardInfo,
component: cardForm,
meta: {
type:'edit',
path:'/card/list'
......@@ -104,7 +104,7 @@ export default {
{
path: 'info/:id',
name: '卡券详情',
component: cardInfo,
component: cardForm,
meta: {
type:'info',
path:'/card/record/get'
......@@ -113,7 +113,7 @@ export default {
{
path: 'copy/:id',
name: '卡券复制',
component: cardInfo,
component: cardForm,
meta: {
type:'copy',
path:'/card/record/get'
......@@ -122,7 +122,7 @@ export default {
{
path: 'add',
name: '新增卡券',
component: cardInfo,
component: cardForm,
meta: {
type:'add',
path:'/card/list'
......
src/views/card/card-info.vue → src/views/card/form.vue
<template>
<el-form class="dm-wrap" :model="form" ref="form" :rules="rules" label-width="120px">
<el-form-item label="卡券类型">
<el-radio-group v-model="form.cardType" :disabled="isEdit || isInfo" @change="reset">
<el-radio :label="0">抵金券</el-radio>
......@@ -176,11 +175,10 @@
<el-button type="primary" @click="submitForm('form')" v-if="!isInfo">保存并提交审核</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
</el-form>
</template>
<script>
import cardInfo from './cardInfo.js';
export default cardInfo;
import cardForm from './form.js';
export default cardForm;
</script>
src/views/game/klfl/index.vue
......@@ -5,12 +5,12 @@
<el-option v-for="(v,i) in gameStatusOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w200" placeholder="输入游戏名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button class="fr" icon="iconfont icon-icon_yunxiazai fz14" @click="downLoadQr"> 下载二维码 </el-button>
<el-button class="fr mr10" type="primary" @click="$router.push('/game/klfl/add')">新建游戏</el-button>
<!-- <el-button class="fr" icon="iconfont icon-icon_yunxiazai fz14" @click="downLoadQr"> 下载二维码 </el-button> -->
<el-button class="fr" type="primary" @click="$router.push('/game/klfl/add')">新建游戏</el-button>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" fixed="left"></el-table-column>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%" v-loading="loading">
<!-- <el-table-column type="selection" width="50" fixed="left"></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">
<template slot-scope="scope">
<span v-if="v.formatter" v-html="v.formatter(scope.row)"></span>
......@@ -71,7 +71,7 @@ export default {
{label:'参与人数',prop:'cyrs',width:'80',align:'left'},
{label:'参与次数',prop:'cyrc',width:'80',align:'left'}],
tableList:[],
multipleSelection:[]
// multipleSelection:[]
}
},
created() {
......@@ -79,9 +79,9 @@ export default {
this.$store.commit('mutations_breadcrumb',[{name:'营销管理',path:''},{name:'游戏营销',path:''},{name:'口令福利',path:'/game/klfl'}])
},
methods: {
handleSelectionChange(val) {
this.multipleSelection = val;
},
// handleSelectionChange(val) {
// this.multipleSelection = val;
// },
async getTableList() {
this.loading = true;
try {
......@@ -108,21 +108,21 @@ export default {
}
},
//下载二维码
async downLoadQr(){
if (this.multipleSelection.length === 0) {
this.$tips({type:'warning',message:'请先勾选游戏'});
return;
}
const params = {
urlInfos:JSON.stringify(this.multipleSelection.map(v => {return {gameName:v.gameName,gameUrl:v.gameUrl || 'null'}}))
}
try {
let resCreate = await createQrCode(params);
window.location = downloadQrCode+'?zipName='+resCreate.result+'&requestProject=gic-web';
} catch (err){
this.$tips({type:'error',message:'下载二维码失败'});
}
}
// async downLoadQr(){
// if (this.multipleSelection.length === 0) {
// this.$tips({type:'warning',message:'请先勾选游戏'});
// return;
// }
// const params = {
// urlInfos:JSON.stringify(this.multipleSelection.map(v => {return {gameName:v.gameName,gameUrl:v.gameUrl || 'null'}}))
// }
// try {
// let resCreate = await createQrCode(params);
// window.location = downloadQrCode+'?zipName='+resCreate.result+'&requestProject=gic-web';
// } catch (err){
// this.$tips({type:'error',message:'下载二维码失败'});
// }
// }
}
}
</script>
......
src/views/game/ptyx/partials/audio-upload.vue
......@@ -54,15 +54,18 @@ export default {
.then(res => {
_vm.loading = false;
el.value = "";
console.log(res)
if (res.data.errorCode === 0) {
const code = res.data.result[0].imageFiledCode;
const name = res.data.result[0].qcloudImageUrl;
_vm.$emit('sendAduioList',{name,code});
const name = res.data.result.musicName;
const code = res.data.result.musicFieldCode;
const url = res.data.result.musicUrl;
_vm.$emit('sendAduioList',{name,code,url});
_vm.$tips({ type: 'success', message: '上传成功' });
} else {
_vm.$tips({ type: 'error', message:res.data.message || '上传失败' });
}
}).catch(error => {
console.log(error)
_vm.loading = false;
_vm.$tips({ type: 'error', message: error.msg || '上传失败' });
});
......
src/views/wechat/addRecord.vue
......@@ -238,14 +238,14 @@ export default {
this.info.mediaId = val
},
// 微信文本
getWxText(data){
console.log(data)
this.info.textNum = data.textNum;
this.info.content = data.textarea;
this.info.imageMediaId = data.imageMediaId;
},
// getWxText(data){
// console.log(data)
// this.info.textNum = data.textNum;
// this.info.content = data.textarea;
// this.info.imageMediaId = data.imageMediaId;
// },
submit() {
console.log(this.info);
if (!this.info.memberType && this.toggleTag && !this.getSaveData ) {
this.$tips({type:'warning',message:'人群筛选未保存条件'})
return;
......@@ -254,6 +254,7 @@ export default {
this.$tips({type:'warning',message:'新先选择一个图文'});
return;
} else if (this.info.contentType === 1 && !this.info.content) {
console.log(this.info.content)
this.$tips({type:'warning',message:'请填写文本'});
return;
} else if (this.info.contentType === 2 && !this.info.mediaId) {
......
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: 2018-11-09 18:37:14
* @Last Modified time: 2019-01-01 15:54:21
*/
<template>
<section class="dm-wrap">
......@@ -72,11 +72,11 @@ export default {
loading:false,
recordList:[],
recordHeader:[
{label:'时间',prop:'createTimeStr',width:'150',align:'left',fixed:'left',formatter:function(row){
{label:'时间',prop:'createTimeStr',align:'left',fixed:'left',formatter:function(row){
return formateDateTimeByType(row.createTime,'yyyy-MM-dd-HH-mm');
}},
{label:'用户名称',prop:'clerkName',width:'100',align:'left',fixed:'left'},
{label:'标题',prop:'content',minWidth:'150', tooltip:false,align:'left',
{label:'用户名称',prop:'clerkName',align:'left',fixed:'left'},
{label:'标题',prop:'content', tooltip:false,align:'left',
formatter:function(row, column, cellValue, index){
let temp = null;
if (row.mediaUrl) {
......@@ -97,7 +97,7 @@ export default {
}
}
},
{label:'营销场景',prop:'sceneSettingName',width:'100',align:'left'},
{label:'营销场景',prop:'sceneSettingName',align:'left'},
{label:'发送人数',prop:'sendMemberCount',width:'100',align:'left'},
{label:'送达人数',prop:'sendCount',width:'100',align:'left'},
{label:'阅读人数',prop:'readCount',width:'100',align:'left',renderHeader:(h,{colunm,$index}) => {
......
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