fix: 修复模板页面跳转并移除无入口的下单页

新增运行时 openPage/takePageQuery,tabBar 页自动使用 switchTab 并传递参数
- 编译器写入 tabPages,并拒绝 navigateTo/redirectTo 到 tabBar 页或 switchTab 带参数
- 阿成首页、套餐、出摊、主理人、详情、记录、成功页跳转统一改用 openPage
- 套餐筛选改用后台业务提供项分类;详情跳咨询时携带业务提供项
- 移除 capability-booking:小程序无入口且依赖已删除的 /public/brand,需求由咨询表单覆盖"
This commit is contained in:
que01 committed 2026-09-27 10:10:23 +08:00
1 parent a97cc860cf
commit 55989a5dfe
29 files changed
+353 -119

No files matched your search

@@ -1,31 +1,7 @@
const { loadWorkspaceWithFallback } = require("../../utils/runtime-workspace");
const { request, customerRequest, customerTokenKey } = require("../../utils/request");
const { takePageQuery } = require("../../utils/navigation");
const typeOptions = [
"日常留餐",
"宿舍开黑餐",
"社团 / 班级活动",
"生日聚会",
"考试周加餐",
"其他需求",
];
const peopleOptions = [
"1 人(单点)",
"2-4 人(寝室小聚)",
"5-10 人(部门小聚)",
"10-30 人(社团活动)",
"30 人以上(大型活动)",
];
const budgetOptions = [
"15 元左右 / 人(实惠)",
"18-22 元 / 人(荤素双拼)",
"25 元以上 / 人(高规格定制)",
];
const deliveryOptions = [
"摊位自取(报手机尾号即拿)",
"送至宿舍楼下(满 3 份)",
"送至指定教室 / 场地",
];
const labels = {
new: "待处理",
reviewing: "沟通中",
@@ -35,50 +11,69 @@ const labels = {
closed: "已关闭",
};
/** 按提交时的表单快照把记录还原成「标签:值」,后台以后改字段,历史记录仍然可读。 */
function summarize(item) {
const fields = Array.isArray(item.fieldsSnapshot) ? item.fieldsSnapshot : [];
const values = item.values || {};
return fields
.filter((field) => values[field.key] !== undefined && values[field.key] !== "")
.map((field) => ({
key: field.key,
label: field.label || field.key,
value: values[field.key],
}));
}
Page({
data: {
subView: "form",
records: [],
typeOptions,
peopleOptions,
budgetOptions,
deliveryOptions,
peopleIndex: 1,
budgetIndex: 1,
deliveryIndex: 0,
values: {
type: "日常留餐",
people: peopleOptions[1],
budget: budgetOptions[1],
delivery: deliveryOptions[0],
},
// 字段全部来自后台已发布的咨询表单,模板只负责呈现。
fields: [],
values: {},
formId: "",
submitting: false,
formError: "",
},
onLoad(options) {
this.offeringId = options.offeringId || "";
loadWorkspaceWithFallback()
.then((workspace) => {
const form =
(workspace.inquiryForms || []).find((item) => item.targetId === options.offeringId) ||
(workspace.inquiryForms || []).find((item) => item.target === "brand") ||
workspace.inquiryForms?.[0];
this.setData({ formId: form?.key || form?.id || "" });
this.forms = workspace.inquiryForms || [];
this.selectForm();
})
.catch(() => {});
.catch((error) => this.setData({ formError: error.message }));
},
/** 按目标业务提供项选择表单;没有专属表单时回退到品牌表单。 */
selectForm() {
const forms = this.forms || [];
const form =
(this.offeringId && forms.find((item) => item.targetId === this.offeringId)) ||
forms.find((item) => item.target === "brand") ||
forms[0];
const formId = form?.key || form?.id || "";
if (formId !== this.data.formId)
this.setData({ formId, fields: form?.fields || [], values: {} });
},
onShow() {
// 本页是 tabBar 页,从详情页进入时参数经 openPage 暂存,而不是通过 onLoad 传入。
const query = takePageQuery("pages/inquiry/index");
if (query.offeringId) {
this.offeringId = query.offeringId;
this.setData({ subView: "form" });
if (this.forms) this.selectForm();
}
this.loadRecords();
},
loadRecords() {
if (!wx.getStorageSync(customerTokenKey())) return;
customerRequest("/customer/inquiry-submissions")
.then((items) =>
this.setData({
records: (items || []).map((item) => ({
...item,
type: item.inquiryForm?.name || item.values?.type || "品牌咨询",
people: item.values?.people || "",
time: item.values?.date || "",
delivery: item.values?.delivery || "",
remark: item.values?.remark || "",
title: item.inquiryForm?.name || "品牌咨询",
summary: summarize(item),
status: labels[item.status] || item.status,
replyNote: item.replyNote,
createdAt: new Date(item.createdAt).toLocaleDateString("zh-CN"),
@@ -93,32 +88,20 @@ Page({
switchToForm() {
this.setData({ subView: "form" });
},
chooseType(e) {
this.setData({ "values.type": e.currentTarget.dataset.value });
},
choosePeople(e) {
const index = Number(e.detail.value);
this.setData({ peopleIndex: index, "values.people": peopleOptions[index] });
},
chooseBudget(e) {
const index = Number(e.detail.value);
this.setData({ budgetIndex: index, "values.budget": budgetOptions[index] });
},
chooseDelivery(e) {
const index = Number(e.detail.value);
this.setData({ deliveryIndex: index, "values.delivery": deliveryOptions[index] });
},
chooseDate(e) {
this.setData({ "values.date": e.detail.value });
choose(e) {
const field = this.data.fields.find((item) => item.key === e.currentTarget.dataset.key);
const option = field?.options?.[Number(e.detail.value)];
if (option) this.setData({ ["values." + field.key]: option.value });
},
input(e) {
this.setData({ ["values." + e.currentTarget.dataset.key]: e.detail.value });
},
submit() {
const { values, formId } = this.data;
if (!values.phone)
return this.setData({ formError: "请填写手机号或微信号,以便阿成加您发排菜菜单" });
if (!values.date) return this.setData({ formError: "请选择期望用餐日期" });
const { values, formId, fields } = this.data;
const missing = fields.find(
(field) => field.required && (values[field.key] === undefined || values[field.key] === ""),
);
if (missing) return this.setData({ formError: "请填写" + missing.label });
if (!formId) return this.setData({ formError: "咨询表单暂不可用,请稍后重试" });
this.setData({ submitting: true, formError: "" });
const send = () =>
@@ -128,7 +111,7 @@ Page({
}).then((result) => {
wx.setStorageSync("latestInquirySubmission", result);
this.setData({ submitting: false, subView: "history" });
this.onShow();
this.loadRecords();
wx.showToast({ title: "已提交,阿成会尽快联系你", icon: "none" });
});
const fail = (error) =>
@@ -1,5 +1,32 @@
<view class="page booking-page">
<view class="sub-tabs"><view class="sub-tab {{subView === 'form' ? 'active' : ''}}" data-view="form" bindtap="switchView">▤ 新建咨询 / 预订</view><view class="sub-tab {{subView === 'history' ? 'active' : ''}}" data-view="history" bindtap="switchView">▣ 我的咨询记录 ({{records.length}})</view></view>
<block wx:if="{{subView === 'form'}}"><view class="form-card"><text class="form-title">定制 / 预留需求登记</text><text class="form-desc">告诉阿成时间与人数,阿成量身帮你们排菜(免收预约定金)</text><view class="field"><text class="label">1. 咨询类型 <b>*</b></text><view class="type-grid"><view wx:for="{{typeOptions}}" wx:key="*this" class="type-option {{values.type === item ? 'selected' : ''}}" data-value="{{item}}" bindtap="chooseType">{{item}}</view></view></view><view class="two-col"><view class="field"><text class="label">预计用餐人数 <b>*</b></text><picker range="{{peopleOptions}}" value="{{peopleIndex}}" bindchange="choosePeople"><view class="picker">{{values.people || '请选择人数'}}</view></picker></view><view class="field"><text class="label">期望用餐时间 <b>*</b></text><picker mode="date" value="{{values.date}}" bindchange="chooseDate"><view class="picker">{{values.date || '请选择日期'}}</view></picker></view></view><view class="two-col"><view class="field"><text class="label">人均预算期望</text><picker range="{{budgetOptions}}" value="{{budgetIndex}}" bindchange="chooseBudget"><view class="picker">{{values.budget || '请选择预算'}}</view></picker></view><view class="field"><text class="label">取餐 / 配送偏好</text><picker range="{{deliveryOptions}}" value="{{deliveryIndex}}" bindchange="chooseDelivery"><view class="picker">{{values.delivery || '请选择方式'}}</view></picker></view></view><view class="field"><text class="label">预留餐品 / 口味偏好 / 忌口备注</text><textarea value="{{values.remark}}" data-key="remark" bindinput="input" placeholder="例:现炒牛肉饭 1 份,微辣多浇卤汁,不要香菜;或活动特殊要求" /></view><view class="field"><text class="label">联系手机或微信号 <b>*</b></text><input value="{{values.phone}}" data-key="phone" bindinput="input" placeholder="阿成将第一时间加微信发排菜明细与确认" /></view><view wx:if="{{formError}}" class="error">! {{formError}}</view><view class="promise">◷ <text>承诺:阿成将在 15~30 分钟内主动加微信沟通,未成单绝不骚扰。</text></view><button class="submit" loading="{{submitting}}" bindtap="submit">➤ 立即提交咨询(免收定金)</button></view></block>
<block wx:else><view wx:if="{{!records.length}}" class="empty"><text class="empty-icon">▣</text><text class="empty-title">暂无咨询记录</text><text>快向阿成提交一份预订需求吧~</text><button bindtap="switchToForm">新建咨询</button></view><view wx:else class="history-list"><view wx:for="{{records}}" wx:key="id" class="history-card"><view class="history-head"><text class="record-id">单号 #{{item.id}}</text><text class="record-status">{{item.status}}</text></view><text class="history-title">{{item.type}}({{item.people}})</text><text>◷ 时间:{{item.time || item.createdAt}}</text><text>⌖ 配送 / 取餐:{{item.delivery || '待确认'}}</text><text>备注:{{item.remark || item.flavor || '无'}}</text><view wx:if="{{item.replyNote}}" class="reply"><b>阿成微信留言:</b>{{item.replyNote}}</view><view class="history-foot">提交时间:{{item.createdAt}}<text>如有修改可随时微信留言</text></view></view><text class="history-note">仅展示近 30 天内的微信预约咨询历史</text></view></block>
<block wx:if="{{subView === 'form'}}">
<view class="form-card">
<text class="form-title">定制 / 预留需求登记</text>
<text class="form-desc">告诉阿成时间与人数,阿成量身帮你们排菜(免收预约定金)</text>
<view wx:for="{{fields}}" wx:key="key" class="field">
<text class="label">{{item.label}} <b wx:if="{{item.required}}">*</b></text>
<picker wx:if="{{item.type === 'select' || item.type === 'radio'}}" range="{{item.options}}" range-key="label" data-key="{{item.key}}" bindchange="choose"><view class="picker">{{values[item.key] || '请选择' + item.label}}</view></picker>
<picker wx:elif="{{item.type === 'date'}}" mode="date" value="{{values[item.key]}}" data-key="{{item.key}}" bindchange="input"><view class="picker">{{values[item.key] || '请选择日期'}}</view></picker>
<textarea wx:elif="{{item.type === 'textarea'}}" value="{{values[item.key]}}" data-key="{{item.key}}" bindinput="input" placeholder="{{item.placeholder || '请填写' + item.label}}" />
<input wx:else type="{{item.type === 'number' ? 'number' : 'text'}}" value="{{values[item.key]}}" data-key="{{item.key}}" bindinput="input" placeholder="{{item.placeholder || '请填写' + item.label}}" />
</view>
<view wx:if="{{formError}}" class="error">! {{formError}}</view>
<view class="promise">◷ <text>承诺:阿成将在 15~30 分钟内主动加微信沟通,未成单绝不骚扰。</text></view>
<button class="submit" loading="{{submitting}}" bindtap="submit">➤ 立即提交咨询(免收定金)</button>
</view>
</block>
<block wx:else>
<view wx:if="{{!records.length}}" class="empty"><text class="empty-icon">▣</text><text class="empty-title">暂无咨询记录</text><text>快向阿成提交一份预订需求吧~</text><button bindtap="switchToForm">新建咨询</button></view>
<view wx:else class="history-list">
<view wx:for="{{records}}" wx:key="id" class="history-card">
<view class="history-head"><text class="record-id">单号 #{{item.id}}</text><text class="record-status">{{item.status}}</text></view>
<text class="history-title">{{item.title}}</text>
<text wx:for="{{item.summary}}" wx:for-item="line" wx:key="key">{{line.label}}:{{line.value}}</text>
<view wx:if="{{item.replyNote}}" class="reply"><b>阿成微信留言:</b>{{item.replyNote}}</view>
<view class="history-foot">提交时间:{{item.createdAt}}<text>如有修改可随时微信留言</text></view>
</view>
<text class="history-note">仅展示近 30 天内的微信预约咨询历史</text>
</view>
</block>
</view>