预存的功能的优化

yvan.ni
1 parent 0e424c64
Showing 10 changed files with 215 additions and 126 deletions
components/qr_code/qr_code.wxml
components/qr_code/qr_code.wxss
packageA/pages/chongzhi/chongzhi.js
packageA/pages/chongzhi/chongzhi.json
packageA/pages/chongzhi/chongzhi.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
pages/user/deposit/prepaid/prepaid.js
pages/user/deposit/prepaid/prepaid.wxml
@@ -11,14 +11,15 @@
            <view class="q_code">{{object.val}}</view>
        </view>
        <view class="qrcode_rim {{is_fw==0?'mt':'mts'}}">
-         <canvas  class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"  />
-         <view class="r-code">{{object.content}}</view>
+            <canvas  class="qrcode" canvas-id="qrcode{{item.index}}"  wx:for="{{barcode_canvas}}"  />
+            <view class="r-code">{{object.content}}</view>
             <view class="r-code flex" wx:if="{{object.is_quan}}">有效时间：{{object.now}} 至 <view>{{object.validay}}</view></view>
             <block wx:if="{{object.is_quan}}">
                 <view class="r-code" wx:if="{{object.name}}">使用说明: 仅{{object.name}}使用</view>
                 <view class="r-code" wx:else>使用说明: 全场通用</view>
             </block>  
-         <view></view>
+			<view wx:if="{{object.code}}" class="code_show">{{object.code}}</view>
+            <view></view>
        </view>
      </view>
