v2.0.1

-修复收集页面下拉栏关闭时的阴影 -修复树洞说说全部显示
QlQlqiqi · Mar 30, 2022 · 78b0e9f · 78b0e9f
1 parent 53412e8
commit 78b0e9f
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 77 deletions.
diff --git a/project.config.json b/project.config.json
@@ -1,77 +1,55 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.19.6",
-  "appid": "wx5bbb7bc983c50b3d",
-  "projectname": "Self%20Discipline%20Tree%20Hole",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
-    }
-  }
+	"description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+	"packOptions": {
+		"ignore": [],
+		"include": []
+	},
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"enhance": true,
+		"postcss": true,
+		"preloadBackgroundData": false,
+		"minified": true,
+		"newFeature": false,
+		"coverView": true,
+		"nodeModules": true,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
+		"lazyloadPlaceholderEnable": false,
+		"useMultiFrameRuntime": true,
+		"useApiHook": true,
+		"useApiHostProcess": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useIsolateContext": true,
+		"userConfirmedBundleSwitch": false,
+		"packNpmManually": false,
+		"packNpmRelationList": [],
+		"minifyWXSS": true,
+		"disableUseStrict": false,
+		"minifyWXML": true,
+		"showES6CompileOption": false,
+		"useCompilerPlugins": false,
+		"ignoreUploadUnusedFiles": true,
+		"useStaticServer": true
+	},
+	"compileType": "miniprogram",
+	"libVersion": "2.19.6",
+	"appid": "wx5bbb7bc983c50b3d",
+	"projectname": "self-discipline-tree-hole",
+	"condition": {},
+	"editorSetting": {
+		"tabIndent": "tab",
+		"tabSize": 2
+	}
 }
diff --git a/src/pages/collection/collection.wxml b/src/pages/collection/collection.wxml
@@ -9,7 +9,7 @@
   </view>
 </navbar>
 <!-- 导航栏的下拉框 -->
-<view class="listSelectWrap" style="left: {{ windowWidth / 2 - 45 }}px; height: 0;">
+<view class="listSelectWrap" style="left: {{ windowWidth / 2 - 45 }}px; height: 0; {{ !selectIconRotate? 'border:0;': '' }}">
   <scroll-view scroll-y="{{ true }}" style="max-height: {{ 36 * 8 }}px;">
     <view catchtap="handleSelectList" style="background-color: {{ pageName === '收集箱'? 'rgb(243, 246, 249)': 'white'}};">
       <view style="height: 35px;">收集箱</view>

diff --git a/src/pages/share/share.js b/src/pages/share/share.js
@@ -48,6 +48,7 @@ Component({
 		pullDownRefresh: false,
 		scrollTop: 0,
 		chatsRemindShow: false,
+		chatShowCounts: 10,
 	},
 
 	computed: {
@@ -62,7 +63,6 @@ Component({
 				);
 			}
 		},
-		// 当前页面展示的说说
 		chatsShow(data) {
 			let pageNameCurrent = data.pageNameCurrent;
 			let chats = data.chats.filter(item => {
@@ -72,6 +72,11 @@ Component({
 			chats.sort((a, b) => b.pic.date.localeCompare(a.pic.date));
 			return chats;
 		},
+
+		// 当前页面展示的说说
+		// chatsShow(data) {
+		// 	return data._chatsShow.slice(0, data.chatShowCounts);
+		// }
 	},
 
 	watch: {
@@ -158,6 +163,16 @@ Component({
 					+ '&title=' + JSON.stringify(gallery.title),
 			})
 		},
+		// 触底刷新
+		handleLowerRefresh() {
+			let len = this.data.chats.length,  chatShowCounts = this.data.chatShowCounts;
+			if(len <= chatShowCounts)
+				return;
+			chatShowCounts = Math.min(chatShowCounts + 10, len);
+			this.setData({
+				chatShowCounts,
+			})
+		},
 		// 下拉刷新，加载数据，这里暂时为全部时间段的
 		async pullDownLoad() {
 			this.setData({

diff --git a/src/pages/share/share.wxml b/src/pages/share/share.wxml
@@ -42,6 +42,7 @@
 <scroll-view class="share-wrap" refresher-enabled="{{ true }}" refresher-triggered="{{ pullDownRefresh }}" 
   style="height: {{ (windowHeight - navHeight) * ratio }}rpx;" scroll-y="{{ true }}" 
   bindrefresherrefresh="pullDownLoad" scroll-top="{{ scrollTop }}px;" bindscroll="handleScroll"
+	bindscrolltolower="handleLowerRefresh"
 >
   <!-- 轮播图 -->
   <swiper wx:if="{{ !pageNameCurrent }}" class="rotation-chart" indicator-dots="{{ true }}" autoplay="{{ true }}" interval="{{ 3000 }}" bindchange="handleChangeCurrentGallery">