Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 14:51:39
+ * @LastEditTime: 2019-10-24 18:59:49
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -34,15 +34,15 @@
         </item>
         <item>
           <div slot="name" >设备总价</div>
-          <section slot="content">{{ conditionInfo.equip_price | currency }}</section>
+          <section slot="content">{{ conditionInfo.equip_price * conditionInfo.product_num | currency }}</section>
         </item>
         <item>
           <div slot="name" >融资金额</div>
-          <section slot="content">{{ Math.round(conditionInfo.finance_amount) | currency }}</section>
+          <section slot="content">{{ Math.round(conditionInfo.finance_amount) * conditionInfo.product_num | currency }}</section>
         </item>
         <item>
           <div slot="name" >首付款</div>
-          <section slot="content">{{ Math.round(conditionInfo.down_payment) | currency }}</section>
+          <section slot="content">{{ Math.round(conditionInfo.down_payment) * conditionInfo.product_num | currency }}</section>
         </item>
         <item>
           <div slot="name" >保证金比例</div>
@@ -50,7 +50,7 @@
         </item>
         <item>
           <div slot="name" >保证金</div>
-          <section slot="content">{{ Math.round(conditionInfo.deposit) | currency }}</section>
+          <section slot="content">{{ Math.round(conditionInfo.deposit) * conditionInfo.product_num | currency }}</section>
         </item>
         <item>
           <div slot="name" >手续费比例</div>
@@ -58,7 +58,7 @@
         </item>
         <item>
           <div slot="name" >手续费</div>
-          <section slot="content">{{ Math.round(conditionInfo.lease_charge) | currency }}</section>
+          <section slot="content">{{ Math.round(conditionInfo.lease_charge) * conditionInfo.product_num | currency }}</section>
         </item>
         <item>
           <div slot="name" >预计付款日</div>
@@ -186,24 +186,21 @@ export default {
   computed: {},
   watch: {},
   beforeRouteEnter (to, from, next) {
-    if (from.name === 'ContractSigning') {
-      next(vm => {
+    next(vm => {
+      if (from.name === 'ContractSigning') {
+        vm.bank_flag = false
         vm.project_id = vm.$route.params.project_id
         vm.confirm_id = vm.$route.params.confirm_id
         vm.confirm_status = vm.$route.params.confirm_status
         vm.conditionQuery()
-      })
-    }
-    next()
+        vm.bankCardQuery()
+      } else if (from.name === 'EntryInfo') {
+        vm.bankCardQuery()
+      }
+    })
   },
   activated () {
-    this.bankCardQuery()
-    // console.log('...........', this.$route.params.confirm_status)
-    // if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag，传入银行卡录入页面，负责重置数据与否
-    //   this.entry_info_flag = true
-    // } else {
-    //   this.entry_info_flag = false
-    // }
+    // this.bankCardQuery()
   },
   methods: {
     // 合同商务条件查询
@@ -259,16 +256,18 @@ export default {
         let param = {
           master: {
             confirm_id: vm.confirm_id,
-            con_confirm_status: vm.confirm_status,
+            con_confirm_status: 'APPROVED',
           },
         }
         vm.hlsHttp.post(url, param).then(function (res) {
-          console.log('商务条件', res)
-          // if (res.result === 'S') {
-          //   vm.conditionInfo = res.info
-          // } else {
-          //   hlsPopup.showLongCenter(res.message)
-          // }
+          console.log('保存结果', res)
+          if (res.result === 'S') {
+            vm.$router.push({
+              name: 'ContractSigning',
+            })
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
         })
       } else {
         this.isshow = true
@@ -286,7 +285,7 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         console.log('bankcardinfo。。。。。。。。。。。。', res)
         if (res.result === 'S') {
-          if (!(JSON.stringify(res.info) === '{}')) {
+          if ('info' in res && Object.keys(res.info).length !== 0) {
             // vm.bank_lists = [res.info]
             // console.log(vm.bank_lists[0])
             vm.bank_flag = true

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 14:51:12
+ * @LastEditTime: 2019-10-24 18:52:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -101,12 +101,12 @@ export default {
 
   },
   beforeRouteEnter (to, from, next) {
-    if (from.name === 'MyInfo') {
-      next(vm => {
-        vm.contractList()
-      })
-    }
-    next()
+    // if (from.name === 'MyInfo') {
+    next(vm => {
+      vm.contractList()
+    })
+    // }
+    // next()
   },
   methods: {
     contractList () {

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-24 14:52:02
+ * @LastEditTime: 2019-10-24 17:45:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -29,7 +29,7 @@
           <item>
             <div slot="name" >银行卡卡号</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_account_num" type="text" readonly placeholder="上传银行卡自动填充"
+              slot="content" v-model="bank_lists[0].bank_account_num" type="text" placeholder="上传银行卡自动填充"
             >
           </item>
           <item>
@@ -38,7 +38,7 @@
           </item>
           <item>
             <div slot="name" >银行名称</div>
-            <input slot="content" v-model="bank_lists[0].bank_full_name" readonly type="text" placeholder="请输入银行名称">
+            <input slot="content" v-model="bank_lists[0].bank_full_name" type="text" placeholder="请输入银行名称">
           </item>
           <item>
             <div slot="name" >支行名称</div>
@@ -236,11 +236,11 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         console.log('bankcardinfo。。。。。。。。。。。。', res)
         if (res.result === 'S') {
-          if (!(JSON.stringify(res.info) === '{}')) {
+          if ('info' in res) {
             vm.bank_lists = [res.info]
             // console.log(vm.bank_lists[0])
           } else {
-            this.bank_lists = [
+            vm.bank_lists = [
               {
                 bank_full_name: '', // 银行名称
                 bank_account_num: '', // 卡号

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-10-23 14:56:38
+ * @LastEditTime: 2019-10-24 16:52:41
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -188,7 +188,7 @@ export default new Router({
     // 产品查询
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
     {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},
-    {path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: false}},
+    {path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}},
     // 帮助与反馈
     {path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}},
     {path: '/help-detail', component: HelpDetail, name: 'HelpDetail', meta: {keepAlive: true}},