1.增加工会卡支付

Utils/Api.js

@@ -325,4 +325,7 @@ export const getListOutRechargePrice = params => {
 //提交订单
 export const orderToUNionPay = params => {
 	return POST('POST', `${base}/outRechargeOrder/orderToPay`, params).then(res => res.data);
-}
+}
+export const hltUnionCardPayUnion = params => {
+	return POST('POST', `${base}/outRechargeOrder/hltUnionCardPay`, params).then(res => res.data);
+}

pages/tabBar/user/user.vue

@@ -74,6 +74,7 @@
 				</view>
 			</view>
 		</view>
+
 		<!-- 我的推广 -->
 		<view class="toolbar" style="margin-top: 20px;">
 			<view class="title">推广中心</view>
@@ -201,7 +202,7 @@
 						text: '我的推广',
 						img: 'user/renw.png'
 					}
-					
+
 					// ,
 					// {
 					// 	url: '/pages/user/Charge/Charge',
@@ -243,7 +244,7 @@
 		},
 		onShow() {
 			// if (app.globalData.userInfo) {
-				this.findUser();
+			this.findUser();
 			// }
 
 			if (!app.globalData.userInfo.isSetPayPwd) {

subPages/unionComfirmation/unionComfirmation.vue

@@ -64,7 +64,7 @@
 		<view class="width100 height60"></view>
 		<view class="footer">
 			<view class="settlement">
-				<view class="sum">实付:<view class="money" v-if="paytype == 'weixin'">￥{{orderPrice}}</view>
+				<view class="sum">实付:<view class="money" v-if="paytype == 'weixin' || paytype == 'gonghuika' ">￥{{orderPrice}}</view>
 					<view class="money aliitem" v-else>
 						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../static/img/jfx.png">
 						</image>{{orderPrice*100}}
@@ -93,7 +93,8 @@
 		findUser,
 		orderToGoldPay,
 		orderToGoldPayunion,
-		hltUnionCardPay
+		hltUnionCardPayUnion,
+		getHuiLianTongCardBalance
 	} from '../../Utils/Api.js';
 	import ssPaymentPassword from '../../components/sanshui-payment-password';
 	let app = getApp();
@@ -163,7 +164,7 @@
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
-						// this.getHuiLianTongCardBalance();
+						this.getHuiLianTongCardBalance();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
@@ -406,15 +407,15 @@
 					"cardNo": this.user.hltCardNo.cardNo,
 					"password": this.PaymentPassword
 				}
-				hltUnionCardPay(params).then(res => {
+				hltUnionCardPayUnion(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						uni.showToast({
 							title: '支付成功'
 						})
-						uni.reLaunch({
+						uni.switchTab({
-							url: '../pay/success/success?id=' + this.couponId
+							url:'../../pages/tabBar/user/user'
-						});
+						})
 						return;
 					}
 					if (res.return_code == '102130') {