diff --git a/apps/miniapp/app.wxss b/apps/miniapp/app.wxss new file mode 100644 index 0000000..c7701e5 --- /dev/null +++ b/apps/miniapp/app.wxss @@ -0,0 +1,7 @@ +@import "styles/tokens.wxss"; + +page { + background: var(--brand-color-bg); + color: var(--brand-color-text); + font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", sans-serif; +} diff --git a/apps/miniapp/components/ui/brand-button/brand-button.js b/apps/miniapp/components/ui/brand-button/brand-button.js new file mode 100644 index 0000000..7e3086d --- /dev/null +++ b/apps/miniapp/components/ui/brand-button/brand-button.js @@ -0,0 +1,15 @@ +Component({ + options: { addGlobalClass: true }, + properties: { + theme: { type: String, value: "primary" }, + size: { type: String, value: "large" }, + disabled: Boolean, + loading: Boolean, + block: { type: Boolean, value: true }, + }, + methods: { + handleTap(event) { + if (!this.data.disabled && !this.data.loading) this.triggerEvent("tap", event.detail); + }, + }, +}); diff --git a/apps/miniapp/components/ui/brand-button/brand-button.json b/apps/miniapp/components/ui/brand-button/brand-button.json new file mode 100644 index 0000000..75d1e24 --- /dev/null +++ b/apps/miniapp/components/ui/brand-button/brand-button.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "t-button": "tdesign-miniprogram/button/button" + } +} diff --git a/apps/miniapp/components/ui/brand-button/brand-button.wxml b/apps/miniapp/components/ui/brand-button/brand-button.wxml new file mode 100644 index 0000000..5d9caee --- /dev/null +++ b/apps/miniapp/components/ui/brand-button/brand-button.wxml @@ -0,0 +1 @@ + diff --git a/apps/miniapp/components/ui/brand-button/brand-button.wxss b/apps/miniapp/components/ui/brand-button/brand-button.wxss new file mode 100644 index 0000000..e273b99 --- /dev/null +++ b/apps/miniapp/components/ui/brand-button/brand-button.wxss @@ -0,0 +1,8 @@ +:host { + display: block; +} +t-button { + --td-button-primary-bg-color: var(--brand-color-primary); + --td-button-primary-active-bg-color: var(--brand-color-primary-dark); + --td-button-radius: var(--brand-radius-control); +} diff --git a/apps/miniapp/components/ui/brand-empty/brand-empty.js b/apps/miniapp/components/ui/brand-empty/brand-empty.js new file mode 100644 index 0000000..b5013d1 --- /dev/null +++ b/apps/miniapp/components/ui/brand-empty/brand-empty.js @@ -0,0 +1 @@ +Component({ properties: { description: { type: String, value: "暂无内容" } } }); diff --git a/apps/miniapp/components/ui/brand-empty/brand-empty.json b/apps/miniapp/components/ui/brand-empty/brand-empty.json new file mode 100644 index 0000000..8afee0c --- /dev/null +++ b/apps/miniapp/components/ui/brand-empty/brand-empty.json @@ -0,0 +1 @@ +{ "component": true, "usingComponents": { "t-empty": "tdesign-miniprogram/empty/empty" } } diff --git a/apps/miniapp/components/ui/brand-empty/brand-empty.wxml b/apps/miniapp/components/ui/brand-empty/brand-empty.wxml new file mode 100644 index 0000000..4dc9f9f --- /dev/null +++ b/apps/miniapp/components/ui/brand-empty/brand-empty.wxml @@ -0,0 +1 @@ + diff --git a/apps/miniapp/components/ui/brand-empty/brand-empty.wxss b/apps/miniapp/components/ui/brand-empty/brand-empty.wxss new file mode 100644 index 0000000..59b123a --- /dev/null +++ b/apps/miniapp/components/ui/brand-empty/brand-empty.wxss @@ -0,0 +1,3 @@ +t-empty { + --td-empty-description-color: var(--brand-color-muted); +} diff --git a/apps/miniapp/components/ui/brand-field/brand-field.js b/apps/miniapp/components/ui/brand-field/brand-field.js new file mode 100644 index 0000000..1fdf7bd --- /dev/null +++ b/apps/miniapp/components/ui/brand-field/brand-field.js @@ -0,0 +1,19 @@ +Component({ + options: { addGlobalClass: true }, + properties: { + label: String, + value: { type: String, value: "" }, + placeholder: String, + type: { type: String, value: "text" }, + required: Boolean, + maxlength: { type: Number, value: -1 }, + }, + methods: { + handleChange(event) { + this.triggerEvent("change", event.detail); + }, + handleBlur(event) { + this.triggerEvent("blur", event.detail); + }, + }, +}); diff --git a/apps/miniapp/components/ui/brand-field/brand-field.json b/apps/miniapp/components/ui/brand-field/brand-field.json new file mode 100644 index 0000000..f9c3951 --- /dev/null +++ b/apps/miniapp/components/ui/brand-field/brand-field.json @@ -0,0 +1,7 @@ +{ + "component": true, + "usingComponents": { + "t-input": "tdesign-miniprogram/input/input", + "t-textarea": "tdesign-miniprogram/textarea/textarea" + } +} diff --git a/apps/miniapp/components/ui/brand-field/brand-field.wxml b/apps/miniapp/components/ui/brand-field/brand-field.wxml new file mode 100644 index 0000000..5827d65 --- /dev/null +++ b/apps/miniapp/components/ui/brand-field/brand-field.wxml @@ -0,0 +1 @@ +{{label}} * diff --git a/apps/miniapp/components/ui/brand-field/brand-field.wxss b/apps/miniapp/components/ui/brand-field/brand-field.wxss new file mode 100644 index 0000000..4c82f28 --- /dev/null +++ b/apps/miniapp/components/ui/brand-field/brand-field.wxss @@ -0,0 +1,18 @@ +.field { + margin-bottom: 24rpx; +} +.label { + margin-bottom: 12rpx; + color: var(--brand-color-text); + font-size: 28rpx; + font-weight: 600; +} +.required { + color: var(--brand-color-primary); +} +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); +} diff --git a/apps/miniapp/components/ui/brand-loading/brand-loading.js b/apps/miniapp/components/ui/brand-loading/brand-loading.js new file mode 100644 index 0000000..84df393 --- /dev/null +++ b/apps/miniapp/components/ui/brand-loading/brand-loading.js @@ -0,0 +1 @@ +Component({ properties: { text: { type: String, value: "加载中…" } } }); diff --git a/apps/miniapp/components/ui/brand-loading/brand-loading.json b/apps/miniapp/components/ui/brand-loading/brand-loading.json new file mode 100644 index 0000000..7c412b9 --- /dev/null +++ b/apps/miniapp/components/ui/brand-loading/brand-loading.json @@ -0,0 +1 @@ +{ "component": true, "usingComponents": { "t-loading": "tdesign-miniprogram/loading/loading" } } diff --git a/apps/miniapp/components/ui/brand-loading/brand-loading.wxml b/apps/miniapp/components/ui/brand-loading/brand-loading.wxml new file mode 100644 index 0000000..7beeb55 --- /dev/null +++ b/apps/miniapp/components/ui/brand-loading/brand-loading.wxml @@ -0,0 +1 @@ + diff --git a/apps/miniapp/components/ui/brand-loading/brand-loading.wxss b/apps/miniapp/components/ui/brand-loading/brand-loading.wxss new file mode 100644 index 0000000..8ba6617 --- /dev/null +++ b/apps/miniapp/components/ui/brand-loading/brand-loading.wxss @@ -0,0 +1,6 @@ +.loading { + padding: 96rpx 0; + display: flex; + justify-content: center; + color: var(--brand-color-muted); +} diff --git a/apps/miniapp/package.json b/apps/miniapp/package.json index ce293c0..d02f8f9 100644 --- a/apps/miniapp/package.json +++ b/apps/miniapp/package.json @@ -4,7 +4,8 @@ "type": "module", "dependencies": { "@personal-brand/api-client": "workspace:*", - "@personal-brand/types": "workspace:*" + "@personal-brand/types": "workspace:*", + "tdesign-miniprogram": "^1.16.1" }, "scripts": { "lint": "eslint src --ext .ts", diff --git a/apps/miniapp/pages/booking/index.json b/apps/miniapp/pages/booking/index.json index 0fcbac4..56ab430 100644 --- a/apps/miniapp/pages/booking/index.json +++ b/apps/miniapp/pages/booking/index.json @@ -1,5 +1,9 @@ { "navigationBarTitleText": "提交需求", "navigationBarBackgroundColor": "#FBF7F1", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "usingComponents": { + "brand-button": "/components/ui/brand-button/brand-button", + "brand-field": "/components/ui/brand-field/brand-field" + } } diff --git a/apps/miniapp/pages/booking/index.wxml b/apps/miniapp/pages/booking/index.wxml index 576f616..be73d34 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}} + + ● {{template.submitNotice}}{{submitting ? '提交中...' : template.submitLabel}} diff --git a/apps/miniapp/pages/bookings/index.json b/apps/miniapp/pages/bookings/index.json index 9fa3e67..95d705e 100644 --- a/apps/miniapp/pages/bookings/index.json +++ b/apps/miniapp/pages/bookings/index.json @@ -1,5 +1,9 @@ { "navigationBarTitleText": "我的订单", "navigationBarBackgroundColor": "#FBF7F1", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "usingComponents": { + "brand-loading": "/components/ui/brand-loading/brand-loading", + "brand-empty": "/components/ui/brand-empty/brand-empty" + } } diff --git a/apps/miniapp/pages/bookings/index.wxml b/apps/miniapp/pages/bookings/index.wxml index 5b0ccc2..98d9085 100644 --- a/apps/miniapp/pages/bookings/index.wxml +++ b/apps/miniapp/pages/bookings/index.wxml @@ -1,8 +1,8 @@ 我的订单☎ - 加载中... + {{error}} - 完成预约后,订单会显示在这里 + 订单状态查看每笔预约的最新进展✓ diff --git a/apps/miniapp/pages/services/index.json b/apps/miniapp/pages/services/index.json index f533acb..5196c18 100644 --- a/apps/miniapp/pages/services/index.json +++ b/apps/miniapp/pages/services/index.json @@ -1,5 +1,9 @@ { "navigationBarTitleText": "服务列表", "navigationBarBackgroundColor": "#FBF7F1", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "black", + "usingComponents": { + "brand-loading": "/components/ui/brand-loading/brand-loading", + "brand-empty": "/components/ui/brand-empty/brand-empty" + } } diff --git a/apps/miniapp/pages/services/index.wxml b/apps/miniapp/pages/services/index.wxml index 098bc0e..625b716 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}}{{labels.empty}}{{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}}{{error}}{{item.name}}{{item.isEnabled !== false ? labels.available : labels.unavailable}}{{item.description || item.summary}}{{item.priceText || '面议'}} diff --git a/apps/miniapp/styles/tokens.wxss b/apps/miniapp/styles/tokens.wxss new file mode 100644 index 0000000..5ab962f --- /dev/null +++ b/apps/miniapp/styles/tokens.wxss @@ -0,0 +1,14 @@ +/* 个人品牌 Design Tokens;行业模板只提供内容,不覆盖这些基础视觉变量。 */ +page { + --brand-color-bg: #fbf7f1; + --brand-color-surface: #ffffff; + --brand-color-subtle: #f4ebd9; + --brand-color-primary: #b54a2c; + --brand-color-primary-dark: #913a23; + --brand-color-text: #2b2b2b; + --brand-color-muted: #7a4a2b; + --brand-color-accent: #e8a75f; + --brand-radius-card: 16rpx; + --brand-radius-control: 12rpx; + --brand-space-page: 32rpx; +} diff --git a/docs/miniapp-ui.md b/docs/miniapp-ui.md new file mode 100644 index 0000000..05f2ae3 --- /dev/null +++ b/docs/miniapp-ui.md @@ -0,0 +1,17 @@ +# 小程序 UI 基础层 + +小程序使用 `tdesign-miniprogram` 提供成熟的交互控件,再由 `apps/miniapp/components/ui/` 提供品牌层封装。行业模板只负责内容和字段配置,不直接依赖 TDesign 组件名。 + +## 首次预览 + +在微信开发者工具中打开 `apps/miniapp` 后执行「工具 → 构建 npm」。构建完成后,工具会生成被 `.gitignore` 忽略的 `miniprogram_npm/` 目录,页面即可解析 `tdesign-miniprogram/*` 组件路径。 + +依赖升级后需要重新执行一次「构建 npm」。CI 或发布流程也必须先完成该步骤,再上传小程序代码。 + +## 组件边界 + +- `BrandButton`、`BrandField`、`BrandEmpty`、`BrandLoading`:稳定的品牌交互契约,页面只依赖这些封装。 +- `tdesign-miniprogram`:输入、按钮、弹层、加载等基础行为和无障碍细节。 +- 页面和行业模板:只消费统一字段与状态,不出现 `templateKey === "food"` 一类分支。 + +品牌颜色、圆角和间距统一维护在 `apps/miniapp/styles/tokens.wxss`。 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 17fbf69..215406d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,6 +118,9 @@ importers: '@personal-brand/types': specifier: workspace:* version: link:../../packages/types + tdesign-miniprogram: + specifier: ^1.16.1 + version: 1.16.1 packages/api-client: dependencies: @@ -1823,6 +1826,9 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} + tdesign-miniprogram@1.16.1: + resolution: {integrity: sha512-exdLrz9qAYXuGSFWugtiiXMbE+sdMzDwZC1yrDnsUepJLoMFp2SFMPr7l1eFihraAneDRV4qntiarnD5owNhNg==} + thread-stream@4.2.0: resolution: {integrity: sha512-e2zZ96wSChazBsbENf/Pcm/4swHt2cEKQ92rhUjkL9GCKiTDJIaTBenjE/m9DXi0QBmTMDkFDdOomUy20A1tDQ==} engines: {node: '>=20'} @@ -3643,6 +3649,8 @@ snapshots: dependencies: has-flag: 4.0.0 + tdesign-miniprogram@1.16.1: {} + thread-stream@4.2.0: dependencies: real-require: 1.0.0