Merge branch 'feature/12月迭代' into dev

src/components/common/editor.vue

@@ -204,6 +204,8 @@ export default {
     selectEmoji(item) {
       const str = this.textarea + item.key;
       this.textarea = str;
+      this.xcxUrlObj.textarea = this.textarea;
+      this.$emit('listenWxText', this.xcxUrlObj);
     },
     onClosed() {
       this.form = {
@@ -557,6 +559,7 @@ export default {
     putName() {
       this.textarea = this.textarea + '<微信昵称>';
       this.xcxUrlObj.textarea = this.textarea;
+      this.$emit('listenWxText', this.xcxUrlObj);
     }
   }
 };

src/views/enterprise/salutatorySet.vue

@@ -81,7 +81,7 @@ export default {
       let str3 = str2
         .split('<br>')
         .filter(v => v)
-        .join('<br>');
+        .join('');
       let hrefReg = /href=['"]([^"]*)['"].*?/g;
       // let hrefReg = /(?<=href=\").*?(?=\")/img;  // 获取a标签的href值
       if (hrefReg.test(str3)) {
@@ -93,6 +93,7 @@ export default {
         let href = str3.match(hrefReg)[0];
         str3 = str3.replace(/<((a)).*?>/g, '<a ' + href + '>'); // 获取 <a> 并替代
       }
+      console.log(str3);
       if (!str3 || /^[ ]*$/.test(str3)) {
         // str3不是空字符串 或 不全是空格
         this.$message.error('请输入欢迎语内容');