Merge remote-tracking branch 'origin/master'

sub/invite/addEnterprise.vue

@@ -456,8 +456,8 @@ export default {
           uni.showToast({
             icon: 'none',
             title: '操作成功'
-          })
-          uni.navigateBack()
+          })          
+          uni.navigateBack()          
         })
       } else {
         createEnterPrise(data).then(res => {

sub/invite/index.vue

@@ -3,6 +3,9 @@
     class="view-container"
     direction="vertical"
     :show-scrollbar="false"
+    @refresherrefresh="onRefresh"
+    :refresher-enabled="true"
+    :refresher-triggered="isRefreshing"
   >
     <view class="emty" v-if="list.length == 0">
       <image
@@ -109,6 +112,7 @@ export default {
       inviteId: '',
       list: [],
       dictMap: {},
+      isRefreshing: false,
       share: {
         title: '企业变更管理', // 标题
         path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`,
@@ -116,6 +120,9 @@ export default {
       }
     }
   },
+  onShow() {
+    this.getList()
+  },
   onLoad(res) {
     if (res.inviteId) {
       this.inviteId = res.inviteId
@@ -127,6 +134,13 @@ export default {
     return this.share
   },
   methods: {
+    onRefresh(e) {
+      this.isRefreshing = true
+      this.getList()
+      setTimeout(() => {
+        this.isRefreshing = false
+      }, 1000)
+    },
     getList() {
       uni.showLoading({
         title: '加载中...'
@@ -183,7 +197,7 @@ export default {
   padding: 0 24rpx;
   display: flex;
   flex-flow: column nowrap;
-  padding-bottom: 13vh;
+  height: calc(100vh - env(safe-area-inset-bottom));
   &::-webkit-scrollbar {
     display: none;
   }