Merge branch 'liuxin' into develop

index.html

@@ -8,6 +8,7 @@
   <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">-->
   <meta name="format-detection" content="telephone=no">
   <meta name="format-detection" content="email=no">
+
   <!-- safari私有meta标签 允许全屏模式浏览 指定safari顶部状态栏样式(黑色) -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">

src/pages/carConfirm/confirm-list.vue

@@ -53,7 +53,9 @@ export default {
     return {
       tabNum: 0,
       keyWord: '',
-      pagenum: 1,
+      status: '',
+      pagenumNew: 1,
+      pagenumApproved: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -64,10 +66,13 @@ export default {
     tabNum: {
       handler (newVal, oldVal) {
         if (newVal === 0) {
+          this.status = 'SUBMIT'
           this.showList = this.undo
         } else if (newVal === 1) {
+          this.status = 'APPROVED'
           this.showList = this.done
         }
+        this.getList()
       },
       immediate: true,
     },
@@ -78,9 +83,9 @@ export default {
   created () {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.pagenum = 1
+      vm.pagenumNew = 1
+      vm.pagenumApproved = 1
       vm.lists = []
-      vm.getList()
     })
   },
   methods: {
@@ -94,6 +99,7 @@ export default {
         `'${randomString}'`
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        confirm_status: vm.status,
         searchInput: vm.keyWord,
       }
       vm.$post(url, param).then(function (res) {
@@ -109,7 +115,6 @@ export default {
       let vm = this
       vm.undo = []
       vm.done = []
-      vm.tabNum = 0
       this.lists.forEach(item => {
         if (item.confirm_status === 'SUBMIT') {
           vm.undo.push(item)
@@ -117,7 +122,11 @@ export default {
           vm.done.push(item)
         }
       })
+      if (vm.tabNum === 0) {
         this.showList = this.undo
+      } else {
+        this.showList = this.done
+      }
     },
     getTabNum (i) {
       this.tabNum = i
@@ -142,7 +151,8 @@ export default {
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
-        pagenum: vm.pagenum,
+        pagenum: vm.status === 'APPROVED' ? vm.pagenumApproved : vm.pagenumNew,
+        confirm_status: vm.status,
         searchInput: vm.keyWord,
       }
       hlsPopup.showLoading('请稍候')
@@ -157,13 +167,13 @@ export default {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(false)
           }
           vm.selectShowList()

src/pages/contractStart/start-list.vue

@@ -6,7 +6,7 @@
         <span>合同发车</span>
       </div>
     </h-header>
-    <Tab :fatherTabNum="tabNum" @getTabNum="getTabNum" />
+    <Tab @getTabNum="getTabNum" />
     <div class="search has-header">
       <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
@@ -56,7 +56,9 @@ export default {
     return {
       tabNum: 0,
       keyWord: '',
-      pagenum: 1,
+      status: '',
+      pagenumNew: 1,
+      pagenumApproved: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -66,9 +68,9 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       // if (from.name === 'MyInfo') {
-      vm.pagenum = 1
+      vm.pagenumNew = 1
+      vm.pagenumApproved = 1
       vm.lists = []
-      vm.getList()
       // }
     })
   },
@@ -76,10 +78,13 @@ export default {
     tabNum: {
       handler (newVal, oldVal) {
         if (newVal === 0) {
+          this.status = 'NEW'
           this.showList = this.undo
         } else if (newVal === 1) {
+          this.status = 'APPROVED'
           this.showList = this.done
         }
+        this.getList()
       },
       immediate: true,
     },
@@ -99,6 +104,7 @@ export default {
         `'${randomString}'`
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        car_start_status: vm.status,
         searchInput: vm.keyWord,
       }
       vm.$post(url, param).then(function (res) {
@@ -114,7 +120,6 @@ export default {
       let vm = this
       vm.undo = []
       vm.done = []
-      vm.tabNum = 0
       vm.undo = vm.lists.filter(i => {
         return (
           i.car_start_status === 'REJECTED' || i.car_start_status === 'NEW'
@@ -123,7 +128,11 @@ export default {
       vm.done = vm.lists.filter(i => {
         return i.car_start_status === 'APPROVED'
       })
+      if (vm.tabNum === 0) {
         this.showList = this.undo
+      } else {
+        this.showList = this.done
+      }
     },
     getTabNum (i) {
       this.tabNum = i
@@ -155,8 +164,9 @@ export default {
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
         pagesize: 10,
-        pagenum: vm.pagenum,
+        pagenum: vm.status === 'APPROVED' ? vm.pagenumApproved : vm.pagenumNew,
         searchInput: vm.keyWord,
+        car_start_status: vm.status,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -170,13 +180,13 @@ export default {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(true)
           } else if (returnData.length === 10) {
             vum.forEach(returnData, function (data, index, array) {
               vm.lists.push(array[index])
             })
-            vm.pagenum++
+            vm.status === 'APPROVED' ? vm.pagenumApproved++ : vm.pagenumNew++
             vm.$refs.scroll.update(false)
           }
           vm.selectShowList()

src/pages/contractStart/tab.vue

@@ -20,11 +20,6 @@ import sign from '@/assets/contractStart/1.png'
 import finish from '@/assets/contractStart/3.png'
 
 export default {
-  props: {
-    'fatherTabNum': {
-      type: Number,
-    },
-  },
   data () {
     return {
       tabNum: 0,
@@ -34,13 +29,6 @@ export default {
       finish: finish,
     }
   },
-  watch: {
-    'fatherTabNum': {
-      handler (newVal, oldVal) {
-        this.tabNum = newVal
-      },
-    },
-  },
   methods: {
     sendTabNum () {
       this.$emit('getTabNum', this.tabNum)

src/pages/myInfo/my-info.vue

@@ -153,7 +153,7 @@ export default {
     bp_identity (newVal, oldVal) {
       if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ' || !newVal) {
         this.elecStatus = false
-      } else if (newVal === 'NP_OK' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
+      } else if (newVal === 'NP_YES' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
         this.elecStatus = true
       }
     },
@@ -525,7 +525,7 @@ export default {
               },
             })
           } else {
-            //hlsPopup.showLongCenter('获取认证url失败')
+            // hlsPopup.showLongCenter('获取认证url失败')
           }
         } else {
           hlsPopup.showLongCenter('您已认证通过')

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

@@ -339,7 +339,12 @@ export default {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
           } else {
-            window.open(res.paymentURL)
+            vm.$router.push({
+              name: 'PayPage',
+              params: {
+                url: res.paymentURL,
+              },
+            })
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/pay/pay-page.vue

+<template>
+  <h-view id="pay-page" class="public-style">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="changePage">
+        <span>支付中心</span>
+      </div>
+    </h-header>
+    <h-content>
+      <iframe
+        :src="url" sandbox="allow-scripts" frameborder="0"
+        scrolling="no"
+        width="100%" height="100%"/>
+        <!-- <object :data="url" width="100%" height="100%" type="text/html"/> -->
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      name: '',
+      url: '',
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.name = from.name
+      vm.url = vm.$route.params.url
+    })
+  },
+  methods: {
+    changePage () {
+      let toPath
+      if (this.name === 'PayEntry') {
+        toPath = 'FirstPay'
+      } else if (this.name === 'PaymentPayEntry') {
+        toPath = 'NewList'
+      }
+      this.$router.replace({
+        name: toPath,
+      })
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+#pay-page {
+
+}
+</style>

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

@@ -279,7 +279,12 @@ export default {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
           } else {
-            window.open(res.paymentURL)
+            vm.$router.push({
+              name: 'PayPage',
+              params: {
+                url: res.paymentURL,
+              },
+            })
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/userBind/np/naturePerson.vue

@@ -17,9 +17,16 @@
     <h-content class="content">
       <div v-show="tabNum==0">
         <list-item :item-height="44">
-          <item :showArrow="true">
+          <item :showArrow="true" @click.native="selectIdType()">
             <div slot="name" class="required">客户类型</div>
-            <input
+            <div slot="content" class="typeBP">
+              <span>{{ baseInfo.bp_type_n }}</span>
+              <span v-for="(item,index) in bp_type" :key="index">
+                {{ item.bp_type_n }}
+                <img src="@/assets/userBind/deleteTag.png" @click.stop @click="deleteBP(item)" >
+              </span>
+            </div>
+            <!-- <input
               slot="content"
               v-model="baseInfo.bp_type_n"
               placeholder="请选择"
@@ -27,7 +34,7 @@
               readonly
               onfocus="this.blur()"
               @click="selectIdType()"
-            >
+            >-->
           </item>
           <item v-if="(isPaople&&from)||(isPaople&&isSelected)">
             <div slot="name" class="required">业务经办人</div>
@@ -196,7 +203,10 @@
               @click="selectBackType"
             >
           </item>
-          <item v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'" :showArrow="true">
+          <item
+            v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"
+            :showArrow="true"
+          >
             <div slot="name" class="required">婚姻状况</div>
             <input
               slot="content"
@@ -208,7 +218,10 @@
             >
           </item>
         </list-item>
-        <div v-if="(hasSP && baseInfo.bp_type === 'TENANT') || (hasSP && baseInfo.bp_type === 'GUTA')"><!-- 主承租人活担保人为已婚显示-->
+        <div
+          v-if="(hasSP && baseInfo.bp_type === 'TENANT') || (hasSP && baseInfo.bp_type === 'GUTA')"
+        >
+          <!-- 主承租人活担保人为已婚显示-->
           <div class="userInfo">配偶信息</div>
           <div class="upload-id-card">
             <span>身份证照片上传</span>
@@ -252,15 +265,30 @@
             </item>
             <item>
               <div slot="name" class="required">配偶身份证号</div>
-              <input slot="content" v-model="baseInfo.id_card_no_sp" readonly placeholder="上传身份证自动填充" >
+              <input
+                slot="content"
+                v-model="baseInfo.id_card_no_sp"
+                readonly
+                placeholder="上传身份证自动填充"
+              >
             </item>
             <item>
               <div slot="name" class="required">身份证有效期从</div>
-              <input slot="content" v-model="baseInfo.id_card_date_from_sp" readonly placeholder="上传身份证自动填充" >
+              <input
+                slot="content"
+                v-model="baseInfo.id_card_date_from_sp"
+                readonly
+                placeholder="上传身份证自动填充"
+              >
             </item>
             <item>
               <div slot="name" class="required">身份证有效期到</div>
-              <input slot="content" v-model="baseInfo.id_card_date_to_sp" readonly placeholder="上传身份证自动填充" >
+              <input
+                slot="content"
+                v-model="baseInfo.id_card_date_to_sp"
+                readonly
+                placeholder="上传身份证自动填充"
+              >
             </item>
             <item>
               <div slot="name" class="required">手机号码</div>
@@ -276,8 +304,16 @@
             </item>
           </list-item>
         </div>
-        <div v-if="(cddItemList.length && baseInfo.bp_type === 'TENANT') || (cddItemList.length && baseInfo.bp_type === 'GUTA')" class="userInfo">附件信息</div>
-        <div v-for="(list, index) in cddItemList" v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'" :key="index" class="card">
+        <div
+          v-if="(cddItemList.length && baseInfo.bp_type === 'TENANT') || (cddItemList.length && baseInfo.bp_type === 'GUTA')"
+          class="userInfo"
+        >附件信息</div>
+        <div
+          v-for="(list, index) in cddItemList"
+          v-if="baseInfo.bp_type === 'TENANT' || baseInfo.bp_type === 'GUTA'"
+          :key="index"
+          class="card"
+        >
           <span>{{ list.description }}</span>
           <div class="img-content">
             <!--待上传图片列表-->
@@ -311,13 +347,17 @@
             </div>
           </div>
         </div>
-        <div v-if="(from&&isApproved&&isAGENT)||fromPromisePay" class="tax" @click="changeUndertake">
-          <img src="@/assets/userBind/tax.png" class="left-img">
+        <div
+          v-if="(from&&isApproved&&isAGENT)||fromPromisePay"
+          class="tax"
+          @click="changeUndertake"
+        >
+          <img src="@/assets/userBind/tax.png" class="left-img" >
           <div>
             <span>缴纳保证金</span>
             <p>已缴纳：500000</p>
           </div>
-          <img src="@/assets/userBind/arrow-right.png" class="right-img">
+          <img src="@/assets/userBind/arrow-right.png" class="right-img" >
         </div>
       </div>
 
@@ -365,11 +405,20 @@
             class="addBack"
             @click="ocrShow('bankCard', '')"
           >
-          <img v-if="!bankImg && isApproved && !isClear" src="@/assets/userBind/addBack.png" class="addBack" >
+          <img
+            v-if="!bankImg && isApproved && !isClear"
+            src="@/assets/userBind/addBack.png"
+            class="addBack"
+          >
           <list-item :item-height="44" class="card-Info">
             <item>
               <div slot="name">银行卡卡号</div>
-              <input slot="content" v-model="bank.bank_account_num" readonly placeholder="识别银行卡自动填充">
+              <input
+                slot="content"
+                v-model="bank.bank_account_num"
+                readonly
+                placeholder="识别银行卡自动填充"
+              >
             </item>
             <item>
               <div slot="name">账户姓名</div>
@@ -386,7 +435,8 @@
           </list-item>
         </div>
       </h-view>
-      <bottom-tab class="add-box">      <!-- v-if="!isApproved || (isClear && isApproved)"-->
+      <bottom-tab class="add-box">
+        <!-- v-if="!isApproved || (isClear && isApproved)"-->
         <tab-button class="add-card" @click.native="addBankInfo">添加</tab-button>
       </bottom-tab>
     </h-modal>
@@ -405,6 +455,7 @@ export default {
   data () {
     return {
       list: {},
+      bp_type: [],
       fromPromisePay: false,
       hasSP: false,
       isPaople: false,
@@ -539,18 +590,19 @@ export default {
     }
   },
   beforeRouteEnter (to, from, next) {
-    if (from.fullPath === '/tab/my-info') { // 绑定查询入口
+    if (from.fullPath === '/tab/my-info') {
+      // 绑定查询入口
       next(vm => {
         vm.from = true
         vm.basicInfoQuery()
-        vm.loadItemList()// 附件查询
+        vm.loadItemList() // 附件查询
         vm.getBankInfo()
       })
     } else if (from.fullPath === '/margin-first-pay') {
       next(vm => {
         vm.fromPromisePay = true
         vm.basicInfoQuery()
-        vm.loadItemList()// 附件查询
+        vm.loadItemList() // 附件查询
         vm.getBankInfo()
       })
     }
@@ -560,11 +612,20 @@ export default {
     this.getinvoiceList()
   },
   methods: {
+    deleteBP (e) {
+      this.bp_type.forEach(i => {
+        if (i.bp_type_n === e.bp_type_n) {
+          this.bp_type.splice(i, 1)
+        }
+      })
+    },
     basicInfoQuery () {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'
       let param = {
-        bp_id: vm.fromPromisePay ? window.localStorage.getItem('bp_id') : vm.$route.params.bp_id,
+        bp_id: vm.fromPromisePay
+          ? window.localStorage.getItem('bp_id')
+          : vm.$route.params.bp_id,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -591,7 +652,8 @@ export default {
     },
     load_picture (check_id, index, cdd_item) {
       let vm = this
-      let url = process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
+      let url =
+        process.env.basePath + 'attachment_list_query' + '&index' + index // 附件查询
       let param = {
         check_id: check_id,
       }
@@ -600,7 +662,12 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           res.lists.forEach(item => {
-            item['url'] = process.env.filePath + 'attachment_id=' + item.attachment_id + '&access_token=' + window.localStorage.access_token
+            item['url'] =
+              process.env.filePath +
+              'attachment_id=' +
+              item.attachment_id +
+              '&access_token=' +
+              window.localStorage.access_token
           })
           switch (cdd_item) {
             case 'NP_ID_CARD_F': // 承租人身份证正面
@@ -635,13 +702,15 @@ export default {
     },
     loadItemList () {
       let vm = this
-      let bpId = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('bp_id')
+      let bpId = vm.from
+        ? vm.$route.params.bp_id
+        : window.localStorage.getItem('bp_id')
       let url = process.env.basePath + 'prj_cdd_check_list'
       let param = {
         master: {
-          'document_id': bpId,
-          'document_table': 'HLS_BP_MASTER',
-          'tab_group': 'HLS_NP',
+          document_id: bpId,
+          document_table: 'HLS_BP_MASTER',
+          tab_group: 'HLS_NP',
         },
       }
       // vm.hlsPopup.showLoading('请稍候')
@@ -665,7 +734,6 @@ export default {
                 vm.idCardBackSpCheck_id = item.check_id
                 break
               case 'BANK_CARD':
-
                 break
               default:
                 vm.cddItemList.push(item)
@@ -675,65 +743,69 @@ export default {
           listTemp.forEach((item, index) => {
             vm.load_picture(item.check_id, index, item.cdd_item)
           })
-          if (vm.idCardFrontEditFlag) { // 身份证正面图片已修改，重新上传
+          if (vm.idCardFrontEditFlag) {
+            // 身份证正面图片已修改，重新上传
             var list = []
             let obj = {
-              'pkvalue': vm.idCardFrontCheck_id,
-              'source_type': 'PRJ_CDD_ITEM_CHECK',
-              'picture': '',
-              'check_id': vm.idCardFrontCheck_id,
-              'filePath': vm.idCardFront,
-              'attachment_id': '',
-              'user_id': 1,
-              'fileName': '自然人身份证正面',
+              pkvalue: vm.idCardFrontCheck_id,
+              source_type: 'PRJ_CDD_ITEM_CHECK',
+              picture: '',
+              check_id: vm.idCardFrontCheck_id,
+              filePath: vm.idCardFront,
+              attachment_id: '',
+              user_id: 1,
+              fileName: '自然人身份证正面',
             }
             list.push(obj)
             vm.save_picture(list)
             vm.idCardFrontEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
           }
-          if (vm.idCardBackEditFlag) { // 身份证反面图片已修改，重新上传
+          if (vm.idCardBackEditFlag) {
+            // 身份证反面图片已修改，重新上传
             var list = []
             let obj = {
-              'pkvalue': vm.idCardBackCheck_id,
-              'source_type': 'PRJ_CDD_ITEM_CHECK',
-              'picture': '',
-              'check_id': vm.idCardBackCheck_id,
-              'filePath': vm.idCardBack,
-              'attachment_id': '',
-              'user_id': 1,
-              'fileName': '自然人身份证背面',
+              pkvalue: vm.idCardBackCheck_id,
+              source_type: 'PRJ_CDD_ITEM_CHECK',
+              picture: '',
+              check_id: vm.idCardBackCheck_id,
+              filePath: vm.idCardBack,
+              attachment_id: '',
+              user_id: 1,
+              fileName: '自然人身份证背面',
             }
             list.push(obj)
             vm.save_picture(list)
             vm.idCardBackEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
           }
-          if (vm.idCardFrontSpEditFlag) { // 配偶身份证正面图片已修改，重新上传
+          if (vm.idCardFrontSpEditFlag) {
+            // 配偶身份证正面图片已修改，重新上传
             var list = []
             let obj = {
-              'pkvalue': vm.idCardFrontSpCheck_id,
-              'source_type': 'PRJ_CDD_ITEM_CHECK',
-              'picture': '',
-              'check_id': vm.idCardFrontSpCheck_id,
-              'filePath': vm.idCardFrontSp,
-              'attachment_id': '',
-              'user_id': 1,
-              'fileName': '配偶身份证正面',
+              pkvalue: vm.idCardFrontSpCheck_id,
+              source_type: 'PRJ_CDD_ITEM_CHECK',
+              picture: '',
+              check_id: vm.idCardFrontSpCheck_id,
+              filePath: vm.idCardFrontSp,
+              attachment_id: '',
+              user_id: 1,
+              fileName: '配偶身份证正面',
             }
             list.push(obj)
             vm.save_picture(list)
             vm.idCardFrontSpEditFlag = false // 置为false,防止再次保存重复上传，只有重新识别才会重新上传
           }
-          if (vm.idCardBackSpEditFlag) { // 配偶身份证背面图片已修改，重新上传
+          if (vm.idCardBackSpEditFlag) {
+            // 配偶身份证背面图片已修改，重新上传
             var list = []
             let obj = {
-              'pkvalue': vm.idCardBackSpCheck_id,
-              'source_type': 'PRJ_CDD_ITEM_CHECK',
-              'picture': '',
-              'check_id': vm.idCardBackSpCheck_id,
-              'filePath': vm.idCardBackSp,
-              'attachment_id': '',
-              'user_id': 1,
-              'fileName': '配偶身份证背面',
+              pkvalue: vm.idCardBackSpCheck_id,
+              source_type: 'PRJ_CDD_ITEM_CHECK',
+              picture: '',
+              check_id: vm.idCardBackSpCheck_id,
+              filePath: vm.idCardBackSp,
+              attachment_id: '',
+              user_id: 1,
+              fileName: '配偶身份证背面',
             }
             list.push(obj)
             vm.save_picture(list)
@@ -794,9 +866,15 @@ export default {
         vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
       } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_no_sp) {
         vm.hlsPopup.showLongCenter('配偶身份证号不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_date_from_sp) {
+      } else if (
+        vm.marital_status_n === '已婚' &&
+        !vm.baseInfo.id_card_date_from_sp
+      ) {
         vm.hlsPopup.showLongCenter('配偶身份证有效期从不能为空！')
-      } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.id_card_date_to_sp) {
+      } else if (
+        vm.marital_status_n === '已婚' &&
+        !vm.baseInfo.id_card_date_to_sp
+      ) {
         vm.hlsPopup.showLongCenter('配偶身份证有效期到不能为空！')
       } else if (vm.marital_status_n === '已婚' && !vm.baseInfo.spouse_phone) {
         vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
@@ -833,14 +911,14 @@ export default {
     imgUploadOpenCamera (description, check_id) {
       let vm = this
       let obj = {
-        'pkvalue': check_id,
-        'source_type': 'PRJ_CDD_ITEM_CHECK',
-        'picture': '',
-        'check_id': check_id,
-        'filePath': '',
-        'attachment_id': '',
-        'user_id': 1,
-        'fileName': description + '_' + new Date().getTime(),
+        pkvalue: check_id,
+        source_type: 'PRJ_CDD_ITEM_CHECK',
+        picture: '',
+        check_id: check_id,
+        filePath: '',
+        attachment_id: '',
+        user_id: 1,
+        fileName: description + '_' + new Date().getTime(),
       }
       let cameraoptions = {
         quality: 100,
@@ -868,14 +946,14 @@ export default {
         var list = []
         for (let i = 0; i < imgUrl.length; i++) {
           let obj = {
-            'pkvalue': check_id,
-            'source_type': 'PRJ_CDD_ITEM_CHECK',
-            'picture': '',
-            'check_id': check_id,
-            'filePath': '',
-            'attachment_id': '',
-            'user_id': 1,
-            'fileName': description + '_' + new Date().getTime(),
+            pkvalue: check_id,
+            source_type: 'PRJ_CDD_ITEM_CHECK',
+            picture: '',
+            check_id: check_id,
+            filePath: '',
+            attachment_id: '',
+            user_id: 1,
+            fileName: description + '_' + new Date().getTime(),
           }
           obj.picture = imgUrl[i]
           obj.filePath = imgUrl[i]
@@ -884,8 +962,7 @@ export default {
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(list)
       }
-      let error = function () {
-      }
+      let error = function () {}
       vm.hlsUtil.takePicture(cameraoptions, success, error)
     },
     // 图片保存
@@ -930,11 +1007,11 @@ export default {
     remove_pic (attachment_id, index) {
       let vm = this
       var delete_list = []
-      let obj = {'attachment_id': attachment_id}
+      let obj = { attachment_id: attachment_id }
       delete_list.push(obj)
       let url = process.env.basePath + 'app_delete_attment' // 附件删除
       let param = {
-        'picturelist': delete_list,
+        picturelist: delete_list,
       }
       hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -956,11 +1033,11 @@ export default {
     delete_pic (attachment_id) {
       let vm = this
       var delete_list = []
-      let obj = {'attachment_id': attachment_id}
+      let obj = { attachment_id: attachment_id }
       delete_list.push(obj)
       let url = process.env.basePath + 'app_delete_attment' // 附件删除
       let param = {
-        'picturelist': delete_list,
+        picturelist: delete_list,
       }
       hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -1013,9 +1090,22 @@ export default {
           hlsPopup.showLongCenter('请拍照')
         } else {
           if (ocrType === 'idCard') {
-            type === 'front' ? (vm.idCardFront = imgdata, vm.idCardIdentify(imgdata, 'idCard'), vm.idCardFrontEditFlag = true) : (vm.idCardBack = imgdata, vm.idCardBackIdentify(imgdata, 'idCard'), vm.idCardBackEditFlag = true)
-          } else if (ocrType === 'idCardSp') { // 配偶身份证识别
-            type === 'front' ? (vm.idCardFrontSp = imgdata, vm.idCardIdentify(imgdata, 'idCardSp'), vm.idCardFrontSpEditFlag = true) : (vm.idCardBackSp = imgdata, vm.idCardBackIdentify(imgdata, 'idCardSp'), vm.idCardBackSpEditFlag = true)
+            type === 'front'
+              ? ((vm.idCardFront = imgdata),
+              vm.idCardIdentify(imgdata, 'idCard'),
+              (vm.idCardFrontEditFlag = true))
+              : ((vm.idCardBack = imgdata),
+              vm.idCardBackIdentify(imgdata, 'idCard'),
+              (vm.idCardBackEditFlag = true))
+          } else if (ocrType === 'idCardSp') {
+            // 配偶身份证识别
+            type === 'front'
+              ? ((vm.idCardFrontSp = imgdata),
+              vm.idCardIdentify(imgdata, 'idCardSp'),
+              (vm.idCardFrontSpEditFlag = true))
+              : ((vm.idCardBackSp = imgdata),
+              vm.idCardBackIdentify(imgdata, 'idCardSp'),
+              (vm.idCardBackSpEditFlag = true))
           } else if (ocrType === 'bankCard') {
             vm.bankImg = imgdata
             vm.bankCardIdentify(imgdata)
@@ -1040,9 +1130,22 @@ export default {
           hlsPopup.showLongCenter('请选择一张图片')
         } else {
           if (ocrType === 'idCard') {
-            type === 'front' ? (vm.idCardFront = imgUrl[0], vm.idCardIdentify(imgUrl[0], 'idCard'), vm.idCardFrontEditFlag = true) : (vm.idCardBack = imgUrl[0], vm.idCardBackIdentify(imgUrl[0], 'idCard'), vm.idCardBackEditFlag = true)
-          } else if (ocrType === 'idCardSp') { // 配偶身份证识别
-            type === 'front' ? (vm.idCardFrontSp = imgUrl[0], vm.idCardIdentify(imgUrl[0], 'idCardSp'), vm.idCardFrontSpEditFlag = true) : (vm.idCardBackSp = imgUrl[0], vm.idCardBackIdentify(imgUrl[0], 'idCardSp'), vm.idCardBackSpEditFlag = true)
+            type === 'front'
+              ? ((vm.idCardFront = imgUrl[0]),
+              vm.idCardIdentify(imgUrl[0], 'idCard'),
+              (vm.idCardFrontEditFlag = true))
+              : ((vm.idCardBack = imgUrl[0]),
+              vm.idCardBackIdentify(imgUrl[0], 'idCard'),
+              (vm.idCardBackEditFlag = true))
+          } else if (ocrType === 'idCardSp') {
+            // 配偶身份证识别
+            type === 'front'
+              ? ((vm.idCardFrontSp = imgUrl[0]),
+              vm.idCardIdentify(imgUrl[0], 'idCardSp'),
+              (vm.idCardFrontSpEditFlag = true))
+              : ((vm.idCardBackSp = imgUrl[0]),
+              vm.idCardBackIdentify(imgUrl[0], 'idCardSp'),
+              (vm.idCardBackSpEditFlag = true))
           } else if (ocrType === 'bankCard') {
             vm.bankImg = imgUrl[0]
             vm.bankCardIdentify(imgUrl[0])
@@ -1134,7 +1237,9 @@ export default {
         content: '您确认添加吗？',
         onConfirm: data => {
           if (data === 1) {
-            let bpName = this.from ? this.$route.params.user_bp_name : window.localStorage.getItem('bp_name')
+            let bpName = this.from
+              ? this.$route.params.user_bp_name
+              : window.localStorage.getItem('bp_name')
             if (
               this.bank.bank_account_num === '' ||
               this.bank.bank_account_name === '' ||
@@ -1152,7 +1257,9 @@ export default {
               let url = process.env.basePath + 'bp_bank_save'
               let param = {
                 master: {
-                  bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id'),
+                  bp_id: this.from
+                    ? this.$route.params.bp_id
+                    : window.localStorage.getItem('bp_id'),
                   bank_lists: this.bankList,
                 },
               }
@@ -1171,7 +1278,9 @@ export default {
       })
     },
     putData () {
-      let bp_id = this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id')
+      let bp_id = this.from
+        ? this.$route.params.bp_id
+        : window.localStorage.getItem('bp_id')
       if (bp_id) {
         this.hlsPopup.showConfirm({
           title: '提示',
@@ -1182,7 +1291,9 @@ export default {
               let url = process.env.basePath + 'bp_bind_submit'
               let param = {
                 master: {
-                  bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('bp_id'),
+                  bp_id: this.from
+                    ? this.$route.params.bp_id
+                    : window.localStorage.getItem('bp_id'),
                   company_id: '2145',
                 },
               }
@@ -1233,15 +1344,24 @@ export default {
         code: 'bp_type',
         object: {},
         returnItem: function (index, obj) {
-          vm.baseInfo.bp_type = obj.bp_type
-          vm.baseInfo.bp_type_n = obj.bp_type_n
+          // vm.baseInfo.bp_type = obj.bp_type
+          // vm.baseInfo.bp_type_n = obj.bp_type_n
+          let flag
+          flag = vm.bp_type.some(i => {
+            return i.bp_type_n.indexOf(obj.bp_type_n) !== -1
+          })
+          if (!flag && obj.bp_type_n !== vm.baseInfo.bp_type_n) {
+            vm.bp_type.push({ bp_type: obj.bp_type, bp_type_n: obj.bp_type_n })
+          }
           vm.isSelected = true
         },
       })
     },
     getBankInfo () {
       let vm = this
-      let id = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('bp_id')
+      let id = vm.from
+        ? vm.$route.params.bp_id
+        : window.localStorage.getItem('bp_id')
       let url = process.env.basePath + 'bp_bank_query'
       let param = {
         bp_id: id,
@@ -1475,12 +1595,26 @@ export default {
   }
   textarea {
     text-align: right;
-    color:#666;
+    color: #666;
+  }
+  .typeBP {
+    span {
+      display: inline-block;
+      padding: 1px 5px;
+      border-radius: 5px;
+      text-align: center;
+      line-height: 20px;
+      background-color: rgba(220, 220, 221, 0.26);
+      color: #666;
+      margin-right: 5px;
+      margin-top: 3px;
+    }
+    img {
+      width: 10px;
+      height: 10px;
+      margin-left: 1px;
+    }
   }
-  // .compute{
-  //   display:block;
-  //   font-size: 14px;
-  // }
   .tax {
     width: 351px;
     height: 78px;
@@ -1610,7 +1744,7 @@ export default {
         justify-content: flex-start;
         align-items: center;*/
       }
-      .plus{
+      .plus {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -1632,10 +1766,10 @@ export default {
           margin-top: -100%;
           margin-left: -10%;*/
           position: absolute;
-          color: #F96F68;
+          color: #f96f68;
           top: -6px;
           right: -6px;
-          img{
+          img {
             width: 14px;
             height: 14px;
           }
@@ -1656,9 +1790,9 @@ export default {
   .put {
     width: 175px;
     height: 45px;
-    color: #FDB62F;
+    color: #fdb62f;
     border-radius: 4px;
-    border: 1px solid #FDB62F;
+    border: 1px solid #fdb62f;
     background-color: #fafafa;
   }
   .put-approved {

src/router/index.js

@@ -62,6 +62,8 @@ import NewList from '@/pages/pay/payment/new-list'
 // 保证金支付
 import MarginFirstPay from '@/pages/pay/marginPay/first-pay'
 import MarginPayEntry from '@/pages/pay/marginPay/pay-entry'
+// 支付页
+import PayPage from '@/pages/pay/pay-page'
 // 产品查询
 import QueryHome from '@/pages/productQuery/query-home'
 import ProDetailed from '@/pages/productQuery/product-detailed'
@@ -216,6 +218,8 @@ export default new Router({
     // 保证金支付
     {path: '/margin-first-pay', component: MarginFirstPay, name: 'MarginFirstPay', meta: {keepAlive: true}},
     {path: '/margin-pay-entry', component: MarginPayEntry, name: 'MarginPayEntry', meta: {keepAlive: true}},
+    // 支付页
+    {path: '/pay-page', component: PayPage, name: 'PayPage', meta: {keepAlive: true}},
     // 产品查询
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
     {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},