充值有礼的优化

yvan.ni
1 parent ef14e486
Showing 5 changed files with 157 additions and 19 deletions
packageA/pages/chongzhi/chongzhi.js
packageA/pages/chongzhi/chongzhi.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
@@ -183,16 +183,45 @@ Page({
 		app.goto('../chongzhiDetails/chongzhiDetails?id=' + id+"&type=1");
 	},
-	viewDetails(e){
+	 viewDetails(e){
 		var index=e.currentTarget.dataset.index;
-		var WriteOffCode=this.data.list[index].WriteOffCode;		
+		//var WriteOffCode=this.data.list[index].WriteOffCode;
+		var id=this.data.list[index].ID;
+
+		this.detail_next(id);
+	},
+
+	async detail_next(id){
+	    var code='';
+		//获取二维码,强制更新
+		let res= await  getApp().request.promisePut("/api/weshop/store/updateErpApi",{
+			data:{
+				store_id:getApp().globalData.setting.stoid,
+				ApiName:"/api/erp/vip/buyaddmoneyactDetails/updateMainCode",
+				Id:id,
+				VIPId:getApp().globalData.userInfo.erpvipid
+			}
+		})
+		if(res){
+			if(res.data.code==-1){
+				util.m_toast(res.data.msg);
+				return false;
+			}
+			if(res.data.data)
+				code = res.data.data.WriteOffCode;
+		}
+		if(!code){
+			util.m_toast('未找到二维码');
+			return false;
+		}
+
+
 		var qrcode = this.selectComponent("#qrcode"); //组件的id
-		var code=WriteOffCode;		
-		var e={is_fw:1,val:code,code:code}	
-		qrcode.open(e);	
-		
+		var e={is_fw:1,val:code,code:code}
+		qrcode.open(e);
 	},
-	
+
+
 	// 检测上拉滚动到底部
 	// scrollToLower: function (requestData, callback) {
 	// 	// 数据总量
@@ -28,7 +28,7 @@
 								<view class="fs28 ellipsis-2 txt-justify">{{item.ActName}}</view>
 								<view>
 									<view class="price fs24">零售价：￥{{item.PosPrice}}</view>
-									<view class="date fs24">{{(currentIndex == 0 ? '兑换截止日期': '核销时间') + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate)}}</view>
+									<view class="date fs24">购买时间：{{item.BillDate}}</view>
 								</view>
 							</view>
 						</view>
@@ -36,7 +36,7 @@
 						<view class="bottom" wx:if="{{currentIndex == 0}}" >
 							<text wx:if="{{g_filter.is_acting(item.EndDate) || item.EndDate==''}}" 
 							   catchtap="viewDetails" data-index="{{index}}"  class="btn" >立即使用</text>
-							<text wx:else class="btn" style="background-color: #ccc;">已过期</text>   
+							<text wx:else class="btn" style="background-color: #ccc;">已过期</text>
 							<text  data-index="{{index}}"  class="btn details" >详情</text>
 						</view>
 						<view class="bottom" wx:if="{{currentIndex == 1}}" >
@@ -63,7 +63,8 @@ Page({
 	   if(options.type==1){
 		   api="/api/weshop/users/getBuyaddmoneyactDetails";
 	   }
-	   			
+
+	   this.data.op_id=options.id;
 	   app.request.get(api, {
 		  data: {
 				Id:options.id,
@@ -71,8 +72,8 @@ Page({
 				user_id: UserInfo.user_id,
 			},
 		  success: function (res) {			  
+
 			    var result=res.data.data;
-				
 				var now=new Date();
 				var reg = RegExp("-", "g");
                 var endtime = result.EndDate.replace(reg, '/');  
@@ -136,11 +137,41 @@ Page({
   },
-  onUse() {							
-	 	var qrcode = this.selectComponent("#qrcode"); //组件的id		
-		var code=this.data.result.WriteOffCode;
-		var e={is_fw:1,val:code,code:code}	
-		qrcode.open(e);	
+  async onUse() {
+	    //-- 如果过期就不可用 ---
+	    if(this.data.result.IsGQ){
+		   return false;
+	    }
+
+
+	  //var code=this.data.result.WriteOffCode;
+	  var code='';
+
+	  //获取二维码
+	  let res= await  getApp().request.promisePut("/api/weshop/store/updateErpApi",{
+		  data:{
+			  store_id:os.stoid,
+			  ApiName:"/api/erp/vip/buyaddmoneyactDetails/updateMainCode",
+			  Id:this.data.op_id,
+			  VIPId:getApp().globalData.userInfo.erpvipid
+		  }
+	  })
+	  if(res){
+		  if(res.data.code==-1){
+			  util.m_toast(res.data.msg);
+			  return false;
+		  }
+		  if(res.data.data)
+			  code = res.data.data.WriteOffCode;
+	  }
+	  if(!code){
+		  util.m_toast('未找到二维码');
+		  return false;
+	  }
+
+	  var qrcode = this.selectComponent("#qrcode"); //组件的id
+	  var e={is_fw:1,val:code,code:code}
+	  qrcode.open(e);
    },
@@ -286,5 +317,53 @@ Page({
 		if(url){
            getApp().goto(url);
 		}
+	},
+	
+	//-- 显示二维码 --
+	getcode(e) {
+		var idx = e.currentTarget.dataset.index;
+		var item = this.data.result.givelist[idx];
+		this.get_code_next(item);
+	},
+
+	async get_code_next(item){
+		var th = this;
+		//--获取成功的时候--
+		var no = '';
+
+		var id=item.GiftsId;
+		var IsRetrieval=item.IsRetrieval;
+
+		//-- 有调起的时候 --
+		if(IsRetrieval){
+			no=item.WriteOffCodeOne;
+		}else {
+			//获取二维码
+			let res = await getApp().request.promisePut("/api/weshop/store/updateErpApi", {
+				data: {
+					store_id: os.stoid,
+					ApiName: "/api/erp/vip/buyaddmoneyactDetails/updateMainCodeOne",
+					Id: id,
+					VIPId: getApp().globalData.userInfo.erpvipid
+				}
+			})
+			if (res) {
+				if (res.data.code == -1) {
+					util.m_toast(res.data.msg);
+					return false;
+				}
+				if (res.data.data)
+					no = res.data.data.WriteOffCode;
+			}
+		}
+		if(!no){
+			util.m_toast('未找到二维码');
+			return false;
+		}
+
+
+		var qc_com = th.selectComponent("#qrcode"); //组件的id
+		var e={is_fw:1,val:no,code:no}
+		qc_com.open(e)
 	}
 })
 \ No newline at end of file
@@ -39,13 +39,23 @@
 						<image wx:if="{{item.PAdvanceItemId>0}}" src="{{url}}/miniapp/images/giftbag/gift01.png"></image><!-- 预存 -->		
 					</view>
 					<!-- 右 -->
-					<view class="info">
+					<view class="info" style="position: relative;">
 						<view wx:if="{{item.GiveType=='0'}}">{{item.CouponSum}}元优惠券</view>
 						<view wx:elif="{{item.Integral>0}}">{{item.Integral}}积分</view>
 						<view wx:elif="{{item.GradeSum>0}}">{{item.GradeSum}}成长值</view>
 						<view wx:else>{{item.GiveName}}</view>
 						<!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲，可以享受1次。</view> -->
-						<view wx:if="{{item.Qty>0}}" class="t-r fs24">数量：{{item.Qty}}</view>
+						<view wx:if="{{item.Qty>0}}" class="fs24">数量：{{item.Qty}}</view>
+						<view  wx:if="{{item.GiveType=='2'}}" class="date fs24">{{'兑换截止日期' + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate) }}</view>
+
+						<!-- 优化显示二维码 -->
+						<view class="box_ware_code data-v-3a5b7e36" wx:if="{{item.GiveType=='2' && item.IsQrCode==1}}">
+							 <!-- <block wx:if="{{c_state==0}}"> -->
+							 <image src="{{url+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode"
+									data-index="{{index}}"
+									class="data-v-3a5b7e36"></image>
+						</view>
+
 					</view>
 				</view>		
 			</view>			
@@ -57,7 +67,7 @@
 				<text wx:if="{{type==0}}" data-advance="{{result.Id}}"  data-money="{{result.BeginSum}}" 
 				   class="btn" bindtap="go_buy">立即充值</text>
 				<block wx:else>
-				  <text wx:if="{{result.AddType==0 || result.AddType=='0'}}" class="btn" bindtap="onUse">立即使用</text>
+				  <text wx:if="{{result.AddType==0 || result.AddType=='0'}}" class="btn {{result.IsGQ?'bk_huise':''}}  " bindtap="onUse">立即使用</text>
 				  <text wx:if="{{result.AddType==1 || result.AddType=='1'}}" class="btn" >已核销</text>
 				</block>		
 		</view>
@@ -109,6 +109,10 @@
 	font-size: 28rpx;
 }
+.btn.bk_huise {
+	background-color: gainsboro;
+}
+
 .img-block {
 	display: block;
 	width: 100%;
@@ -147,4 +151,20 @@
 .container{
 	display: block;min-height: 100%;width: 100%;position: absolute;left: 0;top: 0;z-index: 1;
+}
+
+.date {
+	padding-top: 10rpx;
+	color: #FE6867;
+}
+
+.box_ware_code.data-v-3a5b7e36 {
+	position: absolute;
+	right: 10rpx;
+	top: 10rpx;
+}
+
+.box_ware_code image.data-v-3a5b7e36 {
+	width: 50rpx;
+	height: 50rpx;
 }
 \ No newline at end of file