diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue index c2227c8..713ceb4 100644 --- a/components/base/tabbar.vue +++ b/components/base/tabbar.vue @@ -48,6 +48,13 @@ "title": "产品", key: 'product', }, + { + "selectedIconPath": "/static/image/tabbar/cart-active.png", + "iconPath": "/static/image/tabbar/cart.png", + "pagePath": "/pages/index/cart", + "title": "购物车", + key: 'cart', + }, { "selectedIconPath": "/static/image/tabbar/user-center-active.png", "iconPath": "/static/image/tabbar/user-center.png", @@ -90,6 +97,7 @@ bottom: 0; left: 0; color: #BCBCBC; + border-top: 2rpx solid #F1F1F1; .tabbar-item { flex: 1; diff --git a/components/cart/productCard.vue b/components/cart/productCard.vue new file mode 100644 index 0000000..1ed53a4 --- /dev/null +++ b/components/cart/productCard.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/components/product/courseRecommendView.vue b/components/product/courseRecommendView.vue index 140410e..d16344f 100644 --- a/components/product/courseRecommendView.vue +++ b/components/product/courseRecommendView.vue @@ -65,34 +65,34 @@ { id: '001', url: '/pages_order/static/product/course-1.png', - productName: '情绪管理课程', + name: '情绪管理课程', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '002', url: '/pages_order/static/product/course-2.png', - productName: '我认知与成长课程', + name: '我认知与成长课程', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '003', url: '/pages_order/static/product/course-3.png', - productName: '情绪管理课程', + name: '情绪管理课程', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '004', url: '/pages_order/static/product/course-4.png', - productName: '我认知与成长课程', + name: '我认知与成长课程', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, ] }, diff --git a/components/product/detectCustomView.vue b/components/product/detectCustomView.vue index 8d262e4..80880ea 100644 --- a/components/product/detectCustomView.vue +++ b/components/product/detectCustomView.vue @@ -28,26 +28,26 @@ { id: '001', url: '/pages_order/static/product/detect-3.png', - productName: '腹部超声', + name: '腹部超声', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '002', url: '/pages_order/static/product/detect-4.png', - productName: '血常规', + name: '血常规', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '003', url: '/pages_order/static/product/detect-3.png', - productName: '腹部超声', + name: '腹部超声', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, ] }, diff --git a/components/product/detectRecommendSwiper.vue b/components/product/detectRecommendSwiper.vue index 6adc6f4..117f746 100644 --- a/components/product/detectRecommendSwiper.vue +++ b/components/product/detectRecommendSwiper.vue @@ -48,23 +48,23 @@ { id: '001', url: '/pages_order/static/product/detect-1.png', - productName: '心电图检查', - productPriceVal: 688.00, - productPriceBef: 1664, + name: '心电图检查', + price: 688.00, + originalPrice: 1664, }, { id: '002', url: '/pages_order/static/product/detect-2.png', - productName: '甲状腺功能检查', - productPriceVal: 688.00, - productPriceBef: 1664, + name: '甲状腺功能检查', + price: 688.00, + originalPrice: 1664, }, { id: '003', url: '/pages_order/static/product/detect-1.png', - productName: '心电图检查', - productPriceVal: 688.00, - productPriceBef: 1664, + name: '心电图检查', + price: 688.00, + originalPrice: 1664, }, ] }, diff --git a/components/product/nutrientCustomView.vue b/components/product/nutrientCustomView.vue index 2ac25ed..29a1757 100644 --- a/components/product/nutrientCustomView.vue +++ b/components/product/nutrientCustomView.vue @@ -99,26 +99,26 @@ { id: '001', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '002', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '003', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, ] }, diff --git a/components/product/nutrientRecommendSwiper.vue b/components/product/nutrientRecommendSwiper.vue index c390800..fbe8b4f 100644 --- a/components/product/nutrientRecommendSwiper.vue +++ b/components/product/nutrientRecommendSwiper.vue @@ -45,26 +45,26 @@ { id: '001', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '002', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, { id: '003', url: '/pages_order/static/index/recommend-pic.png', - productName: '月度装定制营养包', + name: '月度装定制营养包', sales: 24770, - productPriceVal: 688.00, - productPriceBef: 1664, + price: 688.00, + originalPrice: 1664, }, ] }, diff --git a/components/product/productCard.vue b/components/product/productCard.vue index c5b4f23..911206d 100644 --- a/components/product/productCard.vue +++ b/components/product/productCard.vue @@ -1,20 +1,20 @@