冲突解决

src/views/ebiz/sale/AttachmentManagement.vue

@@ -14,7 +14,7 @@
                   <van-cell-group>
                     <van-field required :label="item.id == '2' ? `${item.text}户主页` : `${item.text}正面`" disabled />
                   </van-cell-group>
-                  <div @click="test('fileListIdFront', saleInsuredInfo.idType)" class="flex align-items-e">
+                  <div @click="test('', saleInsuredInfo.idType)" class="flex align-items-e">
                     <van-uploader
                       name="fileListIdFront"
                       v-model="fileListIdFront"
@@ -199,14 +199,21 @@
         </div>
       </div>
       <!-- 受益人类型 -->
+<<<<<<< Updated upstream
       <div v-if="typebeneficiary == true">
+=======
+      <div v-if="typebeneficiary">
+>>>>>>> Stashed changes
         <div class="flex bg-white p10 align-items-c">
           <span>受益人附件</span>
         </div>
         <div class="m20 bg-white">
+<<<<<<< Updated upstream
           <van-cell-group>
             <van-field required label="受益人附件上传" disabled />
           </van-cell-group>
+=======
+>>>>>>> Stashed changes
           <div @click="test('fileListtypebeneficiary', saleInsuredPersonInfo.idType)" class="flex">
             <van-uploader
               name="fileListtypebeneficiary"
@@ -841,7 +848,11 @@ export default {
               subBusinessNo: '',
               fileName: that.imgName
             }
+<<<<<<< Updated upstream
             that.list.push(obj)
+=======
+           that.list.push(obj)
+>>>>>>> Stashed changes
           }
           // })
         } else {
@@ -979,7 +990,7 @@ export default {
         return false
       } else {
         let beneficiaryInfoList = JSON.parse(window.localStorage.getItem('beneficiaryInfo'))
-        if (JSON.parse(window.localStorage.getItem('trialList'))[0].prem >= 100000) {
+        if (JSON.parse(window.localStorage.getItem('trialList'))[0].prem >= 200000) {
           for (let index = 0; index < beneficiaryInfoList.length; index++) {
             if (beneficiaryInfoList[index].relationToInsured == 5) {
               return true
@@ -1007,6 +1018,7 @@ export default {
         saleInsuredInfoOther,
         fileListtypebeneficiary
       } = this
+      console.log(this)
       return {
         fileListIdFront,
         fileListIdBack,