diff --git a/common/common.scss b/common/common.scss index 745c3e9..d01168d 100644 --- a/common/common.scss +++ b/common/common.scss @@ -1,3 +1,27 @@ +// 导航栏 +.nav_title{ + position: fixed; + z-index: 99; + top: 0; + width: 100%; + &::after{ + content: ""; + background-color: #F6F5FA; + height: 14.67rpx; + width: 100%; + position: absolute; + bottom: -14.67rpx; + } + .uni-navbar{ + font-size: 32rpx; + font-weight: bold; + } + +} +.nav_body{ + padding-top: 100rpx; +} + .mask{ position: fixed; width: 100%; @@ -100,7 +124,53 @@ } } - +// 推荐 +.recommend{ + padding: 0 26.67rpx; + padding-top: 54rpx; + + .recommend_title{ + position: relative; + text-align: center; + font-size: 29.33rpx; + font-weight: bold; + margin-bottom: 64rpx; + &::after{ + content: ""; + position: absolute; + bottom: -13.33rpx; + width: 53.33rpx; + height: 4rpx; + background-color: black; + left: 50%; + margin-left: -26rpx; + } + } + .recommend_content{ + display: flex; + justify-content: space-between; + flex-wrap: wrap; + font-size: 29.33rpx; + font-weight: 400; + + .recommend_content_item{ + width: 340rpx; + margin-bottom: 46.67rpx; + + .recommend_content_item_image{ + width: 100%; + height:340rpx ; + background-color: #999999; + margin-bottom: 37.33rpx; + } + .recommend_content_item_pric{ + font-size: 32rpx; + font-weight: bold; + margin-top: 34rpx; + } + } + } +} // 优惠卷 .coupons_item{ display: flex; diff --git a/pages.json b/pages.json index 06bc3fe..77019f3 100644 --- a/pages.json +++ b/pages.json @@ -110,6 +110,33 @@ "style": { "titleNView":false } + }, + { + "path": "pages/order/paySuccess", + "style": { + "navigationBarTitleText": "Pay success", + "navigationBarBackgroundColor":"#FFFFFF" + } + }, + { + "path": "pages/account/address", + "style": { + "navigationBarTitleText": "Shipping Address", + "navigationBarBackgroundColor":"#FFFFFF" + } + }, + { + "path": "pages/account/addAddress", + "style": { + "navigationBarTitleText": "Shipping Address", + "navigationBarBackgroundColor":"#FFFFFF" + } + }, + { + "path": "pages/account/pointsDetails", + "style": { + "titleNView":false + } } ], "globalStyle": { diff --git a/pages/account/addAddress.vue b/pages/account/addAddress.vue new file mode 100644 index 0000000..d8c9fa4 --- /dev/null +++ b/pages/account/addAddress.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file diff --git a/pages/account/address.vue b/pages/account/address.vue new file mode 100644 index 0000000..17458a4 --- /dev/null +++ b/pages/account/address.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/pages/account/index.vue b/pages/account/index.vue index 1545196..6ea7e0b 100644 --- a/pages/account/index.vue +++ b/pages/account/index.vue @@ -19,10 +19,10 @@ 6 Coupons - + 25 Points - + Wishlist @@ -67,10 +67,10 @@ My Review - + My Address - + Return Policy diff --git a/pages/account/pointsDetails.vue b/pages/account/pointsDetails.vue new file mode 100644 index 0000000..f84a763 --- /dev/null +++ b/pages/account/pointsDetails.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/pages/account/settings.vue b/pages/account/settings.vue index d027832..8bf556f 100644 --- a/pages/account/settings.vue +++ b/pages/account/settings.vue @@ -45,7 +45,7 @@ \ No newline at end of file diff --git a/static/img/address1.png b/static/img/address1.png new file mode 100644 index 0000000..eddfeb5 Binary files /dev/null and b/static/img/address1.png differ diff --git a/static/img/success.png b/static/img/success.png new file mode 100644 index 0000000..c14d0d7 Binary files /dev/null and b/static/img/success.png differ diff --git a/static/img/update.png b/static/img/update.png new file mode 100644 index 0000000..55f68c6 Binary files /dev/null and b/static/img/update.png differ