Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -19,7 +19,7 @@
           <span>{{ user_phone }}</span>
           <div>
             电子签
-            <p :class="[elecStatus?'across':'un-across']" @click="certification">{{ elecStatus?'已通过':'待认证' }}</p>
+            <p :class="[elecStatus?'across':'un-across']" @click="certification">{{ elecStatusDesceibe }}</p>
           </div>
         </div>
       </div>
@@ -124,6 +124,7 @@ export default {
     return {
       flag: true,
       isAGENT: false,
+      elecStatusDesceibe: '',
       user_bp_status: '',
       user_bp_class: '',
       bp_id: '',
@@ -151,11 +152,58 @@ export default {
       }
     },
     bp_identity (newVal, oldVal) {
-      if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ' || !newVal) {
+      switch (newVal) {
+        case 'NP_NO': {
+          this.elecStatusDesceibe = '个人待认证'
           this.elecStatus = false
-      } else if (newVal === 'NP_YES' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
+          break
+        }
+        case 'NP_YES': {
+          this.elecStatusDesceibe = '个人认证通过'
+          this.elecStatus = true
+          break
+        }
+        case 'ORG_NO': {
+          this.elecStatusDesceibe = '企业待认证'
+          this.elecStatus = false
+          break
+        }
+        case 'ORG_YES': {
+          this.elecStatusDesceibe = '企业认证通过'
+          this.elecStatus = true
+          break
+        }
+        case 'ORG_L_NO': {
+          this.elecStatusDesceibe = '法人待认证'
+          this.elecStatus = false
+          break
+        }
+        case 'ORG_L_YES': {
+          this.elecStatusDesceibe = '法人认证通过'
+          this.elecStatus = true
+          break
+        }
+        case 'ORG_AUTH_NO': {
+          this.elecStatusDesceibe = '授权人待认证'
+          this.elecStatus = false
+          break
+        }
+        case 'ORG_AUTH_YES': {
+          this.elecStatusDesceibe = '授权人认证通过'
           this.elecStatus = true
+          break
+        }
+        default: {
+          this.elecStatusDesceibe = '用户未绑定'
+          this.elecStatus = false
+          break
+        }
       }
+      // if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ' || !newVal) {
+      //   this.elecStatus = false
+      // } else if (newVal === 'NP_YES' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
+      //   this.elecStatus = true
+      // }
     },
   },
   created () {
@@ -602,7 +650,7 @@ export default {
           display: flex;
           align-items: center;
           justify-content: center;
-          width: 44px;
+          padding:0 5px;
           height: 20px;
           margin-left: 10px;
           border: 1px solid #fff;

src/pages/userBind/np/naturePerson.vue

@@ -17,16 +17,9 @@
     <h-content class="content">
       <div v-show="tabNum==0">
         <list-item :item-height="44">
-          <item :showArrow="true" @click.native="selectIdType()">
+          <item v-if="!isApproved" :showArrow="true" @click.native="selectIdTypeOnly()">
             <div slot="name" class="required">客户类型</div>
-            <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
+            <input
               slot="content"
               v-model="baseInfo.bp_type_n"
               placeholder="请选择"
@@ -34,7 +27,17 @@
               readonly
               onfocus="this.blur()"
               @click="selectIdType()"
-            >-->
+            >
+          </item>
+          <item v-if="isApproved" :showArrow="true" @click.native="selectIdType()">
+            <div slot="name" class="required">客户类型</div>
+            <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>
           </item>
           <item v-if="(isPaople&&from)||(isPaople&&isSelected)">
             <div slot="name" class="required">业务经办人</div>
@@ -1357,6 +1360,18 @@ export default {
         },
       })
     },
+    selectIdTypeOnly (e) {
+      let vm = this
+      vm.hlsPopup.selectList({
+        list: vm.typeList,
+        code: 'bp_type',
+        object: {},
+        returnItem: function (index, obj) {
+          vm.baseInfo.bp_type = obj.bp_type
+          vm.baseInfo.bp_type_n = obj.bp_type_n
+        },
+      })
+    },
     getBankInfo () {
       let vm = this
       let id = vm.from