APP
/
ox_zhiNengZhuShou
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fix 230614 bug

privacy
刘嘉炜 2 years ago
parent
a521bf602f
commit
b9451b4489
3 changed files with 24 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/pages/site/confirm/confirm.vue
  2. 2
      src/subpackage/common/components/card_search.vue
  3. 16
      src/subpackage/common/pages/pay_type_select.vue

19
src/pages/site/confirm/confirm.vue
View File

@ -47,12 +47,12 @@
</view>
<view class="sc-ipt">
<view class="si-price">
<view class="si-tit"><text>* </text>收取金额</view>
<view class="sp-frame"><text>￥</text><input v-model="ocPrice" type="digit" /></view>
<view class="si-tit">收取金额</view>
<view class="sp-frame"><text>￥</text><input v-model="ocPrice" type="digit" placeholder="0" /></view>
</view>
<view class="si-usage">
<view class="su-line">
<view class="si-tit"><text>* </text>占用用途</view>
<view class="si-tit"><text class="red">* </text>占用用途</view>
<view class="su-ls">
<block v-for="(e, i) in usageLs" :key="i">
<view :class="[e.type == ocUsage ? 'active' : '']" @click="usageChange(e.type)">
@ -65,7 +65,9 @@
<view class="su-tip">注：占用用途如选择“散客”，用户端次卡列表将会显示该占用场次为散客时间</view>
</view>
<view class="si-reason">
<view class="si-tit">占用原因</view>
<view class="si-tit">
<text class="red">* </text>占用原因<text class="tip">必填，占用原因将显示在看板对应占用的场地</text>
</view>
<view class="sr-frame">
<textarea placeholder="多行输入…" v-model="ocReaon"></textarea>
</view>
@ -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;

2
src/subpackage/common/components/card_search.vue
View File

@ -25,7 +25,7 @@
<view class="cc-line green"><text class="cc-txt">微信昵称：</text>{{ e.nickname || '-' }}</view>
<view class="cc-line"><text class="cc-txt">手机号码：</text>{{ e.mobile || '-' }}</view>
<view class="cc-line"><text class="cc-txt">卡名称：</text>{{ e.card_name || '-' }}</view>
<view class="cc-line"><text class="cc-txt">卡余额：</text>￥{{ e.amount || '0' }}</view>
<view class="cc-line"><text class="cc-txt">卡余额：</text>￥{{ e.balance || '0' }}</view>
</view>
<view class="ci-icon" :class="[selectedCard.card_no==e.card_no?'active':'']">
<image class="ci-img" mode="aspectFit" src="/subpackage/common/static/images/choose.png"></image>

16
src/subpackage/common/pages/pay_type_select.vue
View File

@ -8,7 +8,7 @@
<view class="ph-type-text">订场支付金额</view>
<view class="ph-price"><text>¥</text>{{ payAmount || 0 }}</view>
<view class="ph-discount-tip">
<block v-if="payMethodsID == 3&&selectedCard&&selectedCard.discount">
<block v-if="payMethodsID == 3&&selectedCard&&selectedCard.discount&&selectedCard.discount<10">
<text>原价：¥{{ optionsQuery.amount || 0 }}，</text>折扣金额¥{{ discountAmount || 0 }}
</block>
</view>
@ -31,7 +31,7 @@
<view class="pr-content" v-if="e.id == 3&&selectedCard&&selectedCard.card_no">
<view class="pc-line">
<view class="pl-txt">储值卡卡号：{{ selectedCard.card_no || '-' }}</view>
<view class="pl-tag" v-if="selectedCard.discount">使用会员卡支付{{ selectedCard.discount || '-' }}折</view>
<view class="pl-tag" v-if="selectedCard.discount&&selectedCard.discount<10">使用会员卡支付{{ selectedCard.discount || '-' }}折</view>
</view>
<view class="pc-line">
<view class="pl-txt">微信昵称：{{ selectedCard.nickname || '-' }}</view>
@ -43,7 +43,7 @@
<view class="pl-txt">卡名称：{{ selectedCard.card_name || '-' }}</view>
</view>
<view class="pc-line">
<view class="pl-txt">卡余额：￥{{ selectedCard.amount || '0' }}</view>
<view class="pl-txt">卡余额：￥{{ selectedCard.balance || '0' }}</view>
</view>
</view>
</view>
@ -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 || '';
}
}

Write Preview
Loading…
Cancel
Save