From 85ba155db4b813a4762e86599d7d3dea11c542b8 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 6 May 2021 11:48:59 +0800
Subject: [PATCH] 服务卡购买

---
 packageA/pages/cardList/cardList.js     |  8 ++++++++
 packageA/pages/cardList/cardList.wxml   | 29 ++++++++++++++++++-----------
 packageA/pages/cardList/cardList.wxss   | 20 ++++++++++++--------
 packageA/pages/cart2_ser/cart2_ser.js   |  6 +++++-
 packageA/pages/goodsInfo/goodsInfo.js   |  3 ++-
 packageA/pages/goodsInfo/goodsInfo.wxml |  2 +-
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 7a2ad2a..60c419c 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -217,4 +217,12 @@ Page({
 	  var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
 	  app.goto(url);
 	},
+	
+	//图片失败，默认图片
+	bind_bnerr: function(e) {
+	  var _errImg = e.target.dataset.errorimg;
+	  var _errObj = {};
+	  _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+	  this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+	},
 })
\ No newline at end of file
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index 8a60054..2f5d45a 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -1,6 +1,6 @@
 <block wx:if="{{object}}">
+	<view class="bg_view" style="background-color:{{object.bg_color}};">
 	<advertising object="{{object}}"></advertising>	
-	<view style="background-color: #{{object.bg_color}};">
 		<!-- 列表 -->
 		<block wx:if="{{object.column=='4'}}">
 			
@@ -9,12 +9,14 @@
 				
 				<view class="flex  bg-white ">		
 				<view>
-					<image class="image" src="{{imghost + item.imgUrl}}"/>
+					<image class="image" src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}"
+					   lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					   />
 				</view>
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
@@ -24,20 +26,21 @@
 				</view>	
 			</view>
 			
-		</block>
-		
+		</block>		
 		<!-- 一列和俩列 -->	
 		<block wx:else>	
-		    <view class="pd20 flex-set">
+		    <view class="pd20 flex-set" style="background-color: #{{object.bg_color}};">
 				<!-- 1列 2列 -->
 				<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 style="width: 100%;" src="{{imghost + item.imgUrl}}" mode="aspectFill"/></view>
+					<view style="width: 100%;">
+						<image style="width: 100%;"  lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					     src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}" mode="aspectFill"/></view>
 					<view class="flex fdc space-bt f1 pdl20">
 						<view>
 							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-							<view class="fs24 c7b">有效天数：{{item.validDays}}</view>
+							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
 						</view>
 						<view class="flex space-bt ali-c">
 							<view class="price">{{item.money}}</view>
@@ -47,9 +50,10 @@
 				</view>	
 			</view>
 		</block>				
-	</view>
+	
 	<nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata>
 	<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+	</view>
 </block>
 
 <block wx:else>
@@ -61,12 +65,15 @@
 		<view class="bg-white">
 			<view class="flex pd20" wx:for="{{list.pageData}}" bindtap="go_goods" data-gid="{{item.id}}">
 				<view>
-					<image class="image" src="{{imghost + item.imgUrl}}"/>
+					<image class="image" 
+					 lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					 src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}"
+					/>
 				</view>
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
diff --git a/packageA/pages/cardList/cardList.wxss b/packageA/pages/cardList/cardList.wxss
index 1e3b0d4..168bec7 100644
--- a/packageA/pages/cardList/cardList.wxss
+++ b/packageA/pages/cardList/cardList.wxss
@@ -1,13 +1,10 @@
 /* pages/i_service/cardList/cardList.wxss */
-page,
+page{ background-color: #f2f2f2;}
+
+
 .page {
 	height: 100%;
 }
-
-page {
-	background-color: #f2f2f2;
-}
-
 .scroll-view {
 	height: calc(100% - 300rpx);
 }
@@ -69,9 +66,16 @@ page {
 .list_item{ display: inline-block;}
 .w100{ width: 100%;} 
 .w50{ width: 49%; } 
-.w50.ml{margin-left: 15rpx;}
+.w50.ml{margin-left: 12rpx;}
 
 .w50 image{ width: 100%; height: 340rpx; } 
 .flex-set{display: flex;flex-wrap: wrap;}
 
-.b-bottom{ border-bottom:1rpx solid #fff}
\ No newline at end of file
+.b-bottom{ border-bottom:1rpx solid #fff}
+.bg_view{
+	display: block;
+	min-height: 100%;
+	width: 100%;
+	position: absolute;
+	left: 0;top: 0;z-index: 1;
+}
\ No newline at end of file
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index a22f10c..fc0f10c 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -41,7 +41,11 @@ Page({
         //判断页面是返回回来的还是 首次进入的
         yuer:0,
     },
-    onLoad: function(t) {
+    onLoad: function(t) {	
+		wx.setNavigationBarTitle({
+		  title: "填写订单",
+		});
+		
         var appD=getApp().globalData.service_now;
         this.data.postdata=appD;
         this.data.param=t;  
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 7260ba1..75fe01a 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -399,6 +399,7 @@ Page({
 						'data.goods_id': t.data.data.id,
 						'data.id': t.data.data.id,
 						'data.sales_sum': t.data.data.sales_sum,
+						'data.storageId':t.data.data.storageId
 					});		
 								
 					
@@ -803,7 +804,7 @@ Page({
 			  if(sto_list){
 					 for (var k = 0; k < e.data.data.pageData.length; k++) {
 					   var it=e.data.data.pageData[k];	 
-					   if (sto_list.indexof(it.keyid)==-1) {
+					   if (sto_list.indexOf(it.keyid)==-1) {
 						  //删除
 						  e.data.data.pageData.splice(k--, 1);
 					   }
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index dd454e5..cf0f2e5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -40,7 +40,7 @@
 			
 			<view class="goods-num" style="margin-bottom: 10rpx;">
 			  <view class="sales">销量：{{data.sales_sum}}</view>
-			  <view class="sales">有效天数：{{data.validDays}}</view>
+			  <view class="sales">有效天数：{{data.validDays?data.validDays:0}}</view>
 			</view>
 
           
--
libgit2 0.21.4