diff --git a/supplied-h5/src/assets/joyful-selection/hero-bg.png b/supplied-h5/src/assets/joyful-selection/hero-bg.png new file mode 100644 index 0000000..6e51483 Binary files /dev/null and b/supplied-h5/src/assets/joyful-selection/hero-bg.png differ diff --git a/supplied-h5/src/assets/joyful-selection/products/bluetooth-earbuds.png b/supplied-h5/src/assets/joyful-selection/products/bluetooth-earbuds.png new file mode 100644 index 0000000..5dfe379 Binary files /dev/null and b/supplied-h5/src/assets/joyful-selection/products/bluetooth-earbuds.png differ diff --git a/supplied-h5/src/assets/joyful-selection/products/gift-box.png b/supplied-h5/src/assets/joyful-selection/products/gift-box.png new file mode 100644 index 0000000..44e8d3e Binary files /dev/null and b/supplied-h5/src/assets/joyful-selection/products/gift-box.png differ diff --git a/supplied-h5/src/assets/joyful-selection/products/mini-oven.png b/supplied-h5/src/assets/joyful-selection/products/mini-oven.png new file mode 100644 index 0000000..d5feefa Binary files /dev/null and b/supplied-h5/src/assets/joyful-selection/products/mini-oven.png differ diff --git a/supplied-h5/src/assets/joyful-selection/products/smart-speaker.png b/supplied-h5/src/assets/joyful-selection/products/smart-speaker.png new file mode 100644 index 0000000..62a7793 Binary files /dev/null and b/supplied-h5/src/assets/joyful-selection/products/smart-speaker.png differ diff --git a/supplied-h5/src/router/index.js b/supplied-h5/src/router/index.js index 409d9ec..5809428 100644 --- a/supplied-h5/src/router/index.js +++ b/supplied-h5/src/router/index.js @@ -1,6 +1,7 @@ import Vue from 'vue' import Router from 'vue-router' import SupplierHome from '@/view/index.vue' +import JoyfulSelectionLayout from '@/view/joyful-selection/layout.vue' import JoyfulSelectionHome from '@/view/joyful-selection/index.vue' import JoyfulSelectionProductList from '@/view/joyful-selection/products/index.vue' import JoyfulSelectionProductDetail from '@/view/joyful-selection/product-detail/index.vue' @@ -23,18 +24,24 @@ Vue.use(Router) export default new Router({ routes: [ { path: '/', component: SupplierHome }, - { path: '/joyful-selection', component: JoyfulSelectionHome }, - { path: '/joyful-selection/products', component: JoyfulSelectionProductList }, - { path: '/joyful-selection/product-detail', component: JoyfulSelectionProductDetail }, - { path: '/joyful-selection/cart', component: JoyfulSelectionCart }, - { path: '/joyful-selection/cart/edit', component: JoyfulSelectionCartEdit }, - { path: '/joyful-selection/checkout', component: JoyfulSelectionCheckout }, - { path: '/joyful-selection/payment', component: JoyfulSelectionPayment }, - { path: '/joyful-selection/payment-confirm', component: JoyfulSelectionPaymentConfirm }, - { path: '/joyful-selection/payment-success', component: JoyfulSelectionPaymentSuccess }, - { path: '/joyful-selection/orders', component: JoyfulSelectionOrders }, - { path: '/joyful-selection/profile', component: JoyfulSelectionProfile }, - { path: '/joyful-selection/points', component: JoyfulSelectionPoints }, + { + path: '/joyful-selection', + component: JoyfulSelectionLayout, + children: [ + { path: '', component: JoyfulSelectionHome }, + { path: 'products', component: JoyfulSelectionProductList }, + { path: 'product-detail', component: JoyfulSelectionProductDetail }, + { path: 'cart', component: JoyfulSelectionCart }, + { path: 'cart/edit', component: JoyfulSelectionCartEdit }, + { path: 'checkout', component: JoyfulSelectionCheckout }, + { path: 'payment', component: JoyfulSelectionPayment }, + { path: 'payment-confirm', component: JoyfulSelectionPaymentConfirm }, + { path: 'payment-success', component: JoyfulSelectionPaymentSuccess }, + { path: 'orders', component: JoyfulSelectionOrders }, + { path: 'profile', component: JoyfulSelectionProfile }, + { path: 'points', component: JoyfulSelectionPoints } + ] + }, { path: '/home-living', component: HomeLiving }, { path: '/happy-shopping', component: HappyShopping }, { path: '/fresh-fruit', component: FreshFruit }, diff --git a/supplied-h5/src/view/joyful-selection/cart/checkout/index.vue b/supplied-h5/src/view/joyful-selection/cart/checkout/index.vue index 70405ea..32b44e3 100644 --- a/supplied-h5/src/view/joyful-selection/cart/checkout/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/checkout/index.vue @@ -1,3 +1,50 @@ - - - + + + + + diff --git a/supplied-h5/src/view/joyful-selection/cart/edit/index.vue b/supplied-h5/src/view/joyful-selection/cart/edit/index.vue index b63d2a4..1aad777 100644 --- a/supplied-h5/src/view/joyful-selection/cart/edit/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/edit/index.vue @@ -1,3 +1,42 @@ - - - + + + + + diff --git a/supplied-h5/src/view/joyful-selection/cart/index.vue b/supplied-h5/src/view/joyful-selection/cart/index.vue index 75e1815..d8f03d9 100644 --- a/supplied-h5/src/view/joyful-selection/cart/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/index.vue @@ -1,3 +1,42 @@ - - - + + + + + diff --git a/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue b/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue index 78b5bc1..766a75c 100644 --- a/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/payment-confirm/index.vue @@ -1,3 +1,3 @@ - + diff --git a/supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue b/supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue index 3eb86d9..c358370 100644 --- a/supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/payment-success/index.vue @@ -1,3 +1,3 @@ - + diff --git a/supplied-h5/src/view/joyful-selection/cart/payment/index.vue b/supplied-h5/src/view/joyful-selection/cart/payment/index.vue index b918c62..709950a 100644 --- a/supplied-h5/src/view/joyful-selection/cart/payment/index.vue +++ b/supplied-h5/src/view/joyful-selection/cart/payment/index.vue @@ -1,3 +1,3 @@ - + diff --git a/supplied-h5/src/view/joyful-selection/index.vue b/supplied-h5/src/view/joyful-selection/index.vue index 9c15478..af349dc 100644 --- a/supplied-h5/src/view/joyful-selection/index.vue +++ b/supplied-h5/src/view/joyful-selection/index.vue @@ -6,23 +6,23 @@

品质生活 悦享好物

精选好物,悦享品质生活

- 立即抢购 + 立即选购
-
-
今日特惠更多 ›
+
限时秒杀更多 ›
@@ -45,26 +45,17 @@
- - 首页 - 分类 - 购物车 - 我的 - + + diff --git a/supplied-h5/src/view/joyful-selection/product-data.js b/supplied-h5/src/view/joyful-selection/product-data.js new file mode 100644 index 0000000..1c3badf --- /dev/null +++ b/supplied-h5/src/view/joyful-selection/product-data.js @@ -0,0 +1,53 @@ +import bluetoothEarbudsImage from '@/assets/joyful-selection/products/bluetooth-earbuds.png' +import miniOvenImage from '@/assets/joyful-selection/products/mini-oven.png' +import smartSpeakerImage from '@/assets/joyful-selection/products/smart-speaker.png' +import giftBoxImage from '@/assets/joyful-selection/products/gift-box.png' + +export const joyfulProducts = [ + { + id: 'bluetooth-earbuds', + name: '小米蓝牙耳机 Air2 SE', + desc: '轻盈半入耳,通勤运动都好听', + detail: '舒适半入耳设计,配合便携充电盒,日常通勤、运动和在线会议都能保持清晰稳定的聆听体验。', + price: '69.90', + originPrice: '99.90', + category: '数码家电', + tag: '积分兑换', + image: bluetoothEarbudsImage + }, + { + id: 'mini-oven', + name: '奶油白家用迷你烤箱', + desc: '小巧不占地,早餐烘焙好帮手', + detail: '紧凑台式机身搭配可视化炉门,适合烤吐司、蛋挞和小份点心,让厨房日常更轻松。', + price: '129.00', + originPrice: '169.00', + category: '居家生活', + tag: '新品上架', + image: miniOvenImage + }, + { + id: 'smart-speaker', + name: '黑曜智能音箱 Pro', + desc: '语音唤醒,沉浸听感', + detail: '圆柱一体式声学结构,支持语音互动和日常音乐播放,适合卧室、书房与办公桌面使用。', + price: '99.00', + originPrice: '139.00', + category: '数码家电', + tag: '热门推荐', + image: smartSpeakerImage + }, + { + id: 'gift-box', + name: '橙意惊喜礼盒', + desc: '精致包装,送礼更有心意', + detail: '亮橙礼盒搭配丝带包装,适合节日福利、积分兑换礼和日常心意礼赠场景。', + price: '59.90', + originPrice: '89.90', + category: '食品饮料', + tag: '品质精选', + image: giftBoxImage + } +] + +export const getJoyfulProduct = id => joyfulProducts.find(item => item.id === id) || joyfulProducts[0] diff --git a/supplied-h5/src/view/joyful-selection/product-detail/index.vue b/supplied-h5/src/view/joyful-selection/product-detail/index.vue index 2584ca7..b445803 100644 --- a/supplied-h5/src/view/joyful-selection/product-detail/index.vue +++ b/supplied-h5/src/view/joyful-selection/product-detail/index.vue @@ -1,17 +1,20 @@ diff --git a/supplied-h5/src/view/joyful-selection/products/index.vue b/supplied-h5/src/view/joyful-selection/products/index.vue index e778016..b30fc3d 100644 --- a/supplied-h5/src/view/joyful-selection/products/index.vue +++ b/supplied-h5/src/view/joyful-selection/products/index.vue @@ -1,3 +1,319 @@ - - - + + + + + diff --git a/supplied-h5/src/view/joyful-selection/profile/index.vue b/supplied-h5/src/view/joyful-selection/profile/index.vue index 772ffba..84f39b5 100644 --- a/supplied-h5/src/view/joyful-selection/profile/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/index.vue @@ -1,3 +1,59 @@ - - - + + + + + diff --git a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue index 2b55937..065bdcc 100644 --- a/supplied-h5/src/view/joyful-selection/profile/orders/index.vue +++ b/supplied-h5/src/view/joyful-selection/profile/orders/index.vue @@ -1,3 +1,48 @@ - - - + + + + +