diff --git a/bundle/combo/combo-list.vue b/bundle/combo/combo-list.vue index 06e05ae..e2b8579 100644 --- a/bundle/combo/combo-list.vue +++ b/bundle/combo/combo-list.vue @@ -7,11 +7,18 @@ - {{ item.eg_name }} + + {{ item.eg_name }} + {{ item.name }} {{ item.order ? '续费' : '立即开通' }} + + + 月卡 ¥{{ item.month_price }} + 季卡 ¥{{ item.seasonal_price }} + @@ -94,6 +101,7 @@ page { font-size: 30rpx; font-weight: bold; + & .kt-txt1 { padding-left: 60rpx; } @@ -101,9 +109,18 @@ page { & .kt-txt2 { padding-left: 80rpx; } + + + .kt-price { + color: #C2863E; + margin-left: 10rpx; + font-size: 24rpx; + } } .mb-20 { margin-bottom: 20px; } + + \ No newline at end of file diff --git a/bundle/combo/details.vue b/bundle/combo/details.vue index e62cb1b..eb34bde 100644 --- a/bundle/combo/details.vue +++ b/bundle/combo/details.vue @@ -27,7 +27,7 @@ - + @@ -65,6 +65,33 @@ + + + + + + + + + + + 月卡 + + {{ info.month_price }} + 每月/¥{{ info.month_price }} + + + + + + 季卡 + + {{ info.seasonal_price }} + 每季/¥{{ info.seasonal_price }} + + + + @@ -447,6 +474,79 @@ page { background-color: #fff; } +.combo-cards { + display: flex; + justify-content: center; + gap: 30rpx; + padding: 0 30rpx 0; + + .combo-card { + width: 216rpx; + background: #FFFFFF; + border-radius: 16rpx; + border: 2rpx solid #F0DCAF; + display: flex; + flex-direction: column; + align-items: center; + padding-bottom: 50rpx; + position: relative; + box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.02); + + .combo-tag { + position: absolute; + top: -8rpx; + left: 50%; + transform: translateX(-50%); + width: 112rpx; + height: 40rpx; + z-index: 10; + } + + .combo-type1 { + font-size: 28rpx; + color: #CB8438; + font-weight: 500; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } + + .combo-type2 { + font-size: 28rpx; + color: #fff; + font-weight: 500; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } + + .combo-price { + margin-top: 60rpx; + font-size: 44rpx; + color: #C2863E; + font-weight: bold; + display: flex; + align-items: baseline; + + .currency { + font-size: 28rpx; + font-weight: normal; + margin-right: 4rpx; + } + } + + .combo-desc { + margin-top: 20rpx; + font-size: 22rpx; + color: #888888; + text-align: center; + line-height: 1.6; + } + } +} + .page-container { padding-bottom: 200rpx; } diff --git a/bundle/combo/info.vue b/bundle/combo/info.vue index ee02b97..5ebce9d 100644 --- a/bundle/combo/info.vue +++ b/bundle/combo/info.vue @@ -377,7 +377,7 @@ export default { }, function(res) { if (res.code) { - self.info = res.data; + self.setting = res.data; } } ) @@ -400,9 +400,8 @@ export default { }, contactUs() { - console.log("🚀 ~ this.setting:", this.setting) uni.makePhoneCall({ - phoneNumber: this.setting.company.contact + phoneNumber: this.setting.lists.company.contact }); }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 173d9d5..2438458 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -41,9 +41,9 @@ - 篮球套餐卡 + 篮球会员卡 青年卡、亲子卡、成年卡...等你来领 - 立即查看 + 立即抢购