From ef0d3dcb96611afe150e292bb8665cef9be73d1e Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Mon, 17 Jan 2022 11:04:33 +0800
Subject: [PATCH] 卡项列表

---
 packageA/pages/cardList/cardList.js   | 5 ++++-
 packageA/pages/cardList/cardList.wxml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 60c419c..377fcf6 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -24,6 +24,7 @@ Page({
    */
   onLoad: function (options) {
 		self = this;//保存全局指针
+		this.data.options = options;
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
 				userInfo: data,
@@ -60,7 +61,9 @@ Page({
 					imghost: app.globalData.setting.imghost,
 					isLogin: true,
 				});
-				
+				if(this.data.options.cat_id) {
+					currentQuery.cat_id = this.data.options.cat_id;
+				};
 				currentQuery.page=1;			
 				this.getData(true, url, currentQuery);			
 				// app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index efb3a19..9a3eaf5 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -52,7 +52,7 @@
 		</block>				
 	
 	<nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata>
-	<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+	<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
 	</view>
 </block>
 
@@ -85,7 +85,7 @@
 			<nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
 		</view>
 
-		<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+		<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
 	</scroll-view>
 </view>
 </block>
--
libgit2 0.21.4