diff --git a/pages/chat/index.vue b/pages/chat/index.vue index 6aaceb25..5447b437 100644 --- a/pages/chat/index.vue +++ b/pages/chat/index.vue @@ -104,13 +104,21 @@ return; } - if (!chat.toolsMode || chat.toolsMode === mode) { - chat.showTools = !chat.showTools; + // 第二次点击关闭 + if (chat.showTools && chat.toolsMode === mode){ + handleToolsClose(); + return; } - chat.toolsMode = mode; - if (!chat.showTools) { + // 切换工具栏 + if (chat.showTools && chat.toolsMode !== mode) { + chat.showTools = false; chat.toolsMode = ''; } + // 延迟打开等一下过度效果 + setTimeout(()=>{ + chat.toolsMode = mode; + chat.showTools = true; + }, 200) } function onShowSelect(mode) { diff --git a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js index 4b33c8ca..8eb7bfa9 100644 --- a/sheep/components/s-share-modal/canvas-poster/poster/groupon.js +++ b/sheep/components/s-share-modal/canvas-poster/poster/groupon.js @@ -96,8 +96,8 @@ const groupon = async (poster) => { text: poster.shareInfo.link, css: { position: 'fixed', - left: width * 0.5, - top: width * 1.3, + left: width * 0.75, + top: width * 1.4, width: width * 0.2, height: width * 0.2, }, @@ -110,7 +110,7 @@ const groupon = async (poster) => { css: { position: 'fixed', left: width * 0.75, - top: width * 1.3, + top: width * 1.4, width: width * 0.2, height: width * 0.2, }, diff --git a/sheep/util/index.js b/sheep/util/index.js index 7f5ba28e..ae3a56e5 100644 --- a/sheep/util/index.js +++ b/sheep/util/index.js @@ -147,7 +147,7 @@ export function jsonParse(str) { try { return JSON.parse(str); } catch (e) { - console.error(`str[${str}] 不是一个 JSON 字符串`); - return ''; + console.warn(`str[${str}] 不是一个 JSON 字符串`); + return str; } }