From 8872316ad3b2a7d657fa9946e91c196a07e91c4a Mon Sep 17 00:00:00 2001 From: que01 Date: Sun, 20 Sep 2026 12:05:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=93=81=E7=89=8C=E7=BB=84=E4=BB=B6=E8=A7=86?= =?UTF-8?q?=E8=A7=89=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ui/brand-card/brand-card.js | 1 + .../components/ui/brand-card/brand-card.json | 1 + .../components/ui/brand-card/brand-card.wxml | 1 + .../components/ui/brand-card/brand-card.wxss | 7 +++++++ .../components/ui/brand-error/brand-error.js | 11 ++++++++++ .../ui/brand-error/brand-error.json | 1 + .../ui/brand-error/brand-error.wxml | 1 + .../ui/brand-error/brand-error.wxss | 20 +++++++++++++++++++ .../ui/brand-field/brand-field.wxml | 2 +- .../ui/brand-field/brand-field.wxss | 18 ++++++++++++++--- apps/miniapp/pages/booking/index.json | 3 ++- apps/miniapp/pages/booking/index.wxml | 2 +- apps/miniapp/pages/bookings/index.json | 3 ++- apps/miniapp/pages/bookings/index.wxml | 2 +- apps/miniapp/pages/services/index.js | 4 ++++ apps/miniapp/pages/services/index.json | 3 ++- apps/miniapp/pages/services/index.wxml | 2 +- 17 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 apps/miniapp/components/ui/brand-card/brand-card.js create mode 100644 apps/miniapp/components/ui/brand-card/brand-card.json create mode 100644 apps/miniapp/components/ui/brand-card/brand-card.wxml create mode 100644 apps/miniapp/components/ui/brand-card/brand-card.wxss create mode 100644 apps/miniapp/components/ui/brand-error/brand-error.js create mode 100644 apps/miniapp/components/ui/brand-error/brand-error.json create mode 100644 apps/miniapp/components/ui/brand-error/brand-error.wxml create mode 100644 apps/miniapp/components/ui/brand-error/brand-error.wxss diff --git a/apps/miniapp/components/ui/brand-card/brand-card.js b/apps/miniapp/components/ui/brand-card/brand-card.js new file mode 100644 index 0000000..1248f32 --- /dev/null +++ b/apps/miniapp/components/ui/brand-card/brand-card.js @@ -0,0 +1 @@ +Component({ options: { addGlobalClass: true } }); diff --git a/apps/miniapp/components/ui/brand-card/brand-card.json b/apps/miniapp/components/ui/brand-card/brand-card.json new file mode 100644 index 0000000..67f8e03 --- /dev/null +++ b/apps/miniapp/components/ui/brand-card/brand-card.json @@ -0,0 +1 @@ +{ "component": true } diff --git a/apps/miniapp/components/ui/brand-card/brand-card.wxml b/apps/miniapp/components/ui/brand-card/brand-card.wxml new file mode 100644 index 0000000..936ce6e --- /dev/null +++ b/apps/miniapp/components/ui/brand-card/brand-card.wxml @@ -0,0 +1 @@ + diff --git a/apps/miniapp/components/ui/brand-card/brand-card.wxss b/apps/miniapp/components/ui/brand-card/brand-card.wxss new file mode 100644 index 0000000..9e89745 --- /dev/null +++ b/apps/miniapp/components/ui/brand-card/brand-card.wxss @@ -0,0 +1,7 @@ +.card { + padding: 28rpx; + background: var(--brand-color-surface); + border: 1rpx solid rgba(122, 74, 43, 0.1); + border-radius: var(--brand-radius-card); + box-shadow: 0 8rpx 24rpx rgba(122, 74, 43, 0.06); +} diff --git a/apps/miniapp/components/ui/brand-error/brand-error.js b/apps/miniapp/components/ui/brand-error/brand-error.js new file mode 100644 index 0000000..27ab1b4 --- /dev/null +++ b/apps/miniapp/components/ui/brand-error/brand-error.js @@ -0,0 +1,11 @@ +Component({ + properties: { + message: { type: String, value: "暂时无法加载内容" }, + actionText: { type: String, value: "重新加载" }, + }, + methods: { + retry() { + this.triggerEvent("retry"); + }, + }, +}); diff --git a/apps/miniapp/components/ui/brand-error/brand-error.json b/apps/miniapp/components/ui/brand-error/brand-error.json new file mode 100644 index 0000000..67f8e03 --- /dev/null +++ b/apps/miniapp/components/ui/brand-error/brand-error.json @@ -0,0 +1 @@ +{ "component": true } diff --git a/apps/miniapp/components/ui/brand-error/brand-error.wxml b/apps/miniapp/components/ui/brand-error/brand-error.wxml new file mode 100644 index 0000000..aa4d745 --- /dev/null +++ b/apps/miniapp/components/ui/brand-error/brand-error.wxml @@ -0,0 +1 @@ +{{message}} diff --git a/apps/miniapp/components/ui/brand-error/brand-error.wxss b/apps/miniapp/components/ui/brand-error/brand-error.wxss new file mode 100644 index 0000000..362b391 --- /dev/null +++ b/apps/miniapp/components/ui/brand-error/brand-error.wxss @@ -0,0 +1,20 @@ +.error { + padding: 72rpx 32rpx; + display: flex; + flex-direction: column; + align-items: center; + color: var(--brand-color-muted); +} +.message { + margin-bottom: 24rpx; + font-size: 28rpx; +} +.retry { + margin: 0; + padding: 0 28rpx; + color: var(--brand-color-primary); + background: var(--brand-color-subtle); + border-radius: 999rpx; + font-size: 26rpx; + line-height: 68rpx; +} diff --git a/apps/miniapp/components/ui/brand-field/brand-field.wxml b/apps/miniapp/components/ui/brand-field/brand-field.wxml index 5827d65..3a15fb6 100644 --- a/apps/miniapp/components/ui/brand-field/brand-field.wxml +++ b/apps/miniapp/components/ui/brand-field/brand-field.wxml @@ -1 +1 @@ -{{label}} * +{{label}} * diff --git a/apps/miniapp/components/ui/brand-field/brand-field.wxss b/apps/miniapp/components/ui/brand-field/brand-field.wxss index 4c82f28..6f15786 100644 --- a/apps/miniapp/components/ui/brand-field/brand-field.wxss +++ b/apps/miniapp/components/ui/brand-field/brand-field.wxss @@ -10,9 +10,21 @@ .required { color: var(--brand-color-primary); } +.field-control { + padding: 4rpx 20rpx; + background: var(--brand-color-surface); + border: 1rpx solid #eadfce; + border-radius: var(--brand-radius-control); +} t-input, t-textarea { - --td-input-bg-color: var(--brand-color-surface); - --td-input-border-color: #eadfce; - --td-input-border-radius: var(--brand-radius-control); + --td-input-vertical-padding: 20rpx; + --td-input-bg-color: transparent; + --td-input-border-color: transparent; + --td-input-default-text-color: var(--brand-color-text); + --td-input-placeholder-text-color: #a98f7b; + --td-textarea-background-color: transparent; + --td-textarea-border-color: transparent; + --td-textarea-text-color: var(--brand-color-text); + --td-textarea-placeholder-color: #a98f7b; } diff --git a/apps/miniapp/pages/booking/index.json b/apps/miniapp/pages/booking/index.json index 56ab430..c356afb 100644 --- a/apps/miniapp/pages/booking/index.json +++ b/apps/miniapp/pages/booking/index.json @@ -4,6 +4,7 @@ "navigationBarTextStyle": "black", "usingComponents": { "brand-button": "/components/ui/brand-button/brand-button", - "brand-field": "/components/ui/brand-field/brand-field" + "brand-field": "/components/ui/brand-field/brand-field", + "brand-card": "/components/ui/brand-card/brand-card" } } diff --git a/apps/miniapp/pages/booking/index.wxml b/apps/miniapp/pages/booking/index.wxml index be73d34..34e4a53 100644 --- a/apps/miniapp/pages/booking/index.wxml +++ b/apps/miniapp/pages/booking/index.wxml @@ -2,6 +2,6 @@ {{service.name || '选择服务'}}{{service.priceText || '沟通报价'}}{{template.available}} 数量{{quantity}} 份 {{template.modeLabel}} - + ● {{template.submitNotice}}{{submitting ? '提交中...' : template.submitLabel}} diff --git a/apps/miniapp/pages/bookings/index.json b/apps/miniapp/pages/bookings/index.json index 95d705e..1177f3b 100644 --- a/apps/miniapp/pages/bookings/index.json +++ b/apps/miniapp/pages/bookings/index.json @@ -4,6 +4,7 @@ "navigationBarTextStyle": "black", "usingComponents": { "brand-loading": "/components/ui/brand-loading/brand-loading", - "brand-empty": "/components/ui/brand-empty/brand-empty" + "brand-empty": "/components/ui/brand-empty/brand-empty", + "brand-error": "/components/ui/brand-error/brand-error" } } diff --git a/apps/miniapp/pages/bookings/index.wxml b/apps/miniapp/pages/bookings/index.wxml index 98d9085..b3d1aeb 100644 --- a/apps/miniapp/pages/bookings/index.wxml +++ b/apps/miniapp/pages/bookings/index.wxml @@ -1,7 +1,7 @@ 我的订单☎ - {{error}} + 订单状态查看每笔预约的最新进展✓ diff --git a/apps/miniapp/pages/services/index.js b/apps/miniapp/pages/services/index.js index 882346c..066be85 100644 --- a/apps/miniapp/pages/services/index.js +++ b/apps/miniapp/pages/services/index.js @@ -3,6 +3,10 @@ const { getTemplate } = require("../../utils/templates"); Page({ data: { loading: true, error: "", services: [], filtered: [], category: "package", labels: {} }, onLoad() { + this.load(); + }, + load() { + this.setData({ loading: true, error: "" }); Promise.all([ request("/public/offerings"), request("/public/services"), diff --git a/apps/miniapp/pages/services/index.json b/apps/miniapp/pages/services/index.json index 5196c18..6a77718 100644 --- a/apps/miniapp/pages/services/index.json +++ b/apps/miniapp/pages/services/index.json @@ -4,6 +4,7 @@ "navigationBarTextStyle": "black", "usingComponents": { "brand-loading": "/components/ui/brand-loading/brand-loading", - "brand-empty": "/components/ui/brand-empty/brand-empty" + "brand-empty": "/components/ui/brand-empty/brand-empty", + "brand-error": "/components/ui/brand-error/brand-error" } } diff --git a/apps/miniapp/pages/services/index.wxml b/apps/miniapp/pages/services/index.wxml index 625b716..c5847c9 100644 --- a/apps/miniapp/pages/services/index.wxml +++ b/apps/miniapp/pages/services/index.wxml @@ -1 +1 @@ -服务列表{{labels.sub}}● {{labels.first}}{{labels.firstSub}}● {{labels.second}}{{labels.secondSub}}{{error}}{{item.name}}{{item.isEnabled !== false ? labels.available : labels.unavailable}}{{item.description || item.summary}}{{item.priceText || '面议'}} +服务列表{{labels.sub}}● {{labels.first}}{{labels.firstSub}}● {{labels.second}}{{labels.secondSub}}{{item.name}}{{item.isEnabled !== false ? labels.available : labels.unavailable}}{{item.description || item.summary}}{{item.priceText || '面议'}}