1.修改话费充值 图片

2.修改工会卡充值 跳转成功页面

pages.json

@@ -18,7 +18,7 @@
 					}]
 				}
 			}
-		},{
+		}, {
 			"path": "pages/qianZhuPay/union-pay/union-pay",
 			"style": {
 				"navigationBarTextStyle": "white",
@@ -639,6 +639,16 @@
 					"navigationBarTextStyle": "white"
 				}
 
+			}, {
+				"path": "union-card-success/union-card-success",
+				"style": {
+					"navigationBarTitleText": "充值成功",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
 			}
 		]
 	}],

pages/user/cardDes/cardDes.vue

@@ -104,7 +104,7 @@
 			unionCardPay() {
 				uni.navigateTo({
 					url: '../../../subPages/trade-union-recharge/trade-union-recharge?cardId=' + this.user
-						.hltCardNo.cardNo
+						.hltCardNo.cardNo + '&RechargeType=1'
 				})
 			}
 		}

subPages/trade-union-recharge/trade-union-recharge.vue

@@ -83,11 +83,13 @@
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres: 'wxpay.png',
 				tongCardPrice: 0,
-				cardId: '' //工会卡号
+				cardId: '', //工会卡号
+				typevas: ''
 			};
 		},
 		onLoad(options) {
 			this.cardId = options.cardId;
+			this.typevas = options.RechargeType;
 		},
 		onShow() {
 			this.user = app.globalData.userInfo;
@@ -150,6 +152,7 @@
 						"goodsPrice": this.inputAmount
 					}]
 				}
+				let that = this;
 				addOrder(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
@@ -180,7 +183,15 @@
 											duration: 2000,
 											success() {
 												setTimeout(() => {
+													if (that.typevas == 'Hlt') {
+														uni.navigateTo({
+															url: '../union-card-success/union-card-success?price=' +
+																that
+																.inputAmount
+														})
+													} else {
 														uni.navigateBack({})
+													}
 												}, 1000)
 											}
 										});

subPages/union-card-success/union-card-success.vue

@@ -0,0 +1,34 @@
+<template>
+	<view>
+		<image src="../static/coupsucces.png" mode="widthFix" class="sucimg mart40"></image>
+		<view class="width90 clor4cd964 mart30 font18 fotct">支付成功</view>
+		<view class="width90 fcor333 mart30 font48 fotct">¥ {{sucprice}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				sucprice:''
+			}
+		},
+		onLoad(options) {
+			this.sucprice = options.price;
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="less">
+	.sucimg {
+		width: 20%;
+		margin-left: 40%;
+	}
+
+	.clor4cd964 {
+		color: #76b554;
+	}
+</style>

subPages/unionComfirmation/unionComfirmation.vue

@@ -81,6 +81,7 @@
 				</view>
 			</view>
 		</view>
+		<image src="../static/union5.jpg" class="width100 mart20 marb30" mode="widthFix"></image>
 		<view class="width100 height60"></view>
 		<view class="footer">
 			<view class="settlement">
@@ -430,6 +431,21 @@
 						}
 					})
 				} else if (that.paytype == 'jinbi') {
+					if (that.user.gold < that.payPrice * 100) {
+						uni.showToast({
+							icon: 'none',
+							title: '积分不足',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/deposit/deposit'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../pages/login/updatePas/updatePas'
@@ -438,6 +454,14 @@
 					}
 					that.$refs.paymentPassword.modalFun('show');
 				} else if (that.paytype == 'gonghuika') {
+					if (that.tongCardPrice < that.payPrice) {
+						uni.showToast({
+							icon: 'none',
+							title: '工会卡余额不足',
+							duration: 2000,
+						});
+						return;
+					}
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../pages/login/updatePas/updatePas'
@@ -520,11 +544,17 @@
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						uni.showToast({
-							title: '支付成功'
-						})
+							icon: 'none',
+							title: '支付成功',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
 									uni.switchTab({
 										url: '../../pages/tabBar/user/user'
 									})
+								}, 1000)
+							}
+						});
 						return;
 					}
 					if (res.return_code == '102130') {
@@ -535,7 +565,8 @@
 					}
 					uni.showToast({
 						title: res.return_msg,
-						icon: 'none'
+						icon: 'none',
+						duration:2000
 					})
 				})