@@ -78,11 +78,11 @@ letter-spacing:6rpx;
 /* 二维码边框*/
 .qrcode_rim {
  width: 550rpx;
-  height:544rpx;
+ height:544rpx;
 display:flex;
 flex-direction:column;
 position: absolute;
-left: 74rpx;
+left: 75rpx;
 }
 .qrcode{
@@ -125,4 +125,8 @@ margin-top: -5.5rpx;
 .flex{
   display: flex;
   justify-content:center;
+}
+
+.code_show{
+	text-align: center;position: relative; left: -20rpx;
 }
 \ No newline at end of file
 // packageA//pages/chongzhi/chongzhi.js
 const app = getApp();
-
-// var e = function(e) {
-//     return e && e.__esModule ? e : {
-//       default: e
-//     };
-//   }(require("../../../utils/LoadMore.js"));
-
+var util = require('../../../utils/util.js');
 Page({
@@ -34,8 +28,9 @@ Page({
    */
   onLoad: function (options) {
-		console.log('userInfo',app.globalData.userInfo);
+
 		var self = this;
+				
 		this.getData(true,'/api/weshop/users/pageNewVIPAddMoney',{
 			store_id: app.globalData.userInfo.store_id,
 			user_id: app.globalData.userInfo.user_id,
@@ -57,13 +52,7 @@ Page({
 		});
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
+ 
   /**
    * 生命周期函数--监听页面显示
    */
@@ -72,20 +61,6 @@ Page({
   },
   /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
@@ -150,8 +125,7 @@ Page({
 			this.setData({
 				saveData: data
 			});
-		}
-		
+		}		
 		this.getData(true,'/api/weshop/users/pageNewVIPAddMoney',data);	
 	},
@@ -197,12 +171,21 @@ Page({
 	},
-	viewDetails(e) {
-		let id = e.target.dataset.id;
-		// console.log('eeeeeeeeeee', id);
-		app.goto('../chongzhiDetails/chongzhiDetails?id=' + id);
+	goDetails(e) {
+		let id = e.currentTarget.dataset.id;
+		app.goto('../chongzhiDetails/chongzhiDetails?id=' + id+"&type=1");
 	},
+	viewDetails(e){
+		var index=e.currentTarget.dataset.index;
+		var WriteOffCode=this.data.list[index].WriteOffCode;
+		
+		var qrcode = this.selectComponent("#qrcode"); //组件的id
+		var code=util.base64_encode(WriteOffCode + '|' + util.formatTime());		
+		var e={is_fw:1,val:code,code:WriteOffCode}	
+		qrcode.open(e);	
+		
+	},
 	// 检测上拉滚动到底部
 	// scrollToLower: function (requestData, callback) {
@@ -228,4 +211,12 @@ Page({
 	// 		this.getData(false, requestData, callback);
 	// 	};
 	// },
+	
+	
+	bind_err: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
@@ -2,6 +2,7 @@
 	"navigationBarTitleText": "充值有礼",
 	"enablePullDownRefresh": false,
   "usingComponents": {
-		"nodata": "/components/nodata/nodata"
+		"nodata": "/components/nodata/nodata",
+		"qrcode":"/components/qr_code/qr_code"
 	}
 }
 \ No newline at end of file
@@ -10,9 +10,8 @@
 		</view>
 		<!-- 内容 -->
 		<view class="list">
-			
-
-				<view class="l-item" wx:for="{{list}}">
+			<block wx:for="{{list}}" >            
+				 <view class="l-item"  bindtap="goDetails" data-id="{{item.ID}}" >
 					<!-- 上 -->
 					<view class="{{currentIndex == 0 ? 'top flex':'flex'}}">
 						<!-- 左 -->
@@ -29,18 +28,17 @@
 						</view>
 					</view>
 					<!-- 下 -->
-					<view class="bottom" wx:if="{{currentIndex == 0}}" bindtap="viewDetails">
-						<text class="btn" data-id="{{item.ID}}">立即使用</text>
+					<view class="bottom" wx:if="{{currentIndex == 0}}" catchtap="viewDetails" data-index="{{index}}" >
+						<text class="btn" >立即使用</text>
 					</view>
-				</view>
-	
-			
-			
-			
-			<nodata nodataContainer="nodata" wx:if="{{list.length === 0}}">暂无数据</nodata>
-			<view hidden="{{!noMore}}" class="no-more t-c" wx:if="{{list.length !== 0}}">- 已全部加载 -</view>
-			
-			
+				</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>
 	</view>
-</view>
 \ No newline at end of file
+</view>
+
+<qrcode id="qrcode" ></qrcode>
 \ No newline at end of file
 // packageA//pages/chongzhiDetails/chongzhiDetails.js
 var util = require('../../../utils/util.js');
-
-const app = getApp();
-
+const app = getApp(),os = app.globalData.setting;
+ 
 Page({
   /**
@@ -11,39 +10,57 @@ Page({
   data: {
 		showCode: false,
 		result: null,
+		show_img:null,
+		url: app.globalData.setting.imghost,
+		type:0,  //0是立即充值  1是购买后的
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-		const self = this;
-		app.request.get('/api/weshop/users/getBuyaddmoneyactDetails', {
+	    
+	   const self = this;		
+	   if(options.type)
+	      self.setData({type:options.type});
+	  	   
+	    var UserInfo=app.globalData.userInfo;
+	    if(!UserInfo) {
+			getApp().goto("/pages/togoin/togoin");
+			return false;			
+		}
+		   
+	   getApp().request.promiseGet("/api/weshop/ad/list",{
+		 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});
+		   }
+	   })	
+	   
+	   var api="/api/weshop/users/getAddmoneyactDetails";
+	   if(options.type==1){
+		   api="/api/weshop/users/getBuyaddmoneyactDetails";
+	   }
+	   			
+	   app.request.get(api, {
 		  data: {
 				Id:options.id,
-				store_id:1,
-				user_id:6519826,
+				store_id:os.stoid,
+				user_id: UserInfo.user_id ,
 			},
 		  success: function (res) {
 				self.setData({
 					result: res.data.data
 				});
-				
-				console.log('33333333--->', );
+			
 		  },
 		});
-		
-		
+				
 		// this.data.result.WriteOffCode
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
+ 
   /**
    * 生命周期函数--监听页面显示
    */
@@ -52,20 +69,6 @@ Page({
   },
   /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
@@ -86,20 +89,100 @@ Page({
   },
-	onUse() {
-		
-		
-		if(this.data.showCode) {
-			this.setData({
-				showCode: false
-			});
-		} else {
-			this.setData({
-				showCode: true
-			});
-			
-			var qrcode = this.selectComponent("#qrcode"); //组件的id
-			qrcode.open(util.base64_encode(this.data.result.WriteOffCode + '|' + util.formatTime()));
-		};
-	}
+  onUse() {							
+	 	var qrcode = this.selectComponent("#qrcode"); //组件的id		
+		var code=util.base64_encode(this.data.result.WriteOffCode + '|' + util.formatTime());		
+		var e={is_fw:1,val:code,code:this.data.result.WriteOffCode}	
+		qrcode.open(e);	
+   },
+	
+	
+	bind_err:function(e){
+		var _errImg = e.target.dataset.errorimg;		
+		var _errObj = {};
+		_errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+		this.setData(_errObj); 
+	},
+	
+	     //-- 确定充值 --
+	    go_buy: function(e) {
+	    	 
+	      var money = e.target.dataset.money;
+	      var advance = e.target.dataset.advance;
+	      this.recharge(money, advance);
+	    },
+	    //确定接口
+	    async recharge(money, advancek) {
+	      console.log(money, "有进来吗银行卡", advancek);
+	      var user_id = getApp().globalData.user_id;
+	      var store_id = os.stoid;
+	      var recharge_type = 6;
+	      var buynum = 1;
+	      console.log(money, "有进来吗预存劵", advancek, user_id, store_id );
+	      var e = this,
+	      perpaid = "";
+	      await getApp().request.promiseGet("/api/weshop/users/getPay", {
+	        data: {
+	          account: money,
+	          yucun_id: advancek,
+	          user_id: user_id,
+	          store_id: store_id,
+	          recharge_type: recharge_type,
+	          buynum: buynum ,
+	        }
+	      }).then(res => {
+	           console.log(res);
+	
+	
+	        var msg = res.data.data;
+	        var parentSn = msg.order_sn;
+	        var store_id = os.stoid;
+	        getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
+	          data: {
+	            parentSn: parentSn,
+	            store_id: store_id
+	          },
+	          success: function (su) {
+	            console.log("su是什么",su);
+	            var n=su.data.data;
+	            console.log("su是什么", su);
+	          
+	            e.weixinPay(n,
+	              function () {
+	               e.jumpPaymentPage();
+	              }, function () {
+	                getApp().showWarning("支付失败");
+	              })
+	          }
+	        })
+	      })    
+	    },
+	//------支付成功页面--------
+	jumpPaymentPage: function () {
+	  wx.redirectTo({
+	    url:"msg/msg",
+	  });
+	},
+	
+	//------调起支付框--------
+	weixinPay: function (n, success, fail) {
+	  wx.requestPayment({
+	    timeStamp: String(n.timeStamp),
+	    nonceStr: n.nonceStr,
+	    package: n.packageValue,
+	    signType: n.signType,
+	    paySign: n.paySign,
+	    success: function (n) {
+	      console.log(n), getApp().showSuccess("支付成功！");
+	      "function" == typeof success && success();
+	      wx.redirectTo({
+	        url: "../deposit/deposit"
+	      });
+	    },
+	    fail: function (n) {
+	      console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
+	        "function" == typeof fail && fail();
+	    }
+	  });
+	},
 })
 \ No newline at end of file
 <!--packageA//pages/chongzhiDetails/chongzhiDetails.wxml-->
 <view class="container">
 	<view>
-		<view class="banner-container"><image class="img-block" src="../../../images/banner.jpg"></image></view>
-		
-		
-		
+		<view class="banner-container">
+			<image class="img-block" src="{{url+show_img}}" 
+		       lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view>
+					
 		<view class="list">
 			<view class="title-container">
 				<view class="title">
@@ -12,10 +12,17 @@
 					<view>你的美丽我来缔造</view>
 				</view>
 			</view>
-<!-- 			<block wx:for="{{list}}"> -->
+			
 				<view class="list-item flex" wx:for="{{result.givelist}}">
-					<!-- 左 -->
-					<view class="avatar"><text class="iconfont icon-meirong2"></text></view>
+					<!-- 左图片 -->
+					<view class="avatar">
+						<image wx:if="{{item.GiveType=='0'}}" src="{{url}}/miniapp/images/giftbag/gift05.png"></image><!-- 代金券 -->
+						<image wx:if="{{item.GiveType=='1'}}" src="{{url}}/miniapp/images/giftbag/gift02.png"></image><!-- 服务项目 -->
+						<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><!-- 预存 -->					
+					</view>
 					<!-- 右 -->
 					<view class="info">
 						<view class="">{{item.GiveName}}</view>
@@ -23,23 +30,20 @@
 						<view class="t-r fs24 c-y">数量：{{item.Qty}}</view>
 					</view>
 				</view>
-			<!-- </block> -->
-			
-	
+				
 		</view>
 	</view>
-	<view class="btn-container">
-		<text class="btn" bindtap="onUse">立即使用</text>
-	</view>
-	
-	<view class="qr-container" wx:if="{{showCode}}" bindtap="onUse">
-		<view class="qr">
-			<!-- <view class="qr-img"><image class="img-block" src="../../../images/123456.jpg"></image></view> -->
-			<qrcode id="qrcode" ></qrcode>
-			<view>核销码：{{result.WriteOffCode}}</view>
-		</view>
+	<view class="btn-container">		
+		<text wx:if="{{type==0}}" data-advance="{{result.AdvanceItemId}}"  data-money="{{result.NewSum}}" 
+		   class="btn" bindtap="go_buy">立即充值</text>
+		<block wx:else>
+		  <text wx:if="{{result.AddType==0}}" class="btn" bindtap="onUse">立即使用</text>
+		  <text wx:if="{{result.AddType==1}}" class="btn" >已核销</text>
+		</block>
 	</view>
+
+	<qrcode id="qrcode" ></qrcode>
 </view>
@@ -79,6 +79,8 @@
 	text-align: center;
 }
+.avatar image{ width: 100%; height: 100%;}
+
 .icon-meirong2 {
 	color: white;
 	font-size: 64rpx;
@@ -160,5 +160,10 @@ Page({
     })
     console.log("bb");
+  },
+  
+  go_detail:function(e){
+	  var id=e.currentTarget.dataset.id;
+	  getApp().goto('/packageA/pages/chongzhiDetails/chongzhiDetails?id=' + id);
   }
 })
@@ -5,7 +5,7 @@
 			<image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image>
 			<image wx:if="{{idx % 4 == 3}}" class="picture" src="{{iurl+'miniapp/images/usermoney/blue.png'}}"></image>
 		  <view class="info-container flex">
-				<view class="left">
+				<view class="left"  catchtap="go_detail" data-id="{{perpaid.Id}}">
 					<view>{{perpaid.ItemName}}</view>
 					<view class="pdv20">充{{perpaid.BeginSum}}<text>送{{perpaid.NewSum}}元</text></view>
 					<view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view>
@@ -13,7 +13,7 @@
 				<view class="right">备注：
 				  <view class="">{{perpaid.ItemName}}</view>
 					<view wx:if="{{perpaid.ItemType==1}}" class="ljcz" bindtap="submit" data-name="{{perpaid.BeginSum}}"
-					    data-advance="{{perpaid.AdvanceItemId}}"data-money="{{perpaid.NewSum}}">立即充值</view>
+					    data-advance="{{perpaid.AdvanceItemId}}" data-money="{{perpaid.NewSum}}">立即充值</view>
 					<view wx:if="{{perpaid.ItemType==2}}" class="ljcz" bindtap="go_detail" data-advance="{{perpaid.AdvanceItemId}}">立即充值</view>
 				</view>