diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue index d8ce167..9203127 100644 --- a/src/pages/site/confirm/confirm.vue +++ b/src/pages/site/confirm/confirm.vue @@ -47,12 +47,12 @@ - * 收取金额 - + 收取金额 + - * 占用用途 + * 占用用途 @@ -65,7 +65,9 @@ 注:占用用途如选择“散客”,用户端次卡列表将会显示该占用场次为散客时间 - 占用原因 + + * 占用原因必填,占用原因将显示在看板对应占用的场地 + @@ -182,6 +184,8 @@ export default { reason: ocReaon, } + if(ocReaon === '')return util.showNone('请填写占用原因!'); + if(isOrder&&ocUsage == 4)return this.toOrderPaySelect({ exQuery: { order_no: orderInfo?.order_no, @@ -334,9 +338,14 @@ export default { line-height: 40upx; font-size: 28upx; color: #333; - >text{ + >.red{ color: #EA5061; } + .tip{ + margin-left: 16upx; + font-size: 24upx; + color: #9A9A9D; + } } .si-price{ margin-bottom: 12upx; diff --git a/src/subpackage/common/components/card_search.vue b/src/subpackage/common/components/card_search.vue index 8b66b63..e77c733 100644 --- a/src/subpackage/common/components/card_search.vue +++ b/src/subpackage/common/components/card_search.vue @@ -25,7 +25,7 @@ 微信昵称:{{ e.nickname || '-' }} 手机号码:{{ e.mobile || '-' }} 卡名称:{{ e.card_name || '-' }} - 卡余额:¥{{ e.amount || '0' }} + 卡余额:¥{{ e.balance || '0' }} diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue index 9be7a6d..c952a07 100644 --- a/src/subpackage/common/pages/pay_type_select.vue +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -8,7 +8,7 @@ 订场支付金额 ¥{{ payAmount || 0 }} - + 原价:¥{{ optionsQuery.amount || 0 }},折扣金额¥{{ discountAmount || 0 }} @@ -31,7 +31,7 @@ 储值卡卡号:{{ selectedCard.card_no || '-' }} - 使用会员卡支付{{ selectedCard.discount || '-' }}折 + 使用会员卡支付{{ selectedCard.discount || '-' }}折 微信昵称:{{ selectedCard.nickname || '-' }} @@ -43,7 +43,7 @@ 卡名称:{{ selectedCard.card_name || '-' }} - 卡余额:¥{{ selectedCard.amount || '0' }} + 卡余额:¥{{ selectedCard.balance || '0' }} @@ -73,7 +73,6 @@ import server from '../js/server.js'; import API from '../js/api.js'; import util from '../../../utils/util.js'; import cardSearch from '../components/card_search'; -import numeral from 'numeral'; export default { components: { 'card-search': cardSearch @@ -159,10 +158,10 @@ export default { let { optionsQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { brand_id: optionsQuery.brand_id || '', - amount: optionsQuery.amount || '', + amount: +optionsQuery.amount || '', reason: optionsQuery?.exQuery?.reason || '', order_no: optionsQuery?.exQuery?.order_no || '', - take_up_pay_type: payMethodsID + take_up_pay_type: this.getPayMethodsName(payMethodsID) } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; @@ -184,7 +183,7 @@ export default { let { exQuery, payMethodsID, otherTypeRemark, selectedCard } = this; let _data = { ...exQuery, - take_up_pay_type: payMethodsID || '' + take_up_pay_type: this.getPayMethodsName(payMethodsID) || '' } if(payMethodsID === 4)_data['remark'] = otherTypeRemark || '其它'; if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || ''; @@ -206,6 +205,9 @@ export default { } }) .catch(util.hideLoad) + }, + getPayMethodsName(payMethodsID){ + return this.getPayMethodsLs().find(item=>item.id == payMethodsID)?.name || ''; } }