12月20

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.2.6"'
+  currentVersion: '"3.2.9"'
 }

src/App.vue

@@ -65,6 +65,6 @@ export default {
   }
 
   .weui-dialog {
-    top: 30%;
+    top: 30% !important;
   }
 </style>

src/pages/functionCenter/function-list.vue

@@ -242,7 +242,7 @@ export default {
         let bp_type =  obj.bp_type;
         let bp_name =  obj.bp_name;
 
-        let user_phone =  JSON.parse(window.localStorage.getItem("user_phone"));
+        let user_phone =   window.localStorage.getItem("user_phone");
 
           if (user_bp_status === 'APPROVED') {
             vm.flag = false

src/pages/myInfo/my-info.vue

@@ -14,7 +14,7 @@
 
     <!-- <div :class="['top',(multipleRole!=='GUTA'&&user_bp_type!=='GUTA')?'has':'antiHas']" style="margin-top:-1px;"> -->
     <div class="top" style="margin-top: -1px">
-      <div class="card-top">
+      <div class="card-top" :style="{height: nowBind.bp_type==='MANAGER'?'170px' : '2.4rem'}">
         <img :src="upLoadObj" @click="checkType" />
         <div class="sign">
           <span>{{ user_phone }}</span>
@@ -28,13 +28,13 @@
             </p>-->
 
             <span>{{ nowBind.bp_name ? `${nowBind.bp_name} (当前)` : '未绑定' }}</span>
-            <div v-show="nowBind.bp_name" @click="changeUser">切换</div>
+            <div v-show="nowBind.bp_name && nowBind.bp_type !== 'MANAGER'" @click="changeUser">切换</div>
           </div>
         </div>
       </div>
     </div>
 
-    <div class="bind-user">
+    <div class="bind-user" v-if="nowBind.bp_type !== 'MANAGER'">
       <div class="box">
         <p class="title">我绑定的用户</p>
         <div v-if="!myBindUser.length" class="no-user">
@@ -337,6 +337,7 @@ export default {
         returnItem: (index, obj) => {
           this.nowBind = this.bindUserList[index];
           window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind));
+          hlsPopup.showLongCenter('用户已切换成功');
         },
       })
     },

src/pages/myInfo/myBindUser.vue

@@ -80,17 +80,18 @@ export default {
             NowItem: {}, // 当前操作对象
         }
     },
+    mounted() { 
+        this.getList()
+    },
     methods: {
         // 未认证进行人脸 认证
         face(item) {
+            let vm = this;
             let register = ['NP_NO', 'ORG_NO', 'ORG_L_NO', 'ORG_AUTH_NO'];
             if (register.includes(item.bp_identity)) {
-                // 如果未认证，人脸
 
                 let url = process.env.basePath + 'bp_query'
-                let param = {
-                    bp_id: item.bp_id,
-                }
+                let param = { bp_id: item.bp_id }
                 hlsPopup.showLoading('请稍候')
                 vm.hlsHttp.post(url, param).then((result) => {
                     hlsPopup.hideLoading()
@@ -117,6 +118,8 @@ export default {
                         vm.hlsPopup.showLongCenter(result.message)
                     }
                 })
+            } else {
+                hlsPopup.showLongCenter('认证已通过');
             }
         },
 
@@ -134,12 +137,12 @@ export default {
             if (res.info.code === 0 && res.info.data.authUrl) {
                 hlsPopup.showLongCenter('绑定失败！')
             } else if (res.info.code === 0 && res.info.data.openId) {
-                hlsPopup.showLongCenter('绑定成功！') 
+                hlsPopup.showLongCenter('绑定成功！')
                 vm.getList()
             } else {
                 hlsPopup.showLongCenter(res.info.msg)
             }
-        }, 
+        },
 
         // 针对 不同的 状态 去操作
         doStatus(item) {
@@ -311,6 +314,11 @@ export default {
                 height: 20px;
                 vertical-align: text-bottom;
             }
+
+            .name {
+                display: flex;
+                align-items: center;
+            }
         }
     }
 

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

