From 6161f5c2d389a1566dd0b86518b1d6cd45210b81 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 26 Jun 2024 11:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E4=B9=B0=E5=8D=95=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E5=81=9C=E7=95=99=E5=9C=A8=E4=B9=B0=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=80=8C=E6=98=AF=E8=BF=9B=E5=85=A5=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_pay_status/index.vue             | 18 +++++++++++++++---
 pages/users/online_payment/payment/index.vue |  7 ++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index 4d48e58..e62fd30 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -14,7 +14,11 @@
 					<view class='itemCom'>{{order_pay_info.group_order_sn}}</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'>
-					<view>{{order_type== 20 ? '兑换时间' : '下单时间'}}</view>
+					<view>
+            <text v-if="order_type== 20">兑换时间</text>
+            <text v-else-if="order_pay_info.activity_type == 30">买单时间</text>
+            <text v-else>下单时间</text>
+          </view>
 					<view class='itemCom'>{{order_pay_info.create_time}}</view>
 				</view>
 				<view v-if="order_type== 20" class='item acea-row row-between-wrapper'>
@@ -47,7 +51,10 @@
 			</view>
 			<!--失败时： 重新购买 -->
 			<view @tap="goOrderDetails">
-				<button formType="submit" class='returnBnt gColor' hover-class='none'>查看订单</button>
+				<button formType="submit" class='returnBnt gColor' hover-class='none'>
+          <view v-if="order_pay_info.activity_type == 30">买单记录</view>
+          <view v-else>查看订单</view>
+        </button>
 			</view>
 			<button @click="goPink(order_pay_info.activity_id)" class='returnBnt s-Color' formType="submit" hover-class='none' v-if="order_pay_info.activity_type == 4 && order_pay_info.paid">邀请好友参团</button>
 			<button v-if="!order_pay_info.paid || order_pay_info.activity_type != 4" @click="goIndex" class='returnBnt s-Color' formType="submit" hover-class='none'>返回首页</button>
@@ -214,12 +221,17 @@
           uni.navigateTo({
             url: '/pages/users/order_list/index?is_with_goods=1'
           });
+        }else if(that.order_pay_info.activity_type == 30){
+          uni.navigateTo({
+            url: '/pages/users/online_payment/payment/record'
+          });
         }else{
           if(that.order_type == 20){
             uni.navigateTo({
               url: '/pages/points_mall/exchange_record?delte=1'
             })
-          }else{
+          }
+          else{
             if (that.order_pay_info.paid == 0) {
               uni.navigateTo({
                 url: '/pages/users/order_list/index'
diff --git a/pages/users/online_payment/payment/index.vue b/pages/users/online_payment/payment/index.vue
index ce9c640..2b70de5 100644
--- a/pages/users/online_payment/payment/index.vue
+++ b/pages/users/online_payment/payment/index.vue
@@ -240,13 +240,14 @@ export default {
       });
       onlinePayment(payInfo).then(res => {
         if (res.status == 200) {
-          let backUrl = `/pages/users/online_payment/payment/index?mer_id=${_this.mer_search.mer_id}`;
-          let backTab = 5;
           let status = res.data.status,
               orderId = res.data.result.order_id,
               callback_key = res.data.result.pay_key,
               jsConfig = res.data.result.config;
-          // let goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message;
+
+          let backUrl = '/pages/order_pay_status/index?order_type=30&order_id=' + orderId + '&msg=' + res.message;
+          let backTab = 5;
+
           let goPages = backUrl;
           switch (status) {
             case 'ORDER_EXIST':