From d1f0e5fbd49e6acf33bda6e99d41b393093af937 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Wed, 13 Jul 2022 18:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/detail/modules/Operation.vue | 12 ++++++++++--
 src/pages/order/list.vue                     | 15 ++++++++++-----
 src/pages/order/submit.vue                   | 12 ++++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/pages/order/detail/modules/Operation.vue b/src/pages/order/detail/modules/Operation.vue
index e9108ac..aeb3776 100644
--- a/src/pages/order/detail/modules/Operation.vue
+++ b/src/pages/order/detail/modules/Operation.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 17:46:10
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 17:18:01
+ * @LastEditTime: 2022-07-13 18:20:38
  * @Description: file content
 -->
 <template>
@@ -59,6 +59,7 @@ import {ApiPutCancelOrder,ApiPutOrderReceive} from '@/common/api/order';
 import {ApiPostCashierPrepay} from '@/common/api/pay';
 import BsPay from '../../../../components/BsPay.vue';
 import ORDER from '@/common/dicts/order';
+const ENV = process.env;
 export default {
 	components: { UiButton, UiCell, BsPay },
 	props : {
@@ -130,7 +131,14 @@ export default {
 		},
 		async handlePay(){
 
-			const {error, result} = await ApiPostCashierPrepay({orderId:this.orderInfo.orderId});
+			let payType = 'wxjsapi'
+			if(!this.$store.state.openId){
+				payType = 'h5'
+			}
+			const {error, result} = await ApiPostCashierPrepay({
+				orderId:this.orderInfo.orderId,
+				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${this.orderInfo.orderId}&payType=${payType}`
+			});
 			if(error){
 				uni.$u.toast(error.message);
 				return false;
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index 6828431..ff1c2a7 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 17:17:38
+ * @LastEditTime: 2022-07-13 18:21:13
  * @Description: file content
 -->
 <template>
@@ -62,6 +62,7 @@ import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
 import UiGoodsInfoMax from '../../components/UiGoodsInfoMax.vue';
 import UiMoney from '../../components/UiMoney.vue';
 import ORDER from '@/common/dicts/order';
+const ENV = process.env;
 
 export default {
 	components: { BsEmpty, UiButton, BsPay, UiGoodsInfo, UiGoodsInfoMax, UiMoney },
@@ -135,11 +136,15 @@ export default {
 		 * 立即支付
 		 */
 		async handlePay(item){
-			const {error, result} = await ApiPostCashierPrepay({orderId:item.orderId});
-			if(error){
-				uni.$u.toast(error.message);
-				return false;
+
+			let payType = 'wxjsapi'
+			if(!this.$store.state.openId){
+				payType = 'h5'
 			}
+			const {error, result} = await ApiPostCashierPrepay({
+				orderId:item.orderId,
+				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${item.orderId}&payType=${payType}`
+			});
 			
 
 			// #ifdef H5
diff --git a/src/pages/order/submit.vue b/src/pages/order/submit.vue
index 646f2eb..99424e1 100644
--- a/src/pages/order/submit.vue
+++ b/src/pages/order/submit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-07-13 14:08:54
+ * @LastEditTime: 2022-07-13 18:18:18
  * @Description: file content
 -->
 <template>
@@ -62,6 +62,7 @@ import {Wxpay, Alipay} from '@/common/utils';
 import UiButton from '@/components/UiButton.vue';
 import UiWhiteBox from '../../components/UiWhiteBox.vue';
 import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
+const ENV = process.env;
 export default {
 	components : {UiCell, UiButton, UiWhiteBox, UiGoodsInfo },
 	data(){
@@ -174,7 +175,14 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			const {error:er, result:res} = await ApiPostCashierPrepay({orderId:result.orderId});
+			let payType = 'wxjsapi'
+			if(!this.$store.state.openId){
+				payType = 'h5'
+			}
+			const {error:er, result:res} = await ApiPostCashierPrepay({
+				orderId:result.orderId,
+				returnUrl :  `${ENV.VUE_APP_STATIC_URL}/payResult?orderId=${result.orderId}&payType=${payType}`
+			});
 			if(er){
 				uni.$u.toast(er.message);
 				return false;