From d8158babc318426f4658fea0d20cd6f77f6ce843 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 2 Nov 2022 16:55:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=202.0=20=E9=A6=96=E9=A1=B5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/home/home.vue                    |  4 +-
 .../unionComfirmation/unionComfirmation.vue   | 94 ++++++++++++-------
 2 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index d94b2c6..08f794c 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<!-- 状态栏 -->
-		<view v-if="showHeader && isdisplay" class="status"
+		<view v-if="showHeader && !isdisplay" class="status"
 			:style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view>
 		<!-- 顶部导航栏 -->
 		<view v-if="showHeader && !isdisplay" class="header"
@@ -31,7 +31,7 @@
 				<!-- #endif -->
 			</view>
 		</view>
-		<view v-if="isdisplay">
+		<view style="height: 100%;background-color: red;" v-if="isdisplay">
 			<image :src="imagewxUrl+imgadres5" class="width40w mart90" mode="widthFix"></image>
 		</view>
 		
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 8c53d58..9a772a1 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -185,11 +185,11 @@
 
 <script>
 	import {
-		addOrderPay,
-		orderToPayByWx,
+		create,
+		wechatPay,
 		findUser,
 		orderToGoldPayunion,
-		hltUnionCardPayghk,
+		cardPay,
 		getHuiLianTongCardBalance,
 		loginByPhone,
 		getUserOrderPreList,
@@ -281,7 +281,7 @@
 					platformId: showType,
 					id: this.objectId
 				}
-				findById(datas).then(res => {
+				findById(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.rechargeDes = res.return_data;
@@ -306,8 +306,8 @@
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
 						this.findById();
-						if (this.user.hltCardNo) {
-							this.getHuiLianTongCardBalance();
+						if (this.user.hltCardNo) {
+							this.getHuiLianTongCardBalance();
 						}
 						this.getRebateIntegral();
 						uni.setStorage({
@@ -443,7 +443,7 @@
 				} else {
 					this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
 						.deductionPrice).toFixed(2);
-				}
+				}
 				this.getRebateIntegral();
 			},
 			rechangeload() {
@@ -515,22 +515,27 @@
 					title: '提交订单中...'
 				})
 				let params = {
+					"childOrderList": [{
+						"goodsId": that.objectId,
+						"goodsType": 6,
+						"rechargeContent": that.rechargeContent,
+						"saleCount": 1
+					}],
+					"payGold": that.priceValue[1],
+					"companyId": app.globalData.companyId,
 					"memDiscountId": that.memDiscountId,
-					"rechargeContent": that.rechargeContent,
-					"goodsId": that.objectId,
-					"integralNum": that.priceValue[1],
-					"password": ''
+					"payPwd": ""
 				}
-				addOrderPay(params).then(res => {
+				create(params).then(res => {
 					if (res.return_code == '000000') {
 						uni.hideLoading();
-						that.orderId = res.return_data.id;
+						that.orderId = res.return_data.orderNo;
 						let params = {
 							"orderId": res.return_data.id,
 							"openId": app.globalData.openId,
 							"openIdType": 2
 						}
-						that.orderToPayByWx(params);
+						that.wechatPay(params);
 					} else {
 						uni.hideLoading();
 						uni.showToast({
@@ -549,21 +554,37 @@
 							title: '提交订单中...'
 						})
 						let params = {
+							"childOrderList": [{
+								"goodsId": that.objectId,
+								"goodsType": 6,
+								"rechargeContent": that.rechargeContent,
+								"saleCount": 1
+							}],
+							"payGold": that.priceValue[1],
+							"companyId": app.globalData.companyId,
 							"memDiscountId": that.memDiscountId,
-							"rechargeContent": that.rechargeContent,
-							"goodsId": that.objectId,
-							"integralNum": that.priceValue[1],
-							"password": ''
-						}
-						addOrderPay(params).then(res => {
+							"payPwd": ""
+						}
+						
+						create(params).then(res => {
 							if (res.return_code == '000000') {
 								uni.hideLoading();
-								that.orderId = res.return_data.id;
+								that.orderId = res.return_data.orderNo;
+								// #ifdef H5
+								let params = {
+									"orderNo": res.return_data.orderNo,
+									"openId": app.globalData.openId,
+									"openIdType": 2
+								}
+								// #endif
+								// #ifdef MP
 								let params = {
-									"orderId": res.return_data.id,
-									"openId": app.globalData.openId
+									"orderNo": res.return_data.orderNo,
+									"openId": app.globalData.openId,
+									"openIdType": 1
 								}
-								that.orderToPayByWx(params);
+								// #endif
+								that.wechatPay(params);
 							} else {
 								uni.hideLoading();
 								uni.showToast({
@@ -601,10 +622,10 @@
 				this.$refs.popup.show();
 			},
 			//获取订单数据
-			orderToPayByWx(item) {
+			wechatPay(item) {
 				let that = this;
 				if (that.paytype == '2') {
-					orderToPayByWx(item).then(res => {
+					wechatPay(item).then(res => {
 						if (res.return_code == '000000') {
 							// #ifdef MP
 							uni.showLoading({
@@ -702,16 +723,21 @@
 				}
 				if (this.payPrice == 0) {
 					let params = {
+						"childOrderList": [{
+							"goodsId": this.objectId,
+							"goodsType": 6,
+							"rechargeContent": this.rechargeContent,
+							"saleCount": 1
+						}],
+						"payGold": this.priceValue[1],
+						"companyId": app.globalData.companyId,
 						"memDiscountId": this.memDiscountId,
-						"rechargeContent": this.rechargeContent,
-						"goodsId": this.objectId,
-						"integralNum": this.priceValue[1],
-						"password": this.PaymentPassword
+						"payPwd": this.PaymentPassword
 					}
-					addOrderPay(params).then(res => {
+					create(params).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
-							this.orderId = res.return_data.id;
+							this.orderId = res.return_data.orderNo;
 							uni.reLaunch({
 								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
 									this.orderId
@@ -733,11 +759,11 @@
 					return;
 				}
 				let params = {
-					"orderId": this.orderId,
+					"orderNo": this.orderId,
 					"cardNo": this.user.hltCardNo.cardNo,
 					"password": this.PaymentPassword
 				}
-				hltUnionCardPayghk(params).then(res => {
+				cardPay(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						uni.showToast({