From 02966cf65cf01572a22c1fae42ed346f25fae723 Mon Sep 17 00:00:00 2001 From: que01 Date: Sun, 20 Sep 2026 12:28:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=85=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E7=9A=84=E5=8A=A8=E6=80=81=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/main.ts | 8 +- apps/api/test/http.integration.test.js | 6 ++ apps/miniapp/app.json | 3 +- apps/miniapp/pages/inquiry/index.js | 120 +++++++++++++++++++++++++ apps/miniapp/pages/inquiry/index.json | 12 +++ apps/miniapp/pages/inquiry/index.wxml | 1 + apps/miniapp/pages/inquiry/index.wxss | 50 +++++++++++ apps/miniapp/pages/offering/detail.js | 13 +++ packages/api-client/src/index.ts | 22 +++++ 9 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 apps/miniapp/pages/inquiry/index.js create mode 100644 apps/miniapp/pages/inquiry/index.json create mode 100644 apps/miniapp/pages/inquiry/index.wxml create mode 100644 apps/miniapp/pages/inquiry/index.wxss diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts index 8d2173d..50c4361 100644 --- a/apps/api/src/main.ts +++ b/apps/api/src/main.ts @@ -134,7 +134,7 @@ export class PublicWorkspaceController { @Get() async get(): Promise { const brandId = process.env.DEFAULT_BRAND_ID ?? "00000000-0000-0000-0000-000000000001"; - const [brand, modules, fields, offerings] = await Promise.all([ + const [brand, modules, fields, offerings, inquiryForm] = await Promise.all([ this.prisma.brandProfile.findUnique({ where: { id: brandId } }), this.prisma.brandModule.findMany({ where: { brandId, isEnabled: true }, @@ -148,8 +148,12 @@ export class PublicWorkspaceController { where: { brandId, isEnabled: true }, orderBy: { sortOrder: "asc" }, }), + this.prisma.inquiryForm.findFirst({ + where: { brandId, isEnabled: true }, + orderBy: { updatedAt: "desc" }, + }), ]); - return { brand, modules, fields, offerings }; + return { brand, modules, fields, offerings, inquiryForm }; } } diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 04e07bc..3ac4cf3 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -47,6 +47,8 @@ test("health and public content are available without authentication", async () }); test("admin can install a template and public workspace exposes enabled configuration", async () => { + await prisma.inquirySubmission.deleteMany({ where: { brandId } }); + await prisma.inquiryForm.deleteMany({ where: { brandId } }); await prisma.brandFieldDefinition.deleteMany({ where: { brandId } }); await prisma.brandModule.deleteMany({ where: { brandId } }); await prisma.brandTemplateInstallation.deleteMany({ where: { brandId } }); @@ -74,6 +76,7 @@ test("admin can install a template and public workspace exposes enabled configur const publicWorkspace = await request("/public/workspace"); assert.equal(publicWorkspace.statusCode, 200); assert.equal(JSON.parse(publicWorkspace.body).modules.length, 4); + assert.equal(JSON.parse(publicWorkspace.body).inquiryForm, null); const conflict = await request("/admin/workspace/install", { method: "POST", headers: { authorization: `Bearer ${token}` }, @@ -176,6 +179,9 @@ test("admin can create and version an inquiry form", async () => { assert.equal(JSON.parse(updated.body).version, 2); const publicForm = await request(`/public/inquiry-forms/${id}`); assert.equal(publicForm.statusCode, 200); + const publicWorkspace = await request("/public/workspace"); + assert.equal(publicWorkspace.statusCode, 200); + assert.equal(JSON.parse(publicWorkspace.body).inquiryForm.id, id); const submission = await request("/customer/inquiry-submissions", { method: "POST", headers: { authorization: `Bearer ${customerToken}` }, diff --git a/apps/miniapp/app.json b/apps/miniapp/app.json index 73d0a37..ce611f7 100644 --- a/apps/miniapp/app.json +++ b/apps/miniapp/app.json @@ -4,7 +4,8 @@ "pages/services/index", "pages/booking/index", "pages/bookings/index", - "pages/offering/detail" + "pages/offering/detail", + "pages/inquiry/index" ], "window": { "navigationBarTitleText": "个人品牌", diff --git a/apps/miniapp/pages/inquiry/index.js b/apps/miniapp/pages/inquiry/index.js new file mode 100644 index 0000000..4accba8 --- /dev/null +++ b/apps/miniapp/pages/inquiry/index.js @@ -0,0 +1,120 @@ +const { request, customerRequest } = require("../../utils/request"); + +function isVisible(field, values) { + const condition = field.visibleWhen; + if (!condition || typeof condition !== "object") return true; + return Object.entries(condition).every(([key, expected]) => values[key] === expected); +} + +Page({ + data: { + loading: true, + error: "", + submitting: false, + form: null, + fields: [], + renderFields: [], + values: {}, + formId: "", + }, + onLoad(options) { + this.load(options.formId); + }, + load(formId) { + this.setData({ loading: true, error: "" }); + const formRequest = formId + ? request("/public/inquiry-forms/" + encodeURIComponent(formId)) + : request("/public/workspace").then((workspace) => workspace.inquiryForm); + formRequest + .then((form) => { + if (!form) + return this.setData({ loading: false, form: null, fields: [], renderFields: [] }); + const fields = Array.isArray(form.fieldsSnapshot) ? form.fieldsSnapshot : []; + const values = Object.fromEntries( + fields.map((field) => [field.key, field.defaultValue ?? ""]), + ); + this.setData({ + form, + formId: form.id, + fields, + renderFields: fields, + values, + loading: false, + }); + }) + .catch((error) => + this.setData({ loading: false, error: error.message || "咨询表单加载失败" }), + ); + }, + retry() { + this.load(); + }, + visibleFields() { + return this.data.fields.filter((field) => isVisible(field, this.data.values)); + }, + updateValue(key, value) { + const values = { ...this.data.values, [key]: value }; + this.setData({ + values, + renderFields: this.data.fields.filter((field) => isVisible(field, values)), + }); + }, + onFieldChange(event) { + const key = event.currentTarget.dataset.key; + this.updateValue(key, event.detail?.value ?? event.detail); + }, + onPickerChange(event) { + const field = this.data.renderFields[event.currentTarget.dataset.index]; + this.updateValue(field.key, field.options[event.detail.value]); + }, + onDateChange(event) { + const field = this.data.renderFields[event.currentTarget.dataset.index]; + this.updateValue(field.key, event.detail.value); + }, + validate() { + const missing = this.visibleFields().find( + (field) => field.required && !this.data.values[field.key], + ); + if (missing) { + wx.showToast({ title: "请填写" + missing.label, icon: "none" }); + return false; + } + return true; + }, + submit() { + if (!this.data.formId || !this.validate() || this.data.submitting) return; + const send = () => + customerRequest("/customer/inquiry-submissions", { + method: "POST", + data: { formId: this.data.formId, values: this.data.values }, + }) + .then(() => { + this.setData({ submitting: false }); + wx.showToast({ title: "咨询已提交", icon: "success" }); + setTimeout(() => wx.switchTab({ url: "/pages/bookings/index" }), 500); + }) + .catch((error) => { + this.setData({ submitting: false }); + wx.showToast({ title: error.message || "提交失败", icon: "none" }); + }); + this.setData({ submitting: true }); + const token = wx.getStorageSync("customerToken"); + if (token) return send(); + wx.login({ + success: (login) => + request("/customer/session/wechat", { method: "POST", data: { code: login.code } }) + .then((result) => { + wx.setStorageSync("customerToken", result.token); + send(); + }) + .catch((error) => { + this.setData({ submitting: false }); + wx.showToast({ title: error.message || "微信登录失败", icon: "none" }); + }), + fail: () => { + this.setData({ submitting: false }); + wx.showToast({ title: "微信登录失败", icon: "none" }); + }, + }); + }, +}); diff --git a/apps/miniapp/pages/inquiry/index.json b/apps/miniapp/pages/inquiry/index.json new file mode 100644 index 0000000..faa4496 --- /dev/null +++ b/apps/miniapp/pages/inquiry/index.json @@ -0,0 +1,12 @@ +{ + "navigationBarTitleText": "提交咨询", + "navigationBarBackgroundColor": "#FBF7F1", + "navigationBarTextStyle": "black", + "usingComponents": { + "brand-button": "/components/ui/brand-button/brand-button", + "brand-field": "/components/ui/brand-field/brand-field", + "brand-loading": "/components/ui/brand-loading/brand-loading", + "brand-empty": "/components/ui/brand-empty/brand-empty", + "brand-error": "/components/ui/brand-error/brand-error" + } +} diff --git a/apps/miniapp/pages/inquiry/index.wxml b/apps/miniapp/pages/inquiry/index.wxml new file mode 100644 index 0000000..922c5f0 --- /dev/null +++ b/apps/miniapp/pages/inquiry/index.wxml @@ -0,0 +1 @@ +{{form.name}}告诉我你的想法,我会尽快与你联系{{field.label}} *{{values[field.key] || '请选择'}}{{field.label}} *{{values[field.key] || '请选择日期'}}{{submitting ? '提交中...' : '提交咨询'}} diff --git a/apps/miniapp/pages/inquiry/index.wxss b/apps/miniapp/pages/inquiry/index.wxss new file mode 100644 index 0000000..9bc1c51 --- /dev/null +++ b/apps/miniapp/pages/inquiry/index.wxss @@ -0,0 +1,50 @@ +.page { + min-height: 100vh; + padding: 40rpx 32rpx 64rpx; + box-sizing: border-box; +} +.intro { + margin-bottom: 32rpx; +} +.title { + display: block; + color: var(--brand-color-text); + font-size: 44rpx; + font-weight: 700; +} +.subtitle { + display: block; + margin-top: 12rpx; + color: var(--brand-color-muted); + font-size: 28rpx; + line-height: 1.6; +} +.form-card { + margin-bottom: 32rpx; + padding: 32rpx 28rpx 8rpx; + background: var(--brand-color-surface); + border-radius: var(--brand-radius-card); + box-shadow: 0 8rpx 24rpx rgba(122, 74, 43, 0.06); +} +.picker-field { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 24rpx; + padding: 24rpx 20rpx; + border: 1rpx solid #eadfce; + border-radius: var(--brand-radius-control); + background: var(--brand-color-surface); +} +.label { + color: var(--brand-color-text); + font-size: 28rpx; + font-weight: 600; +} +.required { + color: var(--brand-color-primary); +} +.picker-value { + color: var(--brand-color-muted); + font-size: 28rpx; +} diff --git a/apps/miniapp/pages/offering/detail.js b/apps/miniapp/pages/offering/detail.js index dafc987..d8e0648 100644 --- a/apps/miniapp/pages/offering/detail.js +++ b/apps/miniapp/pages/offering/detail.js @@ -7,6 +7,19 @@ Page({ .catch(() => this.setData({ loading: false, error: "详情加载失败" })); }, submit() { + const cta = this.data.item?.cta || {}; + if (cta.type === "inquiry") { + const formId = cta.config?.formId; + return wx.navigateTo({ + url: "/pages/inquiry/index" + (formId ? "?formId=" + encodeURIComponent(formId) : ""), + }); + } + if (cta.type === "external-link") { + return wx.showToast({ title: "请在支持外链的环境打开", icon: "none" }); + } + if (cta.type === "contact") { + return wx.showToast({ title: "请从品牌主页查看联系方式", icon: "none" }); + } wx.navigateTo({ url: "/pages/booking/index?serviceId=" + encodeURIComponent(this.data.item?.id || ""), }); diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts index 1c41a23..dafaa84 100644 --- a/packages/api-client/src/index.ts +++ b/packages/api-client/src/index.ts @@ -152,6 +152,13 @@ export interface InquiryForm { isEnabled: boolean; fieldsSnapshot: unknown[]; } +export interface PublicWorkspace { + brand: BrandProfile | null; + modules: BrandModule[]; + fields: BrandFieldDefinition[]; + offerings: Offering[]; + inquiryForm: InquiryForm | null; +} export interface Offering { id: string; brandId?: string; @@ -220,6 +227,21 @@ export class ApiClient { listServices(): Promise { return this.request("/public/services"); } + getPublicWorkspace(): Promise { + return this.request("/public/workspace"); + } + getPublicInquiryForm(id: string): Promise { + return this.request(`/public/inquiry-forms/${encodeURIComponent(id)}`); + } + createCustomerInquirySubmission( + formId: string, + values: Record, + ): Promise { + return this.request("/customer/inquiry-submissions", { + method: "POST", + body: { formId, values }, + }); + } createCustomerSession(code: string): Promise<{ token: string }> { return this.request("/customer/session/wechat", { method: "POST", body: { code } }); }