Merge branch 'dev20230131_android' of...

Merge branch 'dev20230131_android' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into dev20230131_android

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.6.5"'
+  currentVersion: '"3.6.6"'
 }

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

@@ -257,7 +257,7 @@
       </div>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="save">下一步</tab-button>
+      <tab-button class="save" @click.native="saveAccessoryInfo">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -332,6 +332,7 @@ export default {
       upload_list: [],
       cddItemList: [], // 资料清单列表
       dowload_list: [],
+      mysetTimeout: null,
     }
   },
   computed: {
@@ -621,6 +622,18 @@ export default {
         return false
       }
     },
+    saveAccessoryInfo () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.save()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.save()
+        }, 1000)
+      }
+    },
     save () {
       let vm = this
       if (vm.isUploadHouse) {

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

@@ -54,7 +54,7 @@
       </div>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="putData">提交</tab-button>
+      <tab-button class="save" @click.native="saveBankInfo">提交</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
@@ -142,6 +142,7 @@ export default {
       },
       bankImg: '', // 银行卡图片
       getBankList: [],
+      mysetTimeout: null,
     }
   },
   computed: {
@@ -194,6 +195,18 @@ export default {
         vm.hlsPopup.showLongCenter(res.message)
       }
     },
+    saveBankInfo () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.putData()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.putData()
+        }, 1000)
+      }
+    },
     // 提交
     async putData () {
       let vm = this

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

@@ -331,7 +331,7 @@
       </div>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
+      <tab-button class="save" @click.native="saveBaseInfo(false)">下一步</tab-button>
     </bottom-tab>
     <!-- <InputNum
       v-show="inputNum"
@@ -446,6 +446,7 @@ export default {
       idCardFrontSpEditFlag: false, // 配偶身份证正面修改标识，为true则标识已修改，后续需要重新上传此照片
       idCardBackSpEditFlag: false, // 配偶身份证反面修改标识，为true则标识已修改，后续需要重新上传此照片
       isClear: false,
+      mysetTimeout: null,
     }
   },
   watch: {
@@ -776,6 +777,18 @@ export default {
         }
       })
     },
+    saveBaseInfo (flag) {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.verified(flag)
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.verified(flag)
+        }, 1000)
+      }
+    },
     async verified (flag) {
       this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
       this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片

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

@@ -84,7 +84,7 @@
       </list-item>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="save">下一步</tab-button>
+      <tab-button class="save" @click.native="saveInvoiceInfo">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -108,6 +108,7 @@ export default {
         open_bank: '',
         open_account: '',
       },
+      mysetTimeout: null,
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -156,6 +157,18 @@ export default {
         }
       })
     },
+    saveInvoiceInfo () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.save()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.save()
+        }, 1000)
+      }
+    },
     save () {
       let vm = this
       let url = process.env.basePath + 'bp_invoice_save'

src/pages/userBindNew/org/bankInfo.vue

@@ -50,7 +50,7 @@
       </div>
     </div>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="addCheck">提交</tab-button>
+      <tab-button class="save" @click.native="saveBankInfo">提交</tab-button>
     </bottom-tab>
     <h-modal ref="modal" v-model="showModalValue" position="bottom">
       <h-view>
@@ -133,6 +133,7 @@ export default {
       showModalValue: false,
       bank_card_flag: false, // 银行卡信息是否完整
       certification_status: '', // 电子签认证状态值Y/N
+      mysetTimeout: null,
     }
   },
   beforeRouteEnter (to, from, next) {
@@ -158,6 +159,18 @@ export default {
     })
   },
   methods: {
+    saveBankInfo () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.addCheck()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.addCheck()
+        }, 1000)
+      }
+    },
     // 提交前校验
     addCheck () {
       let vm = this
@@ -273,21 +286,6 @@ export default {
         },
       })
     },
-    throttle (func, wait) { // 节流
-      let previous = 0
-      return function () {
-        let now = +new Date()
-        let remain = wait - (now - previous)
-
-        if (remain < 0) {
-          previous = now
-          func.call(this, arguments)
-        }
-      }
-    },
-    putData () {
-      this.throttle(this.addCheck(), 3000)
-    },
     // 提交
     async handSubmit () {
       let vm = this

src/pages/userBindNew/org/baseInfo.vue

@@ -425,7 +425,7 @@
     </div></h-content>
     <bottom-tab class="footer-button">
       <!-- <tab-button class="put" @click.native="handSubmit">提交</tab-button> -->
-      <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
+      <tab-button class="save" @click.native="saveBaseInfo(false)">下一步</tab-button>
     </bottom-tab>
     <!-- <InputNum
       v-show="inputNum"
@@ -569,6 +569,7 @@ export default {
       licenseEditFlag: false, // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
       LaEditFlag: false, // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
       isClear: false,
+      mysetTimeout: null,
     }
   },
   computed: {},
@@ -1067,7 +1068,18 @@ export default {
         hlsPopup.showLongCenter('请输入正确的固定电话')
       }
     },
-
+    saveBaseInfo (flag) {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.verified(flag)
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.verified(flag)
+        }, 1000)
+      }
+    },
     verified (flag) {
       window.localStorage.setItem('authFlag', this.flag)
       if (!this.flag) { // 已授权

src/pages/userBindNew/org/enclosure.vue

@@ -338,7 +338,7 @@
       <!-- </div> -->
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="verified">下一步</tab-button>
+      <tab-button class="save" @click.native="saveEnclosure">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -415,6 +415,7 @@ export default {
         land_use_limit: '',
         right_others: '',
       },
+      mysetTimeout: null,
     }
   },
   watch: {},
@@ -724,6 +725,18 @@ export default {
         }
       })
     },
+    saveEnclosure () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.verified()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.verified()
+        }, 1000)
+      }
+    },
     verified () {
       let vm = this
       if (vm.isUploadHouse) {

src/pages/userBindNew/org/invoice.vue

@@ -77,7 +77,7 @@
       </item>
     </list-item>
     <bottom-tab class="footer-button">
-      <tab-button class="save" @click.native="verified">下一步</tab-button>
+      <tab-button class="save" @click.native="saveInvoice">下一步</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -101,6 +101,7 @@ export default {
         open_bank: '',
         open_account: '',
       },
+      mysetTimeout: null,
     }
   },
   watch: {},
@@ -285,6 +286,18 @@ export default {
         },
       })
     },
+    saveInvoice () {
+      if (this.mysetTimeout !== null) {
+        clearTimeout(this.mysetTimeout)
+        this.mysetTimeout = setTimeout(() => {
+          this.verified()
+        }, 1000)
+      } else {
+        this.mysetTimeout = setTimeout(() => {
+          this.verified()
+        }, 1000)
+      }
+    },
     verified () {
       // console.log('bpid', this.$route.params.bp_id)
       // this.$router.push({