Merge branch 'liuxin' into develop

config/dev.env.js

@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=admin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app"',
   currentVersion: '"1.0.2"',

src/pages/contractCreate/add-undertake.vue

@@ -211,7 +211,7 @@ export default {
   }
 }
 .platform-ios {
-  #confirmList {
+  #person {
     .scrollContent {
       padding-top: 1.4rem;
     }

src/pages/home/home-page.vue

@@ -20,7 +20,7 @@
       <div class="top-wrap-white"/>
       <swipe :interval="5000" class="hls-swipe">
         <swipe-item class="hls-swipe">
-          <img src="@/assets/homePage/banner1.png" alt="">
+          <img src="@/assets/homePage/banner.jpg" alt="">
         </swipe-item>
         <swipe-item class="hls-swipe">
           <img src="@/assets/homePage/banner2.png" alt="">

src/pages/myInfo/my-info.vue

@@ -886,8 +886,7 @@ export default {
       if (vm.bp_id) {
         if (
           vm.bp_identity === 'NP_NO' ||
-          vm.bp_identity === 'ORG_L_NO' ||
-          vm.bp_identity === 'ORG_AUTH_NO'
+          vm.bp_identity === 'ORG_L_NO'
         ) {
           let authUrl = await vm.getNpCertificationUrl()
           if (authUrl) {
@@ -900,7 +899,8 @@ export default {
           } else {
             // hlsPopup.showLongCenter('获取认证url失败')
           }
-        } else if (vm.bp_identity === 'ORG_NO') {
+        } else if (vm.bp_identity === 'ORG_NO' ||
+          vm.bp_identity === 'ORG_AUTH_NO') {
           // let authUrl = await vm.getOrgCertificationUrl()
           // if (authUrl) {
           //   vm.$router.push({

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

@@ -220,7 +220,7 @@ export default {
                     vm.hlsPopup.showSuccess('提交成功')
                     if (vm.certification_status === 'Y') {
                       vm.$router.push({
-                        name: 'HomePage',
+                        name: 'MyInfo',
                       })
                     } else if (vm.certification_status === 'N') {
                       vm.$router.push({
@@ -229,6 +229,10 @@ export default {
                           authUrl: vm.authUrl,
                         },
                       })
+                    } else {
+                      vm.$router.push({
+                        name: 'MyInfo',
+                      })
                     }
                   } else {
                     vm.hlsPopup.showLongCenter(res.message)

src/pages/userBindNew/org/bankInfo.vue

@@ -57,7 +57,7 @@
       </div>
     </div>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="handSubmit">提交</tab-button>
+      <tab-button class="save" @click.native="putData">提交</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
@@ -160,11 +160,11 @@ export default {
         vm.certification_status = ''
         vm.getBankInfo()
         vm.electQuery()
-       /* if (window.localStorage.bp_identity === 'ORG_NO') {
+        /* if (window.localStorage.bp_identity === 'ORG_NO') {
           vm.getOrgCertificationUrl() // 获取企业认证url
         } else {
           vm.getNpCertificationUrl()
-        }*/
+        } */
       }
     })
   },
@@ -263,33 +263,48 @@ export default {
         },
       })
     },
