Merge pull request #7 from JunDeer/master

无精选照片情况下详情页loading修复
sysucats · Oct 11, 2021 · 48a0c04 · 48a0c04
2 parents 308b05e + b8c9b41
commit 48a0c04
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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>