添加支付失败/取消后：取消订单

2.解决银联重定向问题

App.vue

@@ -15,15 +15,18 @@
 			snNo: '', // 设备sn号
 			platformType: '', //区分平台
 			//正式
-			url: 'https://hsg.dctpay.com/user',
+			// url: 'https://hsg.dctpay.com/user',
-			graurl: 'https://pay.dctpay.com/crest',
+			// graurl: 'https://pay.dctpay.com/crest',
-			imgUrl: 'https://pay.dctpay.com/filesystem/',
+			// imgUrl: 'https://pay.dctpay.com/filesystem/',
-			imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
-			//测试
-			// url: 'https://hsgcs.dctpay.com/user',
-			// graurl:'https://gratia-pay.dctpay.com/crest',
-			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
 			// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// redirectUrl:'https://pay.dctpay.com/scanPay',
+			//测试
+			url: 'https://hsgcs.dctpay.com/user',
+			graurl:'https://gratia-pay.dctpay.com/crest',
+			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			redirectUrl:'https://gratia-pay.dctpay.com/scanPay',
+			isClick: true, //防止重复点击
 		},
 		onLaunch: function() {
 			
@@ -41,7 +44,7 @@
 				that.globalData.platformType = 'UQRCODEPAY';
 			}
 			
-			uni.getStorage({
+			/* uni.getStorage({
 				key: 'openId',
 				success(e) {
 					if (e.data) {
@@ -65,7 +68,13 @@
 						that.globalData.token = e.data;
 					}
 				}
-			})
+			}) */
+			
+			that.globalData.openId = uni.getStorageSync("openId");
+			that.globalData.userInfo = uni.getStorageSync("user");
+			that.globalData.token = uni.getStorageSync("token");
+			
+			
 		},
 		onHide: function() {
 			console.log('App Hide')

Utils/Api.js

@@ -11,8 +11,8 @@ export const getQrCodeDetail = params => {
 //银行卡识别
 export const recognizeBankCard = params => {
 	return POST('GET', `${grabase}/ocr/recognizeBankCard`, params).then(res => res.data);
-}
+}
-
+
 //创建  JSAPI 订单
 export const createJSAPIOrder = params => {
 	return POST('POST', `${grabase}/tradeOrder/createJSAPIOrder`, params).then(res => res.data);
@@ -20,22 +20,22 @@ export const createJSAPIOrder = params => {
 // 支付 JSAPI 订单
 export const jsapiPay = params => {
 	return POST('POST', `${grabase}/pay/jsapiPay`, params).then(res => res.data);
-}
+}
-
+
-//计算价格
+//计算价格
 export const calculation = params => {
 	return POST('GET', `${grabase}/tradeOrder/calculation`, params).then(res => res.data);
-}
+}
-
+
 //H5 code 转化openid
 export const getH5AccessToken = params => {
 	return POST('GET', `${base}/wechat/getH5AccessToken`, params).then(res => res.data);
 }
-
+
-//支付宝获取openid
+//支付宝获取openid
 export const getAlipayUserId = params => {
 	return POST('GET', `${grabase}/login/getAlipayUserId`, params).then(res => res.data);
-}
+}
 
 //获取登录验证码
 export const getLoginSMSCode = params => {
@@ -62,4 +62,14 @@ export const getUserDetail = params => {
 //查询优惠券
 export const queryUserDiscountList = params => {
 	return POST('GET', `${base}/discount/queryUserDiscountList`, params).then(res => res.data);
-}
+}
+
+// 获取拉卡拉银联用户id
+export const getUnionUserId = params => {
+	return POST('POST', `${grabase}/tradeOrder/getUnionUserId`, params).then(res => res.data);
+}
+
+//取消订单
+export const cancelOrder = params => {
+	return POST('POST', `${grabase}/tradeOrder/cancelOrder`, params).then(res => res.data);
+}

Utils/Request.js

@@ -39,9 +39,10 @@ function request(method, url, data) {
 					})
 				}
 			},
