From b8c9b4197059807c8e7c964a7260f51054d3e904 Mon Sep 17 00:00:00 2001
From: Jun <jundeer0824@gmail.com>
Date: Mon, 11 Oct 2021 20:31:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=B2=BE=E9=80=89=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E8=AF=A6=E6=83=85=E9=A1=B5loading?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.js                                 |  2 +-
 miniprogram/pages/genealogy/detailCat/detailCat.js | 10 ++++++----
 miniprogram/pages/info/devTeam/devTeam.wxml        |  3 +++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/miniprogram/app.js b/miniprogram/app.js
index 1ccd50bb..4e95c534 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -16,7 +16,7 @@ App({
     checkUpdateVersion();
 
     this.globalData = {
-      version: "v1.5.4"
+      version: "v1.5.5"
     }
   }
 })
diff --git a/miniprogram/pages/genealogy/detailCat/detailCat.js b/miniprogram/pages/genealogy/detailCat/detailCat.js
index 1353f826..7a238456 100644
--- a/miniprogram/pages/genealogy/detailCat/detailCat.js
+++ b/miniprogram/pages/genealogy/detailCat/detailCat.js
@@ -45,10 +45,7 @@ Page({
   onLoad: function (options) {
     cat_id = options.cat_id;
     // 开始加载页面
-    wx.showLoading({
-      title: '加载中',
-      mask: true
-    })
+
     const that = this;
     const app = getApp();
     getGlobalSettings('detailCat').then(settings => {
@@ -215,6 +212,11 @@ Page({
     const step = page_settings.photoStep;
     const now = cat.photo.length;
 
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
+
     const db = wx.cloud.database();
     console.log(qf);
     let res = await db.collection('photo').where(qf).orderBy('mdate', 'desc').skip(now).limit(step).get();
diff --git a/miniprogram/pages/info/devTeam/devTeam.wxml b/miniprogram/pages/info/devTeam/devTeam.wxml
index 12be2f9f..3eafbdfe 100644
--- a/miniprogram/pages/info/devTeam/devTeam.wxml
+++ b/miniprogram/pages/info/devTeam/devTeam.wxml
@@ -19,6 +19,9 @@
 <view class='block'>
   <view class='title'>更新日志</view>
   <view class='desc'>
+    <view class='sub-title hl'>v1.5.5</view>
+    <text class='sub-detail'>- BUG修复\n - 更新时间：2021/10/11</text>
+
     <view class='sub-title hl'>v1.5.4</view>
     <text class='sub-detail'>- 页面优化\n - 更新时间：2021/10/7</text>