From 3ce3d3cac4cd09cad662c6c90532a1fc615172c6 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 16 Jul 2025 18:31:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=20debug=20=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/app.json | 2 +- miniprogram/app.ts | 27 ++++++++---- miniprogram/assets/fonts/iconfont.css | 58 ++++++++++++++------------ miniprogram/assets/fonts/iconfont.less | 4 ++ miniprogram/pages/debug/debug.json | 3 +- miniprogram/pages/debug/debug.ts | 23 +++++++--- miniprogram/pages/debug/debug.wxml | 11 ++++- miniprogram/pages/index/index.less | 12 +++--- miniprogram/pages/index/index.ts | 13 +++++- miniprogram/pages/index/index.wxml | 21 ++++++++-- miniprogram/service/textDrawService.ts | 9 +++- miniprogram/ui/button/button.less | 43 +++++++++++++++++++ miniprogram/ui/button/button.wxml | 2 +- typings/common.d.ts | 7 +++- typings/index.d.ts | 2 +- 15 files changed, 177 insertions(+), 60 deletions(-) diff --git a/miniprogram/app.json b/miniprogram/app.json index da968f4..4ddeeec 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -26,7 +26,7 @@ }, "tabBar": { "color": "#323232", - "selectedColor": "#FCD200", + "selectedColor": "#F5BC00", "backgroundColor": "#fff", "list": [ { diff --git a/miniprogram/app.ts b/miniprogram/app.ts index 5523927..3c21a06 100644 --- a/miniprogram/app.ts +++ b/miniprogram/app.ts @@ -1,15 +1,22 @@ // app.ts App({ globalData: { - env: 'release' + env: 'release', + printConfig: { + header: 'wechat', + appName: '涂鸦丫小程序' + } }, onLaunch() { const accountInfo = wx.getAccountInfoSync(); const env = accountInfo.miniProgram.envVersion || 'release'; this.globalData.env = env; if (env !== 'release') { - const printHeader = wx.getStorageSync('printHeader') || 'wechat'; - this.globalData.printHeader = printHeader; + const printConfig = wx.getStorageSync('printConfig') || { + header: 'wechat', + appName: '涂鸦丫小程序' + }; + this.globalData.printConfig = printConfig; } }, @@ -21,13 +28,15 @@ App({ // 小程序隐藏时的生命周期 }, - getPrintHeader(): PrintHeader { - return this.globalData.printHeader || 'wechat'; + getPrintConfig(): PrintConfig { + return this.globalData.printConfig || { + header: 'wechat', + appName: '涂鸦丫小程序' + }; }, - setPrintHeader(header: PrintHeader) { - header = header || 'wechat'; - this.globalData.printHeader = header; - wx.setStorageSync('printHeader', header); + setPrintConfig(config: PrintConfig) { + this.globalData.printConfig = config; + wx.setStorageSync('printConfig', config); } }); diff --git a/miniprogram/assets/fonts/iconfont.css b/miniprogram/assets/fonts/iconfont.css index a2a1ebb..1300711 100644 --- a/miniprogram/assets/fonts/iconfont.css +++ b/miniprogram/assets/fonts/iconfont.css @@ -1,87 +1,91 @@ @font-face { - font-family: "iconfont"; /* Project id 4942823 */ - src: - url('data:application/x-font-woff;charset=utf-8;base64,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') format('woff'), - url('iconfont.ttf?t=1750927958113') format('truetype'); + font-family: 'iconfont'; /* Project id 4942823 */ + src: + url('data:application/x-font-woff;charset=utf-8;base64,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') + format('woff'), + url('iconfont.ttf?t=1750927958113') format('truetype'); } .iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + font-family: 'iconfont' !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } .icon-success:before { - content: "\e650"; + content: '\e650'; } .icon-moon:before { - content: "\e92b"; + content: '\e92b'; } .icon-evernote:before { - content: "\e6ea"; + content: '\e6ea'; } .icon-refresh2:before { - content: "\e6e3"; + content: '\e6e3'; } .icon-sun:before { - content: "\e712"; + content: '\e712'; } .icon-refresh:before { - content: "\e6c2"; + content: '\e6c2'; } .icon-clear:before { - content: "\e63b"; + content: '\e63b'; } .icon-guide:before { - content: "\e600"; + content: '\e600'; } .icon-dustbin-o:before { - content: "\e71d"; + content: '\e71d'; } .icon-editor-o:before { - content: "\e72a"; + content: '\e72a'; } .icon-close:before { - content: "\e704"; + content: '\e704'; } .icon-download:before { - content: "\e716"; + content: '\e716'; } .icon-error-o:before { - content: "\e73b"; + content: '\e73b'; } .icon-close-bold:before { - content: "\e70d"; + content: '\e70d'; } .icon-translate:before { - content: "\e73c"; + content: '\e73c'; } .icon-share-o:before { - content: "\e729"; + content: '\e729'; } .icon-share:before { - content: "\e728"; + content: '\e728'; } .icon-wechat-o:before { - content: "\e727"; + content: '\e727'; } +.icon-wechat:before { + content: '\e727'; +} diff --git a/miniprogram/assets/fonts/iconfont.less b/miniprogram/assets/fonts/iconfont.less index 9bfcef2..2728591 100644 --- a/miniprogram/assets/fonts/iconfont.less +++ b/miniprogram/assets/fonts/iconfont.less @@ -84,4 +84,8 @@ .toy-icon-wechat-o:before { content: "\e727"; +} + +.toy-icon-wechat:before { + content: "\e727"; } \ No newline at end of file diff --git a/miniprogram/pages/debug/debug.json b/miniprogram/pages/debug/debug.json index 36ac758..3bc5c85 100644 --- a/miniprogram/pages/debug/debug.json +++ b/miniprogram/pages/debug/debug.json @@ -10,6 +10,7 @@ "van-radio-group": "@vant/weapp/radio-group/index", "van-cell": "@vant/weapp/cell/index", "van-cell-group": "@vant/weapp/cell-group/index", - "van-switch": "@vant/weapp/switch/index" + "van-switch": "@vant/weapp/switch/index", + "van-field": "@vant/weapp/field/index" } } diff --git a/miniprogram/pages/debug/debug.ts b/miniprogram/pages/debug/debug.ts index f532e66..6105386 100644 --- a/miniprogram/pages/debug/debug.ts +++ b/miniprogram/pages/debug/debug.ts @@ -1,27 +1,38 @@ Page({ data: { - header: 'wechat', + printConfig: { + header: 'wechat', + appName: '涂鸦丫小程序' + }, enableDebug: false }, onLoad() { - const header = getApp().getPrintHeader() || 'wechat'; + const printConfig = getApp().getPrintConfig() || { + header: 'wechat', + appName: '涂鸦丫小程序' + }; const enableDebug = wx.getStorageSync('enableDebug') || false; - this.setData({ header, enableDebug }); + this.setData({ printConfig, enableDebug }); }, onChangeHeader(e: WechatMiniprogram.CustomEvent) { const header = e.detail.value as PrintHeader; - this.setData({ header }); + this.setData({ printConfig: { ...this.data.printConfig, header } }); }, onClickHeaderSetting(e: WechatMiniprogram.CustomEvent) { const header = e.currentTarget.dataset.name as PrintHeader; - this.setData({ header }); + this.setData({ printConfig: { ...this.data.printConfig, header } }); + }, + + onAppNameChange(e: WechatMiniprogram.CustomEvent) { + const appName = e.detail + ''; + this.setData({ printConfig: { ...this.data.printConfig, appName } }); }, onConfirm() { - getApp().setPrintHeader(this.data.header); + getApp().setPrintConfig(this.data.printConfig); const enableDebug = this.data.enableDebug; wx.setStorageSync('enableDebug', enableDebug); wx.setEnableDebug({ enableDebug }); diff --git a/miniprogram/pages/debug/debug.wxml b/miniprogram/pages/debug/debug.wxml index 9ba8df9..036cb7a 100644 --- a/miniprogram/pages/debug/debug.wxml +++ b/miniprogram/pages/debug/debug.wxml @@ -1,10 +1,12 @@ - + + diff --git a/miniprogram/pages/index/index.less b/miniprogram/pages/index/index.less index 15834e1..d3e5726 100644 --- a/miniprogram/pages/index/index.less +++ b/miniprogram/pages/index/index.less @@ -85,16 +85,18 @@ page { // border: 1px solid #666; // } -.btn-area { +.bottom-btn-box { position: fixed; left: 0; bottom: 0; width: 100%; - height: 190rpx; + height: 120rpx; display: flex; - justify-content: center; + justify-content: space-between; + align-items: center; background-color: #fff; - box-shadow: 0px -2px 4px rgba(0, 0, 0, 0.25); - padding-top: 24rpx; + box-shadow: 0px -3.9rpx 5.2rpx rgba(0, 0, 0, 0.15); + padding: 0 24rpx; box-sizing: border-box; + border-radius: 16rpx 16rpx 0 0; } \ No newline at end of file diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index b44e75c..39f97e0 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -18,12 +18,21 @@ Page({ showIntroductionPopup: false, showSelectWordPopup: false, // 选择文字弹窗 env: 'release', + isPCDevtool: false, }, onLoad() { const hasShowIntroduction = wx.getStorageSync('hasShowIntroduction') || false; + // 判断是否在PC端开发工具上运行 + const systemInfo = wx.getDeviceInfo(); + if (systemInfo.platform === 'devtools') { + this.setData({ + isPCDevtool: true, + }); + } + if (!hasShowIntroduction) { this.setData({ cardList: [ @@ -241,13 +250,13 @@ Page({ onShareAppMessage() { return { - title: '涂鸦丫 - 涂色|识字|画画|打印', + title: '涂鸦丫-涂色|识字|画画|打印', path: '/pages/index/index', }; }, onShareTimeline() { return { - title: '涂鸦丫 - 涂色|识字|画画|打印', + title: '涂鸦丫-涂色|识字|画画|打印', query: '/pages/index/index', }; }, diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index f241872..2827dd6 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -62,7 +62,10 @@ 预览打印效果 - + - + + 分享 + + diff --git a/miniprogram/service/textDrawService.ts b/miniprogram/service/textDrawService.ts index a2f2d5f..d3da64f 100644 --- a/miniprogram/service/textDrawService.ts +++ b/miniprogram/service/textDrawService.ts @@ -80,10 +80,17 @@ class TextDrawService { this.currentY = 0; this.colors = ['#000']; this.characters = ['王']; + this.setPrintConfig(); + } + + setPrintConfig() { + const printConfig = getApp().getPrintConfig(); + this.headerType = printConfig.header; + this.options.appName = printConfig.appName; } draw(list: Array<{ color: string; word: string }>) { - this.headerType = getApp().getPrintHeader() || 'wechat'; + this.setPrintConfig(); this.colors = list.map((item) => item.color || '#000'); this.characters = list.map((item) => item.word || '日'); diff --git a/miniprogram/ui/button/button.less b/miniprogram/ui/button/button.less index 394d32e..ab7d29a 100644 --- a/miniprogram/ui/button/button.less +++ b/miniprogram/ui/button/button.less @@ -88,6 +88,49 @@ wx-button:not([size=mini]) { } } + &--flat { + box-shadow: none !important; + border: none; + transition: background 0.1s; + + // 覆盖所有颜色变体 + &.toy-button--primary, + &.toy-button--green, + &.toy-button--white { + box-shadow: none !important; + border: none !important; + + &.active { + transform: none !important; + box-shadow: none !important; + } + } + + // 特殊处理白色plain模式 + &.toy-button--white.plain { + background: transparent !important; + border: none !important; + box-shadow: none !important; + } + + // 重置active变换 + &.active { + transform: none !important; + } + + // 彩色按钮active背景变化 + &.toy-button--primary.active { + background: rgba(255, 215, 25, 0.7); + } + + &.toy-button--green.active { + background: rgba(147, 211, 51, 0.7); + } + + &.toy-button--white.active { + background: rgba(255, 255, 255, 0.7); + } + } .loading-class, diff --git a/miniprogram/ui/button/button.wxml b/miniprogram/ui/button/button.wxml index 455ca38..c3a190a 100644 --- a/miniprogram/ui/button/button.wxml +++ b/miniprogram/ui/button/button.wxml @@ -4,7 +4,7 @@