diff --git a/api/exchange.js b/api/exchange.js index 699fc68..610c22e 100644 --- a/api/exchange.js +++ b/api/exchange.js @@ -56,3 +56,7 @@ export function recordQuotaList(data) { export function recordIntegralList(data) { return request.get(`exchange/record_integral_list`,data); } +// 额度转赠 - 提交 +export function quotaTransfer(data) { + return request.get(`exchange/quota_transfer`,data); +} diff --git a/pages.json b/pages.json index 3789f90..b176daa 100644 --- a/pages.json +++ b/pages.json @@ -564,6 +564,12 @@ "navigationBarTitleText": "酒卡变更记录" } }, + { + "path": "online_payment/record/quota_transfer", + "style": { + "navigationBarTitleText": "酒卡转赠" + } + }, { "path": "online_payment/record/integral", "style": { diff --git a/pages/users/online_payment/exchange/index.vue b/pages/users/online_payment/exchange/index.vue index be0b42e..7d2df93 100644 --- a/pages/users/online_payment/exchange/index.vue +++ b/pages/users/online_payment/exchange/index.vue @@ -43,11 +43,11 @@ {{ pointUserInfo.available }} - 剩余积分 + 剩余酒水卡积分 {{ pointUserInfo.available_integral }} - 使用积分 + 使用酒水卡积分 {{ pay_info.use_integral }} @@ -300,14 +300,14 @@ export default { return false; } // 计算使用的相关信息 - // console.log('可用积分',Number(this.pointUserInfo.available_integral)) + // console.log('可用酒水卡积分',Number(this.pointUserInfo.available_integral)) if(Number(totalMoney) > Number(this.pointUserInfo.available_integral)){ - // 积分不足 + // 酒水卡积分不足 this.pay_info.use_integral = Number(this.pointUserInfo.available_integral); this.pay_info.diff_money = (Number(totalMoney) - Number(this.pay_info.use_integral)).toFixed(2); this.pay_info.diff_money_pay = (Number(this.pay_info.diff_money) * Number(this.pointUserInfo.diff_rate) / 100).toFixed(2); }else{ - // 积分充足 + // 酒水卡积分充足 this.pay_info.use_integral = Number(totalMoney); this.pay_info.diff_money_pay = this.pay_info.diff_money = 0; } diff --git a/pages/users/online_payment/exchange/record.vue b/pages/users/online_payment/exchange/record.vue index 896bde8..292b1d5 100644 --- a/pages/users/online_payment/exchange/record.vue +++ b/pages/users/online_payment/exchange/record.vue @@ -12,7 +12,8 @@ 操作员:{{ item.staff_nickname || item.staff_uid }} - 使用积分:{{ item.use_integral }} + 扣除酒卡额度:{{ (item.total_money - item.diff_money_pay).toFixed(2) }} + 使用酒水卡积分:{{ item.use_integral }} 差价:{{ item.diff_money }} 差价实付金额:{{ item.diff_money_pay }} diff --git a/pages/users/online_payment/record/quota.vue b/pages/users/online_payment/record/quota.vue index e35c0fb..1c5abac 100644 --- a/pages/users/online_payment/record/quota.vue +++ b/pages/users/online_payment/record/quota.vue @@ -9,13 +9,17 @@ + + + 转赠 + - {{ item.remark }} + {{ item.remark }} 增加 减少 @@ -81,6 +85,16 @@ export default{ _this.allow_page = true; }) }, + // 页面跳转 + goMenuPage(url) { + if (this.isLogin) { + uni.navigateTo({ + url + }) + } else { + this.openAuto() + } + }, }, // 触底监听 onReachBottom() { @@ -137,6 +151,27 @@ export default{ } } } + // 转赠按钮 + .transfer-quota{ + text-align: center; + width: 100%; + height: 100rpx; + display: inline-flex; + flex-direction: row; + flex-wrap: nowrap; + align-items: center; + justify-content: center; + .transfer-text{ + font-size: 35rpx !important; + color: #fff; + background-color: #e6a23c; + border-color: #e6a23c; + height: 60rpx; + width: 200rpx; + line-height: 60rpx; + border-radius: 80rpx; + } + } // 信息列表 .integral-list{ .integral-content{ @@ -158,20 +193,29 @@ export default{ width: calc(100% - 200rpx); .left-top { + width: 100%; display: inline-flex; flex-direction: row; flex-wrap: nowrap; justify-content: flex-start; align-items: center; - font-size: 34rpx; - font-weight: bold; - color: #222427; + .left-remark{ + font-size: 34rpx; + font-weight: bold; + color: #222427; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 90rpx); + } .left-tag { font-size: 24rpx; font-weight: unset; margin-left: 20rpx; - padding: 5rpx 15rpx; + padding: 5rpx 0; border-radius: 5rpx; + text-align: center; + width: 80rpx; } .left-tag-frozen{ background: #fceaea; diff --git a/pages/users/online_payment/record/quota_transfer.vue b/pages/users/online_payment/record/quota_transfer.vue new file mode 100644 index 0000000..d2cc7e5 --- /dev/null +++ b/pages/users/online_payment/record/quota_transfer.vue @@ -0,0 +1,575 @@ + + + + + diff --git a/pages/users/online_payment/site/index.vue b/pages/users/online_payment/site/index.vue index 308c873..276928d 100644 --- a/pages/users/online_payment/site/index.vue +++ b/pages/users/online_payment/site/index.vue @@ -30,7 +30,8 @@ 消费用户:{{ item.nickname || item.uid }} - 使用积分:{{ item.use_integral }} + 扣除酒卡额度:{{ (item.total_money - item.diff_money_pay).toFixed(2) }} + 使用酒水卡积分:{{ item.use_integral }} 差价:{{ item.diff_money }} 差价实付金额:{{ item.diff_money_pay }}