Merge branch 'liuxin' into develop

src/pages/myInfo/my-info.vue

@@ -10,7 +10,7 @@
           <span>{{ user_phone }}</span>
           <div>
             电子签
-            <p :class="[elecStatus?'across':'un-across']">{{ elecStatus?'已通过':'未通过' }}</p>
+            <p :class="[elecStatus?'across':'un-across']">{{ elecStatus?'已通过':'待认证' }}</p>
           </div>
         </div>
       </div>
@@ -121,6 +121,7 @@ export default {
       vedioCount: '0',
       productCount: '0',
       description: '',
+      bp_identity: '',
       approveBtn: false,
       elecStatus: false,
     }
@@ -153,6 +154,13 @@ export default {
         this.isAGENT = false
       }
     },
+    bp_identity (newVal, oldVal) {
+      if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ') {
+        this.elecStatus = false
+      } else {
+        this.elecStatus = true
+      }
+    },
   },
   created () {
     /* if (this.user_bp_status === 'APPROVED') {
@@ -421,6 +429,7 @@ export default {
           vm.user_bp_status = res.info.user_bp_status
           vm.user_bp_class = res.info.user_bp_class
           vm.bp_id = res.info.user_bp_id
+          vm.bp_identity = res.info.bp_identity
           window.sessionStorage.setItem('bp_id', res.info.user_bp_id)
           window.sessionStorage.setItem('bp_name', res.info.user_bp_name)
           vm.user_bp_name = res.info.user_bp_name

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

@@ -131,7 +131,6 @@ export default {
       let notNong = vm.lists.filter(i => {
         return (i.bank_full_name.indexOf('农业') === -1)
       })
-      console.log(notNong)
       if (vm.flag) {
         vm.select = 'nong0'
       } else {

src/pages/pay/marginPay/pay-entry.vue

@@ -131,7 +131,6 @@ export default {
       let notNong = vm.lists.filter(i => {
         return (i.bank_full_name.indexOf('农业') === -1)
       })
-      console.log(notNong)
       if (vm.flag) {
         vm.select = 'nong0'
       } else {

src/pages/pay/payment/pay-entry.vue

@@ -122,7 +122,6 @@ export default {
       let notNong = vm.lists.filter(i => {
         return (i.bank_full_name.indexOf('农业') === -1)
       })
-      console.log(notNong)
       if (vm.flag) {
         vm.select = 'nong0'
       } else {