From ae1bb03f26a608995696c6292e383e2d2a36796e Mon Sep 17 00:00:00 2001 From: kola-web Date: Mon, 9 Dec 2024 11:42:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keymap.json | 316 +++++++++++++++++++++++++++++++++ src/components/global-toast/index.wxml | 2 +- src/images/empty-search.png | Bin 0 -> 16873 bytes src/pages/classify/index.scss | 5 +- src/pages/classify/index.ts | 3 + src/pages/classify/index.wxml | 54 ++++-- src/pages/home/index.scss | 5 + src/pages/home/index.ts | 11 ++ src/pages/home/index.wxml | 27 +-- src/pages/my/index.scss | 1 + src/pages/my/index.ts | 2 +- src/pages/my/index.wxml | 31 +--- src/pages/search/index.ts | 7 +- src/pages/search/index.wxml | 27 +-- 14 files changed, 413 insertions(+), 78 deletions(-) create mode 100644 keymap.json create mode 100644 src/images/empty-search.png diff --git a/keymap.json b/keymap.json new file mode 100644 index 0000000..6a68266 --- /dev/null +++ b/keymap.json @@ -0,0 +1,316 @@ +[ + // emmet + { + "key": "alt+e", + "command": "workbench.action.showEmmetCommands" + }, + // console + { + "key": "ctrl+shift+l", + "command": "js-console.insertConsoleLog", + "when": "editorTextFocus" + }, + { + "key": "shift+alt+l", + "command": "-js-console.insertConsoleLog", + "when": "editorTextFocus" + }, + { + "key": "ctrl+shift+t", + "command": "js-console.insertConsoleTable", + "when": "editorTextFocus" + }, + { + "key": "shift+alt+t", + "command": "-js-console.insertConsoleTable", + "when": "editorTextFocus" + }, + { + "key": "ctrl+shift+w", + "command": "js-console.insertConsoleWarn", + "when": "editorTextFocus" + }, + { + "key": "shift+alt+w", + "command": "-js-console.insertConsoleWarn", + "when": "editorTextFocus" + }, + { + "key": "ctrl+shift+d", + "command": "workbench.debug.panel.action.clearReplAction" + }, + { + "key": "ctrl+shift+e", + "command": "js-console.insertConsoleError", + "when": "editorTextFocus" + }, + { + "key": "shift+alt+e", + "command": "-js-console.insertConsoleError", + "when": "editorTextFocus" + }, + // Explorer + { + "key": "enter", + "command": "list.select", + "when": "listFocus && !inputFocus" + }, + { + "key": "a", + "command": "explorer.newFile", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !inputFocus" + }, + { + "key": "shift+a", + "command": "explorer.newFolder", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !inputFocus" + }, + { + "key": "y", + "command": "filesExplorer.copy", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !inputFocus" + }, + { + "key": "x", + "command": "filesExplorer.cut", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !inputFocus" + }, + { + "key": "p", + "command": "filesExplorer.paste", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "r", + "command": "renameFile", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "m", + "command": "workbench.files.action.refreshFilesExplorer", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !explorerResourceReadonly && !inputFocus" + }, + // { + // "key": "m", + // "command": "editor.action.showContextMenu", + // "when": "explorerViewletVisible && filesExplorerFocus && !inputFocus" + // }, + { + "key": "q", + "command": "workbench.action.toggleSidebarVisibility", + "when": "explorerResourceMoveableToTrash && explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" + }, + // "command": "workbench.files.action.refreshFilesExplorer", + { + "key": "d", + "command": "moveFileToTrash", + "when": "explorerResourceMoveableToTrash && explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "shift+d", + "command": "deleteFile", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "c", + "command": "workbench.files.action.collapseExplorerFolders", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceReadonly && !inputFocus" + }, + { + "key": "s", + "command": "explorer.openToSide", + "when": "explorerViewletFocus && explorerViewletVisible && !inputFocus" + }, + { + "key": "f", + "command": "revealFileInOS", + "when": "explorerViewletFocus && explorerViewletVisible && !inputFocus" + }, + { + "key": "t", + "command": "openInTerminal", + "when": "explorerViewletVisible && filesExplorerFocus && !explorerResourceIsRoot && !inputFocus" + }, + { + "key": "u", + "command": "copyFilePath", + "when": "explorerViewletFocus && explorerViewletVisible && !inputFocus" + }, + { + "key": "i", + "command": "copyRelativeFilePath", + "when": "explorerViewletFocus && explorerViewletVisible && !inputFocus" + }, + // select + { + "key": "ctrl+n", + "command": "selectNextSuggestion", + "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + }, + { + "key": "ctrl+n", + "command": "workbench.action.quickOpenSelectNext", + "when": "inQuickOpen" + }, + { + "key": "ctrl+p", + "command": "selectPrevSuggestion", + "when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus" + }, + { + "key": "ctrl+p", + "command": "workbench.action.quickOpenSelectPrevious", + "when": "inQuickOpen" + }, + // focus + { + "key": "ctrl+h", + "command": "workbench.action.navigateLeft", + "when": "terminalFocus || sideBarFocus" + }, + { + "key": "ctrl+l", + "command": "workbench.action.navigateRight", + "when": "terminalFocus || sideBarFocus" + }, + { + "key": "ctrl+p", + "command": "workbench.action.navigateUp", + "when": "terminalFocus || sideBarFocus" + }, + { + "key": "ctrl+n", + "command": "workbench.action.navigateDown", + "when": "terminalFocus || sideBarFocus" + }, + // changeCase + { + "key": "alt+;", + "command": "extension.changeCase.commands" + }, + // focus + { + "key": "alt+`", + "command": "workbench.action.toggleSidebarVisibility" + }, + { + "key": "alt+1", + "command": "workbench.view.explorer" + }, + { + "key": "alt-2", + "command": "outline.focus" + }, + { + "key": "alt-3", + "command": "workbench.view.extension.project-manager" + }, + { + "key": "alt-4", + "command": "todo-tree-view.focus" + }, + { + "key": "alt-5", + "command": "workbench.view.extension.dockerView" + }, + { + "key": "alt+9", + "command": "workbench.view.scm" + }, + { + "key": "alt-0", + "command": "workbench.action.toggleActivityBarVisibility" + }, + { + "key": "tab", + "command": "markdown.extension.onTabKey", + "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !suggestWidgetVisible && editorLangId == 'markdown' && vim.mode =='Insert'" + }, + { + "key": "tab", + "command": "-markdown.extension.onTabKey", + "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !suggestWidgetVisible && editorLangId == 'markdown'" + }, + { + "key": "shift+tab", + "command": "-markdown.extension.onShiftTabKey", + "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !suggestWidgetVisible && editorLangId == 'markdown'" + }, + { + "key": "shift+tab", + "command": "markdown.extension.onShiftTabKey", + "when": "editorTextFocus && !editorReadonly && !editorTabMovesFocus && !hasOtherSuggestions && !hasSnippetCompletions && !inSnippetMode && !suggestWidgetVisible && editorLangId == 'markdown' && vim.mode =='Insert'" + }, + // nav buffer + { + "key": "tab", + "command": "workbench.action.nextEditor", + "when": "vim.mode != 'Insert' && vim.mode != 'CommandlineInProgress' && !panelFocus" + }, + { + "key": "shift+tab", + "command": "workbench.action.previousEditor", + "when": "vim.mode != 'Insert' && vim.mode != 'CommandlineInProgress' && !panelFocus" + }, + // 转换色值格式 + { + "key": "alt+-", + "command": "color-conversion.colorConversion", + "when": "editorTextFocus && editorHasSelection" + }, + // whichkey + { + "key": "space", + "command": "whichkey.show", + "when": "!inputFocus" + }, + { + "key": "e", + "command": "whichkey.triggerKey", + "args": { + "key": "e", + "when": "sideBarVisible && explorerViewletVisible" + }, + "when": "whichkeyVisible && sideBarVisible && explorerViewletVisible" + }, + // 编辑器大小 + { + "key": "shift+ctrl+0", + "command": "workbench.action.evenEditorWidths" + }, + { + "key": "ctrl+down", + "command": "workbench.action.decreaseViewHeight" + }, + { + "key": "ctrl+up", + "command": "workbench.action.increaseViewHeight" + }, + { + "key": "ctrl+right", + "command": "workbench.action.decreaseViewWidth" + }, + { + "key": "ctrl+left", + "command": "workbench.action.increaseViewWidth" + }, + { + "key": "alt+j", + "command": "workbench.action.togglePanel" + }, + { + "key": "ctrl+j", + "command": "-workbench.action.togglePanel" + }, + // replace vim C-d C-u + { + "key": "ctrl+d", + "command": "cursorPageDown", + "when": "textInputFocus" + }, + { + "key": "ctrl+u", + "command": "cursorPageUp", + "when": "textInputFocus" + } +] diff --git a/src/components/global-toast/index.wxml b/src/components/global-toast/index.wxml index ca49198..ec594ed 100644 --- a/src/components/global-toast/index.wxml +++ b/src/components/global-toast/index.wxml @@ -43,6 +43,6 @@ 该账号未开通阅读权益 此小程序暂时仅供经邀请的企业用户使用，请换个手机号登录以完成身份验证。 换个手机号登录 - 取消 + 取消 diff --git a/src/images/empty-search.png b/src/images/empty-search.png new file mode 100644 index 0000000000000000000000000000000000000000..a8aa4199965cfc8024f6d4c5571d61cee5ad21a7 GIT binary patch literal 16873 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�k0X66WSTae(9PNN&V)S%5|fjuw_& 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 literal 0 HcmV?d00001 diff --git a/src/pages/classify/index.scss b/src/pages/classify/index.scss index 735cd96..bd89f98 100644 --- a/src/pages/classify/index.scss +++ b/src/pages/classify/index.scss @@ -3,10 +3,13 @@ page { } .page { padding-bottom: 80rpx; + + .scroll { + background-color: #fff; + } .nav { padding: 0 16rpx; display: flex; - overflow-x: auto; background-color: #fff; &::-webkit-scrollbar { display: none; diff --git a/src/pages/classify/index.ts b/src/pages/classify/index.ts index 5aae30b..9807ed8 100644 --- a/src/pages/classify/index.ts +++ b/src/pages/classify/index.ts @@ -21,6 +21,8 @@ Page({ CateId: '', CateSecondId: '', cateSecondList: [] as any, + + scrollIntoView: '', }, onLoad(options) { this.setData({ @@ -43,6 +45,7 @@ Page({ if (this.data.CateId) { this.setData({ cateSecondList: res.find((item: any) => item.Id === this.data.CateId)?.Children || [], + scrollIntoView: `nav-item${this.data.CateId}`, }); } }); diff --git a/src/pages/classify/index.wxml b/src/pages/classify/index.wxml index 3dd0126..6e7a1d8 100644 --- a/src/pages/classify/index.wxml +++ b/src/pages/classify/index.wxml @@ -1,13 +1,28 @@ - - 全部 - - {{item.CateName}} + + + 全部 + + {{item.CateName}} + - + 全部 - + {{item.CateName}} @@ -21,7 +36,13 @@ {{item.BrowseNum}} - + 已收藏 @@ -43,7 +64,13 @@ {{item.BrowseNum}} - + 已收藏 @@ -56,8 +83,15 @@
- - + + 加载中... diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index 18caf08..be467ef 100644 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -100,6 +100,8 @@ page { justify-content: center; flex-direction: column; overflow: hidden; + height: 164rpx; + box-sizing: border-box; .title { font-size: 36rpx; color: #3795f7; @@ -161,5 +163,8 @@ page { background: linear-gradient(90deg, #134df6 36%, #3795f7 100%); border-radius: 112rpx 112rpx 112rpx 112rpx; } + .not-submit { + background: #e3e3e3; + } } } diff --git a/src/pages/home/index.ts b/src/pages/home/index.ts index 9ab9814..b53509b 100644 --- a/src/pages/home/index.ts +++ b/src/pages/home/index.ts @@ -71,10 +71,15 @@ Page({ method: 'GET', url: '?r=shizhong/account/get-can-feedback-count', data: {}, + showMsg: false, }).then((res) => { this.setData({ feedbackCount: res, }); + wx.showToast({ + icon: 'none', + title: '留言成功', + }); }); }, handleRemark() { @@ -96,6 +101,12 @@ Page({ }); }); }, + handleNotRemark() { + wx.showToast({ + icon: 'none', + title: '今日留言次数已达上限，欢迎明天再来留言吧', + }); + }, }); export {}; diff --git a/src/pages/home/index.wxml b/src/pages/home/index.wxml index 6ae8a04..eb17f00 100644 --- a/src/pages/home/index.wxml +++ b/src/pages/home/index.wxml @@ -1,4 +1,7 @@ - + 人人都是家庭健康师，让生活更有质量 @@ -14,12 +17,7 @@ placeholder="请输入要搜索的内容" /> - + - + @@ -57,12 +51,7 @@ confirm-type="send" bindconfirm="handleRemark" > - - 提交 - + 提交 + 提交 diff --git a/src/pages/my/index.scss b/src/pages/my/index.scss index 26ac902..c9e7c23 100644 --- a/src/pages/my/index.scss +++ b/src/pages/my/index.scss @@ -37,6 +37,7 @@ page { color: #141515; font-weight: bold; line-height: 1; + word-break: break-all; .icon { width: 36rpx; height: 36rpx; diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 39df704..7e3ce9c 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -8,7 +8,7 @@ Page({ userInfo: {} as any, }, onLoad() { - app.waitLogin(false, true).then(() => { + app.waitLogin().then(() => { app.getUserInfo(this); }); }, diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 0949674..7b76a5a 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -1,33 +1,14 @@