Merge branch 'ren' into develop

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-03 12:27:02
+ * @LastEditTime: 2019-12-05 14:53:37
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -58,7 +58,7 @@
             <div><span>年利率</span><p>{{ item.int_rate_n }}</p></div>
             <div><span>期限</span><p>{{ item.lease_times }}期</p></div>
             <div><span>融资金额</span><p class="bold">{{ parseFloat(item.finance_amount).toFixed(2) | currency }}</p></div>
-            <span class="red">{{ item.con_overdue_status }}</span>
+            <span v-if="item.con_overdue_status === '已逾期'" class="red">{{ item.con_overdue_status }}</span>
             <section @click="toRepayDetail(item.project_id)">
               <img src="@/assets/contractRepayment/view.png" alt="">
               <span>查看合同明细</span>
@@ -644,8 +644,8 @@ export default {
 
         span.red{
           margin-top: 10px;
-          position: relative;
-          top: 10px;
+          position: absolute;
+          //top: 10px;
           color: #F04747;
           font-family: PingFangSC-Regular;
           font-size: 14px;
@@ -653,7 +653,7 @@ export default {
 
         span.red::before {
           position: absolute;
-          bottom: -1px;
+          bottom: -3px;
           content: "";
           width: 100%;
           height: 4px;
@@ -665,7 +665,7 @@ export default {
           width: 123px;
           height: 30px;
           right: 24px;
-          bottom: -15px;
+          //bottom: 13px;
           line-height: 30px;
           background: rgba(33, 37, 76,.1);
           border-radius: 4px;

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-04 19:42:20
+ * @LastEditTime: 2019-12-05 11:03:28
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -677,14 +677,23 @@ export default {
     },
     // 跳转银行信息录入
     entryInfo () {
+      let idCard = ''
+      if (this.baseInfo.auth_flag) {
+        this.baseInfo.auth_flag === '是' ? idCard = this.baseInfo.auth_person_id_card : this.baseInfo.id_card_no
+        console.log(',,,,,,,,,,,', idCard)
+      } else {
+        idCard = this.baseInfo.id_card_no
+      }
       this.$router.push({
         name: 'EntryInfo',
         params: {
+          id_card_no: idCard,
           bp_name: this.bp_name,
           project_id: this.project_id,
           confirm_status: this.con_confirm_status,
           entry_info_flag: this.entry_info_flag,
           user_bp_type: this.user_bp_type,
+          bp_id: this.baseInfo.bp_id,
         },
       })
     },
@@ -723,6 +732,7 @@ export default {
       let url = $config.basePath + 'con_bank_query'
       let param = {
         project_id: vm.project_id,
+        bp_id: vm.baseInfo.bp_id,
       }
       // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-04 20:17:01
+ * @LastEditTime: 2019-12-05 14:06:17
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -29,36 +29,42 @@
           <item>
             <div slot="name" >银行卡卡号</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_account_num" type="text"
+              slot="content" v-model="bank_lists.bank_account_num" type="text"
               placeholder="上传银行卡自动填充" readonly
             >
           </item>
           <item>
             <div slot="name" >账户名称</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_account_name" type="text" readonly
+              slot="content" v-model="bank_lists.bank_account_name" type="text" readonly
               placeholder="请输入账户名称">
           </item>
           <item>
             <div slot="name" >银行名称</div>
             <input
-              slot="content" v-model="bank_lists[0].bank_full_name" type="text"
+              slot="content" v-model="bank_lists.bank_full_name" type="text"
               placeholder="请输入银行名称" readonly>
           </item>
           <item>
             <div slot="name" >预留手机号</div>
             <input
-              slot="content" type="number"
-              placeholder="请输入预留手机号">
+              slot="content" v-model="bank_lists.reserve_phone" type="number"
+              placeholder="请输入手机号" @blur="phoneCheck(bank_lists.reserve_phone)">
+          </item>
+          <item>
+            <div slot="name" >开户身份证</div>
+            <input
+              slot="content" v-model="bank_lists.id_card_no" type="text" readonly
+              placeholder="请输入身份证">
           </item>
           <item>
             <div slot="name" >支行名称</div>
             <input
-              v-if="user_bp_type !== 'GUTA' && confirm_status !== 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" type="text"
+              v-if="user_bp_type !== 'GUTA' && confirm_status !== 'APPROVED'" slot="content" v-model="bank_lists.bank_branch_name" type="text"
               placeholder="请输入支行名称"
             >
             <input
-              v-if="user_bp_type === 'GUTA' || confirm_status === 'APPROVED'" slot="content" v-model="bank_lists[0].bank_branch_name" readonly
+              v-if="user_bp_type === 'GUTA' || confirm_status === 'APPROVED'" slot="content" v-model="bank_lists.bank_branch_name" readonly
               type="text" placeholder="请输入支行名称"
             >
           </item>
@@ -100,35 +106,38 @@ export default {
       confirm_status: '',
       res: '',
       name: '',
-      bank_lists: [
-        {
-          bank_full_name: '', // 银行名称
-          bank_account_num: '', // 卡号
-          bank_account_name: this.$route.params.bp_name,
-          bank_branch_name: '',
-        },
-      ],
+      bank_lists: {
+        bp_id: '',
+        project_id: '',
+        bank_full_name: '', // 银行名称
+        bank_account_num: '', // 卡号
+        bank_account_name: this.$route.params.bp_name,
+        bank_branch_name: '',
+        reserve_phone: '', // 预留手机号
+        id_card_no: this.$route.params.id_card_no,
+      },
     }
   },
   computed: {},
   watch: {},
   activated () {
-    console.log('................', this.$route.params.user_bp_type)
     this.user_bp_type = this.$route.params.user_bp_type
     this.name = this.$route.params.name
     this.confirm_status = this.$route.params.confirm_status
     //  || !this.$route.params.entry_info_flag
-    if (this.project_id !== this.$route.params.project_id) {
-      this.project_id = this.$route.params.project_id
+    if (this.bank_lists.project_id !== this.$route.params.project_id) {
+      // this.bank_lists.project_id = this.$route.params.project_id
       this.bankImg = ''
-      this.bank_lists = [
-        {
-          bank_full_name: '', // 银行名称
-          bank_account_num: '', // 卡号
-          bank_account_name: this.$route.params.bp_name,
-          bank_branch_name: '',
-        },
-      ]
+      this.bank_lists = {
+        bp_id: this.$route.params.bp_id,
+        project_id: this.$route.params.project_id,
+        bank_full_name: '', // 银行名称
+        bank_account_num: '', // 卡号
+        bank_account_name: this.$route.params.bp_name,
+        bank_branch_name: '',
+        reserve_phone: '',
+        id_card_no: this.$route.params.id_card_no,
+      }
     }
     this.bankCardQuery()
   },
@@ -197,31 +206,35 @@ export default {
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
         let result = res.result.result
-        vm.bank_lists[0].bank_account_num = result.bank_card_number.replace(/\s*/g, '') // 卡号
-        vm.bank_lists[0].bank_full_name = result.bank_name // 银行名称
+        vm.bank_lists.bank_account_num = result.bank_card_number.replace(/\s*/g, '') // 卡号
+        vm.bank_lists.bank_full_name = result.bank_name // 银行名称
         vm.bank_lists.sort()
         // vm.bank_lists.bank_card_type = result.bank_card_type
       })
     },
+    // 校验手机号
+    phoneCheck (phone) {
+      if (!hlsUtil.phoneNumber(phone) && !hlsUtil.phoneNumber86(phone)) {
+        hlsPopup.showLongCenter('请输入正确的手机号')
+        this.bank_card_flag = false
+      }
+    },
     cardAdd () {
-      if (this.bank_lists[0].bank_account_num === '') {
+      if (this.bank_lists.bank_account_num === '') {
         this.hlsPopup.showLongCenter('请识别银行卡')
         this.bank_card_flag = false
-      } else if (this.hlsUtil.isBankAccount(this.bank_lists[0].bank_account_num)) {
+      } else if (this.hlsUtil.isBankAccount(this.bank_lists.bank_account_num)) {
         this.bank_card_flag = false
         this.hlsPopup.showLongCenter('请输入正确银行卡号！')
       } else {
         this.bank_card_flag = true
       }
-
+      this.phoneCheck(this.bank_lists.reserve_phone)
       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,
-          },
+          master: {...vm.bank_lists},
         }
         vm.hlsPopup.showLoading('请稍后')
         vm.hlsHttp.post(url, param).then(function (res) {
@@ -245,15 +258,21 @@ export default {
       let vm = this
       let url = $config.basePath + 'con_bank_query'
       let param = {
+        bp_id: vm.$route.params.bp_id,
         project_id: vm.$route.params.project_id,
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         if (res.result === 'S') {
           if (res.info.bank_full_name !== ' ') {
             vm.readyonlf_flag = true
-            vm.bank_lists = [res.info]
+            vm.bank_lists = res.info
+            vm.bank_lists.bank_account_name = vm.$route.params.bp_name
+            vm.bank_lists.id_card_no = vm.$route.params.id_card_no
+            vm.bank_lists.project_id = vm.$route.params.project_id
           } else {
-            vm.bank_lists[0].bank_account_name = vm.$route.params.bp_name
+            vm.bank_lists.bank_account_name = vm.$route.params.bp_name
+            vm.bank_lists.id_card_no = vm.$route.params.id_card_no
+            vm.bank_lists.project_id = vm.$route.params.project_id
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/financingTrial/financing-trial.vue

@@ -65,6 +65,7 @@ export default {
     return {
       lists: [],
       pagenum: 1,
+      division: '', // 产品线
       plan_price: '',
       searchInput: '',
       price_date_to: '',
@@ -94,6 +95,7 @@ export default {
       if (from.name === 'ProDetailed') {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
+        vm.division = vm.$route.params.division
         vm.calculationQuery('collect')
         vm.fromProduct = true
       } else if (from.name === 'HomePage') {
@@ -132,7 +134,7 @@ export default {
               pagesize: 10,
               searchInput: vm.searchInput,
               pagenum: vm.pagenum,
-              division: window.localStorage.division, // 收藏到试算通过产品线查询
+              division: vm.division, // 收藏到试算通过产品线查询
             }
             vm.hlsPopup.showLoading('数据加载中')
             vm.hlsHttp.post(url, param).then(function (res) {

src/pages/help/feedback.vue

@@ -10,7 +10,7 @@
       <h4>问题反馈</h4>
       <div class="write">
         <div class="box">
-          <span>问题描述</span>
+          <span @click="getPic">问题描述</span>
           <textarea v-model="question_desc" placeholder="请输入您的描述……" />
         </div>
       </div>
@@ -53,7 +53,7 @@ export default {
     return {
       question_desc: '', // 问题描述
       list: {
-        chck_id: '123456',
+        chck_id: this.$route.params.question_id,
       },
       upload_list: [], // 上传图片列表
     }
@@ -105,7 +105,7 @@ export default {
       let vm = this
       let obj = {
         'pkvalue': check_id,
-        'source_type': 'PRJ_CDD_ITEM_CHECK',
+        'source_type': 'HLS_APP_QUESTION',
         'picture': '',
         'check_id': check_id,
         'filePath': '',
@@ -140,7 +140,7 @@ export default {
         for (let i = 0; i < imgUrl.length; i++) {
           let obj = {
             'pkvalue': check_id,
-            'source_type': 'PRJ_CDD_ITEM_CHECK',
+            'source_type': 'HLS_APP_QUESTION',
             'picture': '',
             'check_id': check_id,
             'filePath': '',
@@ -265,6 +265,22 @@ export default {
       vm.upload_list.remove(index)
       vm.upload_list.sort()
     },
+    // 获取图片
+    getPic () {
+      let vm = this
+      let url = process.env.basePath + 'app_attment_query'
+      let param = {
+        master: {
+          source_type: 'HLS_APP_QUESTION',
+          pkvalue: vm.$route.params.question_id,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        console.log('sssss', res)
+      })
+    },
   },
 }
 </script>

src/pages/myProductCollection/my-product-list.Vue

@@ -193,7 +193,6 @@ export default {
     // val：产品id, status: 收藏状态
     goDetailed (item) { // 进入产品查询功能明细页面
       window.localStorage.setItem('collect_status', item.collect_status)
-      window.localStorage.setItem('division', item.division)
       this.$router.push({
         name: 'ProDetailed',
         params: {

src/pages/productQuery/product-detailed.vue

@@ -314,6 +314,7 @@ export default {
             params: {
               plan_price: price,
               price_date_to: date,
+              division: this.baseInfo.division,
             },
           })
         },

src/pages/productQuery/product-list.vue

@@ -89,7 +89,7 @@ export default {
      let vm = this
      let url = $config.basePath + 'prd_product_list'
      let param = {
-       division: window.localStorage.division,
+       division: vm.$route.params.division,
        user_phone: window.localStorage.user_phone,
        searchInput: vm.searchInput,
        pagenum: vm.pagenum,

src/pages/productQuery/query-home.vue

@@ -116,9 +116,11 @@ export default {
    },
    // 跳列表 val = 产品线
    goLists (val) {
-     window.localStorage.setItem('division', val)
      this.$router.push({
        name: 'ProductList',
+       params: {
+         division: val,
+       },
      })
    },
 

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-11-28 15:13:32
+ * @LastEditTime: 2019-12-05 14:39:47
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -658,9 +658,9 @@ export default {
   computed: {},
   watch: {
     'baseInfo.auth_flag' (newVal, oldVal) {
-      if (newVal === '是') {
+      if (newVal === 'Y') {
         this.flag = false
-      } else if (newVal === '否') {
+      } else if (newVal === 'N') {
         this.flag = true
       }
     },
@@ -964,7 +964,7 @@ export default {
               this.legal_personMsg[i] = ''
             } */
 
-        this.baseInfo.auth_flag = 'Y'
+        this.baseInfo.auth_flag = 'N'
         this.lastInfo = {...this.baseInfo, ...this.legal_personMsg, ...this.authMsg}
         this.saveInfo = {
           ...this.lastInfo,
@@ -1409,9 +1409,9 @@ export default {
           Object.assign(vm.saveInfo, res.info)
           vm.addRows(vm.baseInfo.registered_place)
           vm.addRowsLive(vm.baseInfo.business_address)
-          if (vm.baseInfo.auth_flag === '是') {
+          if (vm.baseInfo.auth_flag === 'Y') {
             vm.flag = false
-          } else if (vm.baseInfo.auth_flag === '否') {
+          } else if (vm.baseInfo.auth_flag === 'N') {
             vm.flag = true
           }
           vm.loadItemList()// 附件查询