diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/coupons/coupons.vue b/yshop-drink-uniapp-vue3/pages/components/pages/coupons/coupons.vue index d982927..5b37739 100644 --- a/yshop-drink-uniapp-vue3/pages/components/pages/coupons/coupons.vue +++ b/yshop-drink-uniapp-vue3/pages/components/pages/coupons/coupons.vue @@ -349,28 +349,6 @@ page { } } -.bottom-box { - height: 80rpx; - flex-shrink: 0; - .item { - padding: 0 20rpx; - position: relative; - - &::after { - content: " "; - border-right: 1rpx solid $text-color-assist; - height: 100%; - position: absolute; - right: 0; - top: 0; - transform: scaleX(0.5) scaleY(0.8); - } - - &:nth-last-child(1)::after { - border-right: 0; - } - } -} .coupon-list { height: calc(100vh - 120rpx - 200rpx); diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue b/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue index 4cefc13..277d1ad 100644 --- a/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue +++ b/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue @@ -227,10 +227,5 @@ page { border-radius: 50rem !important; font-size: $font-size-lg; } -.logout-btn { - width: 90%; - border-radius: 50rem !important; - font-size: $font-size-lg; - background-color:rgb(237, 81, 29); -} + diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue b/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue index 649d1ff..2bb4414 100644 --- a/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue +++ b/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue @@ -261,30 +261,7 @@ const refund = (order) => { margin-right: 30rpx; border-radius: 8rpx; } -// @mixin arch { -// content: ""; -// position: absolute; -// background-color: $bg-color; -// width: 30rpx; -// height: 30rpx; -// bottom: -15rpx; -// z-index: 10; -// border-radius: 100%; -// } -// .section { -// position: relative; - -// &::before { -// @include arch; -// left: -15rpx; -// } - -// &::after { -// @include arch; -// right: -15rpx; -// } -// } .pay-cell { width: 100%; @@ -300,53 +277,7 @@ const refund = (order) => { } } -.invote-box { - position: absolute; - width: 100%; - left: 0; - top: 0; - display: flex; - justify-content: center; - align-items: center; - - image { - width: 30rpx; - height: 30rpx; - } -} -.btn-box { - background-color: #ffffff; - position: fixed; - bottom: 0; - left: 0; - right: 0; - height: 120rpx; - box-shadow: 0 0 20rpx rgba($color: #000000, $alpha: 0.1); - display: flex; - align-items: center; - justify-content: space-evenly; - z-index: 11; - - .item { - display: flex; - align-items: center; - justify-content: center; - padding: 20rpx 10rpx; - flex: 1; - flex-shrink: 0; - - button { - width: 100%; - border-radius: 50rem !important; - height: 80rpx; - display: flex; - align-items: center; - justify-content: center; - padding: 0; - } - } -} /* #ifdef H5 */ page { @@ -370,14 +301,7 @@ const refund = (order) => { margin: 60rpx 0 80rpx; line-height: 48rpx; } - - .drink-btn { - width: 320rpx; - border-radius: 50rem !important; - margin-bottom: 40rpx; - font-size: $font-size-base; - line-height: 3.0; - } + @mixin arch { content: ""; diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/packages/index.vue b/yshop-drink-uniapp-vue3/pages/components/pages/packages/index.vue index d854f92..0697768 100644 --- a/yshop-drink-uniapp-vue3/pages/components/pages/packages/index.vue +++ b/yshop-drink-uniapp-vue3/pages/components/pages/packages/index.vue @@ -187,28 +187,6 @@ page { flex-direction: column; } -.bottom-box { - height: 80rpx; - flex-shrink: 0; - .item { - padding: 0 20rpx; - position: relative; - - &::after { - content: ' '; - border-right: 1rpx solid $text-color-assist; - height: 100%; - position: absolute; - right: 0; - top: 0; - transform: scaleX(0.5) scaleY(0.8); - } - - &:nth-last-child(1)::after { - border-right: 0; - } - } -} .coupon-list { margin-top: 30rpx; diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/shop/shop.vue b/yshop-drink-uniapp-vue3/pages/components/pages/shop/shop.vue index 2f100bb..6383aec 100644 --- a/yshop-drink-uniapp-vue3/pages/components/pages/shop/shop.vue +++ b/yshop-drink-uniapp-vue3/pages/components/pages/shop/shop.vue @@ -129,7 +129,5 @@ const choice = (shop) => { } } - .u-border { - border: 1rpx solid #1296db; - } + diff --git a/yshop-drink-uniapp-vue3/pages/menu/menu.vue b/yshop-drink-uniapp-vue3/pages/menu/menu.vue index d59d6f3..e88116e 100644 --- a/yshop-drink-uniapp-vue3/pages/menu/menu.vue +++ b/yshop-drink-uniapp-vue3/pages/menu/menu.vue @@ -726,72 +726,6 @@ const toPay = () => { } } - .stores { - width: 100%; - display: flex; - flex-direction: column; - justify-content: flex-start; - margin-bottom: -40rpx; - .store { - width: 100%; - background-color: $bg-color-grey; - padding: 20rpx; - display: flex; - align-items: center; - margin-bottom: 20rpx; - border-radius: 6rpx; - - .iconfont { - font-size: 50rpx; - margin-right: 15rpx; - - &.iconradio-button-off { - color: $text-color-assist; - } - - &.iconradio-button-on { - color: $color-primary; - } - } - - .infos { - flex: 1; - display: flex; - flex-direction: column; - color: $text-color-base; - overflow: hidden; - - .name_and_distance { - width: 100%; - display: flex; - justify-content: space-between; - margin-bottom: 10rpx; - overflow: hidden; - - .name { - flex: 1; - flex-shrink: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - font-size: $font-size-lg; - } - - .distance { - flex-shrink: 0; - font-size: $font-size-lg; - font-weight: bold; - margin-left: 20rpx; - } - } - - .street { - color: $text-color-assist; - font-size: $font-size-sm; - } - } - } - } .main { width: 100%; @@ -891,30 +825,7 @@ const toPay = () => { } } } - - .coupon { - flex: 1; - width: 100%; - background-color: $bg-color-primary; - font-size: $font-size-base; - color: $color-primary; - padding: 0 20rpx; - display: flex; - align-items: center; - overflow: hidden; - - .title { - flex: 1; - margin-left: 10rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - .iconfont { - line-height: 100%; - } - } + } .content { @@ -1130,9 +1041,6 @@ const toPay = () => { } } - .modal-box { - max-height: 90vh; - } .good-detail-modal { width: 100%; diff --git a/yshop-drink-uniapp-vue3/pages/mine/mine.vue b/yshop-drink-uniapp-vue3/pages/mine/mine.vue index 8eadb52..2a9f109 100644 --- a/yshop-drink-uniapp-vue3/pages/mine/mine.vue +++ b/yshop-drink-uniapp-vue3/pages/mine/mine.vue @@ -194,33 +194,6 @@ const serv = (item) => { min-height: 100%; } - .bg { - width: 100%; - height: calc(410 / 594 * 750rpx); - } - - .hym-btn { - position: absolute; - top: 40rpx; - right: 40rpx; - color: $color-primary; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rem; - font-size: $font-size-sm; - box-shadow: 0 0 20rpx rgba(66, 66, 66, 0.1); - - &::after { - border: 0; - } - - image { - width: 30rpx; - height: 30rpx; - margin-right: 10rpx; - } - } .user-box { position: relative; @@ -271,11 +244,6 @@ const serv = (item) => { } } - .level-benefit { - margin-left: 35rpx; - padding: 10rpx 0 10rpx 30rpx; - border-radius: 50rem 0 0 50rem; - } .user-grid { width: 25%; @@ -290,46 +258,7 @@ const serv = (item) => { } } - .level-benefit-box { - border-radius: 8rpx; - margin-bottom: 30rpx; - box-shadow: 0 10rpx 8rpx rgba($color: #878889, $alpha: 0.1); - width: 100%; - display: flex; - padding: 30rpx; - flex-direction: column; - background-color: #FFFFFF; - - .row { - display: flex; - padding: 30rpx 0 20rpx; - justify-content: space-around; - align-items: center; - - .grid { - width: 20%; - display: flex; - flex-direction: column; - font-size: $font-size-sm; - color: $text-color-assist; - align-items: center; - - image { - width: 80rpx; - height: 80rpx; - margin-bottom: 10rpx; - } - - } - } - } - - - .banner { - width: 100%; - border-radius: 8rpx; - margin-bottom: 30rpx; - } + .service-box { width: 100%; diff --git a/yshop-drink-uniapp-vue3/static/style/cart (1).png b/yshop-drink-uniapp-vue3/static/style/cart (1).png deleted file mode 100644 index 6c286be..0000000 Binary files a/yshop-drink-uniapp-vue3/static/style/cart (1).png and /dev/null differ diff --git a/yshop-drink-uniapp-vue3/static/style/cart.png b/yshop-drink-uniapp-vue3/static/style/cart.png deleted file mode 100644 index df23118..0000000 Binary files a/yshop-drink-uniapp-vue3/static/style/cart.png and /dev/null differ