From ee80577e85f126e815cfdf2179c1dc47b700109d Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 23 Jul 2025 09:55:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=201.0.4=20=E7=89=88=E6=9C=AC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/assets/fonts/iconfont.less | 4 ++++ miniprogram/pages/index/index.less | 4 ++-- miniprogram/pages/index/index.wxml | 12 +++++++++++- miniprogram/ui/button/button.ts | 4 ++++ miniprogram/ui/button/button.wxml | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) 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/index/index.less b/miniprogram/pages/index/index.less index 15834e1..267838e 100644 --- a/miniprogram/pages/index/index.less +++ b/miniprogram/pages/index/index.less @@ -92,9 +92,9 @@ page { width: 100%; height: 190rpx; display: flex; - justify-content: center; + justify-content: space-between; background-color: #fff; box-shadow: 0px -2px 4px rgba(0, 0, 0, 0.25); - padding-top: 24rpx; + padding: 24rpx 30rpx; box-sizing: border-box; } \ No newline at end of file diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index f241872..1b833ac 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -90,9 +90,19 @@ + 分享 + + diff --git a/miniprogram/ui/button/button.ts b/miniprogram/ui/button/button.ts index 353da81..d161e1b 100644 --- a/miniprogram/ui/button/button.ts +++ b/miniprogram/ui/button/button.ts @@ -10,6 +10,10 @@ Component({ type: String, value: 'default', // primary, green, white }, + openType: { + type: String, + value: '', + }, plain: { type: Boolean, value: false, // 是否朴素按钮 diff --git a/miniprogram/ui/button/button.wxml b/miniprogram/ui/button/button.wxml index 455ca38..003afaf 100644 --- a/miniprogram/ui/button/button.wxml +++ b/miniprogram/ui/button/button.wxml @@ -9,6 +9,7 @@ data-loading="{{loading}}" style="{{style}};{{width ? 'width:' + width + ';' : ''}};{{height ? 'height:' + height + ';' : ''}}" session-from="{{ sessionFrom }}" + open-type="{{ disabled || loading ? '' : openType }}" send-message-title="{{ sendMessageTitle }}" send-message-path="{{ sendMessagePath }}" send-message-img="{{ sendMessageImg }}" From 3bca31e21967e5a468d4b732062680f3bc2f35d9 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 23 Jul 2025 10:01:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=88=86=E4=BA=AB=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/pages/index/index.wxml | 2 +- miniprogram/ui/button/button.wxml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 1b833ac..d428f7b 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -95,7 +95,7 @@ bind:click="onShareAppMessage" width="240rpx" icon="wechat" - iconSize="50rpx" + iconSize="48rpx" icon-class-prefix="toy-icon"> 分享 diff --git a/miniprogram/ui/button/button.wxml b/miniprogram/ui/button/button.wxml index 003afaf..6308e1e 100644 --- a/miniprogram/ui/button/button.wxml +++ b/miniprogram/ui/button/button.wxml @@ -38,7 +38,6 @@