Merge branch 'main' of http://git.mokasz.com/maomao/mini_read_space_front

# Conflicts:
#	pages/video/video.js

pages/video/video.js

@@ -17,28 +17,28 @@ const app = getApp()
 let interstitialAd = null
 
 Page({
-  data: {
-    videoList: [],
-    loading: false,
-    hasMore: true,
-    page: 1,
-    size: 10,
-    // 状态栏高度
-    statusBarHeight: 20,
-    navHeight: 64, // 导航栏高度 = 状态栏 + 44
-    navStyle: '',
-    listStyle: '',
-    // 添加防抖时间戳
-    lastLoadTime: 0,
-    ads: null,
-    globalConfig: null,
-    // 视频分类列表
-    categoryList: [],
-    // 当前选中的分类ID
-    currentCategoryId: null,
-
-    share_count: 1
-  },
+    data: {
+        videoList: [],
+        loading: false,
+        hasMore: true,
+        page: 1,
+        size: 10,
+        // 状态栏高度
+        statusBarHeight: 20,
+        navHeight: 64, // 导航栏高度 = 状态栏 + 44
+        navStyle: '',
+        listStyle: '',
+        // 添加防抖时间戳
+        lastLoadTime: 0,
+        ads: null,
+        globalConfig: null,
+        // 视频分类列表
+        categoryList: [],
+        // 当前选中的分类ID
+        currentCategoryId: null,
+
+        share_count: 1
+    },
 
   async onLoad() {
     console.log('打开视频页面--------------------------')