diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss index c8c97a9..a9a9460 100644 --- a/pages/bargain/bargain.wxss +++ b/pages/bargain/bargain.wxss @@ -14,10 +14,7 @@ page{ width: 142rpx; height: 142rpx!important; border-radius: 10rpx; - /* overflow: hidden; */ margin-top:10rpx; - /* word-wrap: break-word; - word-break: break-all; */ display: block; } .listitem .icon{ diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss index 1427b0a..ce3e585 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxss +++ b/pages/bargain/bargainDatail/bargainDatail.wxss @@ -331,7 +331,7 @@ page{ line-height: 75rpx; text-align: center; border: none; - font-size: 32rpx; + font-size: 28rpx; margin: 0 auto; } button::after{ border: none; } diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss index 9dfac2a..74f0a65 100644 --- a/pages/cardorder/index/index.wxss +++ b/pages/cardorder/index/index.wxss @@ -6,10 +6,9 @@ .tabs { width: 100% !important; - height: 88rpx; + height: 96rpx; text-align: center; position: fixed; - /* top: 136rpx; */ left: 0; right: 0; z-index: 100000; @@ -247,7 +246,6 @@ } .txt2{ - /* opacity: .99; */ margin-top: 36rpx; } .imgicon { @@ -287,8 +285,6 @@ font-family: PingFang-SC-Regular; font-weight: 400; color: #FD832D; - /* opacity: .99; */ - line-height: 44rpx; margin-top: 30rpx; background: #fff; position: fixed; diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index be1d23f..aee6dac 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -48,7 +48,7 @@ {{data.salePriceStr}} - {{data.creditPrice}}积分 + {{data.creditPrice}}积分 {{data.priceStr}}元 {{data.priceStr}}小时 diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 5228d32..5b6f66e 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -721,7 +721,7 @@ button::after { color: #999; font-size: 32rpx; background: #fff; - + padding-top: 20rpx; } .presslimit { @@ -869,4 +869,7 @@ background: #ccc8c8; } .swiper-box .wx-swiper-dot-active::before{ background:#f6792b; +} +.jifen{ + font-size: 30rpx; } \ No newline at end of file diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 8d318e1..31e0263 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -8,6 +8,9 @@ const QR = require("../../../utils/memberqrcode.js"); //券详情页面 Page({ data: { + showMore: true, + more: "点击查看更多", + hidden: "hidden", navigationBarHeight, code: "", topLine: imgurl.topLine.url, @@ -34,6 +37,25 @@ Page({ staticGamedata: {}, showIf: false, }, + // 点击查看更多 + more: function () { + let that = this; + if (that.data.more == '点击查看更多') { + this.setData({ + hidden: "", + height: that.data.data.merchantVoList.length * 140 + 'rpx', + more: "点击收起", + showMore: true + }) + } else { + this.setData({ + hidden: "hidden", + height: 4 * 140 + 'rpx', + more: "点击查看更多", + showMore: true + }) + } + }, onUnload:function(){ let that = this; clearInterval(that.data.setInter); @@ -148,7 +170,7 @@ Page({ }) } }, 2000); - + /** * 页面需要初始渲染的效果 */ @@ -173,6 +195,16 @@ Page({ validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") }) } + if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) { + that.setData({ + height: that.data.data.merchantVoList.length * 140 + 'rpx', + showMore: false + }) + } else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) { + that.setData({ + height: 4 * 140 + 'rpx' + }) + } let url = JSON.stringify({ END:"C", TYPE:"couponorder", diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 621fae4..11fd3dc 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -49,26 +49,26 @@ 优惠券码:{{code}} - - - - 适用门店 - - - diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss index 11042f1..c6940c8 100644 --- a/pages/spellGroup/spellGroup.wxss +++ b/pages/spellGroup/spellGroup.wxss @@ -13,7 +13,6 @@ page { } .content-box{ height: auto; - /* padding-bottom: 200rpx; */ padding: 0 16rpx 200rpx; } .loading { @@ -166,9 +165,6 @@ image{ font-weight:500; color:#FD782D; line-height:44rpx; - width: 50%; - white-space: nowrap; - text-overflow: ellipsis; } .spell-centerH .price02{ font-size: 24rpx; @@ -176,7 +172,7 @@ image{ font-weight:500; text-decoration:line-through; color:rgba(140,140,140,1); - line-height: 30rpx; + line-height: 44rpx; margin-top: 15rpx; } .spell-centerH .price-num{ @@ -192,7 +188,7 @@ image{ .spell-centerHr .price-num{ display: inline-block; font-size: 32rpx; - width: 95rpx; + width: 100rpx; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; @@ -204,7 +200,7 @@ image{ } .spell-centerH .price-numHr{ font-size:32rpx; - line-height: 32rpx; + line-height: 44rpx; } .content .price-unit{ font-size:24rpx;