多角色

src/pages/carConfirm/confirm-detail.vue

@@ -276,6 +276,9 @@ export default {
     },
     getTabNum (i) {
       this.tabNum = i
+    },
+    getImg () {
+
     },
     takePhonto () {
       let vm = this
@@ -376,13 +379,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) {

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/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>
@@ -244,6 +244,8 @@ export default {
       read: false, // 表示只读
       showDate: '',
       flag: false,
+      isUpload: false, // 是否上传
+      upload_list: [], // 上传列表
       productLine: [
         {
           code: '5',
@@ -400,6 +402,7 @@ export default {
         if (!imgdata) {
           hlsPopup.showLongCenter('请拍照')
         } else {
+          vm.isUpload = true
           vm.vehicleImg = imgdata
           vm.vehicleIdentify(imgdata)
         }
@@ -421,6 +424,7 @@ export default {
         if (imgUrl.length === 0) {
           hlsPopup.showLongCenter('请选择一张图片')
         } else {
+          vm.isUpload = true
           vm.vehicleImg = imgUrl[0]
           vm.vehicleIdentify(imgUrl[0])
         }
@@ -441,10 +445,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 +516,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.code === '00') {
           vm.hlsPopup.showSuccess('保存成功')
+          vm.savePicture()
           setTimeout(() => {
             vm.downNum = false
             vm.getEquipment()
@@ -483,6 +526,22 @@ export default {
         }
       })
     },
+    savePicture () {
+      let vm = this
+      let list = []
+      let obj = {
+        pkvalue: 'contract_lease_item_id',
+        source_type: 'CON_CONTRACT_LEASE_ITEM',
+        picture: '',
+        check_id: '',
+        filePath: vm.vehicleImg,
+        attachment_id: '',
+        user_id: 1,
+        fileName: '合格证',
+      }
+      list.push(obj)
+      vm.save_picture(list)
+    },
     isSave () {
       this.hlsPopup.showConfirm({
         title: '提示',

src/pages/myInfo/my-info.vue

@@ -33,11 +33,11 @@
               <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')&&(multipleRole!=='GUTA')" @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')&&(multipleRole!=='GUTA')" @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,7 @@ export default {
           } else if (index === 1) {
             this.changePageHead()
           } else if (index === 2) {
-            this.$refs.roleSwitch.show()
+            this.$refs.roleSwitchRoleList.show()
           }
         },
       })

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 {