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

src/pages/carConfirm/confirm-detail.vue

@@ -11,7 +11,7 @@
           <div class="down-content">
             <span>请上传照片</span>
             <div class="photo">
-              <!-- <img src=""> -->
+              <img :src="vehicleImg">
             </div>
             <list-item :item-height="44">
               <item>
@@ -107,7 +107,7 @@
           v-for="(item,index) in equip"
           :key="index"
           class="equipment"
-          @click="downNum=true;getRent(item.contract_id)"
+          @click="downNum=true;getRent(item.contract_id,item.contract_lease_item_id)"
         >
           <div class="left">
             <span>
@@ -194,6 +194,7 @@ export default {
       downNum: false,
       show: false,
       flag: false, // 判断是否为已确认
+      vehicleImg: '', // 查询到的合格证
       leasePic: '', // 租赁合同图片
       agentPic: '', // 经销商担保协议图片
       bankPic: '', // 农行代扣授权书图片
@@ -257,6 +258,30 @@ export default {
     })
   },
   methods: {
+    getImg (id) { // 获取合格证
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'app_attment_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        'master': {
+          'source_type': 'CON_CONTRACT_LEASE_ITEM',
+          'pkvalue': id,
+        },
+      }
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          if (res.info) {
+            vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 签约校验
     async signCheck () {
       let vm = this
@@ -329,7 +354,7 @@ export default {
     // 获取身份证照片
     async idCardImgUrlGet () {
       let vm = this
-      let url = $config.basePath + 'prj_id_card_query'
+      let url = $config.basePath + 'car_id_card_query'
       let param = {
         confirm_id: vm.confirm_id,
       }
@@ -376,13 +401,13 @@ export default {
     },
     goBodyCheck (confirm_id) { // 活体检测
       this.$refs.body.show()
-      /*this.$router.push({
+      /* this.$router.push({
         name: 'BodyCheck',
         params: {
           check_id: this.$route.params.check_id,
           confirm_id: confirm_id,
         },
-      })*/
+      }) */
     },
     // 图片保存
     save_picture (list) {
@@ -500,7 +525,7 @@ export default {
         }
       })
     },
