1.修改话费充值

high-unionPay/Utils/Api.js

@@ -169,12 +169,14 @@ export const getListOutRechargePrice = params => {
 export const orderToUNionPay = params => {
 	return POST('POST', `${base}/outRechargeOrder/orderToPay`, params).then(res => res.data);
 }
-
 //银联提交订单
 export const unionPay = params => {
 	return POST('POST', `${base}/order/unionPay`, params).then(res => res.data);
 }
-
+// 银联话费充值
+export const orderToUnionPayphone = params => {
+	return POST('POST', `${base}/outRechargeOrder/orderToUnionPay`, params).then(res => res.data);
+}
 
 
 /**

high-unionPay/manifest.json

@@ -80,7 +80,7 @@
                 }
             }
         },
-        "title" : "嗨森逛",
+        "title" : "嗨加油",
         "router" : {
             "mode" : "hash",
             "base" : "/unionPay"
@@ -89,7 +89,7 @@
             "port" : "",
             "https" : false
         },
-        "domain" : "https://hsg.dctpay.com",
+        "domain" : "https://hsgcs.dctpay.com",
         "template" : "index.html"
     }
 }

high-unionPay/pages/pay/payment/payment.vue

@@ -18,7 +18,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-					<view class="row" @tap="paytype='jinbi'" v-if="pryType == 2 || pryType==3 ">
+					<view class="row" @tap="paytype='jinbi'">
 						<view class="left">
 							<image src="../../../static/img/jfx.png"></image>
 						</view>
@@ -34,13 +34,13 @@
 							<image style="border-radius: 50%;" src="../../../static/img/ghkpay.png"></image>
 						</view>
 						<view class="center">
-							汇联通工会卡(余额:{{tongCardPrice}}元)
+							银联支付
 						</view>
 						<view class="right">
-							<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
+							<radio :checked="paytype=='gonghuika'" color="#0083f5" />
 						</view>
 					</view>
-					<view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 ">
+					<!-- <view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 ">
 						<view class="left">
 							<image :src="imagewxUrl+imgadres"></image>
 						</view>
@@ -50,7 +50,7 @@
 						<view class="right">
 							<radio :checked="paytype=='wxpay'" color="#0083f5" />
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -71,8 +71,8 @@
 	import {
 		orderToPay,
 		orderToGoldPay,
-		getHuiLianTongCardBalance,
+		hltUnionCardPay,
-		hltUnionCardPay
+		unionPay
 	} from '../../../Utils/Api.js'
 	import ssPaymentPassword from '../../../components/sanshui-payment-password'
 	let app = getApp();
@@ -115,98 +115,13 @@
 		onShow() {
 			let that = this;
 			that.user = app.globalData.userInfo;
-			that.getHuiLianTongCardBalance();
 		},
 		methods: {
-			//获取选择支付方式
-			changeRiado() {
-				if (!this.user.isSetHltCard) {
-					uni.showToast({
-						icon: 'none',
-						title: '当前账号还未绑定,前往绑定',
-						duration: 2000,
-						success() {
-							setTimeout(() => {
-								uni.navigateTo({
-									url: '../../user/bindingCard/bindingCard'
-								})
-							}, 1000)
-						}
-					});
-					return;
-				}
-			},
-			//查询工会卡余额
-			//查询详情
-			getHuiLianTongCardBalance() {
-				let params = {
-					cardNo: this.user.hltCardNo.cardNo
-				}
-				getHuiLianTongCardBalance(params).then(res => {
-					if (res.return_code == '000000') {
-						this.tongCardPrice = res.return_data.balance;
-					}
 
-				});
-			},
 			//获取订单数据
 			orderToPay() {
 				let that = this;
-				if (that.paytype == 'wxpay') {
+				if (that.paytype == 'jinbi') {
-
-					let params = {
-						"orderId": that.orderNo,
-						"openId": app.globalData.openId,
-						"orderScene": "GOODS_ORDER"
-					}
-					orderToPay(params).then(res => {
-						if (res.return_code == '000000') {
-							// #ifdef MP
-							uni.showLoading({
-								title: '支付中...'
-							})
-							uni.requestPayment({
-								"appId": res.return_data.appId,
-								"nonceStr": res.return_data.nonceStr,
-								"package": res.return_data.package,
-								"paySign": res.return_data.sign,
-								"signType": "MD5",
-								"timeStamp": res.return_data.timeStamp,
-								success: function(res) {
-									uni.hideLoading();
-									uni.showToast({
-										title: '支付成功'
-									})
-									if (that.jumpType == 4) {
-										uni.reLaunch({
-											url: '/pages/tabBar/user/user'
-										});
-										return;
-									}
-									uni.reLaunch({
-										url: '../success/success?id=' + that.couponId
-									});
-								},
-								fail: function(err) {
-									uni.hideLoading();
-								},
-							});
-							// #endif
-
-							//判断是否是公众号
-							// #ifdef H5
-							//判断微信浏览器
-							that.payRequest(res);
-							// #endif
-
-						} else {
-							uni.showToast({
-								title: res.return_msg,
-								icon: 'none'
-							})
-						}
-					})
-				} else if (that.paytype == 'jinbi') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'
@@ -215,35 +130,56 @@
 					}
 					that.$refs.paymentPassword.modalFun('show');
 				} else if (that.paytype == 'gonghuika') {
-					if (!that.user.isSetPayPwd) {
+					that.unionPay();
-						uni.navigateTo({
+				} else {
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					if (!that.user.isSetHltCard) {
 					uni.showToast({
+						title: '请选择支付方式',
 						icon: 'none',
-							title: '当前账号还未绑定,前往绑定',
+						duration: 2000
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '../../user/bindingCard/bindingCard'
 					})
-								}, 1000)
 				}
-						});
+			},
-						return;
+			//银联获取信息
+			unionPay() {
+				let goods = {
+					"orderId": this.orderNo
 				}
-					that.$refs.paymentPassword.modalFun('show');
+				unionPay(goods).then(res => {
+					if (res.return_code == '000000') {
+						this.uniontopay(res.return_data.prepayid);
 					} else {
 						uni.showToast({
-						title: '请选择支付方式',
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//银联支付
+			uniontopay(item) {
+				let that = this;
+				upsdk.pluginReady(function() {
+					upsdk.pay({
+						tn: item,
+						success: function(res) {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../success/success?id=' + this.couponId
+							});
+						},
+						fail: function(err) {
+							uni.showToast({
+								title: err.msg,
 								icon: 'none',
 								duration: 2000
 							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
 						}
+					});
+				});
 			},
 			submitHandle(e) {
 				this.PaymentPassword = e.value;

high-unionPay/pages/tabBar/user/user.vue

@@ -63,9 +63,9 @@
 						<uni-badge  text="1" type="error" />
 					</view> -->
 
-					<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
+					<uni-badge style="width: 20px;position: absolute; right: 53%;" v-if="row.text == '我的卡券' && textnum "
 						:text="textnum" type="error" size="normal"></uni-badge>
-					<uni-badge style="width: 20px;position: absolute; right: 53%;"
+					<uni-badge style="width: 20px;position: absolute; right: 30%;"
 						v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
 					<view class="img">
 						<image :src="imagewxUrl+row.img"></image>
@@ -492,7 +492,7 @@
 		padding-left: 20px;
 		padding-right: 20px;
 		text-align: right;
-		height: 100upx;
+		height: 50upx;
 		/*  #ifdef  APP-PLUS  */
 		margin-top: var(--status-bar-height);
 

high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue

@@ -61,14 +61,11 @@
 </template>
 
 <script>
-	// #ifdef H5
-	var jweixin = require('jweixin-module');
-	// #endif
 	let app = getApp();
 	import {
 		getListOutRechargePrice,
 		addOrderPay,
-		orderToUNionPay
+		orderToUnionPayphone
 	} from '../../../Utils/Api.js';
 	export default {
 		data() {
@@ -167,11 +164,8 @@
 				addOrderPay(params).then(res => {
 					uni.hideLoading()
 					if (res.return_code == '000000') {
-						let params = {
+						this.orderToUnionPayphone(res.return_data.id);
-							"orderId": res.return_data.id,
+						
-							"openId": app.globalData.openId
-						}
-						this.orderToUNionPay(params);
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -179,17 +173,15 @@
 						})
 					}
 				})
-
 			},
 			//获取订单信息
