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

冲突解决

Browse Source
This commit is contained in:
邓晓坤
2019-10-16 15:12:06 +08:00
parent 327a39440e
commit 877fae362d
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,21 +199,14 @@
</div> </div>
</div> </div>
<!-- 受益人类型 --> <!-- 受益人类型 -->
<<<<<<< Updated upstream
<div v-if="typebeneficiary == true"> <div v-if="typebeneficiary == true">
=======
<div v-if="typebeneficiary">
>>>>>>> Stashed changes
<div class="flex bg-white p10 align-items-c"> <div class="flex bg-white p10 align-items-c">
<span>受益人附件</span> <span>受益人附件</span>
</div> </div>
<div class="m20 bg-white"> <div class="m20 bg-white">
<<<<<<< Updated upstream
<van-cell-group> <van-cell-group>
<van-field required label="受益人附件上传" disabled /> <van-field required label="受益人附件上传" disabled />
</van-cell-group> </van-cell-group>
=======
>>>>>>> Stashed changes
<div @click="test('fileListtypebeneficiary', saleInsuredPersonInfo.idType)" class="flex"> <div @click="test('fileListtypebeneficiary', saleInsuredPersonInfo.idType)" class="flex">
<van-uploader <van-uploader
name="fileListtypebeneficiary" name="fileListtypebeneficiary"
@@ -848,11 +841,7 @@ export default {
subBusinessNo: '', subBusinessNo: '',
fileName: that.imgName fileName: that.imgName
} }
<<<<<<< Updated upstream
that.list.push(obj) that.list.push(obj)
=======
that.list.push(obj)
>>>>>>> Stashed changes
} }
// }) // })
} else { } else {