diff --git a/common/common.scss b/common/common.scss index 16e6fd2..745c3e9 100644 --- a/common/common.scss +++ b/common/common.scss @@ -101,6 +101,118 @@ } +// 优惠卷 +.coupons_item{ + display: flex; + background-color: #FEF6F4; + height: 186.67rpx; + color: #F66C46; + margin-bottom: 25.33rpx; + .coupons_item_left{ + width: 216.67rpx; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + font-size: 20rpx; + font-weight: 400; + &:before{ + content: ""; + background-color: white; + z-index: 99; + position: absolute; + right: -15rpx; + top: 0; + width: 30rpx; + height: 20rpx; + border-radius: 0 0 15rpx 15rpx; + } + &:after{ + content: ""; + background-color: white; + z-index: 99; + position: absolute; + right: -15rpx; + bottom: 0; + width: 30rpx; + height: 20rpx; + border-radius: 15rpx 15rpx 0 0; + } + .item_left_prcie{ + font-weight: bold; + font-size: 40rpx; + // margin-bottom: 13.33rpx; + } + .item_left_span{ + text-align: center; + } + } + .coupons_item_right{ + width: 480.67rpx; + height: 100%; + font-size: 20rpx; + font-weight: 400; + display: flex; + justify-content: space-between; + align-items: center; + position: relative; + padding-left: 36rpx; + padding-right: 23.33rpx; + &:before{ + content: ""; + z-index: 99; + position: absolute; + left: -5rpx; + height: 120rpx; + border: dashed #F66C46 1rpx; + } + .coupons_item_right_select{ + width: 34.67rpx; + height: 34.67rpx; + position: absolute; + top: 12.67rpx; + right: 15.33rpx; + } + .coupons_item_right_bg{ + width: 82.67rpx; + height: 60.67rpx; + position: absolute; + top: 0; + right:116.67rpx; + } + .coupons_right_info{ + .coupons_right_info_title{ + font-size: 32rpx; + font-weight: bold; + } + .coupons_right_info_time{ + font-size: 16rpx; + margin-top: 13.33rpx; + } + } + button{ + background: none; + border-radius: 0; + margin: 0; + border: #F66C46 1px solid; + font-size: 25.33rpx; + height: 39.33rpx; + line-height: 39.33rpx; + color: #F66C46; + font-weight: bold; + white-space:nowrap; + padding:0 10rpx; + box-sizing: content-box; + overflow: inherit; + &::after{ + content: none; + } + } + } +} + .login{ padding: 0 32rpx; diff --git a/pages.json b/pages.json index f35b945..06bc3fe 100644 --- a/pages.json +++ b/pages.json @@ -98,6 +98,18 @@ "navigationBarTitleText": "0rder Confirmation", "navigationBarBackgroundColor":"#FFFFFF" } + }, + { + "path": "pages/account/myCoupons", + "style": { + "titleNView":false + } + }, + { + "path": "pages/index/pickUpCentre", + "style": { + "titleNView":false + } } ], "globalStyle": { diff --git a/pages/account/index.vue b/pages/account/index.vue index 8b0cb87..1545196 100644 --- a/pages/account/index.vue +++ b/pages/account/index.vue @@ -15,10 +15,10 @@ - + 6 Coupons - + 25 Points diff --git a/pages/account/myCoupons.vue b/pages/account/myCoupons.vue new file mode 100644 index 0000000..bfb3c51 --- /dev/null +++ b/pages/account/myCoupons.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue index 0fc0c15..f509b55 100644 --- a/pages/account/myOrders.vue +++ b/pages/account/myOrders.vue @@ -173,7 +173,7 @@ @@ -122,11 +186,15 @@ export default { data() { return { - isShow:false + isShow:false, + popup_index:'' } }, methods:{ - + openMore(i){ + this.popup_index=i + this.isShow=true + } } } @@ -376,6 +444,9 @@ top: 50%; margin-top: -5.5rpx; } + .order_popup_title_span{ + color: #B22234; + } } .order_popup_coupons{ @@ -383,9 +454,6 @@ padding-top: 28rpx; padding-bottom: 106.67rpx; - .coupons_item{ - - } } .order_popup_commodity{ padding:0 26rpx; @@ -447,5 +515,69 @@ } } } + .order_popup_pay{ + padding: 0 26.67rpx; + padding-bottom: 56.67rpx; + + .pay_item{ + border-bottom: 1px solid #EEEEEE; + padding: 13.33rpx 0; + display: flex; + align-items: center; + font-size: 28rpx; + &:nth-child(4){ + border-bottom: none + } + .pay_item_select{ + width: 29.33rpx; + height: 29.33rpx; + margin-right: 26rpx; + + } + .pay_item_right{ + display: flex; + align-items: center; + + image{ + width: 74.67rpx; + height: 74.67rpx; + margin-right: 28.67rpx; + } + } + + + } + button{ + background: black; + color: white; + height: 88rpx; + line-height: 88rpx; + font-size: 26.67rpx; + font-weight: bold; + margin-top: 33.33rpx; + } + } + .order_popup_points{ + padding-bottom: 63.33rpx; + padding-left: 47.33rpx; + padding-top: 34.67rpx; + font-size: 28rpx; + + .points_item{ + display: flex; + align-items: center; + margin-bottom: 40rpx; + &:last-child{ + margin-bottom: 0; + } + + image{ + width: 29.33rpx; + height: 29.33rpx; + margin-right: 26rpx; + + } + } + } } \ No newline at end of file diff --git a/static/img/APay.png b/static/img/APay.png new file mode 100644 index 0000000..e5b7ddf Binary files /dev/null and b/static/img/APay.png differ diff --git a/static/img/GPay.png b/static/img/GPay.png new file mode 100644 index 0000000..9ba28b4 Binary files /dev/null and b/static/img/GPay.png differ diff --git a/static/img/card.png b/static/img/card.png new file mode 100644 index 0000000..91c5a48 Binary files /dev/null and b/static/img/card.png differ diff --git a/static/img/coupons.png b/static/img/coupons.png new file mode 100644 index 0000000..f9ceb44 Binary files /dev/null and b/static/img/coupons.png differ diff --git a/static/img/coupons_bg.png b/static/img/coupons_bg.png new file mode 100644 index 0000000..c33315e Binary files /dev/null and b/static/img/coupons_bg.png differ diff --git a/static/img/pay_pal.png b/static/img/pay_pal.png new file mode 100644 index 0000000..48ff939 Binary files /dev/null and b/static/img/pay_pal.png differ diff --git a/static/img/select3.png b/static/img/select3.png new file mode 100644 index 0000000..87df6ee Binary files /dev/null and b/static/img/select3.png differ