diff --git a/apps/miniapp/assets/brand/brand-texture.jpg b/apps/miniapp/assets/brand/brand-texture.jpg new file mode 100644 index 0000000..4d1b40c Binary files /dev/null and b/apps/miniapp/assets/brand/brand-texture.jpg differ diff --git a/apps/miniapp/assets/brand/home-hero.jpg b/apps/miniapp/assets/brand/home-hero.jpg new file mode 100644 index 0000000..f675c34 Binary files /dev/null and b/apps/miniapp/assets/brand/home-hero.jpg differ diff --git a/apps/miniapp/assets/brand/service-chicken.jpg b/apps/miniapp/assets/brand/service-chicken.jpg new file mode 100644 index 0000000..97867ba Binary files /dev/null and b/apps/miniapp/assets/brand/service-chicken.jpg differ diff --git a/apps/miniapp/assets/brand/service-private-chef.jpg b/apps/miniapp/assets/brand/service-private-chef.jpg new file mode 100644 index 0000000..a18262a Binary files /dev/null and b/apps/miniapp/assets/brand/service-private-chef.jpg differ diff --git a/apps/miniapp/assets/brand/service-red-braised-pork.jpg b/apps/miniapp/assets/brand/service-red-braised-pork.jpg new file mode 100644 index 0000000..7cf5000 Binary files /dev/null and b/apps/miniapp/assets/brand/service-red-braised-pork.jpg differ diff --git a/apps/miniapp/pages/index/index.js b/apps/miniapp/pages/index/index.js index ec5e86f..c993657 100644 --- a/apps/miniapp/pages/index/index.js +++ b/apps/miniapp/pages/index/index.js @@ -11,7 +11,7 @@ Page({ getApp().globalData.brand = brand; wx.setNavigationBarTitle({ title: brand.name || '个人品牌' }); const copy = getTemplate(brand.templateKey); - this.setData({ brand, services, copy, loading: false }); + this.setData({ brand: { ...brand, coverUrl: brand.coverUrl || '/assets/brand/home-hero.jpg' }, services, copy, loading: false }); }).catch(() => this.setData({ loading: false, error: '暂时无法加载内容' })); }, selectService(event) { wx.navigateTo({ url: '/pages/booking/index?serviceId=' + encodeURIComponent(event.currentTarget.dataset.id) }); }, diff --git a/apps/miniapp/pages/services/index.js b/apps/miniapp/pages/services/index.js index 5cfdd9b..6f056dd 100644 --- a/apps/miniapp/pages/services/index.js +++ b/apps/miniapp/pages/services/index.js @@ -1,3 +1,3 @@ const { request } = require('../../utils/request'); const { getTemplate } = require('../../utils/templates'); -Page({ data: { loading: true, error: '', services: [], filtered: [], category: 'package', labels: {} }, onLoad() { Promise.all([request('/public/services'), request('/public/brand')]).then(([services, brand]) => { const labels = getTemplate(brand.templateKey); this.setData({ services, labels, filtered: services.filter((item) => item.priceAmount !== null), loading: false }); }).catch(() => this.setData({ loading: false, error: '服务加载失败' })); }, switchCategory(e) { const category = e.currentTarget.dataset.category; const filtered = category === 'package' ? this.data.services.filter((item) => item.priceAmount !== null) : this.data.services.filter((item) => item.priceAmount === null); this.setData({ category, filtered }); }, book(e) { wx.navigateTo({ url: '/pages/booking/index?serviceId=' + encodeURIComponent(e.currentTarget.dataset.id) }); } }); +Page({ data: { loading: true, error: '', services: [], filtered: [], category: 'package', labels: {} }, onLoad() { Promise.all([request('/public/services'), request('/public/brand')]).then(([services, brand]) => { const labels = getTemplate(brand.templateKey); const mapped = services.map((item) => ({ ...item, coverUrl: item.coverUrl || (item.name.includes('红烧肉') ? '/assets/brand/service-red-braised-pork.jpg' : item.name.includes('小炒鸡') ? '/assets/brand/service-chicken.jpg' : item.name.includes('私厨') ? '/assets/brand/service-private-chef.jpg' : '') })); this.setData({ services: mapped, labels, filtered: mapped.filter((item) => item.priceAmount !== null), loading: false }); }).catch(() => this.setData({ loading: false, error: '服务加载失败' })); }, switchCategory(e) { const category = e.currentTarget.dataset.category; const filtered = category === 'package' ? this.data.services.filter((item) => item.priceAmount !== null) : this.data.services.filter((item) => item.priceAmount === null); this.setData({ category, filtered }); }, book(e) { wx.navigateTo({ url: '/pages/booking/index?serviceId=' + encodeURIComponent(e.currentTarget.dataset.id) }); } });