Merge branch 'master-charge' of http://git.yujin.shuziyunyao.com/yujin/digital-medicine-front into master-charge

src/views/training/models/meeting-detail-attend.vue

@@ -166,11 +166,11 @@
             </vxe-column>
             <vxe-column title="支付方式" field="payType" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">
                 <template #default="{ row }">
-                    <div v-if="row.payType === '1'" class="f-w-5">微信支付</div>
-                    <div v-if="row.payType === '2'" class="f-w-5">对公转账</div>
-                    <div v-if="row.payType === '3'" class="f-w-5">对公转账收款</div>
-                    <div v-if="row.payType === '4'" class="f-w-5">现场收款</div>
-                    <div v-if="row?.payType !=='1'&& row?.payType !=='2' && row?.payType !=='3' && row?.payType !=='4'">-</div>
+                    <div v-if="row.payType === '1' && +row?.joinFee" class="f-w-5">微信支付</div>
+                    <div v-if="row.payType === '2' && +row?.joinFee" class="f-w-5">对公转账</div>
+                    <div v-if="row.payType === '3' && +row?.joinFee" class="f-w-5">对公转账收款</div>
+                    <div v-if="row.payType === '4' && +row?.joinFee" class="f-w-5">现场收款</div>
+                    <div v-if="(row?.payType !=='1'&& row?.payType !=='2' && row?.payType !=='3' && row?.payType !=='4') || !+row?.joinFee">-</div>
                 </template>
             </vxe-column>
             <vxe-column title="开票信息" field="remark" min-width="100" :formatter="colNoData" v-if="form?.meetingCharge?.hasFee =='1'">