diff --git a/components/base/navbar.vue b/components/base/navbar.vue index e640a9e..cedeac5 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -1,7 +1,7 @@ + + + + \ No newline at end of file diff --git a/components/product/courseRecommendView.vue b/components/product/courseRecommendView.vue new file mode 100644 index 0000000..140410e --- /dev/null +++ b/components/product/courseRecommendView.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file diff --git a/components/product/detectCustomView.vue b/components/product/detectCustomView.vue new file mode 100644 index 0000000..8d262e4 --- /dev/null +++ b/components/product/detectCustomView.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/components/product/detectPackageView.vue b/components/product/detectPackageView.vue new file mode 100644 index 0000000..48a42f2 --- /dev/null +++ b/components/product/detectPackageView.vue @@ -0,0 +1,154 @@ + + + + + \ No newline at end of file diff --git a/components/product/detectRecommendSwiper.vue b/components/product/detectRecommendSwiper.vue new file mode 100644 index 0000000..6adc6f4 --- /dev/null +++ b/components/product/detectRecommendSwiper.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/components/product/nutrientCustomView.vue b/components/product/nutrientCustomView.vue new file mode 100644 index 0000000..2ac25ed --- /dev/null +++ b/components/product/nutrientCustomView.vue @@ -0,0 +1,159 @@ + + + + + \ No newline at end of file diff --git a/components/product/nutrientRecommendSwiper.vue b/components/product/nutrientRecommendSwiper.vue new file mode 100644 index 0000000..c390800 --- /dev/null +++ b/components/product/nutrientRecommendSwiper.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/components/product/productCard.vue b/components/product/productCard.vue new file mode 100644 index 0000000..c5b4f23 --- /dev/null +++ b/components/product/productCard.vue @@ -0,0 +1,136 @@ + + + + + \ No newline at end of file diff --git a/components/product/sectionHeader.vue b/components/product/sectionHeader.vue new file mode 100644 index 0000000..c610d8c --- /dev/null +++ b/components/product/sectionHeader.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/components/product/styles/tab.scss b/components/product/styles/tab.scss new file mode 100644 index 0000000..357ca74 --- /dev/null +++ b/components/product/styles/tab.scss @@ -0,0 +1,86 @@ +.search { + padding: 30rpx 32rpx 0 32rpx; + + /deep/ .uv-search__content__icon { + margin-top: 2rpx; + } +} + +.intro { + position: relative; + margin: 38rpx 32rpx 0 32rpx; + width: calc(100% - 32rpx * 2); + height: 316rpx; + background: #E5E5E5; + border-radius: 40rpx; + box-shadow: -5rpx -5rpx 10rpx 0 #FFFFFF, + 10rpx 10rpx 20rpx 0 #AAAACC80, + 4rpx 4rpx 10rpx 0 #AAAACC40, + -2rpx -2rpx 5rpx 0 #FFFFFF; + + .bg { + float: right; + width: 100%; + height: 100%; + } + + .content { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + padding: 40rpx; + box-sizing: border-box; + + .font1 { + font-size: 28rpx; + font-weight: 600; + line-height: 1.4; + font-family: PingFang SC; + color: #252545; + } + .font2 { + font-size: 36rpx; + font-weight: 600; + line-height: 1.4; + font-family: PingFang SC; + color: transparent; + background-image: linear-gradient(to right, #4B348F, #845CFA); + background-clip: text; + display: inline-block; + } + .font3 { + font-size: 24rpx; + font-weight: 400; + line-height: 1.4; + font-family: PingFang SC; + color: #252545; + } + + .btn { + margin-top: 56rpx; + display: inline-flex; + padding: 9rpx 22rpx; + font-size: 24rpx; + font-weight: 400; + font-family: PingFang SC; + line-height: 1.4; + color: #252545; + border-radius: 28rpx; + border: 2rpx solid #252545; + + &-icon { + width: 28rpx; + height: 28rpx; + margin-right: 8rpx; + } + } + + } + +} + +.section { + margin-top: 48rpx; +} diff --git a/components/product/tabCourse.vue b/components/product/tabCourse.vue new file mode 100644 index 0000000..78d3358 --- /dev/null +++ b/components/product/tabCourse.vue @@ -0,0 +1,85 @@ + + + + + \ No newline at end of file diff --git a/components/product/tabDetect.vue b/components/product/tabDetect.vue new file mode 100644 index 0000000..558afaa --- /dev/null +++ b/components/product/tabDetect.vue @@ -0,0 +1,95 @@ + + + + + \ No newline at end of file diff --git a/components/product/tabNutrient.vue b/components/product/tabNutrient.vue new file mode 100644 index 0000000..fc97ea6 --- /dev/null +++ b/components/product/tabNutrient.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/components/report/recommendTest.vue b/components/report/recommendTest.vue index 2b9569f..c7d3828 100644 --- a/components/report/recommendTest.vue +++ b/components/report/recommendTest.vue @@ -5,36 +5,18 @@ - - - - - - {{ item.productName }} - {{ `已售出${item.sales}+单` }} - - - - ¥ - {{ item.productPriceVal }} - /份 - - - {{ `¥${item.productPriceBef}/份` }} - - - - - - + @@ -96,86 +73,4 @@ grid-column-gap: 32rpx; } -.card { - font-size: 0; - height: 420rpx; - background-image: linear-gradient(#FAFAFF, #F3F3F3); - border: 2rpx solid #FFFFFF; - border-radius: 32rpx; - - &-img { - width: 100%; - height: 220rpx; - padding: 0 20rpx; - box-sizing: border-box; - - .img { - width: 100%; - height: 100%; - } - } - - &-detail { - padding: 16rpx 24rpx 0 24rpx; - - .product { - &-name { - font-family: PingFang SC; - font-weight: 600; - font-size: 28rpx; - line-height: 1.4; - color: #000000; - } - - &-sales { - margin-top: 8rpx; - font-family: PingFang SC; - font-weight: 400; - font-size: 24rpx; - line-height: 1; - color: #8B8B8B; - } - - &-price { - margin-top: 16rpx; - justify-content: space-between; - - &-val { - font-family: PingFang SC; - font-weight: 600; - font-size: 24rpx; - line-height: 1.4; - color: $uni-color; - - .highlight { - font-size: 32rpx; - margin: 0 8rpx; - } - } - - &-bef { - margin-top: 4rpx; - text-decoration: line-through; - font-family: PingFang SC; - font-weight: 400; - font-size: 24rpx; - line-height: 1; - color: #8B8B8B; - } - - .btn { - width: 56rpx; - height: 56rpx; - border-radius: 50%; - background: $uni-color; - - &-img { - width: 20rpx; - height: 20rpx; - } - } - } - } - } -} \ No newline at end of file diff --git a/pages.json b/pages.json index 9113699..1ef6b32 100644 --- a/pages.json +++ b/pages.json @@ -13,7 +13,7 @@ } }, { - "path": "pages/index/category", + "path": "pages/index/product", "style": { "navigationBarTitleText": "" } diff --git a/pages/index/product.vue b/pages/index/product.vue new file mode 100644 index 0000000..5d85dfb --- /dev/null +++ b/pages/index/product.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/pages_order/report/compare/result.vue b/pages_order/report/compare/result.vue index fbd143d..8a4cc08 100644 --- a/pages_order/report/compare/result.vue +++ b/pages_order/report/compare/result.vue @@ -243,7 +243,7 @@ background-color: $uni-bg-color; position: relative; - /deep/ .navbar__view { + /deep/ .nav-bar__view { position: fixed; top: 0; left: 0; diff --git a/pages_order/report/compare/select.vue b/pages_order/report/compare/select.vue index b4c6cb9..1c0bf02 100644 --- a/pages_order/report/compare/select.vue +++ b/pages_order/report/compare/select.vue @@ -79,7 +79,7 @@ background-color: $uni-bg-color; position: relative; - /deep/ .navbar__view { + /deep/ .nav-bar__view { position: fixed; top: 0; left: 0; diff --git a/pages_order/report/detail/index.vue b/pages_order/report/detail/index.vue index 1f71ed8..cfe3c97 100644 --- a/pages_order/report/detail/index.vue +++ b/pages_order/report/detail/index.vue @@ -187,7 +187,7 @@ background-color: $uni-bg-color; position: relative; - /deep/ .navbar__view { + /deep/ .nav-bar__view { position: fixed; top: 0; left: 0; diff --git a/pages_order/report/nutritionProgram/index.vue b/pages_order/report/nutritionProgram/index.vue index 4ebbbb0..1dfe908 100644 --- a/pages_order/report/nutritionProgram/index.vue +++ b/pages_order/report/nutritionProgram/index.vue @@ -203,7 +203,7 @@ background-color: $uni-bg-color; position: relative; - /deep/ .navbar__view { + /deep/ .nav-bar__view { position: fixed; top: 0; left: 0; diff --git a/pages_order/static/product/course-1.png b/pages_order/static/product/course-1.png new file mode 100644 index 0000000..828cbb8 Binary files /dev/null and b/pages_order/static/product/course-1.png differ diff --git a/pages_order/static/product/course-2.png b/pages_order/static/product/course-2.png new file mode 100644 index 0000000..094b193 Binary files /dev/null and b/pages_order/static/product/course-2.png differ diff --git a/pages_order/static/product/course-3.png b/pages_order/static/product/course-3.png new file mode 100644 index 0000000..f7b8c56 Binary files /dev/null and b/pages_order/static/product/course-3.png differ diff --git a/pages_order/static/product/course-4.png b/pages_order/static/product/course-4.png new file mode 100644 index 0000000..1797af8 Binary files /dev/null and b/pages_order/static/product/course-4.png differ diff --git a/pages_order/static/product/detect-1.png b/pages_order/static/product/detect-1.png new file mode 100644 index 0000000..cecf799 Binary files /dev/null and b/pages_order/static/product/detect-1.png differ diff --git a/pages_order/static/product/detect-10.png b/pages_order/static/product/detect-10.png new file mode 100644 index 0000000..323b227 Binary files /dev/null and b/pages_order/static/product/detect-10.png differ diff --git a/pages_order/static/product/detect-11.png b/pages_order/static/product/detect-11.png new file mode 100644 index 0000000..ac20d84 Binary files /dev/null and b/pages_order/static/product/detect-11.png differ diff --git a/pages_order/static/product/detect-12.png b/pages_order/static/product/detect-12.png new file mode 100644 index 0000000..347fc11 Binary files /dev/null and b/pages_order/static/product/detect-12.png differ diff --git a/pages_order/static/product/detect-13.png b/pages_order/static/product/detect-13.png new file mode 100644 index 0000000..4d5518f Binary files /dev/null and b/pages_order/static/product/detect-13.png differ diff --git a/pages_order/static/product/detect-14.png b/pages_order/static/product/detect-14.png new file mode 100644 index 0000000..7e2e666 Binary files /dev/null and b/pages_order/static/product/detect-14.png differ diff --git a/pages_order/static/product/detect-15.png b/pages_order/static/product/detect-15.png new file mode 100644 index 0000000..19806f6 Binary files /dev/null and b/pages_order/static/product/detect-15.png differ diff --git a/pages_order/static/product/detect-2.png b/pages_order/static/product/detect-2.png new file mode 100644 index 0000000..8feda9a Binary files /dev/null and b/pages_order/static/product/detect-2.png differ diff --git a/pages_order/static/product/detect-3.png b/pages_order/static/product/detect-3.png new file mode 100644 index 0000000..b0ef33c Binary files /dev/null and b/pages_order/static/product/detect-3.png differ diff --git a/pages_order/static/product/detect-4.png b/pages_order/static/product/detect-4.png new file mode 100644 index 0000000..51e6b7e Binary files /dev/null and b/pages_order/static/product/detect-4.png differ diff --git a/pages_order/static/product/detect-5.png b/pages_order/static/product/detect-5.png new file mode 100644 index 0000000..4f34007 Binary files /dev/null and b/pages_order/static/product/detect-5.png differ diff --git a/pages_order/static/product/detect-6.png b/pages_order/static/product/detect-6.png new file mode 100644 index 0000000..bba0283 Binary files /dev/null and b/pages_order/static/product/detect-6.png differ diff --git a/pages_order/static/product/detect-7.png b/pages_order/static/product/detect-7.png new file mode 100644 index 0000000..4e0ed25 Binary files /dev/null and b/pages_order/static/product/detect-7.png differ diff --git a/pages_order/static/product/detect-8.png b/pages_order/static/product/detect-8.png new file mode 100644 index 0000000..59ba327 Binary files /dev/null and b/pages_order/static/product/detect-8.png differ diff --git a/pages_order/static/product/detect-9.png b/pages_order/static/product/detect-9.png new file mode 100644 index 0000000..e40a0d9 Binary files /dev/null and b/pages_order/static/product/detect-9.png differ diff --git a/pages_order/static/product/intro-bg.png b/pages_order/static/product/intro-bg.png new file mode 100644 index 0000000..3d6ee29 Binary files /dev/null and b/pages_order/static/product/intro-bg.png differ diff --git a/pages_order/static/product/live.png b/pages_order/static/product/live.png new file mode 100644 index 0000000..8de761e Binary files /dev/null and b/pages_order/static/product/live.png differ