From 72c7bcfcefd5ba216f3c14022281ab4dacd8365c Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Wed, 17 Jul 2024 18:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=BE=85?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E5=8A=A0=E5=85=A5=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                    |  2 +-
 src/pages/ycnc/config.js       |  3 ++-
 src/pages/ycnc/order.vue       |  3 +++
 src/pages/ycnc/orderDetail.vue | 14 ++++++++++++--
 src/utils/http.js              |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b257c51..bf0f3d1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,6 +25,6 @@ uni-page-head{
   display: none !important;
 }
 body{  
-  font-family: 'PingFang SC','Source Han Sans';
+  font-family: PingFang SC , Source Han Sans;
 }
 </style>
diff --git a/src/pages/ycnc/config.js b/src/pages/ycnc/config.js
index c998803..ac17be4 100644
--- a/src/pages/ycnc/config.js
+++ b/src/pages/ycnc/config.js
@@ -53,7 +53,8 @@ export const stateConfig = {
     5: '订单核销',  
     6: '退款中',  
     7: '退款完成',  
-    8: '退款失败' 
+    8: '退款失败' ,
+    9: '订单取消'
 }
 
 export const tabs = [{
diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue
index d242521..91938c9 100644
--- a/src/pages/ycnc/order.vue
+++ b/src/pages/ycnc/order.vue
@@ -108,6 +108,7 @@
     function viewPwd(orderData){
         const {voucher_link} = orderData
         if(voucher_link){
+            console.log('跳转外部链接--->',voucher_link);
             window.location.href = voucher_link
         }else{
             console.error(`${voucher_link}无有效值`);
@@ -145,6 +146,8 @@
     padding-bottom:30rpx
 }
 .order-wrapper{
+    display: flex;
+    flex-direction: column;
     width:100%;
 }
 .no-more{
diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue
index 0254ea3..67e0ea6 100644
--- a/src/pages/ycnc/orderDetail.vue
+++ b/src/pages/ycnc/orderDetail.vue
@@ -38,7 +38,8 @@
         </view>
     </view>
     <view class="btns">
-        <view class="btn pwd" @click="viewPwd">查看卡密</view>
+        <view class="btn pwd" @click="viewPwd(orderDetail)"  v-if="[3].includes(orderDetail.state)">查看卡密</view>
+        <view class="btn pwd" @click="pay(orderDetail)"  v-if="[1].includes(orderDetail.state)">立即付款</view>
         <view class="btn back" @click="backIndex">返回首页</view>
     </view>
 </view>
@@ -47,7 +48,8 @@
 <script setup>
     import { onLoad } from '@dcloudio/uni-app';
     import { onMounted, reactive, ref, unref } from 'vue';
-    import { queryOrderDetail, goPay } from '../../api/ycnc';
+    import { queryOrderDetail} from '../../api/ycnc';
+    import usePay from './hooks/usePay';
     const id = ref('');
     const orderNo = ref('');
     const orderDetail = reactive({});
@@ -68,12 +70,20 @@
     const viewPwd = (detailData) => {
         const {voucher_link} = detailData
         if(voucher_link){
+            console.log(`跳转外部链接-->${voucher_link}`);
             window.location.href = voucher_link
         }else{
             console.error(`voucher_link无有效值`);
         }
     }
 
+    function pay(orderData){
+        console.log(orderData);
+        const {order_no,notify_url,price} = orderData;
+        const {payFunc} = usePay();
+        payFunc({order_no,notify_url,TranAmt:price})
+    }
+
     onMounted(() => {
       getDetail()
     })
diff --git a/src/utils/http.js b/src/utils/http.js
index 66805a8..ca9150d 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -40,7 +40,7 @@ function http(options) {
 					}else{
 						uni.hideLoading().then(() => {
 							uni.showToast({
-								title: '请求错误',
+								title: res.data.message,
 								icon: 'none'
 							});
 						})