Skip to content

M
marketing
Commit 81ab250f by zhangmeng
Options

迭代

parent 27715f97
Showing with 90 additions and 33 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.1af002822325fdfd8dfa4144f99dbbc0.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.36a2ac04287db4a87222.js></script><script type=text/javascript src=/marketing/static/js/app.4452eb46896932eb3c53.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.ebe8f6f0c892db6163158a2766f2ee81.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.36a2ac04287db4a87222.js></script><script type=text/javascript src=/marketing/static/js/app.fa40a6d65a718cb487d9.js></script></body></html>
\ No newline at end of file
dist/static/js/app.4452eb46896932eb3c53.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.fa40a6d65a718cb487d9.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/libs/imgTextTemp/index.vue
......@@ -94,7 +94,14 @@ export default {
syncImgtext
},
watch:{
activeId(val) {
this.textImgList.map(v => {
console.log('111'+val)
if (this.activeId === v.imageTextWechatId) {
this.selectedData = v;
}
})
}
},
methods:{
async loadImgTextList() {
......@@ -107,6 +114,7 @@ export default {
this.textImgList.map(v => {
v.createTimeStr = formateDateTimeByType(v.createTime,'yyyy-MM-dd-HH-mm')
v.updateTimeStr = formateDateTimeByType(v.updateTime,'yyyy-MM-dd-HH-mm')
console.log(this.activeId)
if (this.activeId === v.imageTextWechatId) {
this.selectedData = v;
}
......
src/components/wxText/wxText.vue
......@@ -247,7 +247,11 @@
this.$emit('listenWxText',this.xcxUrlObj)
},
getAllMytext(){ // 文本框输入失去焦点时获得输入框的内容
this.textarea = this.$refs.myTextarea.innerHTML.replace(/(<(?!\/?(a)(\s|\>))[^>]*>)/g,'').replace(/\&nbsp;/g,'');
console.log(this.$refs.myTextarea.innerHTML);
this.textarea = this.$refs.myTextarea.innerHTML.replace(/<\/div>|&nbsp;/g,'').replace(/<div>/g,'<br>').split('<br>').filter(v => v).join('<br>');
console.log(this.textarea);
// this.textarea = this.$refs.myTextarea.innerHTML;
this.xcxUrlObj.textarea = this.textarea;
......
src/test/dmStore/com-type.vue
<template>
<el-popover placement="bottom-start" width="176" trigger="click">
<el-popover class="vertical-middle" placement="bottom-start" width="176" trigger="click">
<el-checkbox-group v-model="checkList">
<div v-for="(v,i) in typeList" :key="i">
<el-checkbox :label="v"></el-checkbox>
</div>
</el-checkbox-group>
<div class="el-select w200" slot="reference">
<div class="el-input el-input--suffix">
<div placeholder="请选择" class="el-input__inner"></div>
<span class="el-input__suffix">
<div class="el-input dm-store__type__inner w200" slot="reference">
<div placeholder="请选择" class="el-input__inner">
<div class="dm-store__tag__wrap">
<el-tag v-for="(v,i) in checkList" size="mini" :key="i" closable @close="delTag(i)">{{v}}</el-tag>
</div>
<el-popover class="dm-store__tag__count" placement="top-start" title="已选择" width="200" trigger="hover">
<span slot="reference">共{{checkList.length}}项</span>
</el-popover>
</div>
<!-- <span class="el-input__suffix">
<span class="el-input__suffix-inner">
<i class="el-select__caret el-input__icon el-icon-arrow-up"></i>
</span>
</span>
</div>
</span> -->
</div>
</el-popover>
</template>
<script>
export default {
name:'options-type',
data() {
return {
typeList:[1,2,3,4],
typeList:[1,2,3,4,5,6,7],
checkList:[]
}
},
methods:{
delTag(index){
this.checkList.splice(index,1);
},
}
}
</script>
......
src/test/dmStore/index.scss 0 → 100644
.w200 {
width: 200px;
}
.vertical-middle {
vertical-align: middle;
}
.block{
display: block;
overflow: hidden;
}
.dm-store .dm-store__type__inner {
position: relative;
vertical-align: middle;
}
.dm-store .dm-store__tag__wrap{
line-height: 28px;
overflow: hidden;
white-space: nowrap;
max-width: calc(100% - 20px);
}
.dm-store .dm-store__tag__count {
position:absolute;
right: 0;
top: 0;
}
src/test/dmStore/index.vue
<template>
<section>
<el-select v-model="leftValue" placeholder="请选择" class="w200">
<section class="dm-store">
<el-select v-model="leftValue" placeholder="请选择" class="w200 vertical-middle">
<el-option v-for="(v,i) in leftList" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<com-type v-show="leftValue === 2"></com-type>
......@@ -33,11 +33,5 @@ export default {
<style lang="scss">
.w200 {
width: 200px;
}
.block{
display: block;
overflow: hidden;
}
@import url('./index.scss');
</style>
src/test/index.vue
<template>
<div>
<dm-store style="padding:20px;"></dm-store>
<div>
<dm-store style="padding:20px;"></dm-store>
</div>
<div>
<vue-gic-store-linkage style="padding:20px;"></vue-gic-store-linkage>
</div>
</div>
</template>
<script>
......
src/views/card/record-get.vue
......@@ -186,7 +186,14 @@ export default {
this.listParams.beginTime = '';
this.listParams.endTime = '';
}
window.location = exportReceivedRecordExcel+"?searchParam="+this.listParams.search+"&beginTime="+this.listParams.beginTime+"&endTime="+this.listParams.endTime+"&cardStatus="+this.listParams.cardStatus+'&requestProject=gic-web';
if (this.dateTime2) {
this.listParams.writeOffBeginTime = formateDateTimeByType(this.dateTime2[0],'yyyy-MM-dd');
this.listParams.writeOffEndTime = formateDateTimeByType(this.dateTime2[1],'yyyy-MM-dd');
} else {
this.listParams.writeOffBeginTime = '';
this.listParams.writeOffEndTime = '';
}
window.location = exportReceivedRecordExcel+"?search="+this.listParams.search+"&beginTime="+this.listParams.beginTime+"&endTime="+this.listParams.endTime+"&writeOffBeginTime="+this.listParams.writeOffBeginTime+"&writeOffEndTime="+this.listParams.writeOffEndTime+"&cardStatus="+this.listParams.cardStatus+"&sortBy="+this.listParams.sortBy+'&requestProject=gic-web';
},
// 列表状态过滤器
filterCardStatus(row) {
......
src/views/wechat/addRecord.vue
......@@ -3,7 +3,7 @@
<section class="dm-form__wrap">
<div class="mb20">
<span class="dm-input_label">营销场景：</span>
<span v-if="isEdit">{{info.sceneSettingName}}</span>
<span v-if="isEdit || isInfo">{{info.sceneSettingName}}</span>
<el-select v-else class="w250" size="medium" v-model="info.sceneSettingId" :disabled="isEdit || isInfo" placeholder="选择营销场景">
<el-option v-for="item in sceneSettingIdOptions" :key="item.sceneSettingId" :label="item.sceneName" :value="item.sceneSettingId"></el-option>
</el-select>
......@@ -45,7 +45,7 @@
</el-radio-group>
<div class="pt20">
<div v-show="info.contentType === 0" style="padding:15px; border:1px solid #DCDFE6;border-radius:2px;">
<dm-img-text @get-data="getImgTextData" :radioShow="true" :auto="false" :imageTextId="info.imageTextId" :imageTextWechatId="info.imageTextWechatId"></dm-img-text>
<dm-img-text @get-data="getImgTextData" :radioShow="true" :auto="false" :imageTextId="info.imageTextId" :activeId="info.imageTextWechatId"></dm-img-text>
</div>
<dm-img-box v-show="info.contentType === 2" :mediaId="info.mediaId" @get-data="getImgData"></dm-img-box>
<div v-show="info.contentType === 1">
......@@ -158,7 +158,7 @@ export default {
this.wechatImageTextEdit();
this.sceneSettingList();
}
if (this.isEdit) {
if (this.isEdit || this.isInfo) {
this.getWechatMarketingDetail();
}
if (this.isAdd) {
......@@ -279,17 +279,17 @@ export default {
this.$tips({type:'warning',message:'请选择图片'});
return;
}
if (this.info.memberType) {
// if (this.info.memberType) {
// if (!this.info.openIds) {
// this.$tips({type:'warning',message:'指定会员不能为空'});
// return;
// }
} else {
if (!this.info.memberSearchDTO) {
this.$tips({type:'warning',message:'会员筛选不能为空'});
return;
}
}
// } else {
// if (!this.info.memberSearchDTO) {
// this.$tips({type:'warning',message:'会员筛选不能为空'});
// return;
// }
// }
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