-			fail(err) {
+			fail(err) {
+				app.globalData.isClick = true;
 				uni.showToast({
-					title: '请求失败',
+					title: '请求失败,查看网络是否正常',
 					icon: 'none',
 					duration: 1500,
 				})

pages/index/index.vue

@@ -122,7 +122,7 @@
 		</view>
 
 		<!-- 优惠券弹窗   -->
-		<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true" scrollY="true">
+		<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true" :scrollY="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
 			<view v-if="discountList == ''" class="mart60 fotct font14 fcor666">
 				<image mode="widthFix" style="width: 50vw;" src="../../static/noorder.png"></image>
@@ -151,7 +151,7 @@
 			<view class="height40p"></view>
 		</wybPopup>
 		<!-- 门店活动 -->
-		<wybPopup ref="popupstore" type="bottom" width="500" radius="6" :showCloseIcon="true" scrollY="true">
+		<wybPopup ref="popupstore" type="bottom" width="500" radius="6" :showCloseIcon="true" :scrollY="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">门店活动选择</view>
 			<view v-if="storeCouponlist == ''" class="mart60 fotct font14 fcor666">
 				<image mode="widthFix" style="width: 50vw;" src="../../static/noorder.png"></image>
@@ -200,6 +200,25 @@
 
 			</view>
 		</wybPopup>
+		<wybPopup ref="popupTip" type="center" :maskClickClose="false" :height="popupHeight" :width="popupWidth"
+			bgColor="" radius="20" :showCloseIcon="false">
+
+			<view class="width100 height100 pr">
+				<image class="popImg" mode="aspectFit" src="/static/tipBg.png"></image>
+				<view class="popContain width100 ">
+					<view class="tip-top font20">恭喜!获得了到店优惠</view>
+					<view class="tip-price tip-color">
+						<text class="font45 " v-if="tradeDetail">{{tradeDetail.rebateActivityActualPrice}}</text><text
+							class="">元</text>
+					</view>
+					<view class="tip-color tip-desc">
+						到店付款可当现金用
+					</view>
+
+					<view class="btnPay " @tap.stop="tapToPay">去支付</view>
+				</view>
+			</view>
+		</wybPopup>
 	</view>
 </template>
 
@@ -217,7 +236,8 @@
 		phone,
 		getUserAccount,
 		queryUserDiscountList,
-		calculation
+		calculation,
+		cancelOrder
 	} from '../../Utils/Api.js';
 	// #ifdef H5
 	var jweixin = require('jweixin-module');
@@ -270,7 +290,13 @@
 				storediscountType: '', //门店优惠类型
 				storediscountCondition: '', //门店优惠条件
 				storediscountPrice: '', //门店优惠价格
-				storeDiscountId: '' //门店活动id
+				storeDiscountId: '', //门店活动id
+
+				tradeDetail: null, //订单详情
+				/* 弹窗 */
+				popupHeight: 485,
+				popupWidth: 330,
+				outTradeNo: '', //订单编号
 			}
 		},
 		mounted() {},
@@ -283,6 +309,9 @@
 				this.getUserAccount();
 				this.queryUserDiscountList();
 			}
+
+			this.popupHeight = this.rpxTopx(this.popupHeight);
+			this.popupWidth = this.rpxTopx(this.popupWidth);
 		},
 		computed: {
 			//获取输入金额值
@@ -310,6 +339,13 @@
 
 		},
 		methods: {
+			rpxTopx(temp) {
+				let deviceWidth = uni.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
+
+				let rpx = (750 / deviceWidth) * Number(temp)
+				return Math.floor(rpx);
+
+			},
 			Timer() {},
 			//发送验证码
 			getCode() {
@@ -464,7 +500,7 @@
 					if (item >= this.storediscountCondition) {
 						storetype = this.storediscountType;
 						storeprice = this.storediscountPrice;
-					} 
+					}
 					// else {
 					// 	storetype = this.storediscountType;
 					// 	storeprice = this.storediscountPrice;
@@ -672,13 +708,17 @@
 				// if (userAgent.match(/Alipay/i) == "alipay") {
 				// 	this.createJSAPIOrder('ALIPAY');
 				// } else if (userAgent.match(/MicroMessenger/i) == "micromessenger") {
-				this.createJSAPIOrder();
+
+				if (app.globalData.isClick) {
+					this.createJSAPIOrder();
+					app.globalData.isClick = false;
+				}
 				// }
 			},
 			// 创建订单
