1. 预存充值和积分购的bug修复

yvan.ni
1 parent 4bff1420
Showing 11 changed files with 114 additions and 70 deletions
packageA/pages/chongzhi/chongzhi.js
packageA/pages/chongzhi/chongzhi.wxml
packageA/pages/chongzhi/chongzhi.wxss
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
packageA/pages/jfbuy/jfbuy.js
packageA/pages/jfbuy/jfbuy.wxml
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -10,6 +10,7 @@ Page({
   data: {
 		url: app.globalData.setting.imghost,
 		imgAd: '',
+		ad_color:'',
 		currentIndex: 0,
 		list: null,
@@ -37,7 +38,7 @@ Page({
 			IsPos: 0,
 		});	
-		app.request.get('/api/weshop/ad/list', {
+		app.request.get('/api/weshop/ad/page', {
 		  data: {
 				pid: 601,
 				store_id: app.globalData.userInfo.store_id,
@@ -45,9 +46,15 @@ Page({
 			},
 		  success: function (res) {
 				// console.log('604',res.data.data[0].ad_code);
-				self.setData({
-					imgAd: res.data.data[0].ad_code
-				});
+				if(res.data.code==0  &&  res.data.data.pageData  &&  res.data.data.pageData.length>0 ){
+					var a = res.data.data.pageData;
+					self.setData({
+						imgAd: a[0].ad_code,
+						ad_color: a[0].bgcolor,
+					});
+				}
+				
+				
 		  },
 		});
   },
@@ -212,8 +219,8 @@ Page({
 	// },
-	bind_err:function(e){
-		var _errImg = e.target.dataset.errorimg;		
+	onerror:function(e){
+		var _errImg = e.currentTarget.dataset.errimg;		
 		var _errObj = {};
 		_errObj[_errImg] = "/miniapp/images/default_g_img.gif";
 		this.setData(_errObj); 
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
 	<!-- 封面 -->
-	<view class="banner-container"><image class="img-block" src="{{url + imgAd}}"></image></view>
+	<view class="banner-container">
+		  <image class="img-block" src="{{url + imgAd}}"  binderror="onerror" data-errimg="imgAd"></image>
+	</view>
 	<!-- 列表 -->
 	<view>
 		<!-- 标题 -->
@@ -10,7 +12,7 @@
 			<view class="t-item {{currentIndex == 1 ? 'active':''}}" data-index="1">已核销</view>
 		</view>
 		<!-- 内容 -->
-		<view class="list">
+		<view class="list" style="background-color: {{ad_color?ad_color:'#ff9a00'}};">
 			<block wx:for="{{list}}" >            
 				 <view class="l-item"  bindtap="goDetails" data-id="{{item.ID}}" >
 					<!-- 上 -->
@@ -41,11 +43,11 @@
 				</view>	
 		   </block>	
-						
-		   <nodata nodataContainer="nodata" wx:if="{{list.length === 0}}">暂无数据</nodata>
-		   <view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view>
-						
+		   <view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view>									
 		</view>
+		
+		<nodata nodataContainer="nodata" wx:if="{{list.length === 0}}">暂无数据</nodata>
+		
 	</view>
 </view>
@@ -2,7 +2,7 @@
 @charset "utf-8";
 page {
-	background-color: #FA437E;
+	/* background-color: #FA437E; */
 }
 .banner-container {
@@ -97,7 +97,6 @@ page {
 	text-decoration:line-through;
 }
-
 .date {
 	padding-top: 10rpx;
 	color: #FE6867;
@@ -48,11 +48,12 @@ Page({
 		})
-	   getApp().request.promiseGet("/api/weshop/ad/list",{
+	   getApp().request.promiseGet("/api/weshop/ad/page",{
 		 data:{store_id:os.stoid,enabled:1,pid:601}  
 	   }).then(res=>{
-		   if(res.data.code==0){
-			   self.setData({show_img:res.data.data[0].ad_code});
+		   if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+			   var a = res.data.data.pageData;			   
+			   self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor});
 		   }
 	   })	
@@ -13,7 +13,7 @@
 					<view>你的美丽我来缔造</view>
 				</view>
 			</view>
-			
+			<view style="background-color: {{ad_color?ad_color:'#fff'}};">			
 				<view class="list-item flex" wx:for="{{result.givelist}}">									
 					<!-- 左图片 -->
 					<view class="avatar">
@@ -22,7 +22,7 @@
 						<image wx:if="{{item.GiveType=='2'}}" src="{{url}}/miniapp/images/giftbag/gift01.png"></image><!-- 商品 -->
 						<image wx:if="{{item.Integral>0}}" src="{{url}}/miniapp/images/giftbag/gift03.png"></image><!-- 积分 -->
 						<image wx:if="{{item.GradeSum>0}}" src="{{url}}/miniapp/images/giftbag/gift04.png"></image><!-- 成长值 -->
-						<image wx:if="{{item.PAdvanceItemId>0}}" src="{{url}}/miniapp/images/giftbag/gift01.png"></image><!-- 预存 -->					
+						<image wx:if="{{item.PAdvanceItemId>0}}" src="{{url}}/miniapp/images/giftbag/gift01.png"></image><!-- 预存 -->		
 					</view>
 					<!-- 右 -->
 					<view class="info">
@@ -33,7 +33,8 @@
 						<!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲，可以享受1次。</view> -->
 						<view wx:if="{{item.Qty>0}}" class="t-r fs24 c-y">数量：{{item.Qty}}</view>
 					</view>
-				</view>				
+				</view>		
+			</view>			
 		</view>		
 	</view>
@@ -51,6 +52,6 @@
 		</block>		
 	</view>
-	<qrcode id="qrcode" ></qrcode>
+	<qrcode id="qrcode"></qrcode>
 </view>
@@ -26,7 +26,6 @@
 }
 .list-item {
-	background-color: white;
 	align-items: center;
 	padding: 20rpx;
 }
@@ -72,7 +71,6 @@
 	border-radius: 50%;
 	background-color: pink;
 	flex-shrink: 0;
-	transform:scaleX(-1);
 	text-align: center;
 }
@@ -99,7 +97,7 @@
 	text-align: center;
 	padding: 20rpx 0;
 	background-color: white;
-	border-top: 2rpx solid #f2f2f2;
+	border-top: 1rpx solid #f2f2f2;
 }
 .btn {
@@ -357,4 +357,12 @@ Page({
 			th.isPullDownRefresh = false;
 		});
 	},
+	
+	// 点击查看
+	viewItemDetails:function(e){
+		 var index=e.currentTarget.dataset.index;
+		 var item=this.data.list2[index];
+		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id;
+		 getApp().goto(url);
+	}
 })
 \ No newline at end of file
@@ -7,10 +7,9 @@
 	</view> -->
 	<view class="banner-container">
-		<image src="{{h5_url}}/template/mobile/new/static/images/integral/liwu.png" class="banner"></image>
+		<image src="{{url}}/miniapp/images/integral/liwu.png?v=1" class="banner"></image>
 	</view>
-	
-	
+		
 	<!-- 列表 -->
 	<view class="list-container">
 		<!-- 标题 -->
@@ -31,7 +30,7 @@
 			 bindrefresherrefresh="onPullDownRefresh">
 				<block wx:for="{{list2}}">
-					<view class class="list-item" bindtap="viewItemDetails">
+					<view class class="list-item" bindtap="viewItemDetails" data-index="{{index}}">
 						<view class="img-container">
 							<image
 							src="{{url+item.original_img}}"
@@ -53,8 +52,7 @@
 						</view>
 					</view>
 				</block>
-				
-			
+							
 				<!-- <view style="height: 1rpx;"></view>	 -->	
 				<nodata wx:if="{{list2.length==0}}" nodataContainer="nodata">暂无数据</nodata>
 				<view wx:if="{{is_no_more2}}" class="no-more t-c">- 已全部加载 -</view>
@@ -74,19 +74,23 @@
             <text class="data-v-3a5b7e36"></text>
           </view>
           <view class="box_ware_item_qty data-v-3a5b7e36">
-            <text class="data-v-3a5b7e36 ellipsis-1">{{"数量:"+item.num}}</text>
+            <text class="data-v-3a5b7e36 ellipsis-1">
+			    {{"数量:"+item.num}}
+			</text>
           </view>
           <view class="box_ware_code data-v-3a5b7e36">
-            <block wx:if="{{c_state==0}}">
+            <!-- <block wx:if="{{c_state==0}}"> -->
               <block wx:if="{{isBuy==0&item.lbType==1}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode" class="data-v-3a5b7e36"></image>
               </block>
-            </block>
+            <!-- </block> -->
+			<!--
             <block wx:else>
               <block wx:if="{{isBuy==0&item.lbType==1}}">
                 <image src="{{iurl+'/miniapp/images/giftbag/gift08.png'}}" lazy-load="true" class="data-v-3a5b7e36"></image>
               </block>
-            </block>
+            </block>-->
+			
             <block wx:if="{{isBuy==0&item.lbType==2}}">
               <image src="{{iurl+'/miniapp/images/giftbag/gift06.png'}}" class="data-v-3a5b7e36" lazy-load="true" data-url="/pages/user/coupons/coupons" bindtap="goto"></image>
             </block>
@@ -3563,7 +3563,7 @@ Page({
       return false;
     }
-    //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
+    //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团  4阶梯团
     var type = this.data.prom_type;
     if (type == 6) type = 2;
     if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
@@ -3650,39 +3650,58 @@ Page({
 			 context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 76 * unit); 
 		  }
-          
-
+         
           //---产品名称---
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-          context.setFillStyle("black");
-          context.setFontSize(21.3 * unit)
-          th.draw_Text(context, th.data.data.goods_name,
-              38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
-          //------产品的价格-------
-          context.setFontSize(23 * unit)
-          context.setFillStyle("red")
-          context.fillText("￥", 416 * unit, 185 * unit);
-          context.setFontSize(31 * unit)
-          var pri0 = th.data.data.shop_price;
-          if (th.data.prom_act)
-            pri0 = th.data.prom_act.price;
-
-          pri0 = parseFloat(pri0).toFixed(2);
-          context.fillText(pri0, 438 * unit, 185 * unit);
-          //---市场价划掉---
-          context.setFillStyle("gray")
-          context.setFontSize(22 * unit)
-          context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
-          context.setStrokeStyle('gray')
-          context.setLineWidth(1 * unit)
-          context.moveTo(426 * unit, 206 * unit)
-          context.lineTo(510 * unit, 206 * unit)
-          context.stroke();
+		  if(type!=4){
+			 context.setFillStyle("black");
+			 context.setFontSize(21.3 * unit)
+			 th.draw_Text(context, th.data.data.goods_name,
+			     38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+			 //------产品的价格-------
+			 context.setFontSize(23 * unit)
+			 context.setFillStyle("red")
+			 context.fillText("￥", 416 * unit, 185 * unit);
+			 context.setFontSize(31 * unit)
+			 var pri0 = th.data.data.shop_price;
+			 if (th.data.prom_act)
+			    pri0 = th.data.prom_act.price;			 
+			 pri0 = parseFloat(pri0).toFixed(2);
+			 context.fillText(pri0, 438 * unit, 185 * unit); 	 
+			 //---市场价划掉---
+			 context.setFillStyle("gray")
+			 context.setFontSize(22 * unit)
+			 context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
+			 context.setStrokeStyle('gray');
+			 context.setLineWidth(1 * unit);
+			 context.moveTo(426 * unit, 206 * unit);
+			 context.lineTo(510 * unit, 206 * unit);
+			 context.stroke();
+			 
+		  }else{
+			  context.setFillStyle("black");
+			  context.setFontSize(21.3 * unit)
+			  th.draw_Text(context, th.data.data.goods_name,
+			      38 * unit, 180 * unit, 20 * unit, 300*unit, unit);
+			  //------ 产品的价格 -----			 
+			  var pri0 = th.data.prom_act.addmoney;
+			  var integral=th.data.prom_act.integral;				 	  
+			  var text=	"";			  
+			  if(integral){text=integral+"积分";  }				  
+			  if(pri0 && integral){ text+="+";}
+			  if(pri0){ text+="￥"+pri0;}
+			
+			  context.setFillStyle("red");	  
+			  context.fillText(text, 38 * unit, 215 * unit); 	 
+		 			  
+		  }
+		  	        
           //---中间大图---
           context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
           //-------大图后面就不一样了-----------
           switch (type) {
             case 0: //普通商品的展示
+			case 4: 
               //中间的几个字
 			  if(th.data.poster && parseInt(th.data.poster.style)==2 ){				 		 
 				 if(parseInt(th.data.poster.show_quality)){
@@ -3730,10 +3749,17 @@ Page({
               //---文字---
               context.setFillStyle("black")
               context.setFontSize(22 * unit)
-			  // 原来start --->
-			  context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
-			  context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
-							
+			  
+			  if(type==0){
+				  // 原来start --->
+				  context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+				  context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);				  							
+			  }else{
+				// 原来start --->
+				context.fillText("长按识别二维码", 40 * unit, 776 * unit);
+				context.fillText("立即开始兑换", 40 * unit, 826 * unit);										 
+			  }
+			 
               //---二维吗图---            
 			  //-- 自定义海报 --
 			  if(th.data.poster){
@@ -3742,7 +3768,7 @@ Page({
 					   context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit);				  
 			  }else{
 					   //---二维吗图---
-					   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+					   context.drawImage(vpath, 410 * unit, 726 * unit, 115 * unit, 125 * unit);
 			  }	
               break;
@@ -3771,9 +3797,7 @@ Page({
               }else{
 				   //---二维吗图---
 				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-              }	
-			  
-			  
+              }							  
               break;
             case 2: //会员团和商家团的展示
@@ -3863,6 +3887,8 @@ Page({
 				   context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
 			  }			  
               break
+			  
+			   case 3: //阶梯团的展示
           }
@@ -236,7 +236,7 @@
 				  <!-- 价格显示 -->
 				  <view class="co-red" style="overflow: hidden" >
 				      <view class="market-price" style="overflow: hidden">
-					     <image class="rel_img" src="{{resourceUrl}}/template/mobile/new/static/images/weixin/integral_red.png"></image>
+					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
 						 <block wx:if="{{prom_integral}}">{{prom_integral}}
 						 <text class="rel_txt">积分</text></block>						
 						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>