From 72c1207a7ddd8b4996ee0dfb25dabdb66e303684 Mon Sep 17 00:00:00 2001 From: xindan <2499232802@qq.com> Date: Thu, 14 Oct 2021 23:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/plugins.css | 3 - pages/buy/buy.css | 1 - pages/buy/buy.vue | 4 +- pages/goods-detail/goods-detail.vue | 4 +- pages/plugins/coupon/index/index.css | 0 pages/plugins/coupon/index/index.vue | 509 ++++++++++++------------- pages/plugins/coupon/user/user.css | 22 ++ pages/plugins/coupon/user/user.vue | 538 ++++++++++++--------------- 8 files changed, 504 insertions(+), 577 deletions(-) delete mode 100644 pages/plugins/coupon/index/index.css create mode 100644 pages/plugins/coupon/user/user.css diff --git a/common/css/plugins.css b/common/css/plugins.css index d30614c1..36650935 100644 --- a/common/css/plugins.css +++ b/common/css/plugins.css @@ -1,9 +1,6 @@ /* * 优惠劵 */ -.coupon-container { - padding: 0 10rpx; -} .coupon-container .item { overflow: hidden; height: 180rpx; diff --git a/pages/buy/buy.css b/pages/buy/buy.css index d4116f2e..60cda1d7 100644 --- a/pages/buy/buy.css +++ b/pages/buy/buy.css @@ -165,7 +165,6 @@ max-height: 80vh; overflow-y: scroll; overflow-x: hidden; - padding-bottom: 50rpx; } .coupon-container .item, .coupon-container .v-right, diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 5a6cae74..3d971ac0 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -143,12 +143,12 @@ - + 不使用优惠劵 - + {{currency_symbol}} diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index a8045b1c..246f2d87 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -367,7 +367,7 @@ - + @@ -376,7 +376,7 @@ - + {{currency_symbol}} diff --git a/pages/plugins/coupon/index/index.css b/pages/plugins/coupon/index/index.css deleted file mode 100644 index e69de29b..00000000 diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue index c649f233..a2711190 100644 --- a/pages/plugins/coupon/index/index.vue +++ b/pages/plugins/coupon/index/index.vue @@ -1,270 +1,243 @@ - - - + \ No newline at end of file diff --git a/pages/plugins/coupon/user/user.css b/pages/plugins/coupon/user/user.css new file mode 100644 index 00000000..dee7b767 --- /dev/null +++ b/pages/plugins/coupon/user/user.css @@ -0,0 +1,22 @@ +/* +* 导航 +*/ +.nav { + height: 80rpx; + line-height: 80rpx; +} +.nav .item { + width: 33.33%; +} + +/* +* 数据列表 +*/ +.scroll-box { + height: calc(100vh - 80rpx); +} +.coupon-container .item, +.coupon-container .v-right, +.coupon-container .v-right .circle { + height: 230rpx; +} \ No newline at end of file diff --git a/pages/plugins/coupon/user/user.vue b/pages/plugins/coupon/user/user.vue index 60776464..14bd938f 100644 --- a/pages/plugins/coupon/user/user.vue +++ b/pages/plugins/coupon/user/user.vue @@ -1,302 +1,238 @@ - - - - \ No newline at end of file