From accf24ad197688cedd884fe96e636ec3910a59f3 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 6 Aug 2025 18:24:10 +0800
Subject: [PATCH] fix order

---
 .../groupon/components/confirm_template.vue        |  3 ++-
 .../groupon/pages/confirm_order/ticket.vue         |  2 +-
 .../groupon/pages/confirm_order/venue.vue          |  2 +-
 src/subpackage/order/components/detail/goods.vue   | 21 ++++++++++++++------
 src/subpackage/order/components/detail/verify.vue  | 23 ++++++++++++++++------
 src/subpackage/order/pages/detail.vue              |  1 +
 6 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/subpackage/groupon/components/confirm_template.vue b/src/subpackage/groupon/components/confirm_template.vue
index 79a61f4..8eaaeb8 100644
--- a/src/subpackage/groupon/components/confirm_template.vue
+++ b/src/subpackage/groupon/components/confirm_template.vue
@@ -74,10 +74,11 @@ onLoad(() => {
             position: fixed;
             left: 0;
             bottom: 0;
+            z-index: 10;
             width: 100%;
             padding: 10upx 24upx;
-            @include isPd(10upx);
             background-color: #fff;
+            @include isPd(10upx);
             // @include ctf;
             // .cf-btn{
             //     @include clearBtn;
diff --git a/src/subpackage/groupon/pages/confirm_order/ticket.vue b/src/subpackage/groupon/pages/confirm_order/ticket.vue
index 8205240..3d3104a 100644
--- a/src/subpackage/groupon/pages/confirm_order/ticket.vue
+++ b/src/subpackage/groupon/pages/confirm_order/ticket.vue
@@ -73,7 +73,7 @@ function confirmBtn(){
             hideLoad();
             // console.warn('verifyCertificates success', res);
             // showModal({ content: '核销成功！' })
-            routeTo(`/subpackage/groupon/pages/exchange_success?brand_id=${_sVal?.brand_id ?? ''}&verify_token=${verify_token.value ?? ''}`);
+            routeTo(`/subpackage/groupon/pages/exchange_success?brand_id=${_sVal?.brand_id ?? ''}&verify_token=${verify_token.value ?? ''}`, 'rL');
         },
         fail(err){
             hideLoad();
diff --git a/src/subpackage/groupon/pages/confirm_order/venue.vue b/src/subpackage/groupon/pages/confirm_order/venue.vue
index 270acac..fe29d61 100644
--- a/src/subpackage/groupon/pages/confirm_order/venue.vue
+++ b/src/subpackage/groupon/pages/confirm_order/venue.vue
@@ -156,7 +156,7 @@ function createServerOrder(){
         .then(oRes=>{
             console.warn('orderPayMini', oRes);
             if(oRes?.code === 0){
-                routeTo(`/subpackage/groupon/pages/exchange_success?brand_id=${_sVal?.brand_id ?? ''}&order_no=${cRes?.order_no ?? ''}`);
+                routeTo(`/subpackage/groupon/pages/exchange_success?brand_id=${_sVal?.brand_id ?? ''}&order_no=${cRes?.order_no ?? ''}`, 'rL');
             }
         })
     })
diff --git a/src/subpackage/order/components/detail/goods.vue b/src/subpackage/order/components/detail/goods.vue
index 7e32e6d..83fa2f9 100644
--- a/src/subpackage/order/components/detail/goods.vue
+++ b/src/subpackage/order/components/detail/goods.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onLoad } from '@dcloudio/uni-app';
-import { reactive, ref } from "vue";
+import { reactive, ref, computed } from "vue";
 import textLine from "./text_line.vue";
 const props = defineProps({
     dyOrder: {
@@ -10,10 +10,19 @@ const props = defineProps({
     imgUrl: {
         type: String,
         default: ''
+    },
+    orderId: {
+        type: String,
+        default: ''
     }
 });
+
+const payAmountFormat = computed(() => {
+    let _amount = props.dyOrder?.amount?.pay_amount ?? 0;
+    return (Number(_amount) / 100).toFixed(2);
+});
 onLoad(() => {
-    
+    console.warn('dyOrder', props.dyOrder);
 });
 
 </script>
@@ -23,17 +32,17 @@ onLoad(() => {
     <view class="od-goods">
         <view class="og-title">抖音商品信息</view>
         <view class="og-info">
-            <image v-if="imgUrl" class="oi-pic" mode="aspectFit" :src="imgUrl"></image>
+            <!-- <image v-if="imgUrl" class="oi-pic" mode="aspectFit" :src="imgUrl"></image> -->
             <view class="oi-desc">
                 <view class="od-name">{{ dyOrder?.sku_info?.title ?? '-' }}</view>
-                <view class="od-price">¥ {{ dyOrder?.amount?.pay_amount ?? '' }}</view>
+                <view class="od-price">¥ {{ payAmountFormat }}</view>
             </view>
-            <text class="oi-icon">&#xe695;</text>
+            <!-- <text class="oi-icon">&#xe695;</text> -->
         </view>
         <view class="og-bottom">
             <view class="ob-lines">
                 <view class="ol-item">
-                    <text-line label="订单编号：">{{ dyOrder?.certificate_id ?? '' }}</text-line>
+                    <text-line label="订单编号：">{{ orderId ?? '' }}</text-line>
                 </view>
                 <!-- <view class="ol-item">
                     <text-line label="核销券码：">{{ dyOrder?.certificate_id ?? '' }}</text-line>
diff --git a/src/subpackage/order/components/detail/verify.vue b/src/subpackage/order/components/detail/verify.vue
index ee70cbc..c596893 100644
--- a/src/subpackage/order/components/detail/verify.vue
+++ b/src/subpackage/order/components/detail/verify.vue
@@ -36,13 +36,24 @@ function toCode(e){
         <view class="dv-tit">验证信息</view>
         <text-line label="使用日期：">{{ orderInfo?.date ?? '' }}</text-line>
         <view class="dv-codes">
-            <view class="dc-item"  :class="{ gray: !isCodeActive(e.status) }" v-for="(e, i) in (orderInfo?.sessions ?? [])" :key="i">
-                <view class="di-status">{{ zh_status(e.status) }}</view>
-                <view class="di-bottom">
-                    <view class="db-code">验证码  {{ e?.verify_code ?? '-' }} </view>
-                    <view class="db-txt-btn" v-if="isCodeActive(e.status)" @click="toCode(e)">查看二维码  &#xe695;</view>
+            <block v-if="orderInfo?.order_type === 0">
+                <view class="dc-item"  :class="{ gray: !isCodeActive(orderInfo.pay_status) }">
+                    <view class="di-status">{{ zh_status(orderInfo.pay_status) }}</view>
+                    <view class="di-bottom">
+                        <view class="db-code">验证码  {{ orderInfo?.verify_code ?? '-' }} </view>
+                        <view class="db-txt-btn" v-if="isCodeActive(orderInfo.pay_status)" @click="toCode(orderInfo.sessions[0])">查看二维码  &#xe695;</view>
+                    </view>
                 </view>
-            </view>
+            </block>
+            <block v-else>
+                <view class="dc-item"  :class="{ gray: !isCodeActive(e.status) }" v-for="(e, i) in (orderInfo?.sessions ?? [])" :key="i">
+                    <view class="di-status">{{ zh_status(e.status) }}</view>
+                    <view class="di-bottom">
+                        <view class="db-code">验证码  {{ e?.verify_code ?? '-' }} </view>
+                        <view class="db-txt-btn" v-if="isCodeActive(e.status)" @click="toCode(e)">查看二维码  &#xe695;</view>
+                    </view>
+                </view>
+            </block>
         </view>
         <view class="vci-share-bar" v-if="false">
             <text class="vsb-add-icon">&#xe60d;</text>
diff --git a/src/subpackage/order/pages/detail.vue b/src/subpackage/order/pages/detail.vue
index 5a1e8af..3effdf6 100644
--- a/src/subpackage/order/pages/detail.vue
+++ b/src/subpackage/order/pages/detail.vue
@@ -280,6 +280,7 @@ function imError(e){
             <detail-goods 
                 :dyOrder="orderInfo?.extension?.douyin_toolkit_info"
                 :imgUrl="orderInfo?.image"
+                :orderId="orderInfo?.extension?.douyin_order_id ?? ''"
             ></detail-goods>
         </view>