提交 2a883f4f authored 作者: lihuihui's avatar lihuihui

修改bug

上级 62f1816e
...@@ -152,12 +152,12 @@ export default { ...@@ -152,12 +152,12 @@ export default {
}, },
{ {
name: 'fontPosition', name: 'fontPosition',
styleName: 'background-color', styleName: 'padding',
value: 'center', value: '5px 20px',
option: [ option: [
{ value: 'center', label: '居中' }, { value: '5px 20px', label: '居中' },
{ value: 'left', label: '居左' }, { value: '5px 20px 5px 0', label: '居左' },
{ value: 'right', label: '居右' } { value: '5px 0 5px 20px', label: '居右' }
] ]
} }
] ]
...@@ -199,6 +199,7 @@ export default { ...@@ -199,6 +199,7 @@ export default {
toolListWat: { toolListWat: {
deep: true, deep: true,
handler() { handler() {
console.log(this.toolList, 'list')
this.setStyleData() this.setStyleData()
const data = Object.assign({ originalData: this.toolList }, this.returnData) const data = Object.assign({ originalData: this.toolList }, this.returnData)
data.toolIndex = this.toolIndex data.toolIndex = this.toolIndex
......
...@@ -67,12 +67,11 @@ export default { ...@@ -67,12 +67,11 @@ export default {
}, },
// 获取位置值 // 获取位置值
getPosition(item) { getPosition(item) {
console.log(item, '111')
if (item) { if (item) {
if (item.left && item.top) { if (item.left && item.top) {
return `left: ${item.left}px;top: ${item.top}px;` return `left: ${item.left}px;top: ${item.top}px;`
} else { } else {
return item.left ? `left: ${item.left}px;` : item.top ? `top: ${item.top}px;` : '' return item.left !== undefined ? `left: ${item.left}px;` : item.top !== undefined ? `top: ${item.top}px;` : ''
} }
} }
} }
......
...@@ -163,7 +163,8 @@ export default { ...@@ -163,7 +163,8 @@ export default {
btnParams: this.btnParams btnParams: this.btnParams
} }
for (const data in params) { for (const data in params) {
if (params[data].show !== false) { console.log(params[data], '123')
if (params[data].show !== false || params[data].textValue === '') {
this.$message({ this.$message({
message: '请编辑主题', message: '请编辑主题',
type: 'warning' type: 'warning'
...@@ -187,7 +188,6 @@ export default { ...@@ -187,7 +188,6 @@ export default {
switch (data.toolIndex) { switch (data.toolIndex) {
case 0: case 0:
this.titleParams = data this.titleParams = data
console.log(this.titleParams.originalData, '12212112')
this.$nextTick(() => { this.$nextTick(() => {
drag(document.querySelector('#title'), document.querySelector('#max'), res => { drag(document.querySelector('#title'), document.querySelector('#max'), res => {
this.titleParams.position = res this.titleParams.position = res
......
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
}) })
} else if (this.data.index === 0) { } else if (this.data.index === 0) {
console.log(this.data) console.log(this.data)
if (this.data.date === '' || this.data.time === '') { if (this.data.date === '' || this.data.time === '' || this.data.time === null) {
flag = false flag = false
} }
} }
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="content-left"> <div class="content-left">
<div class="card-textarea"> <div class="card-textarea">
<div class="title">推送标题</div> <div class="title">推送标题</div>
<textarea v-model="data.title" placeholder="请输入"></textarea> <textarea :maxlength="10" v-model="data.title" placeholder="请输入"></textarea>
</div> </div>
<div class="card-textarea"> <div class="card-textarea">
<div class="title">推送内容</div> <div class="title">推送内容</div>
<textarea v-model="data.content" placeholder="请输入"></textarea> <textarea :maxlength="50" v-model="data.content" placeholder="请输入"></textarea>
</div> </div>
</div> </div>
<div class="content-right"> <div class="content-right">
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
&nbsp;&nbsp;时间范围内 &nbsp;&nbsp;时间范围内
<br /> <br />
<br /> <br />
<el-select v-model="times_every"> <el-select v-model="data.times_every">
<el-option v-for="it in timesList" :key="it.value" :label="it.label" :value="it.value"> </el-option> <el-option v-for="it in timesList" :key="it.value" :label="it.label" :value="it.value"> </el-option>
</el-select> </el-select>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
...@@ -300,7 +300,7 @@ export default { ...@@ -300,7 +300,7 @@ export default {
return false return false
} else if ( } else if (
this.data.index === 2 && this.data.index === 2 &&
(this.data.times_send === null || (this.data.times_send === '' || this.data.times_send === null ||
this.festivalList.filter(item => item.isActive === false).length === this.festivalList.length || this.festivalList.filter(item => item.isActive === false).length === this.festivalList.length ||
this.solarTermsList.filter(item => item.isActive === false).length === this.solarTermsList.length) this.solarTermsList.filter(item => item.isActive === false).length === this.solarTermsList.length)
) { ) {
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="content-left"> <div class="content-left">
<div class="card-textarea"> <div class="card-textarea">
<div class="title">推送标题</div> <div class="title">推送标题</div>
<textarea v-model="data.title" placeholder="请输入"></textarea> <textarea :maxlength="10" v-model="data.title" placeholder="请输入"></textarea>
</div> </div>
<div class="card-textarea"> <div class="card-textarea">
<div class="title">推送内容</div> <div class="title">推送内容</div>
<textarea v-model="data.content" placeholder="请输入"></textarea> <textarea :maxlength="50" v-model="data.content" placeholder="请输入"></textarea>
</div> </div>
</div> </div>
<div class="content-right"> <div class="content-right">
......
...@@ -99,12 +99,18 @@ export default { ...@@ -99,12 +99,18 @@ export default {
} }
submitReport(reports).then(res => { submitReport(reports).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$router.push({ this.$message({
path: '/works-show/history', message: '已成功创建营销计划',
query: { type: 'success'
type: 3
}
}) })
setTimeout(() => {
this.$router.push({
path: '/works-show/history',
query: {
type: 3
}
})
}, 1000)
} }
}) })
}, },
......
...@@ -103,12 +103,18 @@ export default { ...@@ -103,12 +103,18 @@ export default {
} }
submitReport(reports).then(res => { submitReport(reports).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$router.push({ this.$message({
path: '/works-show/history', message: '已成功创建营销计划',
query: { type: 'success'
type: 3
}
}) })
setTimeout(() => {
this.$router.push({
path: '/works-show/history',
query: {
type: 3
}
})
}, 1000)
} }
}) })
}, },
......
...@@ -106,12 +106,18 @@ export default { ...@@ -106,12 +106,18 @@ export default {
} }
submitReport(reports).then(res => { submitReport(reports).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$router.push({ this.$message({
path: '/works-show/history', message: '已成功创建营销计划',
query: { type: 'success'
type: 3
}
}) })
setTimeout(() => {
this.$router.push({
path: '/works-show/history',
query: {
type: 3
}
})
}, 1000)
} }
}) })
}, },
......
...@@ -97,12 +97,18 @@ export default { ...@@ -97,12 +97,18 @@ export default {
} }
submitReport(reports).then(res => { submitReport(reports).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$router.push({ this.$message({
path: '/works-show/history', message: '已成功创建营销计划',
query: { type: 'success'
type: 3
}
}) })
setTimeout(() => {
this.$router.push({
path: '/works-show/history',
query: {
type: 3
}
})
}, 1000)
} }
}) })
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论