commit

src/main/resources/views/mobile/club/clubAudit.html

@@ -133,7 +133,7 @@ layout("/mobile/platform.html"){
     <div style="margin-top: 116px">
         <van-list
                 v-model="loading"
-                :finished="finished" :immediate-check="false"
+                :finished="finished"
                 :finished-text="tableData.length>0?'没有更多了':''"
                 @load="onLoad">
 
@@ -369,7 +369,11 @@ layout("/mobile/platform.html"){
                 this.userTypeOptions.push({text: item.name, value: item.code})
             })
             this.userTypeOptions.unshift({text: '人员类型'})
-            this.onLoad()
+         }
+    })
+    window.addEventListener('pageshow', e => {
+        if (e.persisted || (window.performance && window.performance.navigation.type === 2)) {
+            vue.onLoad()
         }
     })
 </script>

src/main/resources/views/mobile/club/inClub.html

@@ -174,7 +174,7 @@ layout("/mobile/platform.html"){
     <div style="margin-top: 116px">
         <van-list
                 v-model="loading"
-                :finished="finished" :immediate-check="false" @load="onLoad"
+                :finished="finished" @load="onLoad"
                 :finished-text="tableData.length>0?'没有更多了':''">
 
             <div class="van-doc-card" v-for="o in tableData">
@@ -457,7 +457,10 @@ layout("/mobile/platform.html"){
                 provideServicesVisible: false,
                 playRoleVisible: false,
                 selfSkillVisible: false,
-                familyRelationVisible: false
+                familyRelationVisible: false,
+                pageForm: {
+                    isjr: false
+                }
             }
         },
         methods: {
@@ -513,9 +516,14 @@ layout("/mobile/platform.html"){
                     this.loading = false
                 })
             },
-            openInfo(row, type) {
+            async openInfo(row, type) {
                 this.viewType = type
-                if(type === 'join') {
+                if (type === 'join') {
+                    const resp = await $.post("/platform/sys/club/sq/validApply")
+                    if (resp.code !== 0) {
+                        vant.Toast(resp.msg)
+                        return
+                    }
                     this.formData = {
                         username: "${@shiro.getPrincipalProperty('username')}",
                         loginname: "${@shiro.getPrincipalProperty('loginname')}",
@@ -589,7 +597,11 @@ layout("/mobile/platform.html"){
             this.$set(this.pageForm, "clubType", this.typeOptions[0].value)
             this.$set(this.pageForm, "isjr", this.clubType[0].value)
             this.pageForm.searchName = 'club.name'
-            this.onLoad()
+        }
+    })
+    window.addEventListener('pageshow', e => {
+        if (e.persisted || (window.performance && window.performance.navigation.type === 2)) {
+            vue.onLoad()
         }
     })
 </script>