diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..582561b --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,16 @@ +{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 + "version": "0.0", + "configurations": [{ + "app-plus" : + { + "launchtype" : "local" + }, + "default" : + { + "launchtype" : "local" + }, + "type" : "uniCloud" + } + ] +} diff --git a/common/common.scss b/common/common.scss index d01168d..7efe9e0 100644 --- a/common/common.scss +++ b/common/common.scss @@ -1,9 +1,15 @@ +.status_bar { + height: var(--status-bar-height); + width: 100%; +} + // 导航栏 .nav_title{ position: fixed; z-index: 99; top: 0; width: 100%; + background-color: white; &::after{ content: ""; background-color: #F6F5FA; @@ -19,9 +25,63 @@ } .nav_body{ - padding-top: 100rpx; + padding-top: 100rpx + var(--status-bar-height); +} + +//地址信息 +.address{ + padding-top: 33.33rpx; + padding-bottom: 36rpx; + padding-left: 29.33rpx; + padding-right: 22.67rpx; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 14.67rpx #F6F5FA solid; + position: relative; + .address_left{ + + .address_title{ + display: flex; + align-items: center; + color: #666666; + font-size: 24rpx; + margin-bottom: 30.67rpx; + + image{ + width: 32rpx; + height: 32rpx; + } + .address_title_name{ + font-size: 28rpx; + color: black; + font-weight: bold; + margin-left: 24rpx; + margin-right: 38.67rpx; + } + } + .address_content{ + padding-left: 56rpx; + color: #666666; + font-size: 24rpx; + font-weight: bold; + } + } + + .address_xian{ + height: 4rpx; + width: 100%; + position: absolute; + left: 0; + bottom: 0; + } +} +.address_more{ + width: 20rpx; + height: 20rpx; } +// 遮罩层 .mask{ position: fixed; width: 100%; @@ -96,7 +156,7 @@ justify-content: space-between; align-items: center; - img{ + image{ width: 36rpx; height: 36rpx; margin-right: 9.33rpx; diff --git a/common/scss/order.scss b/common/scss/order.scss new file mode 100644 index 0000000..9ae7d00 --- /dev/null +++ b/common/scss/order.scss @@ -0,0 +1,73 @@ +.order_popup_commodity{ + padding:0 26rpx; + + .good_info{ + padding: 40rpx 0; + font-size: 22.67rpx; + color: #666666; + font-weight: bold; + border-bottom: 2.67rpx solid #F1F1F1; + &:last-child{ + border-bottom: none; + } + .good_info_left{ + display: flex; + align-items: center; + width: 100%; + .good_info_image{ + width: 200rpx ; + height: 200rpx; + background-color: #999999; + margin-right: 32.67rpx; + } + .left_info{ + + .info_name{ + font-size: 26.67rpx; + font-weight: 400; + width: 461.33rpx; + } + .left_info_bottom{ + display: flex; + align-items: center; + justify-content: space-between; + font-size: 32rpx; + color: #909090; + margin-top: 24rpx; + .info_lable{ + padding: 5.33rpx 20rpx; + font-size: 22.67rpx; + border-radius: 33.33rpx; + border: 1px solid #D3D3D3; + image{ + width: 17.33rpx; + height: 17.33rpx; + margin-left: 14.67rpx; + } + } + } + .info_price{ + font-size: 28rpx; + color: black; + font-weight: bold; + margin-top: 43.33rpx; + display: flex; + align-items: center; + justify-content: space-between; + + button{ + margin: 0; + height: 45.33rpx; + line-height: 45.33rpx; + border: #999999 solid 1px; + font-size: 17.33rpx; + color: #999999; + &::after{ + content: none; + } + } + } + } + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 77019f3..2ea5007 100644 --- a/pages.json +++ b/pages.json @@ -137,6 +137,28 @@ "style": { "titleNView":false } + }, + { + "path": "pages/order/details", + "style": { + "navigationBarTitleText": "Order details", + "navigationBarBackgroundColor":"#FFFFFF" + // "app-plus": { + // "titleNView": { + // "splitLine":{ + // "color":"#F6F5FA", + // "height":"5px" + // } + // } + // } + } + }, + { + "path": "pages/order/logisticsDetails", + "style": { + "navigationBarTitleText": "Logistics details", + "navigationBarBackgroundColor":"#FFFFFF" + } } ], "globalStyle": { diff --git a/pages/account/favorites.vue b/pages/account/favorites.vue index 394e4b4..1f1c1d9 100644 --- a/pages/account/favorites.vue +++ b/pages/account/favorites.vue @@ -1,20 +1,21 @@