Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/base.vue

@@ -17,7 +17,7 @@
           <input type="checkbox" @click="select" >
           <span>我本人已阅读本协议，并同意授权xxxx</span>
         </div>
-        <button :class="[ischecked?'check1':'uncheck']" @click="confirm">同意</button>
+        <button class="appro" @click="confirm">同意</button>
       </div>
     </div>
     <div v-if="downNum" class="modal-show">
@@ -321,6 +321,17 @@ export default {
       },
     }
   },
+  watch: {
+    'ischecked': function (newVal, oldVal) {
+      let appro = document.querySelector('.appro')
+      console.log(oldVal, newVal)
+      if (newVal) {
+        appro.style.backgroundColor = '#00469c'
+      } else {
+        appro.style.backgroundColor = 'rgba(56, 63, 69, 0.5)'
+      }
+    },
+  },
   created () {
     if (this.bp_class === 'NP') {
       this.getNPBase()
@@ -329,7 +340,6 @@ export default {
     }
   },
   mounted () {
-    // this.getRent()
     this.getBonds()
     this.popProtocol()
   },
@@ -597,11 +607,6 @@ export default {
         color: #fff;
         bottom: 16px;
         left: 30.5px;
-      }
-      .check1 {
-        background-color: #00469c;
-      }
-      .uncheck {
         background-color: rgba(56, 63, 69, 0.5);
       }
       .title-box {

src/pages/intoApproval/intoApproval/refund.vue

@@ -76,7 +76,13 @@ export default {
   },
   data () {
     return {
-      info: {},
+      info: {
+        finance_amount: '',
+        lease_charge: '',
+        down_payment: '',
+        lease_times: '',
+        deposit: '',
+      },
       lists: [],
     }
   },
@@ -94,7 +100,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
-          vm.info = res.info
+          Object.assign(vm.info, res.info)
         }
       })
     },

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -149,7 +149,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.rentInfo = res.info
+          Object.assign(vm.rentInfo, res.info)
         }
       })
     },

src/pages/intoApproval/intoList.vue

@@ -61,7 +61,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'prj_confirm_list_query'
       let param = {
-        user_phone: '18507155349',
+        user_phone: window.localStorage.user_phone,
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()