Merge branch 'bug7118' into debug

public/froala_editor.pkgd.min.css

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v4.0.19 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
  * Copyright 2014-2023 Froala Labs
  */

public/froala_editor.pkgd.min.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v4.0.19 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
  * Copyright 2014-2023 Froala Labs
  */

public/froala_editor_zh_cn.js

@@ -1,5 +1,5 @@
 /*!
- * froala_editor v4.0.19 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
  * Copyright 2014-2023 Froala Labs
  */

src/views/login/hooks/useLogin.js

@@ -26,7 +26,10 @@ export function useLogin(){
             TelAreaCode:areaCode+''||'',
             Source:source
         })
-        if(res.Ret!==200) return 
+        if(res.Ret!==200) {
+            getPicCode()
+            return 
+        }
         showToast('验证码已发送')
         //60秒倒计时
         codeCountDown.value = 60

src/views/report/chapter/List.vue

@@ -709,7 +709,7 @@ async function handleConfirmSetLayout() {
             <div class="item" @click="handleCancelChapter(activeItem)" v-if="activeItem.IsAuth&&activeItem.PublishState===2">撤销</div>
             <div class="item" @click="handleDelChapter(activeItem)" v-if="isCreator">删除</div>
             <div class="item" @click="handleShowTrendTag(activeItem)" v-permission="reportManageBtn.reportMange_chapter_editTag">添加标签</div>
-            <div class="item" @click="handleShowUploadAudio()">上传录音</div>
+            <div class="item" @click="handleShowUploadAudio()" v-if="checkAuthBtn(reportManageBtn.reportManage_audioUpload)">上传录音</div>
         </div>
     </van-action-sheet>