-			createJSAPIOrder(item) {
+			createJSAPIOrder(item) {
-				uni.showLoading({
+				uni.showLoading({
-					title:'请求中'
+					title: '请求中'
 				})
 				// "微信：WECHAT  支付宝：ALIPAY   银联：UQRCODEPAY",
 				let phone = '';
@@ -694,11 +734,21 @@
 					"userDiscountId": this.memDiscountId,
 					"userPhone": phone
 				}
-				createJSAPIOrder(datas).then(res => {
+				this.tradeDetail = null;
+				this.outTradeNo = "";
+				createJSAPIOrder(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
+						this.outTradeNo = res.return_data.outTradeNo;
+						if (res.return_data.tradeDetail && res.return_data.tradeDetail.rebateActivityPart) {
+							this.tradeDetail = res.return_data.tradeDetail;
+							this.$refs.popupTip.show();
+							return
+						}
 						this.jsapiPay(res.return_data.outTradeNo);
+
 					} else {
+						app.globalData.isClick = true;
 						uni.showToast({
 							title: res.return_msg,
 							duration: 2000,
@@ -707,12 +757,26 @@
 					}
 				})
 			},
+			tapToPay() {
+				this.$refs.popupTip.hide();
+				this.$nextTick(() => {
+					if (this.outTradeNo) {
+						this.jsapiPay(this.outTradeNo);
+					}
+				})
+			},
 			//唤起支付参数
 			jsapiPay(item) {
+				uni.showLoading({
+					title: '请求中',
+					mask: true,
+				})
 				let datas = {
 					outTradeNo: item
 				}
+
 				jsapiPay(datas).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						if (res.return_data.payParam && app.globalData.platformType == 'WECHAT') {
 							this.wechatpayRequest(res.return_data);
@@ -733,6 +797,7 @@
 							duration: 2000
 						})
 					} else {
+						app.globalData.isClick = true;
 						uni.showToast({
 							title: res.return_msg,
 							duration: 2000,
@@ -741,6 +806,29 @@
 					}
 				})
 			},
+			//取消支付
+			cancelOrder(outTradeNo) {
+				let params = {
+					"outTradeNo": outTradeNo
+				}
+				cancelOrder(params).then(res => {
+					app.globalData.isClick = true;
+					this.outTradeNo = "";
+					if (res.return_code == '000000') {
+						// uni.showToast({
+						// 	title: "已取消订单",
+						// 	icon: 'none',
+						// 	duration: 2000
+						// })
+					} else {
+						uni.showToast({
+						    title: res.return_msg,
+						    icon: 'none',
+						    duration: 2000
+						}) 
+					}
+				})
+			},
 			//删除金额
 			deleteVal() {
 				// this.plateNumberList.pop();
@@ -848,10 +936,11 @@
 			},
 			//微信支付
 			wechatpayRequest: function(self) {
+				let that = this;
 				uni.showLoading({
 					title: '支付中...'
 				})
-				if (self.platformType == 1) {
+				if (self.platformType == 1 || self.platformType == 5) {
 					jweixin.config({
 						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
 						appId: self.payParam.acc_resp_fields.app_id, // 必填，公众号的唯一标识
@@ -864,8 +953,12 @@
 					jweixin.ready(function() {
 						jweixin.checkJsApi({
 							jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
-							success: function(res) {},
+							success: function(res) {
-							fail: function(res) {}
+								// app.globalData.isClick = true;
+							},
+							fail: function(res) {
+								// app.globalData.isClick = true;
+							}
 						});
 						jweixin.chooseWXPay({
 							appId: self.payParam.acc_resp_fields.app_id,
@@ -883,11 +976,20 @@
 									title: '支付成功'
 								})
 							},
-							cancel: function(r) {},
+							cancel: function(r) {
-							fail: function(res) {}
+								that.cancelOrder(that.outTradeNo); //取消订单
+								// app.globalData.isClick = true;
+							},
+							fail: function(res) {
+								that.cancelOrder(that.outTradeNo); //取消订单
+								// app.globalData.isClick = true;
+							}
 						});
 					});
+					// config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名
 					jweixin.error(function(res) {
+						that.cancelOrder(that.outTradeNo); //取消订单
+						// app.globalData.isClick = true;
 						uni.showToast({
 							icon: 'none',
 							title: '支付失败了',
@@ -923,12 +1025,21 @@
 								uni.showToast({
 									title: '支付成功'
 								})
+
 							},
-							cancel: function(r) {},
+							cancel: function(r) {
-							fail: function(res) {}
+								// app.globalData.isClick = true;
+								that.cancelOrder(that.outTradeNo); //取消订单
+							},
+							fail: function(res) {
+								// app.globalData.isClick = true;
+								that.cancelOrder(that.outTradeNo); //取消订单
+							}
 						});
 					});
 					jweixin.error(function(res) {
+						// app.globalData.isClick = true;
+						that.cancelOrder(that.outTradeNo); //取消订单
 						uni.showToast({
 							icon: 'none',
 							title: '支付失败了',
@@ -939,12 +1050,40 @@
 			},
 			//支付宝支付
 			alipayRequest(item) {
+				let that = this;
 				alipayApi.tradePay({
-					tradeNO: item
+						tradeNO: item,
-				}, function(res) {
+						success: function(res) {
-					// alert(JSON.stringify(res));
+							if(res.resultCode==9000){
-					//支付完成的逻辑
+								app.globalData.isClick = true;
-				});
+								// uni.showToast({
+								// 	title:"支付成功!",
+								// 	icon:'none'
+								// })
+							}else{
+								// uni.showToast({
+								// 	title:"支付失败!",
+								// 	icon:'none'
+								// })
+								that.cancelOrder(that.outTradeNo); //取消订单
+							}
+						},
+						fail: function(res) {
+							uni.showToast({
+								title:res,
+								icon:'none'
+							})
+							that.cancelOrder(that.outTradeNo); //取消订单
+							
+						},
+					},
+
+					/* function(res) {
+						app.globalData.isClick = true;
+						// alert(JSON.stringify(res));
+						//支付完成的逻辑
+					} */
+				);
 
 			},
 
@@ -1003,6 +1142,9 @@
 			border-radius: 45rpx;
 			font-size: 28rpx;
 		}
+
+
+
 	}
 
 	.re {
@@ -1159,4 +1301,66 @@
 
 		}
 	}
+
+	/* 活动金弹窗 */
+	.pr {
+		position: relative;
+	}
+
+	.popImg {
+		width: 100%;
+		height: 100%;
+		min-height: 430px;
+	}
+
+	.popContain {
+		position: absolute;
+		top: 0;
+		// padding: 20px;
+		box-sizing: border-box;
+		text-align: center;
+		font-size: 28rpx;
+
+		.tip-color {
+			color: #BF0E0F;
+		}
+
+		.tip-top {
+			color: white;
+			letter-spacing: 2px;
+		}
+
+		.tip-price {
+			margin-top: 143px;
+			font-weight: bold;
+			display: flex;
+			align-items: baseline;
+			justify-content: center;
+
+			.font45 {
+				font-size: 45px;
+				font-style: oblique;
+				margin-right: 5px;
+			}
+		}
+
+		.tip-desc {
+			font-size: 18px;
+			font-weight: bold;
+			margin-top: 10px;
+		}
+	}
+
+	.btnPay {
+		color: #FFFFFF;
+		background: linear-gradient(to right, #F46538, #E8411A);
+		width: 60%;
+		margin: 22px auto 16px;
+		height: 50px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 25px;
+		font-size: 28rpx;
+	}
 </style>

pages/welcome/welcome.vue

@@ -1,25 +1,35 @@
 <template>
 	<view>
-
 	</view>
 </template>
 
 <script>
-	import {
+import {
 		getH5AccessToken,
-		getAlipayUserId
+		getAlipayUserId,
+		getUnionUserId
 	} from '../../Utils/Api.js';
 	let app = getApp();
 	export default {
 		data() {
 			return {
-
+				appUpIdentifier: ''
 			}
 		},
 		onLoad(options) {
+			//银联
+			if (app.globalData.platformType == 'UQRCODEPAY') {
+				var useragent = navigator.userAgent;
+				var agentname = useragent.split('UnionPay/');
+				var agentno = agentname[1];
+				var agentnoname = agentno.split(')');
+				var lastangetname = agentnoname[0];
+				this.appUpIdentifier = 'UnionPay/' + lastangetname;
+			}
 			var arr1 = window.location.href;
 			var arr2 = arr1.split('=');
-			if (app.globalData.platformType == 'WECHAT' || app.globalData.platformType == 'ALIPAY') {
+			if (app.globalData.platformType == 'WECHAT' || app.globalData.platformType == 'ALIPAY' || app.globalData
+				.platformType == 'UQRCODEPAY') {
 				if (arr2[1].length == 12) {
 					var arr3 = arr2[1].split('#/');
 					app.globalData.snNo = arr3[0];
@@ -31,14 +41,25 @@
 				} else {
 					let that = this;
 					var arr4;
-					arr4 = arr2[2].split('&');
+					if (app.globalData.platformType == 'UQRCODEPAY') {
-					app.globalData.code = arr4[0];
+						arr4 = arr2[1].split('&');
-					uni.getStorage({
+						app.globalData.code = arr4[0];
-						key: 'snNumber',
+						uni.getStorage({
-						success(e) {
+							key: 'snNumber',
-							app.globalData.snNo = e.data;
+							success(e) {
-						}
+								app.globalData.snNo = e.data;
-					})
+							}
+						})
+					} else {
+						arr4 = arr2[2].split('&');
+						app.globalData.code = arr4[0];
+						uni.getStorage({
+							key: 'snNumber',
+							success(e) {
+								app.globalData.snNo = e.data;
+							}
+						})
+					}
 				}
 
 				if (app.globalData.code && app.globalData.platformType == 'WECHAT') {
@@ -47,6 +68,9 @@
 				if (app.globalData.code && app.globalData.platformType == 'ALIPAY') {
 					this.getAlipayUserId();
 				}
+				if (app.globalData.code && app.globalData.platformType == 'UQRCODEPAY') {
+					this.getUnionUserId();
+				}
 			} else {
 				var arr1 = window.location.href;
 				var arr2 = arr1.split('=');
@@ -60,9 +84,10 @@
 					url: '../index/index'
 				})
 			}
+
+
 		},
 		methods: {
-
 			//H5 微信获取openId
 			getH5AccessToken() {
 				let params = {
@@ -71,10 +96,11 @@
 				getH5AccessToken(params).then(res => {
 					if (res.return_code == '000000' && res.return_data.openid) {
 						app.globalData.openId = res.return_data.openid;
-						uni.setStorage({
+						uni.setStorageSync("openId",res.return_data.openid)
+						/* uni.setStorage({
 							key: "openId",
 							data: res.return_data.openid
-						})
+						}) */
 						uni.reLaunch({
 							url: '../index/index'
 						})
@@ -91,10 +117,34 @@
 				getAlipayUserId(params).then(res => {
 					if (res.return_code == '000000' && res.return_data.userId) {
 						app.globalData.openId = res.return_data.userId;
-						uni.setStorage({
+						uni.setStorageSync("openId",res.return_data.userId)
+						/* uni.setStorage({
 							key: "openId",
 							data: res.return_data.userId
+						}) */
+						uni.reLaunch({
+							url: '../index/index'
 						})
+					} else {
+						this.jumpWeb();
+					}
+				});
+			},
+			//云闪付获取openid
+			getUnionUserId() {
+				let params = {
+					"serialNumber": app.globalData.snNo,
+					"userAuthCode": app.globalData.code,
+					"appUpIdentifier": this.appUpIdentifier
+				}
+				getUnionUserId(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.respData.userId) {
+						app.globalData.openId = res.return_data.respData.userId;
+						uni.setStorageSync("openId",res.return_data.respData.userId);
+						/* uni.setStorage({
+							key: "openId",
+							data: res.return_data.respData.userId
+						}) */
 						uni.reLaunch({
 							url: '../index/index'
 						})
@@ -105,13 +155,19 @@
 			},
 			//重定向方法
 			jumpWeb() {
+				let redirectUrl = app.globalData.redirectUrl;
 				if (app.globalData.platformType == 'WECHAT') {
 					location.href =
-						'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/scanPay&response_type=code&scope=snsapi_base#wechat_redirect';
+						'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri='+redirectUrl+'&response_type=code&scope=snsapi_base#wechat_redirect';
 				}
 				if (app.globalData.platformType == 'ALIPAY') {
+					let str =encodeURIComponent(redirectUrl+"?sn=1000017476")
+					location.href =
+						'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https://pay.dctpay.com/redirect?redirect_uri='+str;
+				}
+				if (app.globalData.platformType == 'UQRCODEPAY') {
 					location.href =
-						'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https://pay.dctpay.com/redirect?redirect_uri=https%3A%2F%2Fpay.dctpay.com%2FscanPay%3Fsn%3D1000017476';
+						'https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl='+redirectUrl;
 				}
 			},
 		}