Merge branch 'liuxin' into develop

src/pages/contractCreate/add-undertake.vue

@@ -35,7 +35,7 @@ export default {
   data () {
     return {
       undertakeList: [], // 担保人列表
-      selectUdertake: [],
+      selectUdertake: {},
       pagenum: 1,
       keyWord: '',
       showFlag: false,
@@ -105,20 +105,7 @@ export default {
       })
     },
     addUndertake (e) {
-      if (this.selectUdertake.length === 0) {
-        this.selectUdertake.push(e)
-      } else {
-        let index = this.selectUdertake.findIndex(item => {
-          if (item.bp_name === e.bp_name) {
-            return true
-          }
-        })
-        if (index !== -1) {
-          hlsPopup.showLongCenter('您已添加了该担保人')
-        } else {
-          this.selectUdertake.push(e)
-        }
-      }
+      this.selectUdertake = e
       this.$emit('addUnder', this.selectUdertake)
       setTimeout(() => {
         this.showFlag = false
@@ -167,7 +154,7 @@ export default {
   },
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
 #add-person {
   position: absolute;
   top:0;
@@ -182,7 +169,6 @@ export default {
     width: 100%;
     height: 1.02rem;
     z-index: 100;
-    margin-bottom: 8px;
     input {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
@@ -211,5 +197,57 @@ export default {
       border: 2px solid #bcc6ff;
     }
   }
+   .content {
+    position: absolute;
+    top: 0;
+  }
+   .scrollContent {
+       padding-top: 1rem;
+    padding-bottom: 120px;
+  }
+  .tab-style {
+    width: 100%;
+    position: absolute;
+  }
+}
+.platform-ios {
+  #confirmList {
+    .scrollContent {
+      padding-top: 1.4rem;
+    }
+  }
+}
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #person {
+      .scrollContent {
+        padding-top: 1.8rem;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #person {
+      .scrollContent {
+        padding-top: 1.8rem;
+      }
+      .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
+    }
+  }
 }
 </style>

src/pages/contractCreate/create-base-info.vue

@@ -383,8 +383,7 @@ export default {
       vm.pageNum = 1
       vm.pageNumSearch = 1
       vm.undertakeList = []
-      vm.bp_class = 'NP'
-      // vm.bp_class = window.localStorage.bp_class_tenant
+      vm.bp_class = window.localStorage.bp_class_tenant
       if (from.name === 'SalesInfo') {
         vm.fromPutted = false
         Object.keys(vm.saveInfo).forEach(i => {
@@ -434,7 +433,7 @@ export default {
       if (index !== -1) {
         hlsPopup.showLongCenter('您已添加了该担保人')
       } else {
-        this.selectUdertake.push(...e)
+        this.selectUdertake.push(e)
       }
     },
     addPerson () {