From 0ea0d5edf38ab9399debe6d8cea5c6021a72e2f5 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 29 Apr 2021 10:22:19 +0800
Subject: [PATCH] 服务卡购买自定义的优化

---
 packageA/pages/cardDetails/cardDetails.wxml |  2 ++
 packageA/pages/cardList/cardList.js         | 22 +++++++++-------------
 packageA/pages/cardList/cardList.json       |  3 ++-
 packageA/pages/cardList/cardList.wxml       |  5 +++--
 packageA/pages/cardList/cardList.wxss       |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packageA/pages/cardDetails/cardDetails.wxml b/packageA/pages/cardDetails/cardDetails.wxml
index bd610df..a4b4469 100644
--- a/packageA/pages/cardDetails/cardDetails.wxml
+++ b/packageA/pages/cardDetails/cardDetails.wxml
@@ -17,3 +17,5 @@
 		<view class="pd20">{{details.serviceContent}}</view>
 	</view>
 </view>
+
+<nav_box object="{{item.content}}"></nav_box>
diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 2a25c23..7a2ad2a 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -61,6 +61,7 @@ Page({
 					isLogin: true,
 				});
 				
+				currentQuery.page=1;			
 				this.getData(true, url, currentQuery);			
 				// app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
 				//   data: {
@@ -137,9 +138,7 @@ Page({
 	/**
 	 * promiseGet请求数据
 	 */
-	getData: function(isInit, url, data) {
-		return new Promise(function(resolve, reject) {
-			
+	getData: function(isInit, url, data,callback) {	
 			app.request.promiseGet(url, {
 				data: data,
 				isShowLoading: true,
@@ -172,18 +171,18 @@ Page({
 					self.setData({
 						'list.pageData': []
 					});
-				};
-				resolve();
+				};				
+				if(callback) callback();
+				
 			})
 			.catch(function(err) {
 				console.log('出错拉！！！！',err);
 				self.setData({
 					'list.pageData': []
 				});
+				
+				if(callback) callback();
 			});
-			
-		});
-		
 	},
 	
 	
@@ -207,12 +206,9 @@ Page({
 				isLoading: true,
 				pageNum: this.data.pageNum + 1
 			});
-			requestData.page = this.data.pageNum;
+			requestData.page = this.data.pageNum;		
+			this.getData(false, url, requestData,callback)
 			
-			this.getData(false, url, requestData)
-			.then(function() {
-				callback();
-			});
 		};
 	},
 	
diff --git a/packageA/pages/cardList/cardList.json b/packageA/pages/cardList/cardList.json
index 477fbd1..2100451 100644
--- a/packageA/pages/cardList/cardList.json
+++ b/packageA/pages/cardList/cardList.json
@@ -3,6 +3,7 @@
 	"enablePullDownRefresh": false,
 	"usingComponents": {
 		 "nodata": "/components/nodata/nodata",
-		 "advertising":"/components/diy_advertising/diy_advertising"		
+		 "advertising":"/components/diy_advertising/diy_advertising",		
+		 "nav_box":"/components/nav_box/nav_box"		
 	}
 }
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index 7e9254b..8a60054 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -33,7 +33,7 @@
 				<view wx:for="{{list.pageData}}" class="{{object.column=='1'?'w100':'w50'}} {{index%2==1?'ml':''}} bg-white" 
 				    bindtap="go_goods" data-gid="{{item.id}}"
 				    style="margin-bottom: 20rpx;">
-					<view style="width: 100%;"><image src="{{imghost + item.imgUrl}}" mode="aspectFill"/></view>
+					<view style="width: 100%;"><image style="width: 100%;" src="{{imghost + item.imgUrl}}" mode="aspectFill"/></view>
 					<view class="flex fdc space-bt f1 pdl20">
 						<view>
 							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
@@ -81,4 +81,5 @@
 		<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
 	</scroll-view>
 </view>
-</block>
\ No newline at end of file
+</block>
+<nav_box id="nav_box"></nav_box>
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxss b/packageA/pages/cardList/cardList.wxss
index a64bc81..1e3b0d4 100644
--- a/packageA/pages/cardList/cardList.wxss
+++ b/packageA/pages/cardList/cardList.wxss
@@ -69,9 +69,9 @@ page {
 .list_item{ display: inline-block;}
 .w100{ width: 100%;} 
 .w50{ width: 49%; } 
-
+.w50.ml{margin-left: 15rpx;}
 
 .w50 image{ width: 100%; height: 340rpx; } 
 .flex-set{display: flex;flex-wrap: wrap;}
-.ml{margin-left: 15rpx;}
+
 .b-bottom{ border-bottom:1rpx solid #fff}
\ No newline at end of file
--
libgit2 0.21.4