-			orderToUNionPay(item) {
+			orderToUnionPayphone(item) {
-				orderToUNionPay(item).then(res => {
+				let params = {
+					"orderId" : item
+				}
+				orderToUnionPayphone(params).then(res => {
 					if (res.return_code == '000000') {
-						//判断是否是公众号
+						this.uniontopay(res.return_data.prepayid);
-						// #ifdef H5
-						//判断微信浏览器
-						this.payRequest(res);
-						// #endif
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -198,63 +190,29 @@
 					}
 				})
 			},
-			//唤起支付
+			//银联支付
-			payRequest: function(self) {
+			uniontopay(item) {
-				uni.showLoading({
+				let that = this;
-					title: '支付中...'
+				upsdk.pluginReady(function() {
-				})
+					upsdk.pay({
-				jweixin.config({
+						tn: item,
-					// debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-					appId: self.return_data.appId, // 必填，公众号的唯一标识
-					timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
-					nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串
-					signature: self.return_data.sign, // 必填，签名，见附录1
-					jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-				});
-				uni.hideLoading();
-				jweixin.ready(function() {
-					jweixin.checkJsApi({
-						jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
-						success: function(res) {},
-						fail: function(res) {}
-					});
-					jweixin.chooseWXPay({
-						appId: self.return_data.appId,
-						timestamp: self.return_data
-							.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
-						nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位
-						package: self.return_data
-							.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
-						signType: 'MD5', // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
-						paySign: self.return_data.sign, // 支付签名
 						success: function(res) {
-							// 支付成功后的回调函数
 							uni.showToast({
 								title: '支付成功'
 							})
-							if (that.jumpType == 4) {
 							uni.reLaunch({
 								url: '/pages/tabBar/user/user'
 							});
-								return;
-							}
-							uni.reLaunch({
-								url: '../success/success?id=' + that.couponId
-							});
 						},
-						cancel: function(r) {},
+						fail: function(err) {
-						fail: function(res) {}
-					});
-				});
-
-				jweixin.error(function(res) {
 							uni.showToast({
+								title: err.msg,
 								icon: 'none',
-						title: '支付失败了',
+								duration: 2000
-						duration: 4000
+							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
+						}
 					});
-					// config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
-					/*alert("config信息验证失败");*/
 				});
 			},
 		}

high-unionPay/pages/unionPay/unionPay.vue

@@ -1,43 +1,33 @@
 <template>
 	<view>
 		<image class="width90" mode="widthFix" src="../../static/img/unionimg/union1.jpg" @click="jumpunionpay"></image>
-		<image class="width90" mode="widthFix" src="../../static/img/unionimg/union2.jpg" @click="topay"></image>
+		<image class="width90" mode="widthFix" src="../../static/img/unionimg/union2.jpg"></image>
-		<view class="mart15 font16 fcor333">{{arr3}}</view>
-		<view class="mart15 font16 fcor333">{{arr4}}</view>
-		<view class="mart15 font16 fcor333">{{arr5}}</view>
-		<view class="mart15 font16 fcor333">支付信息{{arr6}}</view>
 
 	</view>
 </template>
 
 <script>
+	let app = getApp()
 	export default {
 		data() {
 			return {
-				arr3: '',
+				
-				arr4: '',
-				arr5: [],
-				arr6:''
 			}
 		},
 		onLoad(options) {
-		
+			uni.getStorage({
-
+				key: "user",
-
+				success(e) {
-
+					app.globalData.userInfo = e.data //这就是你想要取的token
-			// if (JSON.stringify(options) != "{}") {
+					uni.getStorage({
-			// 	this.arr3 = decodeURIComponent(options)
+						key: 'token',
-			// 	this.arr4 = options;
+						success(e) {
-			// 	let arr = [];
+							app.globalData.token = e.data;
-			// 	for (let s of options) {
+						}
-			// 		const item = {
+					})
-			// 			key: s,
+				},
-			// 			value: options[s]
+				fail: res => {}
-			// 		}
+			})
-			// 		arr.push(item);
-			// 	}
-			// 	this.arr5 = arr;
-			// }
 		},
 		methods: {
 			//发起支付
@@ -47,13 +37,9 @@
 						tn: '554191640461075760517',
 						mode:'00',
 						success: function(res) {
-							console.log('======='+res)
-							this.arr6 = JSON.stringify(res);
 							// 支付成功, 开发者执行后续操作。
 						},
 						fail: function(err) {
-							console.log('======='+err)
-							this.arr6 = JSON.stringify(err.msg);
 							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
 						}
 					});