+    throttle (func, wait) { // 节流
+      let previous = 0
+      return function () {
+        let now = +new Date()
+        let remain = wait - (now - previous)
+
+        if (remain < 0) {
+          previous = now
+          func.call(this, arguments)
+        }
+      }
+    },
+    putData () {
+      this.throttle(this.handSubmit(), 3000)
+    },
     // 提交
     async handSubmit () {
       let vm = this
-      if (window.localStorage.bp_identity === 'ORG_NO') {
-        var urlTemp = await vm.getOrgCertificationUrl() // 获取企业认证url
-      } else {
-        var urlTemp = await vm.getNpCertificationUrl()
-      }
-      if(urlTemp){
-        this.hlsPopup.showConfirm({
-          title: '提示',
-          content: '您确认提交吗？',
-          onConfirm: data => {
-            if (data) {
-              let url = $config.basePath + 'bp_bind_submit'
-              let param = {
-                master: {
-                  bp_id: this.$route.params.bp_id,
-                  company_id: '2145',
-                },
-              }
-              let vm = this
-              vm.hlsPopup.showLoading('请稍候')
-              vm.hlsHttp.post(url, param).then(function (res) {
-                vm.hlsPopup.hideLoading()
-                if (res.result === 'S') {
-                  vm.hlsPopup.showSuccess('提交成功')
+      // if (window.localStorage.bp_identity === 'ORG_NO') {
+      //   var urlTemp = await vm.getOrgCertificationUrl() // 获取企业认证url
+      // } else {
+      var urlTemp = await vm.getNpCertificationUrl()
+      // }
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确认提交吗？',
+        onConfirm: data => {
+          if (data) {
+            let url = $config.basePath + 'bp_bind_submit'
+            let param = {
+              master: {
+                bp_id: this.$route.params.bp_id,
+                company_id: '2145',
+              },
+            }
+            let vm = this
+            vm.hlsPopup.showLoading('请稍候')
+            vm.hlsHttp.post(url, param).then(function (res) {
+              vm.hlsPopup.hideLoading()
+              if (res.result === 'S') {
+                vm.hlsPopup.showSuccess('提交成功')
+                if (urlTemp) {
                   if (vm.certification_status === 'Y') {
                     vm.$router.push({
                       name: 'MyInfo',
@@ -303,18 +318,21 @@ export default {
                         },
                       })
                     } else {
-                      vm.hlsPopup.showSuccess(vm.errorMsg)
+                      vm.$router.push({
+                        name: 'MyInfo',
+                      })
                     }
                   }
+                } else {
+                  vm.$router.push({
+                    name: 'MyInfo',
+                  })
                 }
-              })
-            }
-          },
-        })
-      }
-      else {
-        this.hlsPopup.showLongCenter('电子签认证出错')
-      }
+              }
+            })
+          }
+        },
+      })
     },
     // 获取个人认证url
     async getNpCertificationUrl () {
@@ -329,37 +347,37 @@ 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 {
-        hlsPopup.showError(res.info.msg)
-        //vm.errorMsg = res.info.msg
+        // hlsPopup.showError(res.info.msg)
+        // vm.errorMsg = res.info.msg
         return ''
       }
     },
     // 获取企业认证url
-    async getOrgCertificationUrl () {
-      let vm = this
-      let url = $config.basePath + 'auth_company_sign'
-      let param = {
-        phone: window.localStorage.user_phone,
-      }
-      hlsPopup.showLoading('请稍候')
-      let res = await vm.$post(url, param)
-      hlsPopup.hideLoading()
-      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.showError(res.info.msg)
-        return ''
-        //vm.errorMsg = res.info.msg
-      }
-    },
+    // async getOrgCertificationUrl () {
+    //   let vm = this
+    //   let url = $config.basePath + 'auth_company_sign'
+    //   let param = {
+    //     phone: window.localStorage.user_phone,
+    //   }
+    //   hlsPopup.showLoading('请稍候')
+    //   let res = await vm.$post(url, param)
+    //   hlsPopup.hideLoading()
+    //   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.showError(res.info.msg)
+    //     return ''
+    //     //vm.errorMsg = res.info.msg
+    //   }
+    // },
     // ocr识别入口
     ocrShow (ocrType, type) {
       let vm = this

src/pages/userBindNew/org/baseInfo.vue

@@ -27,7 +27,7 @@
               @click="selectIdType()"
             >
           </item>
-          <item v-if="isApproved&&isMultiRole" :showArrow="true" @click.native="selectIdMultiType()">
+          <item v-if="isApproved&&isMultiRole&&!hasMultiRole" :showArrow="true" @click.native="selectIdMultiType()">
             <div slot="name" class="required">客户类型</div>
             <div slot="content" class="typeBP">
               <span>{{ baseInfo.bp_type_n }}</span>
@@ -37,6 +37,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="bp_type_flag">
             <div slot="name" class="required">{{ typeName }}</div>
             <input
@@ -448,7 +455,11 @@ export default {
       multiBpType: {
         bp_type_n: '',
         bp_type: '',
-      },
+      }, // 客户选择的第二个角色
+      multiRole: {
+        bp_type_n: '',
+        bp_type: '',
+      }, // 查询出来的第二个角色
       legal_personMsg: {
         id_card_no: null,
         bp_legal_name: '',
@@ -495,6 +506,7 @@ export default {
       authidCardBack: '', // 授权人身份证反面图片
       licenseImg: '', // 营业执照照片
       laImg: '', // 授权书图片
+      hasMultiRole: false, // 是否有第二个角色
 
       idCardFrontUrlFlag: false, // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
       idCardBackUrlFlag: false, // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
@@ -720,6 +732,31 @@ export default {
     next()
   }, */
   methods: {
+    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 = ''
+        }
+      })
+    },
     timeFormat (str) {
       return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}`
     },