支付调试&积分查询条件切换&积分兑换

App.vue

@@ -67,7 +67,7 @@
 	/*每个页面公共css */
 	uni-page-body{
 		height: 100%;
-		padding-top: 80rpx;
+		padding-top: 100rpx;
 	}
 	@font-face {
 		font-family: 'iconfont';

manifest.json

@@ -66,13 +66,13 @@
                 },
                 "ad" : {},
                 "payment" : {
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    },
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "appid" : "wxec09b9be6cff4eb3",
                         "UniversalLinks" : ""
-                    },
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
                     }
                 },
                 "oauth" : {

pages/myPoints/myPoints.vue

@@ -86,6 +86,9 @@
 		methods:{
 			selectNav(navItem){
 				this.timeFlag = navItem.timeFlag;
+				if(this.timeFlag == 'D'){
+					this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+				}
 				if(this.timeFlag == 'M'){
 					this.fortuneDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
 				}

pages/orderConfirm/orderConfirm.vue

@@ -173,15 +173,22 @@
 					api.aliAppPay(param).then(res=>{
 						if(res['success']){
 							const aliOrderString = res['data']['aliOrderString'];
+							let _this = this
 							if(aliOrderString){
 								uni.requestPayment({
 								    provider: 'alipay',
 								    orderInfo: aliOrderString,
 								    success: function (resp) {
-								        alert('success:' + JSON.stringify(resp));
+								        console.log('success:' + JSON.stringify(resp));
+										uni.navigateTo({
+											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=2`
+										})
 								    },
 								    fail: function (err) {
-								        alert('fail:' + JSON.stringify(err));
+								        console.log('fail:' + JSON.stringify(err));
+										uni.navigateTo({
+											url:`/pages/orderStatus/orderStatus?orderId=${_this.orderId}&fileId=${_this.fileId}&orderStatus=1`
+										})
 								    }
 								});
 							}else{
@@ -262,7 +269,7 @@
 			this.orderId = option.orderId;
 			this.courseDetail();
 			this.queryByUserIdFortuneStatistic()
-			
+			console.log(option)
 		},
 		mounted() {
 			

pages/orderStatus/orderStatus.vue

 <template>
 	<view class="container">
 		<view class="statusBox">
-			<view class="successBox" v-if="orderStatus=='1'">
+			<view class="successBox" v-if="orderStatus=='2'">
 				<i class="iconfont icon-dengdai"></i>
 				<text class="statusText">订单支付成功</text>
 				<text @click="viewDetail()" class="viewOrder">查看订单 ></text>
 			</view>
-			<view class="failBox" v-if="orderStatus!='1'">
+			<view class="failBox" v-if="orderStatus=='1'">
 				<text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text>
 				<view class="optionBox">
 					<text @click="cancelOrder()">取消订单</text>
@@ -52,6 +52,8 @@
 				})
 			},
 			continuePay(){
+				console.log('fileId',this.fileId)
+				console.log('orderId',this.orderId)
 				uni.navigateTo({
 					url:`/pages/orderConfirm/orderConfirm?fileId=${this.fileId}&orderId=${this.orderId}`
 				})
@@ -66,7 +68,7 @@
 			this.orderId = options.orderId;
 			this.orderStatus = options.orderStatus;
 			this.fileId = options.fileId;
-			console.log(this.orderStatus)
+			console.log(options)
 		}
 	}
 </script>

pages/systemMsg/system_msg.vue

@@ -51,7 +51,7 @@
 			     if (res['success']) {
 			       this.system_msgs_list = res['data']['dataList'];
 			     }else{
-					 this.system_msgs_list = null
+					 this.system_msgs_list = null;
 				 }
 			   });
 			},

pages/withdrawal/withdrawal.vue

@@ -120,50 +120,15 @@
 			aliWithdrawal(){
 				this.aliWithdrawalResVO = {
 					...this.aliWithdrawalResVO,
-					orderNo:this.partnerTradeNo
-				}
-				api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
-					alert(JSON.stringify(res))
-					console.log(res)
-				})
-			},
-			//微信去提现
-			wxWithdrawal(){
-				// APP：
-				// #ifdef APP-PLUS
-				uni.login({
-				    provider: 'weixin',
-				    success: function (loginRes) {
-				        // 登录成功
-						// alert(JSON.stringify(loginRes))
-				        uni.getUserInfo({
-				            provider: 'weixin',
-				            success: function(info) {
-				                // 获取用户信息成功, info.authResult保存用户信息
-								console.log(info)
-								this.wxWithdrawalResVO.openId=info.openId;
-								const wxWithdrawalResVO = {
-									...this.wxWithdrawalResVO,
+					orderNo:this.partnerTradeNo,
+					amount:this.exchangeAmount,
 					userId:uni.getStorageSync('cffp_userId'),
+					userReName:'孙超'
 				}
-								api.wxWithdrawal(wxWithdrawalResVO).then((res)=>{
+				console.log(JSON.stringify(this.aliWithdrawalResVO))
+				api.aliWithdrawal(this.aliWithdrawalResVO).then((res)=>{
 					console.log(res)
-								})
-				            }
-				        })
-				    },
-				    fail: function (err) {
-				        // 登录授权失败  
-				        // err.code是错误码
-				    }
-				})
-				// #endif
-			},
-			confirmWithdrawal(){
-				if(this.paymentMethod == 1){
-					this.wxWithdrawal();
-				}
-				if(this.paymentMethod == 2){
+					if(res['data']['isAuth'] == 1){
 						// APP：
 						// #ifdef APP-PLUS
 						let urls= this.aliWithdrawalResVO.aliAuthUrl;
@@ -203,9 +168,50 @@
 						    'com.eg.android.AlipayGphone'
 						  );
 						}
-					// this.aliWithdrawal();
 						// #endif
 					}
+				})
+			},
+			//微信去提现
+			wxWithdrawal(){
+				// APP：
+				// #ifdef APP-PLUS
+				uni.login({
+				    provider: 'weixin',
+				    success: function (loginRes) {
+				        // 登录成功
+						// alert(JSON.stringify(loginRes))
+				        uni.getUserInfo({
+				            provider: 'weixin',
+				            success: function(info) {
+				                // 获取用户信息成功, info.authResult保存用户信息
+								console.log(info)
+								this.wxWithdrawalResVO.openId=info.openId;
+								const wxWithdrawalResVO = {
+									...this.wxWithdrawalResVO,
+									userId:uni.getStorageSync('cffp_userId'),
+								}
+								api.wxWithdrawal(wxWithdrawalResVO).then((res)=>{
+									console.log(res)
+								})
+				            }
+				        })
+				    },
+				    fail: function (err) {
+				        // 登录授权失败  
+				        // err.code是错误码
+				    }
+				})
+				// #endif
+			},
+			confirmWithdrawal(){
+				if(this.paymentMethod == 1){
+					this.wxWithdrawal();
+				}
+				if(this.paymentMethod == 2){
+					
+					this.aliWithdrawal();
+				}
 			}
 		}
 	}