Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -416,6 +416,7 @@ export default {
         master: {
           project_id: this.$route.params.project_id,
           confirm_status: 'APPROVED',
+          confirm_note: '同意',
         },
       }
       hlsPopup.showLoading('请稍候')

src/pages/contractCreate/contract-create-list.vue

@@ -323,10 +323,12 @@ export default {
     changeBase (item) {
       if (this.num === 1) {
         window.localStorage.setItem('contractReadonly', false)
-        window.localStorage.setItem('formPage', 'list')
+        window.localStorage.setItem('fromPage', 'list')
+        window.localStorage.setItem('project_id', item.project_id)
       } else if (this.num === 2) {
         window.localStorage.setItem('contractReadonly', true)
-        window.localStorage.setItem('formPage', 'list')
+        window.localStorage.setItem('fromPage', 'list')
+        window.localStorage.setItem('project_id', item.project_id)
       }
       this.$router.push({
         name: 'CreateBaseInfo',

src/pages/contractCreate/creat-rent-info.vue

@@ -330,7 +330,6 @@ export default {
       if (vm.fromPage === 'sale') {
         vm.fromList = false
       } else if (vm.fromPage === 'list') {
-        debugger
         vm.fromList = true
         vm.rentInfoQuery()
       }
@@ -378,6 +377,8 @@ export default {
           vm.productInfo.product_num = res.info.product_num
           vm.productInfo.product_id = res.info.product_id
           vm.productInfo.product_id_n = res.info.product_id_n
+          vm.saveInfo.product_plan_name = res.info.product_plan_id_n
+          vm.saveInfo.division_n = res.info.product_name
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -403,9 +404,6 @@ export default {
     },
     save () {
       let vm = this
-      vm.$router.push({
-        name: 'CreateEnclosureInfo',
-      })
       let url = process.env.basePath + 'prj_lease_info_save'
       vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
       vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
@@ -419,6 +417,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.isComputed = true
+          hlsPopup.showLongCenter(res.message)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/pay/firstPay/pay-entry.vue

@@ -312,7 +312,7 @@ export default {
         info: {
           order_id: vm.$route.params.order_id,
           fee: vm.serviceCharge,
-          bank_account_id: '9099',
+          bank_account_id: '0',
           pay_type: vm.payTypeObj.payType,
         },
       }

src/pages/pay/payment/pay-entry.vue

@@ -275,7 +275,7 @@ export default {
         info: {
           order_id: vm.$route.params.order_id,
           fee: vm.serviceCharge,
-          bank_account_id: '9099',
+          bank_account_id: '0',
           pay_type: vm.payTypeObj.payType,
         },
       }