hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-25 00:12:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev_1220' into dev

Browse Source
This commit is contained in:
zhouna
2019-12-26 10:41:56 +08:00
parent 624a8196bb c767902932
commit 26b09eb42c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/ebiz/sale/List.vue
View File

@@ -96,7 +96,16 @@
round
>重新支付</van-button
>
<template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '55'">
<van-button
@click="changeCard(order)"
v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '48'"
size="small"
class="mr5"
type="danger"
round
>修改卡号</van-button
>
<template v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '49') || (active == 'commit' && order.orderInfoDTO.orderStatus == '55')">
<van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
<van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
</template>

3
src/views/ebiz/sale/NotifyingMessage.vue
View File

@@ -190,6 +190,7 @@ export default {
},
isShowList() {
let that = this
console.log(that.saleInsuredAge)
that.impartDTOS.map(item => {
if (item.impartType == 0 || item.impartType == 4) {
item.impartItemDTOS.map((items, index, array) => {
@@ -218,7 +219,7 @@ export default {
}
}
if (obj.age && obj.sex) {
if (that.saleInsuredPersonSex != obj.sex || (that.saleInsuredPersonAge == obj.sex && that.saleInsuredPersonAge < obj.age)) {
if (that.saleInsuredPersonSex != obj.sex || (that.saleInsuredPersonSex == obj.sex && that.saleInsuredPersonAge < obj.age)) {
array.splice(index, 1, '')
}
}