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-23 13:51:34
+ * @LastEditTime: 2019-10-23 17:25:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -178,6 +178,7 @@ export default {
       uncheck1: unCheck1,
       uncheck2: unCheck2,
       confirm_status: '',
+      entry_info_flag: false,
     }
   },
   computed: {},
@@ -194,6 +195,11 @@ export default {
   },
   activated () {
     // 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
+    }
   },
   methods: {
     // 合同商务条件查询
@@ -236,11 +242,31 @@ export default {
         name: 'EntryInfo',
         params: {
           project_id: this.project_id,
+          entry_info_flag: this.entry_info_flag,
         },
       })
     },
     inSure () {
-      this.isshow = true
+      console.log(typeof window.sessionStorage.getItem('add_status'))
+      if (window.sessionStorage.getItem('add_status') === 'true') {
+        // this.entry_info_flag = true
+        // let vm = this
+        // let url = $config.basePath + 'con_bp_confirm'
+        // let param = {
+        //   project_id: this.$route.params.project_id,
+        // }
+        // vm.hlsHttp.post(url, param).then(function (res) {
+        //   console.log('商务条件', res)
+        //   if (res.result === 'S') {
+        //     vm.conditionInfo = res.info
+        //   } else {
+        //     hlsPopup.showLongCenter(res.message)
+        //   }
+        // })
+      } else {
+        this.isshow = true
+        // this.entry_info_flag = false
+      }
     },
   },
 }

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 11:01:35
+ * @LastEditTime: 2019-10-23 16:59:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -126,7 +126,8 @@ export default {
       })
     },
     // val: project_id, status: confirm_status
-    goDetails (val, status) {
+    goDetails (val, status) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
+      window.sessionStorage.setItem('add_status', false)
       this.$router.push({
         name: 'ContractDetail',
         params: {

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 13:47:58
+ * @LastEditTime: 2019-10-23 17:33:47
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -64,17 +64,19 @@ import unCheck1 from '@/assets/distributorSign/conditionUncheck.png'
 import unCheck2 from '@/assets/distributorSign/textUncheck.png'
 
 export default {
-  name: 'ContractDetail',
+  name: 'EntryInfo',
   components: {
   },
   data () {
     return {
       num: 1,
       bankImg: '', // 银行卡图片
+      project_id: '',
       check1: Check1,
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
+      bank_card_flag: false,
       res: '',
       name: '',
       // bank_lists: {
@@ -97,6 +99,18 @@ export default {
   watch: {},
   activated () {
     this.name = this.$route.params.name
+    if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
+      this.project_id = this.$route.params.project_id
+      this.bankImg = ''
+      this.bank_lists = [
+        {
+          bank_full_name: '', // 银行名称
+          bank_account_num: '', // 卡号
+          bank_account_name: '',
+          bank_branch_name: '',
+        },
+      ]
+    }
   },
   methods: {
     // ocr识别入口
@@ -169,22 +183,46 @@ export default {
       })
     },
     cardAdd () {
-      let vm = this
-      let url = $config.basePath + 'con_bank_save'
-      let param = {
-        master: {
-          project_id: vm.$route.params.project_id,
-          bank_lists: vm.bank_lists,
-        },
+      for (var key in this.bank_lists[0]) {
+        if (!this.bank_lists[0][key]) {
+          this.bank_card_flag = false
+          this.hlsPopup.showLongCenter('银行信息不完整！')
+          return
+        } else {
+          this.bank_card_flag = true
+        }
+      }
+
+      if (this.hlsUtil.isBankAccount(this.bank_lists[0].bank_account_num)) {
+        this.bank_card_flag = false
+        this.hlsPopup.showLongCenter('请输入正确银行卡号！')
+      }
+      if (this.bank_card_flag) {
+        let vm = this
+        let url = $config.basePath + 'con_bank_save'
+        let param = {
+          master: {
+            project_id: vm.$route.params.project_id,
+            bank_lists: vm.bank_lists,
+          },
+        }
+        vm.hlsHttp.post(url, param).then(function (res) {
+          console.log('银行信息录入', res)
+          if (res.result === 'S') {
+            vm.hlsPopup.showSuccess('保存成功')
+            window.sessionStorage.setItem('add_status', true)
+            vm.$routeGo()
+            // vm.$router.push({
+            //   name: 'ContractDetail',
+            //   // params: {
+            //   //   add_status: true,
+            //   // },
+            // })
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
       }
-      vm.hlsHttp.post(url, param).then(function (res) {
-        console.log('银行信息录入', res)
-        // if (res.result === 'S') {
-        //   vm.conditionInfo = res.info
-        // } else {
-        //   hlsPopup.showLongCenter(res.message)
-        // }
-      })
     },
   },
 }

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

@@ -165,7 +165,7 @@ export default {
   },
 }
 </script>
-<style lang='less'>
+<style lang='less' >
 #contract-record {
   .h-header {
     background-color: #00469C;

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

@@ -191,6 +191,11 @@ export default {
 </script>
 <style lang='less' >
 #payment-contract-record {
+    .none{
+    display:flex;
+    justify-content: center;
+    align-items: center;
+  }
   .h-header {
     background-color: #00469C;
     .h-header-btn {

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

@@ -17,7 +17,7 @@
         <div class="pay-icon"><img src="@/assets/payment/first-pay.png" alt="">租金支付</div>
         <div class="pay-input">
           <span>应还租金</span>
-          <p>{{ pay_rent |currency }}</p>
+          <input v-model="pay_rent" type="text" placeholder="请输入支付金额">
           <div @click="createOrder"><i class="icon ion-ios-arrow-right"/></div>
         </div>
       </div>
@@ -64,7 +64,7 @@ export default {
   },
   computed: {},
   watch: {
-    'liquidated_damages': {
+    'pay_rent': {
       handler () {
         this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages))
       },
@@ -72,7 +72,7 @@ export default {
     },
   },
   activated () {
-    this.money = this.pay_rent
+    // this.money = this.pay_rent
   },
   methods: {
     getRent () {
@@ -130,11 +130,11 @@ export default {
         }
       })
     },
-    toPayEntry (money) {
+    toPayEntry () {
       this.$router.push({
         name: 'PaymentPayEntry',
         params: {
-          money,
+          money: this.money,
         },
       })
     },

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

@@ -68,8 +68,14 @@ export default {
   },
   computed: {},
   watch: {},
-  activated () {
-    this.money = this.$route.params.sumMoney
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'PaymentFirstPay') {
+        vm.money = vm.$route.params.money
+      } else if (from.name === 'PaymentContractRecord') {
+        vm.money = vm.$route.params.sumMoney
+      }
+    })
   },
   methods: {
     isSelect (way) {

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-22 14:52:22
+ * @LastEditTime: 2019-10-23 14:56:38
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'