Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -181,13 +181,14 @@ function useEditorContent(details, netstutas, audioState, loadlmageOnlyWifiSwitc
     // .diff(recordTime.value, 'millisecond')} - ${dayjs()
     // .diff(recordTime.value, 'millisecond')} - ${dayjs()
     // .diff(dayjs(firstTime), 'millisecond')}`)
     // .diff(dayjs(firstTime), 'millisecond')}`)
     recordTime.value = dayjs()
     recordTime.value = dayjs()
-    // TODO 这里是把给到的内容格式化-兼容早晚报
+    // TODO 这里是把给到的内容格式化-兼容早晚报，?x-oss-process=image/resize,w_650
     let str = details.value.newsContent.replace(/<img(.*?)src="(.*?)"(.*?)>/g, '<img$1src="" data-src="$2"$3>')
     let str = details.value.newsContent.replace(/<img(.*?)src="(.*?)"(.*?)>/g, '<img$1src="" data-src="$2"$3>')
     str = str.replace(/<IMG(.*?)src="(.*?)"(.*?)>/g, '<IMG$1src="" data-src="$2"$3>')
     str = str.replace(/<IMG(.*?)src="(.*?)"(.*?)>/g, '<IMG$1src="" data-src="$2"$3>')
     str = str.replace(/<video(.*?)poster="(.*?)"(.*?)>/g, '<video$1poster="" data-poster="$2"$3>')
     str = str.replace(/<video(.*?)poster="(.*?)"(.*?)>/g, '<video$1poster="" data-poster="$2"$3>')
     str = str.replace(/<VIDEO(.*?)poster="(.*?)"(.*?)>/g, '<VIDEO$1poster="" data-poster="$2"$3>')
     str = str.replace(/<VIDEO(.*?)poster="(.*?)"(.*?)>/g, '<VIDEO$1poster="" data-poster="$2"$3>')
     str = str.replace(/<p>\s*<\/p>/g, '')
     str = str.replace(/<p>\s*<\/p>/g, '')
     str = str.replace(/[\u200B-\u200D\uFEFF]/g, '')
     str = str.replace(/[\u200B-\u200D\uFEFF]/g, '')
+    str = str.replace(/‘/g, '\'')
     str = htmlDecode(str)
     str = htmlDecode(str)
     // 这一步去除元素与元素之间的空格
     // 这一步去除元素与元素之间的空格
     str = str.replace(/>\s+</g, '><')
     str = str.replace(/>\s+</g, '><')
@@ -215,6 +216,7 @@ function useEditorContent(details, netstutas, audioState, loadlmageOnlyWifiSwitc
         })
         })
       }
       }
     }
     }
+    // console.log('>>>>>>>>newsContent：',str)
     document.querySelector('#newsContent').innerHTML = str
     document.querySelector('#newsContent').innerHTML = str
     const realHtml = document.querySelector('#newsContent').innerHTML
     const realHtml = document.querySelector('#newsContent').innerHTML
     document.querySelector('#newsContent').innerHTML = ''
     document.querySelector('#newsContent').innerHTML = ''