feat:体育活动、文化活动、品牌活动、系统金刚区 UI优化

src/main/resources/static/components/plugins/h5/TableList.vue

@@ -66,6 +66,10 @@ module.exports = {
     img: {
       type: String,
       default: ""
+    },
+    show_loading_overlay: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {
@@ -111,9 +115,15 @@ module.exports = {
 
     pageData() {
       this.tableLoading = true
+      const isInitialLoad = this.tableData.length === 0
+      this.$emit("loading-change", {loading: true, initial: isInitialLoad})
 
-      const loading = createListLoading()
-      this.$axios.post(this.api, this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm).then((res) => {
+      const loading = this.show_loading_overlay ? createListLoading() : null
+      this.$axios.post(
+          this.api,
+          this.json ? ({pageForm: JSON.stringify(this.localPageForm)}) : this.localPageForm,
+          {h5SkeletonLoading: !this.show_loading_overlay}
+      ).then((res) => {
         if (res.code === 0) {
           this.tableData = this.tableData.concat(res.data.list)
           this.localPageForm.totalCount = res.data.totalCount
@@ -123,11 +133,10 @@ module.exports = {
           this.$emit("update:page_form", {...this.localPageForm})
         }
       }).finally(() => {
-        loading.close()
-        console.log(this.tableLoading)
+        if (loading) loading.close()
         this.tableLoading = false
-        console.log(this.tableLoading)
         this.tableRefreshing = false
+        this.$emit("loading-change", {loading: false, initial: isInitialLoad})
       })
     },
     doSearch() {

src/main/resources/static/components/plugins/vantMore/yearVanDropDownItem.vue

@@ -1,5 +1,11 @@
 <template>
-    <van-dropdown-item :options="yearOptions" @change="yearChange" v-model="year"></van-dropdown-item>
+    <van-dropdown-item
+        :options="yearOptions"
+        v-model="year"
+        @change="yearChange"
+        @open="$emit('open')"
+        @close="$emit('close')"
+    ></van-dropdown-item>
 </template>
 
 <script>