Merge branch 'dev_1.1.5' into feature_220712_US_pay

src/view/iframe/publish/tool-box/child/editor.vue

@@ -146,7 +146,8 @@ const getTitleByHtmlStr = (str = '') => {
   let tag_end = '</title>'
   let index1 = str.indexOf(tag_start) + tag_start.length;
   let index2 = str.indexOf(tag_end);
-  if (index1 < 0 || index2 < 0) {
+  
+  if (index1 < tag_start.length || index2 < 0) {
     return '';
   }
 

src/view/popup/tabbar-page/message/index.vue

@@ -72,7 +72,7 @@
                       <template v-if="item.type == 1">
                         <!-- 进行中-->
                         <template v-if="item.status == 0">
-                          in progress
+                          In progress
                         </template>
                         <!-- 已完成 -->
                         <template v-else-if="item.status == 1">