diff --git a/pages/address/address.vue b/pages/address/address.vue index ef26ae9..40d44d2 100644 --- a/pages/address/address.vue +++ b/pages/address/address.vue @@ -166,17 +166,21 @@ position: fixed; left: 30upx; right: 30upx; - bottom: 16upx; + bottom: constant(safe-area-inset-bottom); + bottom: env(safe-area-inset-bottom); + /* bottom: 16upx; */ + width: 100vw; + height: 100vh; + z-index: 95; display: flex; align-items: center; justify-content: center; - width: 690upx; + width: 640upx; height: 80upx; font-size: 32upx; color: #fff; - background-color: $base-color; - border-radius: 10upx; - box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4); + background-color: #CC342D; + border-radius: 50upx; } diff --git a/pages/address/addressManage.vue b/pages/address/addressManage.vue index 619ae59..00ff2de 100644 --- a/pages/address/addressManage.vue +++ b/pages/address/addressManage.vue @@ -21,11 +21,14 @@ --> 收货地区 - + 详细地址 - + + + + @@ -56,7 +59,8 @@ city: '', region: '', prefixAddress: '' - } + }, + content: '', } }, onLoad(option) { diff --git a/pages/index/index.vue b/pages/index/index.vue index b6cd2f6..4e7a33a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -204,7 +204,7 @@ switch (code) { case 'myOrders': uni.navigateTo({ - url: '/pages/order/order' + url: '/pages/order/order?state=0' }) break; case 'collections': diff --git a/pages/order/order.vue b/pages/order/order.vue index 4888764..eaae0f3 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -421,8 +421,8 @@ .goods-img { display: block; - width: 120upx; - height: 120upx; + width: 192upx; + height: 192upx; } .right { @@ -431,6 +431,7 @@ flex-direction: column; padding: 0 30upx 0 24upx; overflow: hidden; + position: relative; .title { font-size: $font-base + 2upx; @@ -447,6 +448,9 @@ .price { font-size: $font-base + 2upx; color: $font-color-dark; + position: absolute; + left: 24upx; + bottom: 0; &:before { content: '¥'; diff --git a/pages/public/components/checkCode.vue b/pages/public/components/checkCode.vue index 05a55db..9efd5e8 100644 --- a/pages/public/components/checkCode.vue +++ b/pages/public/components/checkCode.vue @@ -9,7 +9,7 @@ {{tips.text}} {{data.area}} {{data.mobile}} - @@ -23,13 +23,11 @@