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

src/pages/userBind/np/naturePerson.vue

@@ -274,18 +274,11 @@ export default {
       }
     },
     tabNum: function (newVal, oldVal) {
-      // if (
-      //   (newVal === 1 && !window.sessionStorage.user_id) ||
-      //   (newVal === 2 && !window.sessionStorage.user_id)
-      // ) {
-      //   this.hlsPopup.showError('清先保存基本信息')
-      //   this.tabNum = oldVal
-      // }
       if (
         (newVal === 1 && !this.isSave) ||
         (newVal === 2 && !this.isSave)
       ) {
-        this.hlsPopup.showError('清先保存基本信息')
+        this.hlsPopup.showError('请先保存基本信息')
         this.tabNum = oldVal
       }
     },

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-09-26 14:00:48
+ * @LastEditTime: 2019-09-26 17:28:42
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -491,6 +491,8 @@ export default {
           if (res.result === 'S') {
             vm.hlsPopup.hideLoading()
             vm.hlsPopup.showSuccess('保存成功')
+            window.localStorage.setItem('user_id', res.bp_id)
+            window.sessionStorage.setItem('user_id', res.bp_id)
             vm.bp_id = res.bp_id
           }
         })