合并
This commit is contained in:
@@ -906,7 +906,6 @@ export default {
|
|||||||
this.htmlContent = data.html;
|
this.htmlContent = data.html;
|
||||||
console.log(data, this.htmlContent, "this.htmlContent--++++");
|
console.log(data, this.htmlContent, "this.htmlContent--++++");
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
if (
|
if (
|
||||||
(this.htmlContent == "" || this.htmlContent == "<p><br></p>") &&
|
(this.htmlContent == "" || this.htmlContent == "<p><br></p>") &&
|
||||||
this.uploadPicLIst.length == 0
|
this.uploadPicLIst.length == 0
|
||||||
@@ -917,19 +916,6 @@ export default {
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
if ((this.htmlContent == '' || this.htmlContent == '<p><br></p>') && this.uploadPicLIst.length == 0) {
|
|
||||||
uni.showToast({
|
|
||||||
icon: 'none',
|
|
||||||
title: '您未输入内容哦'
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let images = ''
|
|
||||||
if (this.uploadPicLIst.length > 0) {
|
|
||||||
let list = this.uploadPicLIst.map(item => item.url)
|
|
||||||
>>>>>>> b988ec5ba4c35d1a3e1bed5bd9907a93aaeeb559
|
|
||||||
|
|
||||||
let images = "";
|
let images = "";
|
||||||
if (this.uploadPicLIst.length > 0) {
|
if (this.uploadPicLIst.length > 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user