@@ -158,8 +158,9 @@ export default {
       let vm = this
       let url = process.env.basePath + 'do_order_0_prj'
       let param = {
-        info: {
-          bp_id: window.localStorage.getItem('bp_id'),
+        info: { 
+          bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
+
         },
       }
       hlsPopup.showLoading('请稍候')

src/pages/pay/payment/new-list.vue

@@ -163,8 +163,8 @@ export default {
       let vm = this
       let url = process.env.basePath + 'do_order_1_con'
       let param = {
-        info: {
-          bp_id: window.localStorage.getItem('bp_id'),
+        info: { 
+           bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
         },
       }
       hlsPopup.showLoading('请稍候')

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

@@ -1094,7 +1094,8 @@ export default {
               vm.estateAttachmentId = res.lists[0].attachment_id
               break
             default:
-              vm.dowload_list.push(res.lists)
+              // vm.dowload_list.push(res.lists)
+              vm.dowload_list = [...vm.dowload_list, ...res.lists]  
           }
         } else {
           hlsPopup.showLongCenter(res.message)

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

@@ -396,7 +396,7 @@ export default {
         academic_background_n: '',
         marital_status_n: '',
         bp_type: '',
-        bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+        bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'NP',
         bp_name: '',
         province_name: '',
         province_id: '',
@@ -420,7 +420,7 @@ export default {
         working_place_sp: '',
         address_sp: '',
         user_phone: window.localStorage.user_phone,
-        bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id 
+        bp_id: JSON.parse(window.localStorage.handleUser).bp_id 
       },
       idCardFront: '', // 身份证正面图片
       idCardBack: '', // 身份证反面图片
@@ -516,7 +516,7 @@ export default {
           academic_background_n: '',
           marital_status_n: '',
           bp_type: '',
-          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'NP',
           bp_name: '',
           province_name: '',
           province_id: '',
@@ -540,7 +540,7 @@ export default {
           working_place_sp: '',
           address_sp: '',
           user_phone: window.localStorage.user_phone,
-          bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
+          bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
 
         }
         vm.idCardFront = '' // 身份证正面图片
@@ -597,7 +597,7 @@ export default {
           academic_background_n: '',
           marital_status_n: '',
           bp_type: '',
-          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'NP',
           bp_name: '',
           province_name: '',
           province_id: '',
@@ -621,7 +621,7 @@ export default {
           working_place_sp: '',
           address_sp: '',
           user_phone: window.localStorage.user_phone,
-          bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
+          bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
         }
         vm.idCardFrontUpload = ''
         vm.idCardBackUpload = ''
@@ -683,7 +683,7 @@ export default {
       let url = process.env.basePath + 'bp_type_save'
       let param = {
         master: {
-          bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
+          bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
           bp_type: vm.multiBpType.bp_type,
         },
       }
@@ -706,7 +706,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'
       let param = {
-        bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
+        bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -757,13 +757,13 @@ export default {
               break
             case 'MATE_ID_CARD_F': // 配偶身份证正面
               if (!vm.idCardFrontSpUrlFlag) {
-                vm.idCardFrontSp = res.lists[0].url
+                vm.idCardFrontSp = res.lists[0] ? res.lists[0].url : null;
               }
               vm.idCardFrontSpAttachmentId = res.lists[0].attachment_id
               break
             case 'MATE_ID_CARD_B': // 配偶身份证背面
               if (!vm.idCardBackSpUrlFlag) {
-                vm.idCardBackSp = res.lists[0].url
+                vm.idCardBackSp =  res.lists[0] ? res.lists[0].url : null;
               }
               vm.idCardBackSpAttachmentId = res.lists[0].attachment_id
               break
@@ -917,8 +917,8 @@ export default {
       let flag = vm.checkHasmultiple()
       let param = {
         master: {
-          bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
-          bp_type: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_type,
+          bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
+          bp_type: JSON.parse(window.localStorage.handleUser).bp_type,
         },
       }
       if (flag) {
@@ -946,7 +946,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_role_check'
       let param = {
-        bp_id: JSON.parse(window.localStorage.now_user_bp_bind_id).bp_id,
+        bp_id: JSON.parse(window.localStorage.handleUser).bp_id,
       }
       let res = await vm.hlsHttp.post(url, param)
       if (res.result === 'S') {

src/pages/userBindNew/org/baseInfo.vue

@@ -32,7 +32,7 @@
             <div slot="name" class="required">客户类型</div>
             <span slot="content">{{ baseInfo.bp_type_n }}</span>
           </item>
-          <item v-if="(isMultiRole&&!hasMultiRole)" :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>
@@ -519,7 +519,7 @@ export default {
         organization_code: '',
         registered_capital: '',
         // business_license_num: '',
-        bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+        bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG',
       },
       authMsg: {
         auth_person_name: '',
@@ -658,7 +658,7 @@ export default {
           organization_code: '',
           registered_capital: '',
           // business_license_num: '',
-          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG',
         }
         vm.authMsg = {
           auth_person_name: '',
@@ -749,7 +749,7 @@ export default {
           organization_code: '',
           registered_capital: '',
           // business_license_num: '',
-          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class,
+          bp_class: JSON.parse(window.localStorage.getItem('handleUser')).bp_class || 'ORG',
         }
         vm.authMsg = {
           auth_person_name: '',
@@ -1105,7 +1105,7 @@ export default {
           return
         }
         for (var key in vm.lastInfo) {
-          if (!vm.lastInfo[key] && key !== 'phone') {
+          if (key !== 'bp_class' && !vm.lastInfo[key] && key !== 'phone') {
             switch (key) {
               case 'province_id':
                 vm.hlsPopup.showLongCenter('请选择省份')
@@ -1311,7 +1311,7 @@ export default {
           vm.hlsPopup.showLongCenter('授权人身份证不正确')
         }
       }
-
+  
       if (vm.msg_flag) {
         vm.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
         vm.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片

www/index.html

+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.e7e2377302829c9967e8db68dae2bfee.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.0220c1f499aeb5db00f1.js></script><script type=text/javascript src=./static/js/vendor.ab3a82a5a65cc1afd48b.js></script><script type=text/javascript src=./static/js/app.dea6ba33c7164ae80cb8.js></script></body></html>
\ No newline at end of file