Merge branch 'liuin' into uat

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

@@ -578,22 +578,22 @@ export default {
       }
     },
     attachmentCheck () {
-      let vm = this
-      let url = process.env.basePath + 'bp_attachment_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.$router.push({
+      // let vm = this
+      // let url = process.env.basePath + 'bp_attachment_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') {
+      this.$router.push({
         name: 'NPBankInfo',
       })
-        } else {
-          hlsPopup.showError(res.message)
-        }
-      })
+      //   } else {
+      //     hlsPopup.showError(res.message)
+      //   }
+      // })
     },
     async getHouseInfo () {
       let vm = this

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="addCheck">提交</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
@@ -169,6 +169,29 @@ export default {
     })
   },
   methods: {
+    // 提交前校验
+    addCheck () {
+      let vm = this
+      let url = process.env.basePath + 'bp_attachment_check'
+      let param = {
+        bp_id: vm.$route.params.bp_id,
+      }
+      if (window.localStorage.getItem('authFlag') === 'true') {
+        console.log(11111111111)
+        vm.handSubmit()
+      } else {
+        console.log(2222222222)
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.handSubmit()
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
+    },
     // 银行卡查询
     getBankInfo () {
       let vm = this
@@ -276,7 +299,7 @@ export default {
       }
     },
     putData () {
-      this.throttle(this.handSubmit(), 3000)
+      this.throttle(this.addCheck(), 3000)
     },
     // 提交
     async handSubmit () {

src/pages/userBindNew/org/enclosure.vue

@@ -554,23 +554,6 @@ export default {
     })
   },
   methods: {
-    // 附件信息保存前校验
-    addCheck () {
-      let vm = this
-      let url = process.env.basePath + 'bp_attachment_check'
-      let param = {
-        bp_id: vm.bp_id,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
     addRow (e, event) {
       // let num = Math.ceil((el.target.scrollHeight - 42) / 20)
       // if (num > 0) {