diff --git a/bundle/recharge/card.vue b/bundle/recharge/card.vue new file mode 100644 index 0000000..c3dd877 --- /dev/null +++ b/bundle/recharge/card.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/bundle/recharge/recharge.vue b/bundle/recharge/recharge.vue new file mode 100644 index 0000000..5166be2 --- /dev/null +++ b/bundle/recharge/recharge.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/bundle/reserve/confirm.vue b/bundle/reserve/confirm.vue index 2b55ea0..39e1938 100644 --- a/bundle/reserve/confirm.vue +++ b/bundle/reserve/confirm.vue @@ -89,6 +89,38 @@ + + + + + + + + 会员卡选择 + + + + + + 白金会员卡 + + 享 + + 9.5 + 折 + + + + + ￥212.00 + + + + + 确定 + + + @@ -179,9 +211,15 @@ - 余额支付：(剩余：{{balance}}) + 平台余额 - + + + + 铂金会员卡 9.3折 + + + @@ -246,7 +284,9 @@ order: {}, result: '', loadding: true, - _submitting: false + _submitting: false, + balancePopup: false, + balance: 0 }; }, @@ -286,17 +326,17 @@ // } // 获取余额 - self._post( - 'user.user/userMoney', - { - app_id: self.getAppId(), - }, - function (res) { - if (res.code) { - self.balance = res.data.balance - } - } - ) + // self._post( + // 'user.user/userMoney', + // { + // app_id: self.getAppId(), + // }, + // function (res) { + // if (res.code) { + // self.balance = res.data.balance + // } + // } + // ) // 获取场馆详情 self._post( @@ -401,6 +441,7 @@ this.billPopup = true; }, + // 关闭消费明细 closeBillPopup() { this.billPopup = false; this.showPrice = true; @@ -409,7 +450,11 @@ // 选择支付方式 payTypeFunc(n) { this.payType = n; - this.countPrice() + if (n == 'balance') { + this.balancePopup = true; + } else { + this.balancePopup = false; + } }, // 去支付 @@ -566,6 +611,16 @@ uni.navigateBack({delta: 1}) }, 500); } + }, + + // 选择会员卡 + selectCard() { + this.balance = 200; // 模拟选择会员卡后的余额 + }, + + // 确认选择 + confirmCard() { + this.balancePopup = false; } } }; @@ -826,4 +881,86 @@ border-radius: 10rpx; text-align: center; } + + .dis { + font-size: 28rpx; + color: #303133; + line-height: 40rpx; + } + + .card { + margin-top: 28rpx; + padding-bottom: 64rpx; + + .card-item { + width: 690rpx; + height: 104rpx; + background: #FFFFFF; + border-radius: 16rpx; + border: 2rpx solid #F4F4F4; + margin: 0 30rpx 20rpx; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 30rpx; + box-sizing: border-box; + + .card-title { + font-size: 30rpx; + color: #121212; + margin-right: 24rpx; + } + + .discount { + width: 44rpx; + height: 44rpx; + line-height: 44rpx; + text-align: center; + border-radius: 100%; + background: #FF5951; + color: #fff; + font-size: 30rpx; + margin-right: 20rpx; + } + + .sale { + font-size: 28rpx; + } + + .card-balance { + font-size: 30rpx; + color: #303133; + line-height: 42rpx; + margin-right: 28rpx; + } + } + + .active { + border: 2rpx solid #FF5951; + background: #FFF4F4; + + .card-checkout { + .iconfont{ + color: #365A9A; + } + } + } + + .card-btn { + width: 630rpx; + height: 90rpx; + background: #365A9A; + border-radius: 8rpx; + font-weight: bold; + font-size: 30rpx; + color: #FFFFFF; + line-height: 90rpx; + text-align: center; + margin: 42rpx auto 0; + } + } + + .pt44 { + padding-top: 44rpx;; + } \ No newline at end of file diff --git a/pages.json b/pages.json index 348b497..f300508 100644 --- a/pages.json +++ b/pages.json @@ -1001,6 +1001,18 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "recharge/recharge", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "recharge/card", + "style": { + "navigationStyle": "custom" + } } ] }], diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue index e9074c5..0a6d2fb 100644 --- a/pages/order/cg-order-detail.vue +++ b/pages/order/cg-order-detail.vue @@ -194,6 +194,11 @@ + + + 联系商家 + + 再次预定 diff --git a/pages/user/index/index.vue b/pages/user/index/index.vue index a2243c4..b7274b4 100644 --- a/pages/user/index/index.vue +++ b/pages/user/index/index.vue @@ -157,10 +157,10 @@ - + + diff --git a/static/bjk.png b/static/bjk.png new file mode 100644 index 0000000..76b0ac1 Binary files /dev/null and b/static/bjk.png differ