解决冲突

src/pages/login.vue

@@ -137,6 +137,7 @@ export default {
     },
     access: function () {
       document.getElementById('passwordInput').blur()
+      document.activeElement.blur()
       let vm = this
       if (!vm.username || vm.username === undefined) {
         vm.hlsPopup.showLongCenter('请输入用户名')

src/pages/pay/payment/contract-record.vue

@@ -217,13 +217,13 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.info = res.prj_lists
-         /* vm.info.forEach(i => {
+          /* vm.info.forEach(i => {
             i.con_lists.forEach(j => {
               // let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
               let num = ''
               vm.$set(j, 'amount', num)
             })
-          })*/
+          }) */
           vm.showList = vm.info
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -236,7 +236,7 @@ export default {
         i.con_lists.forEach(j => {
           if (!j.amount || j.amount === 0) {
 
-          }else{
+          } else {
             let obj = {}
             obj.bp_id = window.localStorage.getItem('bp_id')
             obj.amount = j.amount
@@ -330,6 +330,7 @@ export default {
     justify-content: space-around;
     background: #fff;
     border-radius: 0.08rem;
+    box-shadow: 0 0 10px #ccc;
     top: -23px;
     img {
       //position: absolute;