-    getRent (e) {
+    getRent (e, id) {
       let vm = this
       let url = process.env.basePath + 'leases_info_query'
       let param = {
@@ -511,6 +536,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.rentInfo, res.info)
+          vm.getImg(id)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

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

@@ -130,7 +130,8 @@ export default {
     contractList () {
       let vm = this
       if (vm.num === 1) {
-        let url = $config.basePath + 'prj_submit_list'
+        let randomString = Math.floor(Math.random() * 21)
+        let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
@@ -154,7 +155,8 @@ export default {
           }
         })
       } else if (vm.num === 2) {
-        let url = $config.basePath + 'prj_submit_list'
+        let randomString = Math.floor(Math.random() * 21)
+        let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
         let param = {
           pagesize: 10,
           pagenum: vm.approvedPagenum,
@@ -185,7 +187,8 @@ export default {
       let vm = this
       if (vm.num === 1) {
         vm.submitPagenum++
-        let url = $config.basePath + 'prj_submit_list'
+        let randomString = Math.floor(Math.random() * 21)
+        let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
@@ -219,7 +222,8 @@ export default {
         })
       } else if (vm.num === 2) {
         vm.approvedPagenum++
-        let url = $config.basePath + 'prj_submit_list'
+        let randomString = Math.floor(Math.random() * 21)
+        let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
         let param = {
           user_phone: window.localStorage.user_phone,
           pagesize: 10,
@@ -256,7 +260,8 @@ export default {
     async submitSearch () {
       let vm = this
       vm.submitPagenum = 1
-      let url = $config.basePath + 'prj_submit_list'
+      let randomString = Math.floor(Math.random() * 21)
+      let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
       let param = {
         user_phone: window.localStorage.user_phone,
         pagesize: 10,
@@ -286,7 +291,8 @@ export default {
     },
     approvedearch () {
       let vm = this
-      let url = $config.basePath + 'prj_submit_list'
+      let randomString = Math.floor(Math.random() * 21)
+      let url = $config.basePath + 'prj_submit_list' + '&index' + `'${randomString}'`
       vm.approvedPagenum = 1
       let param = {
         user_phone: window.localStorage.user_phone,

src/pages/contractCreate/sales-info.vue

@@ -186,6 +186,12 @@ export default {
       },
       immediate: true,
     },
+    // '$route' (to, from) {
+    //   debugger
+    //   if (from.fullPath !== '/contract-create-list' && to.fullPath === '/sales-info') {
+    //     this.$router.go(0)
+    //   }
+    // },
   },
   activated () {
 
@@ -222,7 +228,8 @@ export default {
         }
         vm.businessQuery().then(res => {
           vm.agentQuery().then(res => {
-            vm.factoryQuery()
+            vm.factoryQuery().then(res => {
+            })
           })
         })
       } else if (from.name === 'CreateBaseInfo') {
@@ -327,7 +334,7 @@ export default {
         phone: window.localStorage.getItem('user_phone'),
       }
       vm.hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(function (res) {
+      return vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         vm.factoty = res.lists
         if (res.result === 'S') {

src/pages/contractSigning/contract-detail.vue

@@ -118,6 +118,19 @@
       </div>
     </h-content>
     <h-content v-if="num === 2">
+      <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
+        <item v-for="(item,index) in attachArray" :proportion="[7,1]" :key="index">
+          <div slot="name" class="aguremrnt-list">
+            <img src="@/assets/constractSigning/npack.png" alt class="pics" >
+            <p class="second first">{{ item.attachment_file }}</p>
+          </div>
+          <div slot="content" class="in-detail" @click="goContent(item.attachment_file_path)">
+            <img src="@/assets/constractSigning/detail.png" alt >
+          </div>
+        </item>
+      </list-item>
+    </h-content>
+    <!-- <h-content v-if="num === 2">
       <list-item :item-height="56" class="contract-text" style="background-color:rgb(250,250,250);">
         <item :proportion="[7,1]">
           <div slot="name" class="aguremrnt-list">
@@ -129,7 +142,6 @@
           </div>
         </item>
 
-        <!-- 农行代扣授权书 -->
     <item v-if="abc_deduction_flag === 'Y'" :proportion="[7,1]" :class="{'border-red':isshow}">
       <div slot="name" class="aguremrnt-list">
         <img src="@/assets/constractSigning/pack.png" alt class="pics" >
@@ -166,7 +178,7 @@
       </div>
     </item>
       </list-item>
-    </h-content>
+    </h-content>-->
     <h-content v-if="num === 1">
       <list-item :item-height="44" class="second-part">
         <item>
@@ -302,12 +314,11 @@
       </h-view>
     </h-modal>
     <!--活体检测-->
-    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id"/>
+    <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id" />
   </h-view>
 </template>
 
 <script>
-
 import Check1 from '@/assets/constractSigning/business.png'
 import Check2 from '@/assets/constractSigning/constract.png'
 import Check3 from '@/assets/constractSigning/lease.png'
@@ -334,6 +345,7 @@ export default {
       showModalValue: false,
       credit_status: 'N', // 一个月内是否查过征信 N查过
       guarantorInfo: [], // 担保人信息
+      attachArray: [], // 附件数组
       bp_class: this.$route.params.item.bp_class, // 承租人性质(自然人，企业)
       info: {}, // 租赁信息
       baseInfo: {}, // 基本信息
@@ -366,6 +378,7 @@ export default {
     }
   },
   computed: {},
+
   watch: {
     $route (to, from) {
       hlsPopup.hideConfirm()
@@ -418,6 +431,8 @@ export default {
         vm.getLease()
         vm.getGuarantor()
         vm.getContractLists() // 合同列表
+        // 合同文本附件查询
+        vm.getAttachment()
       } else if (from.name === 'EntryInfo') {
         vm.bankCardQuery()
       }
@@ -459,6 +474,29 @@ export default {
         // vm.hlsPopup.showLongCenter(res.message)
       }
     },
+    goContent (url) {
+      // 详情
+      // window.open(url)
+      cordova.InAppBrowser.open(url, '_blank', 'location=yes')
+    },
+    // 合同文本详情附件查询
+    getAttachment () {
+      let vm = this
+      let url = process.env.basePath + 'get_content_app'
+      let param = {
+        confirm_id: vm.confirm_id,
+        data_class: 'PRJ_PROJECT',
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.hlsHttp.post(url, param).then(res => {
+        hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.attachArray = res.attachments
+        } else {
+          vm.hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 征信查询
     creditCheck () {
       let vm = this
@@ -477,7 +515,8 @@ export default {
         }
       })
     },
-    goBodyCheck (confirm_id) { // 活体检测
+    goBodyCheck (confirm_id) {
+      // 活体检测
       this.$refs.body.show()
       /* this.$router.push({
         name: 'BodyCheck',
@@ -532,7 +571,6 @@ export default {
           if (index === 1) {
             vm.takePhontoOpenCamera()
           } else {
-
           }
         },
       })
@@ -859,7 +897,8 @@ export default {
     },
     async inSure () {
       let flag = await this.signCheck()
-      if (flag) { // 只有认证通过后方可进行签约操作
+      if (flag) {
+        // 只有认证通过后方可进行签约操作
         if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
           this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
         } else {
@@ -898,10 +937,10 @@ export default {
 }
 </script>
 <style lang="less" rel="stylesheet">
-  #contract-details {
+#contract-details {
   .sign-elect {
-      width:100%;
-      height:1.1rem;
+    width: 100%;
+    height: 1.1rem;
     position: fixed;
     bottom: 43px;
     // margin-top: 20px;
@@ -921,9 +960,9 @@ export default {
       letter-spacing: 0.2rem;
     }
   }
-    .bodyCheck{
-      width:100%;
-      height:1.1rem;
+  .bodyCheck {
+    width: 100%;
+    height: 1.1rem;
     position: fixed;
     bottom: 92px;
     background: #fff;
@@ -1506,7 +1545,7 @@ export default {
       border: 1px solid #fdb62f;
       border-radius: 4px;
       color: #fdb62f;
-        img{
+      img {
         width: 18px;
       }
     }
@@ -1514,13 +1553,13 @@ export default {
       background: #1d3fff;
       border-radius: 4px;
       color: #fff;
-        img{
+      img {
         width: 18px;
       }
     }
   }
-  }
-  .modal {
+}
+.modal {
   background-color: rgba(0, 0, 0, 0) !important;
-  }
+}
 </style>

src/pages/contractStart/add-car.vue

@@ -10,7 +10,7 @@
           <div class="down-content">
             <span>请上传照片</span>
             <div class="photo" @click="ocrShow()">
-              <img v-if="vehicleImg" :src="vertifyImg" alt="">
+              <img v-if="vehicleImg" :src="vehicleImg" alt="">
             </div>
             <list-item :item-height="44">
               <item>
@@ -156,7 +156,7 @@
         v-for="(item,index) in equip"
         :key="index"
         class="equipment"
-        @click="downNum = true;getRent(item.contract_id)"
+        @click="downNum = true;getRent(item.contract_id,item.contract_lease_item_id)"
       >
         <div class="left">
           <span>
@@ -244,6 +244,9 @@ export default {
       read: false, // 表示只读
       showDate: '',
       flag: false,
+      isUpload: false, // 是否上传
+      contract_lease_item_id: '',
+      upload_list: [], // 上传列表
       productLine: [
         {
           code: '5',
@@ -374,6 +377,30 @@ export default {
     })
   },
   methods: {
+    getImg (id) { // 获取合格证
+      let vm = this
+      let randomString = Math.floor(Math.random() * 21)
+      let url =
+        process.env.basePath +
+        'app_attment_query' +
+        '&index' +
+        `'${randomString}'`
+      let param = {
+        'master': {
+          'source_type': 'CON_CONTRACT_LEASE_ITEM',
+          'pkvalue': id,
+        },
+      }
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          if (res.info) {
+            vm.vehicleImg = process.env.filePath + 'attachment_id=' + res.info.attachment_id + '&access_token=' + window.localStorage.access_token
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // ocr识别入口
     ocrShow () {
       let vm = this
@@ -400,6 +427,7 @@ export default {
         if (!imgdata) {
           hlsPopup.showLongCenter('请拍照')
         } else {
+          vm.isUpload = true
           vm.vehicleImg = imgdata
           vm.vehicleIdentify(imgdata)
         }
@@ -421,6 +449,7 @@ export default {
         if (imgUrl.length === 0) {
           hlsPopup.showLongCenter('请选择一张图片')
         } else {
+          vm.isUpload = true
           vm.vehicleImg = imgUrl[0]
           vm.vehicleIdentify(imgUrl[0])
         }
@@ -441,10 +470,48 @@ export default {
         let result = res.result.words_result
         vm.info.frame_number = result.VinNo // 车架号
         vm.info.engine = result.EngineNo // 发动机号
-        // vm.vehicle_model = result.VinNo // 车辆型号
+        vm.vehicle_model = result.VinNo // 车辆型号
         vm.info.certificate_number = result.CertificationNo // 合格证编号
       })
     },
+    // 图片保存
+    save_picture (list) {
+      let vm = this
+      if (list.length) {
+        // hlsPopup.showLoading('图片上传请稍候')
+        var alreadyUploadNum = 0
+        var attLength = 0
+        var recordUploadInterval = setInterval(function () {
+          if (alreadyUploadNum === attLength) {
+            clearInterval(recordUploadInterval)
+            /* hlsPopup.hideLoading()
+            hlsPopup.showLongCenter('图片上传成功') */
+          }
+        }, 500)
+        for (var i = 0; i < list.length; i++) {
+          let uploadSuccess = function (res) {
+            if (res.result === 'S') {
+              alreadyUploadNum++
+              for (var j = 0; j < list.length; j++) {
+                if (list[j].filePath === res.response.filePath) {
+                  list[j].attachment_id = res.response.attachment_id
+                  vm.upload_list.push(list[j])
+                  break
+                }
+              }
+            } else {
+              hlsPopup.hideLoading()
+            }
+          }
+          if (!list[i].attachment_id) {
+            attLength++
+            hlsUtil.fileUploadSvc(list[i], uploadSuccess)
+          }
+        }
+      } else {
+        hlsPopup.hideLoading()
+      }
+    },
     showTime (format) {
       this.hlsPopup.showTime({
         nowDate: `${this.carDate}`,
@@ -474,6 +541,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.code === '00') {
           vm.hlsPopup.showSuccess('保存成功')
+          vm.savePicture()
           setTimeout(() => {
             vm.downNum = false
             vm.getEquipment()
@@ -483,6 +551,22 @@ export default {
         }
       })
     },
+    savePicture () {
+      let vm = this
+      let list = []
+      let obj = {
+        pkvalue: vm.contract_lease_item_id,
+        source_type: 'CON_CONTRACT_LEASE_ITEM',
+        picture: '',
+        check_id: vm.contract_lease_item_id,
+        filePath: vm.vehicleImg,
+        attachment_id: '',
+        user_id: 1,
+        fileName: '合格证',
+      }
+      list.push(obj)
+      vm.save_picture(list)
+    },
     isSave () {
       this.hlsPopup.showConfirm({
         title: '提示',
@@ -515,7 +599,7 @@ export default {
         },
       })
     },
-    getRent (e) {
+    getRent (e, id) {
       let vm = this
       for (let i in vm.info) {
         vm.info[i] = ''
@@ -530,6 +614,8 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           Object.assign(vm.info, res.info)
+          vm.getImg(id)
+          vm.contract_lease_item_id = id
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/myInfo/my-info.vue

@@ -12,7 +12,7 @@
       <div slot="center">个人中心</div>
     </h-header>
 
-    <div class="top" style="margin-top:-1px;">
+    <div :class="['top',(multipleRole!=='GUTA'&&user_bp_type!=='GUTA')?'has':'antiHas']" style="margin-top:-1px;">
       <div class="card-top">
         <img :src="upLoadObj" @click="checkType" >
         <div class="sign">
@@ -26,18 +26,18 @@
           </div>
         </div>
       </div>
-      <div class="card">
+      <div v-if="multipleRole!=='GUTA'&&user_bp_type!=='GUTA'" class="card">
         <div class="card-info">
           <div class="card-bottom">
             <div v-if="(user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')" @click="goStart">
               <img src="@/assets/myInfo/car.png" >
               <p>发车申请</p>
             </div>
-            <div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changePay">
+            <div v-if="(user_bp_type==='TENANT')" @click="changePay">
               <img src="@/assets/myInfo/pay.png" >
               <p>首付还款</p>
             </div>
-            <div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changeRent">
+            <div v-if="(user_bp_type==='TENANT')" @click="changeRent">
               <img src="@/assets/myInfo/refund.png" >
               <p>租金还款</p>
             </div>
@@ -147,14 +147,14 @@
     </h-content>
     <role-switch
       v-show="roleSwitchFlag"
-      ref="roleSwitch"
+      ref="roleSwitchRoleList"
       :roleList="roleList"
       @roleConfirm="roleConfirm"
       @roleCancle="roleCancle"
     />
     <role-switch
       v-show="popSetectBox"
-      ref="roleSwitch"
+      ref="roleSwitchType"
       :roleList="type"
       @roleConfirm="typeConfirm"
       @roleCancle="typeCancle"
@@ -171,6 +171,7 @@ export default {
   data () {
     return {
       currentVersion: process.env.currentVersion,
+      multipleRole: '',
       upLoadObj: defaultImg, // 上传的图片
       flag: true,
       isAGENT: false,
@@ -277,6 +278,7 @@ export default {
   created () {},
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.multipleRole = window.localStorage.getItem('multipleRole')
       vm.userQuery()
       vm.numQuery()
     })
@@ -323,6 +325,13 @@ export default {
     // 选择角色后确定
     roleConfirm (role) {
       this.roleSwitchFlag = false
+      if (role.bp_type === 'TENANT') {
+        window.localStorage.setItem('multipleRole', 'TENANT')
+        this.multipleRole = 'TENANT'
+      } else if (role.bp_type === 'GUTA') {
+        window.localStorage.setItem('multipleRole', 'GUTA')
+        this.multipleRole = 'GUTA'
+      }
       console.log('选择后的角色为：' + role)
     },
     typeConfirm (e) { // 选择操作方式后
@@ -624,7 +633,11 @@ export default {
           } else if (index === 1) {
             this.changePageHead()
           } else if (index === 2) {
-            this.$refs.roleSwitch.show()
+            if (((vm.user_bp_type === 'TENANT') || (vm.user_bp_type === 'GUTA')) && (vm.user_bp_status === 'APPROVED')) {
+              this.$refs.roleSwitchRoleList.show()
+            } else {
+              hlsPopup.showLongCenter('您当前尚无可用角色')
+            }
           }
         },
       })
@@ -916,11 +929,15 @@ export default {
       hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)
       hlsPopup.hideLoading()
-      if (res.info.code === 0) {
-        return res.info.data.authUrl
+      if ((res.info.code === 0) && (res.info.data.authUrl)) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else if ((res.info.code === 0) && (res.info.data.openId)) {
+        vm.authUrl = res.info.data.openId
+        return vm.authUrl
       } else {
-        hlsPopup.showLongCenter(res.info.msg)
-        return null
+        hlsPopup.showError(res.info.msg)
+        return ''
       }
     },
     // 获取企业认证url
@@ -933,11 +950,21 @@ export default {
       hlsPopup.showLoading('请稍候')
       let res = await vm.$post(url, param)
       hlsPopup.hideLoading()
-      if (res.info.code === 0) {
-        return res.info.data.authUrl
+      // if (res.info.code === 0) {
+      //   return res.info.data.authUrl
+      // } else {
+      //   hlsPopup.showLongCenter(res.info.msg)
+      //   return null
+      // }
+      if ((res.info.code === 0) && (res.info.data.authUrl)) {
+        vm.authUrl = res.info.data.authUrl
+        return vm.authUrl
+      } else if ((res.info.code === 0) && (res.info.data.openId)) {
+        vm.authUrl = res.info.data.openId
+        return vm.authUrl
       } else {
-        hlsPopup.showLongCenter(res.info.msg)
-        return null
+        hlsPopup.showError(res.info.msg)
+        return ''
       }
     },
   },
@@ -1004,9 +1031,15 @@ export default {
       border: 1px solid #00469c;
     }
   }
+  .has{
+    height:206px;
+  }
+.antiHas{
+  height:3.12rem;
+}
   .top {
     width: 100%;
-    height: 206px;
+    // height: 206px;
     background: url("../../assets/myInfo/back.png") no-repeat;
     background-size: 100% 156px;
     background-color: #efefef;

src/pages/myInfo/role-switch-component.vue

@@ -7,7 +7,7 @@
     <div v-show="showFlag" class="role-switch-wrap">
       <div class="role-switch-content">
         <div class="content-header">
-          <span>请选择要切换的角色</span>
+          <span>请选择要切换的内容</span>
           <img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
         </div>
         <div class="content-wrap">

src/pages/pay/pay-page.vue

@@ -85,7 +85,7 @@
             </item>-->
             <div class="orderamount-wrap">
               <span class="orderamount-item">交易金额</span>
-              <span class="orderamount-item font-color">￥ {{info.orderamount|currency}}</span>
+              <span class="orderamount-item font-color">￥ {{ info.orderamount|currency }}</span>
             </div>
             <item>
               <div slot="name" class="name">支付方式</div>
@@ -176,7 +176,7 @@ export default {
     pay (status) {
       let vm = this
       vm.nextPay = false
-      if(status === 'continue' && vm.payType === 'ABC_UNION'){   // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
+      if (status === 'continue' && vm.payType === 'ABC_UNION') { // 在银联模式下继续支付重新获取支付url,因为银联页面只能打开一次
         hlsPopup.showConfirm({
           title: '提示',
           content: '银联不支持二次支付，请重新发起支付订单',
@@ -188,7 +188,7 @@ export default {
             }
           },
         })
-      }else{
+      } else {
         cordova.InAppBrowser.open(this.url, '_blank', 'location=yes')
         // window.open(this.url)
       }
@@ -197,7 +197,7 @@ export default {
         vm.showpay = false
       }, 3000)
     },
-    getPayUrl(){
+    getPayUrl () {
       let vm = this
       let url = process.env.basePath + 'merchant_payment'
       let param = {

src/pages/userBindNew/np/bank-info.vue

@@ -222,7 +222,7 @@ export default {
                       vm.$router.push({
                         name: 'HomePage',
                       })
-                    } else {
+                    } else if (vm.certification_status === 'N') {
                       vm.$router.push({
                         name: 'Certification',
                         params: {
@@ -254,7 +254,7 @@ export default {
       if ((res.info.code === 0) && (res.info.data.authUrl)) {
         vm.authUrl = res.info.data.authUrl
         return vm.authUrl
-      } else if((res.info.code === 0) && (res.info.data.openId)){
+      } else if ((res.info.code === 0) && (res.info.data.openId)) {
         vm.authUrl = res.info.data.openId
         return vm.authUrl
       } else {

src/pages/userBindNew/np/base-info.vue

@@ -20,7 +20,7 @@
             @click="selectIdTypeOnly()"
           >
         </item>
-        <item v-if="isApproved&&isMultiRole" :showArrow="true" @click.native="selectIdType()">
+        <item v-if="isApproved&&isMultiRole&&!hasMultiRole" :showArrow="true" @click.native="selectIdType()">
           <div slot="name" class="required">客户类型</div>
           <div slot="content" class="typeBP">
             <span>{{ baseInfo.bp_type_n }}</span>
@@ -30,6 +30,13 @@
             </span>
           </div>
         </item>
+        <item v-if="isApproved&&isMultiRole&&hasMultiRole" :showArrow="true">
+          <div slot="name" class="required">客户类型</div>
+          <div slot="content" class="typeBP">
+            <span>{{ baseInfo.bp_type_n }}</span>
+            <span v-if="multiRole.bp_type_n">{{ multiRole.bp_type_n }}</span>
+          </div>
+        </item>
         <item v-if="(isPaople&&from)||(isPaople&&isSelected)">
           <div slot="name" class="required">业务经办人</div>
           <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
@@ -319,8 +326,9 @@ export default {
       isApproved: false,
       isSave: false,
       isAGENT: this.$route.params.isAGENT,
-      isMultiRole: this.$route.params.isMultiRole,
+      isMultiRole: this.$route.params.isMultiRole, // 能否选择多角色
       isSelected: false,
+      hasMultiRole: false, // 是否有第二个角色
       from: false,
       multiBpType: {
         bp_type_n: '',
@@ -336,6 +344,10 @@ export default {
       maritalList: [],
       districtList: [],
       img_url: {},
+      multiRole: {
+        bp_type_n: '',
+        bp_type: '',
+      }, // 查询出来的第二个角色
       baseInfo: {
         bp_type_n: '',
         academic_background_n: '',
@@ -468,6 +480,7 @@ export default {
         vm.from = true
         vm.basicInfoQuery()
         vm.loadItemList() // 附件查询
+        vm.checkHasmultiple()// 查询是否有新角色
       } else if (from.name === 'UserBind') {
         vm.list = {}
         vm.multiBpType = {
@@ -762,6 +775,31 @@ export default {
         }
       })
     },
+    checkHasmultiple () {
+      let vm = this
+      let url = process.env.basePath + 'bp_role_check'
+      let param = {
+        bp_id: window.localStorage.getItem('bp_id'),
+      }
+      // vm.hlsPopup.showLoading('请稍后')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        // vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.hasMultiRole = true
+          if (vm.baseInfo.bp_type === 'TENANT') {
+            vm.multiRole.bp_type_n = '担保人'
+            vm.multiRole.bp_type = 'GUTA'
+          } else if (vm.baseInfo.bp_type === 'GUTA') {
+            vm.multiRole.bp_type_n = '承租人'
+            vm.multiRole.bp_type = 'TENANT'
+          }
+        } else {
+          vm.hasMultiRole = false
+          vm.multiRole.bp_type = ''
+          vm.multiRole.bp_type_n = ''
+        }
+      })
+    },
     // 基本信息保存前校验
     bindCheck () {
       let vm = this