Merge pull request #981 from pxgo/master

修复
kccd · Sep 2, 2024 · 28d0fc8 · 28d0fc8
2 parents 99a90b0 + a5e4bc6
commit 28d0fc8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pages/lib/vue/StickerSelector.vue b/pages/lib/vue/StickerSelector.vue
@@ -424,9 +424,9 @@
               formData.append("share", "true");
             }
             let url = '/r';
-            if(fileDomain) {
-              url = fileDomain + url;
-            }
+            // if(fileDomain) {
+            //   url = fileDomain + url;
+            // }
             return nkcUploadFile(url, "POST", formData, function(e, progress) {
               sticker.progress = progress;
             });

diff --git a/pages/lib/vue/message/MessageNotify.vue b/pages/lib/vue/message/MessageNotify.vue
@@ -4,6 +4,7 @@
 <script lang="ts">
 import { getSocket } from '../../js/socket.js'
 import { initEventToGetUnreadMessageCount } from '../../js/socket.js'
+import { getState } from '../../js/state.js';
 import { screenTopWarning } from "../../js/topAlert.js";
 export default {
   data: () =>({
@@ -23,9 +24,10 @@ export default {
   methods:{
     // 初始化 数据来源于本地或默认数据
     initSocket(){
+      const {isApp} = getState();
       // 接受到新消息
       this.socket.on('receiveMessage', (data) => {
-        if (data.beep) {
+        if (data.beep && !isApp) {
           this.playAudio(data.beep); // 播放音频
         }
       });

diff --git a/pages/publicModules/commentCenter/singleComment/singleCommentWarningInfo.pug b/pages/publicModules/commentCenter/singleComment/singleCommentWarningInfo.pug
@@ -1,4 +1,4 @@
-if !isIncluded('singlePostWarningInfo')
+if !isIncluded('singleCommentWarningInfo')
   mixin singleCommentWarningInfo(props)
     -var {status, docId, cid, reason, permissions} = props;
     if status === 'faulty'
@@ -21,6 +21,7 @@ if !isIncluded('singlePostWarningInfo')
             | 通过请点击
             button.btn.btn-xs.btn-default(onclick=`window.singleCommentBottom['${cid}'].passReview('${docId}')`) 通过
             | &nbsp;  按钮，不通过请点击
-            button.btn.btn-xs.btn-default(onclick=`window.singleCommentBottom['${cid}'].disableComment('${cid}')`) 退修或删除
+            //- button.btn.btn-xs.btn-default(onclick=`window.singleCommentBottom['${cid}'].disableComment('${cid}')`) 退修或删除
+            button.btn.btn-xs.btn-default(onclick=`window.singleCommentBottom['${cid}'].disableComment('${docId}')`) 退修或删除
             | 按钮。
             a(href=`/review` target="_blank") 待审核列表