diff --git a/apps/miniapp/app.json b/apps/miniapp/app.json index f3af500..ce611f7 100644 --- a/apps/miniapp/app.json +++ b/apps/miniapp/app.json @@ -13,9 +13,6 @@ "navigationBarTextStyle": "black", "backgroundColor": "#FBF7F1" }, - "usingComponents": { - "brand-error": "/components/ui/brand-error/brand-error" - }, "tabBar": { "color": "#7A4A2B", "selectedColor": "#B54A2C", diff --git a/apps/miniapp/components/ui/brand-error/brand-error.js b/apps/miniapp/components/ui/brand-error/brand-error.js deleted file mode 100644 index 27ab1b4..0000000 --- a/apps/miniapp/components/ui/brand-error/brand-error.js +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 67f8e03..0000000 --- a/apps/miniapp/components/ui/brand-error/brand-error.json +++ /dev/null @@ -1 +0,0 @@ -{ "component": true } diff --git a/apps/miniapp/components/ui/brand-error/brand-error.wxml b/apps/miniapp/components/ui/brand-error/brand-error.wxml deleted file mode 100644 index aa4d745..0000000 --- a/apps/miniapp/components/ui/brand-error/brand-error.wxml +++ /dev/null @@ -1 +0,0 @@ -{{message}} diff --git a/apps/miniapp/components/ui/brand-error/brand-error.wxss b/apps/miniapp/components/ui/brand-error/brand-error.wxss deleted file mode 100644 index 362b391..0000000 --- a/apps/miniapp/components/ui/brand-error/brand-error.wxss +++ /dev/null @@ -1,20 +0,0 @@ -.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/pages/bookings/index.json b/apps/miniapp/pages/bookings/index.json index 1177f3b..95d705e 100644 --- a/apps/miniapp/pages/bookings/index.json +++ b/apps/miniapp/pages/bookings/index.json @@ -4,7 +4,6 @@ "navigationBarTextStyle": "black", "usingComponents": { "brand-loading": "/components/ui/brand-loading/brand-loading", - "brand-empty": "/components/ui/brand-empty/brand-empty", - "brand-error": "/components/ui/brand-error/brand-error" + "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 b3d1aeb..896d38e 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/bookings/index.wxss b/apps/miniapp/pages/bookings/index.wxss index ccc58c1..d0f6e51 100644 --- a/apps/miniapp/pages/bookings/index.wxss +++ b/apps/miniapp/pages/bookings/index.wxss @@ -156,3 +156,15 @@ font-size: 56rpx; line-height: 1; } +.inline-error { + padding: 72rpx 32rpx; + display: flex; + flex-direction: column; + align-items: center; + color: var(--brand-color-muted); +} +.inline-error button { + margin-top: 24rpx; + color: var(--brand-color-primary); + background: var(--brand-color-subtle); +} diff --git a/apps/miniapp/pages/inquiry/index.json b/apps/miniapp/pages/inquiry/index.json index faa4496..76d5a08 100644 --- a/apps/miniapp/pages/inquiry/index.json +++ b/apps/miniapp/pages/inquiry/index.json @@ -6,7 +6,6 @@ "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" + "brand-empty": "/components/ui/brand-empty/brand-empty" } } diff --git a/apps/miniapp/pages/inquiry/index.wxml b/apps/miniapp/pages/inquiry/index.wxml index 922c5f0..cdab4d7 100644 --- a/apps/miniapp/pages/inquiry/index.wxml +++ b/apps/miniapp/pages/inquiry/index.wxml @@ -1 +1 @@ -{{form.name}}告诉我你的想法,我会尽快与你联系{{field.label}} *{{values[field.key] || '请选择'}}{{field.label}} *{{values[field.key] || '请选择日期'}}{{submitting ? '提交中...' : '提交咨询'}} +{{error}}{{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 index 9bc1c51..edcb167 100644 --- a/apps/miniapp/pages/inquiry/index.wxss +++ b/apps/miniapp/pages/inquiry/index.wxss @@ -48,3 +48,15 @@ color: var(--brand-color-muted); font-size: 28rpx; } +.inline-error { + padding: 72rpx 32rpx; + display: flex; + flex-direction: column; + align-items: center; + color: var(--brand-color-muted); +} +.inline-error button { + margin-top: 24rpx; + color: var(--brand-color-primary); + background: var(--brand-color-subtle); +} diff --git a/apps/miniapp/pages/services/index.json b/apps/miniapp/pages/services/index.json index 6a77718..5196c18 100644 --- a/apps/miniapp/pages/services/index.json +++ b/apps/miniapp/pages/services/index.json @@ -4,7 +4,6 @@ "navigationBarTextStyle": "black", "usingComponents": { "brand-loading": "/components/ui/brand-loading/brand-loading", - "brand-empty": "/components/ui/brand-empty/brand-empty", - "brand-error": "/components/ui/brand-error/brand-error" + "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 c5847c9..f2741fa 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}}{{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/pages/services/index.wxss b/apps/miniapp/pages/services/index.wxss index 3895610..4fe1e85 100644 --- a/apps/miniapp/pages/services/index.wxss +++ b/apps/miniapp/pages/services/index.wxss @@ -159,3 +159,15 @@ .chef:after { border-color: rgba(181, 74, 44, 0.12); } +.inline-error { + padding: 72rpx 32rpx; + display: flex; + flex-direction: column; + align-items: center; + color: var(--brand-color-muted); +} +.inline-error button { + margin-top: 24rpx; + color: var(--brand-color-primary); + background: var(--brand-color-subtle); +}