diff --git a/.gitignore b/.gitignore index b8c7be7..b7cdc31 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ node_modules/ .eslintcache unpackage/dist/build/ unpackage/dist/dev/ - +unpackage/apk +unpackage/release # python *.pyc diff --git a/common/scss/order.scss b/common/scss/order.scss index 9ae7d00..a34e30a 100644 --- a/common/scss/order.scss +++ b/common/scss/order.scss @@ -62,6 +62,7 @@ border: #999999 solid 1px; font-size: 17.33rpx; color: #999999; + background: none; &::after{ content: none; } @@ -70,4 +71,364 @@ } } } +} + + +// 订单详情 +.details_title{ + height: 176.67rpx; + background-color: #2C2C38; + width: 100%; + color: white; + font-size: 18.67rpx; + font-weight: bold; + border-top: 14.67rpx #F6F5FA solid; + + .shipped_right_text{ + width: 497.33rpx; + font-size: 33.33rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .cancelled{ + padding-left: 55.33rpx; + display: flex; + align-items: center; + height: 100%; + justify-content: space-between; + + .cancelled_left{ + display: flex; + align-items: center; + + image{ + width: 61.33rpx; + height: 61.33rpx; + } + .cancelled_left_info{ + margin-left: 52.67rpx; + } + } + .cancelled_right{ + image{ + width: 34.67rpx; + height: 34.67rpx; + } + } + + } + .transit{ + padding-left: 74.67rpx; + padding-right: 16rpx; + + .cancelled_left{ + + image{ + width: 58.67rpx; + height: 58.67rpx; + } + .cancelled_left_info{ + margin-left: 49.33rpx; + } + } + } + .completed{ + padding-right: 20rpx; + + } + .toPaid{ + padding:0 31.33rpx; + } + .shipped{ + padding-left: 47.33rpx; + display: flex; + align-items: center; + height: 100%; + + .shipped_left{ + background-image: url("@/static/img/order_bg.png"); + background-size: 100% 100%; + width: 114rpx; + height: 158.67rpx; + display: flex; + align-items: center; + justify-content: center; + margin-right: 30rpx; + image{ + width: 62.67rpx; + height: 62.67rpx; + } + } + + } +} +.order_popup_commodity{ + border-bottom: 14.67rpx solid #F6F5FA; +} +.summary{ + border-bottom: 14.67rpx solid #F6F5FA; + padding:0 26rpx; + padding-top: 44rpx; + padding-bottom: 47.33rpx; + font-size: 28rpx; + &:last-child{ + border-bottom: none; + } + .summary_title{ + font-weight: bold; + margin-bottom: 35.33rpx; + } + .summary_item{ + display: flex; + align-items: center; + margin-bottom: 41.33rpx; + justify-content: space-between; + width: 100%; + &:last-child{ + margin-bottom: 0; + } + .summary_item_text{ + color: #777777; + } + .summary_item_right{ + color: #3C3B6E; + display: flex; + align-items: center; + + button{ + font-size: 20rpx; + color: black; + height: 28.67rpx; + border-radius: 0; + padding:0 15rpx; + line-height: 28.67rpx; + background:none; + margin-left: 15.33rpx; + } + } + .summary_item_right1{ + color: #B22234; + } + } + .summary_tips{ + display: flex; + align-items: center; + justify-content: flex-end; + color: #B22234; + font-size: 24rpx; + font-weight: 400; + image{ + width: 28rpx; + height: 28rpx; + margin-right: 13.33rpx; + } + } +} + +.details_footer{ + padding: 34rpx 26rpx; + background-color: white; + display: flex; + align-items: center; + justify-content: flex-end; + position: fixed; + bottom: 0; + width: 100%; + box-sizing: border-box; + button{ + height: 62.67rpx; + line-height:62.67rpx; + border-radius: 0; + margin: 0; + margin-left: 18rpx; + background-color: white; + border: none; + font-size: 22.67rpx; + &::after{ + content: none; + } + } + .black{ + color: white; + background-color: black; + } + .white{ + border: 1px solid #666666; + color: #666666; + + } +} +// 谈判细节 +.order_popup{ + position: fixed; + z-index: 999; + background-color: white; + width: 100%; + bottom: 0; + + .order_popup_title{ + position: relative; + font-size: 32rpx; + font-weight: bold; + border-bottom: 1px solid #E2E2E2; + display: flex; + align-items: center; + justify-content: center; + padding-top: 44.67rpx; + padding-bottom: 30.67rpx; + + image{ + width: 21.33rpx; + height: 21.33rpx; + position: absolute; + right: 26rpx; + top: 50%; + margin-top: -5.5rpx; + } + .order_popup_title_span{ + color: #B22234; + } + + } + .order_popup_commodity{ + border-bottom:1px solid #E2E2E2 ; + padding-bottom: 40rpx; + } + .order_popup_coupons{ + padding:0 26.67rpx; + padding-top: 28rpx; + padding-bottom: 106.67rpx; + + } + + .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; + + } + } + } +} + +// 进度条 +.logistics_details{ + border-top: 14.67rpx #F6F5FA solid; + padding-left: 28rpx; + padding-right: 24rpx; + padding-top: 64rpx; + + .logistics_step{ + color: #999999; + font-size: 26.67rpx; + font-weight: 400; + padding-bottom: 74rpx; + padding-left: 33.33rpx; + position: relative; + &:before{ + content: ""; + width: 17.33rpx; + height: 17.33rpx; + background-color: #EDEDED; + position: absolute; + left: 0; + top: 0; + border-radius: 50%; + z-index: 99; + } + &::after{ + content: ""; + width: 1px; + height: 95%; + background-color: #EDEDED; + position: absolute; + left: 9.5rpx; + bottom: 0; + border-radius: 50%; + } + &:last-child{ + + &::after{ + content: none; + } + } + + .logistics_step_time{ + + font-size: 22rpx; + margin-top: 13.33rpx; + } + } +} +.step_active{ + color: #333333 !important; + + &:before{ + background-color:#333333 !important; + } + +} +.step_active1{ + &::after{ + background-color: #333333 !important; + + } } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 66f9cee..356c60b 100644 --- a/manifest.json +++ b/manifest.json @@ -43,7 +43,9 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "ad" : {} + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index 2ea5007..802d5bf 100644 --- a/pages.json +++ b/pages.json @@ -159,6 +159,20 @@ "navigationBarTitleText": "Logistics details", "navigationBarBackgroundColor":"#FFFFFF" } + }, + { + "path": "pages/order/refund", + "style": { + "navigationBarTitleText": "Refund", + "navigationBarBackgroundColor":"#FFFFFF" + } + }, + { + "path": "pages/order/refundDetails", + "style": { + "navigationBarTitleText": "Refund Details", + "navigationBarBackgroundColor":"#FFFFFF" + } } ], "globalStyle": { diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue index 0cb5970..ed3b6dc 100644 --- a/pages/account/myOrders.vue +++ b/pages/account/myOrders.vue @@ -39,7 +39,7 @@ - + To be shipped @@ -88,38 +88,41 @@ total:US$12.5 - + + + + - - - - Completed - - order#20245512141212 - - - - - - - - - - 4 ltems + + + + Completed + + order#20245512141212 - total:US$12.5 - - - + + + + + + + 4 ltems + + + + total:US$12.5 + + + + - - + Return and exchange @@ -145,53 +148,58 @@ - - - cancelled - - order#20245512141212 - - - - - - - - - - 4 ltems + + + + cancelled + + order#20245512141212 - total:US$12.5 - - + + + + + + + 4 ltems + + + + total:US$12.5 + + + - +