From c656192050fb469c89d8128ec538a63e583010a9 Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 29 Oct 2024 10:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E5=82=A8=E5=A5=B6=E8=8C=B6=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BB=98=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           |   3 +-
 .env.production                            |   9 +-
 src/api/ycnc.js                            |   7 +
 src/pages/ycnc/components/brand.vue        |   2 +-
 src/pages/ycnc/components/order-item.vue   |   2 +-
 src/pages/ycnc/components/product-item.vue |   2 +-
 src/pages/ycnc/config.js                   |   2 +-
 src/pages/ycnc/detail.vue                  |   4 +-
 src/pages/ycnc/hooks/usePay.js             |  21 +-
 src/pages/ycnc/index.vue                   |   8 +-
 src/pages/ycnc/order.vue                   |   4 +-
 src/pages/ycnc/orderDetail.vue             | 331 +++++++++++++--------
 vite.config.js                             |   2 +-
 13 files changed, 241 insertions(+), 156 deletions(-)

diff --git a/.env.development b/.env.development
index 42e242b..4051359 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,5 @@
 # 兴业优酷
 # VITE_BASE_URL = 'http://192.168.110.50:8083'
 # 邮储奶茶活动
-VITE_BASE_URL = 'http://milk.api.test.86698.cn'
+# VITE_BASE_URL = 'http://milk.api.test.86698.cn'
+VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
diff --git a/.env.production b/.env.production
index 370a255..0f39b4e 100644
--- a/.env.production
+++ b/.env.production
@@ -2,8 +2,9 @@
 # VITE_BASE_URL = 'http://192.168.110.50:8083'
 
 # 邮储奶茶活动(测试环境)
-# VITE_BASE_URL = 'http://milk.api.test.86698.cn'
-# VITE_YCNC_MERCH_CODE = '100610100019029'
+VITE_BASE_URL = 'http://milk.test.api.cdlsxd.cn'
+# VITE_YCNC_MERCH_CODE = '100310100018908'
+VITE_YCNC_MERCH_CODE = '100610100019042'
 # 邮储奶茶活动(正式环境)
-VITE_BASE_URL = 'https://milk.api.cdlsxd.cn'
-VITE_YCNC_MERCH_CODE = '100510102294138'
\ No newline at end of file
+# VITE_BASE_URL = 'https://milk.api.cdlsxd.cn'
+# VITE_YCNC_MERCH_CODE = '100510102303326'
\ No newline at end of file
diff --git a/src/api/ycnc.js b/src/api/ycnc.js
index 1387c67..ee99bfc 100644
--- a/src/api/ycnc.js
+++ b/src/api/ycnc.js
@@ -51,3 +51,10 @@ export const refundOrder = (params) => http({
 })
 
 
+//查询订单状态，主要针对短连接
+export const queryOrderState = (params) => http({
+	url:'/api/v1/auth/order/state',
+	method:'POST',
+	...params
+})
+
diff --git a/src/pages/ycnc/components/brand.vue b/src/pages/ycnc/components/brand.vue
index 55b0b76..8650f3b 100644
--- a/src/pages/ycnc/components/brand.vue
+++ b/src/pages/ycnc/components/brand.vue
@@ -1,5 +1,5 @@
 <template>
-  <scroll-view scroll-y class="pro-container box-border" :style="{backgroundImage: 'url('+config[brandName].src+')',height:`${config[brandName].height}rpx`}">
+  <scroll-view scroll-y class="pro-container box-border" :style="{backgroundImage: 'url('+config[brandName]?.src+')',height:`${config[brandName].height}rpx`}">
     <view class="pro-wrapper flex flex-wrap">
       <view v-for="(item,index) in products" :key="index" class="product-container">
         <ProductItem :detail="item" :index="index"/>
diff --git a/src/pages/ycnc/components/order-item.vue b/src/pages/ycnc/components/order-item.vue
index 2c75e5d..02e20e5 100644
--- a/src/pages/ycnc/components/order-item.vue
+++ b/src/pages/ycnc/components/order-item.vue
@@ -26,7 +26,7 @@
         <view class="btns flex flex-justify-end">
             <view class="btn del" @click="goDel">删除订单</view>
             <view class="btn pay"  v-if="[1].includes(detail.state)" @click="goPay">立即付款</view>
-            <view class="btn view"  v-if="[3].includes(detail.state) && !!detail.voucher_link" @click="goPwd">查看卡密</view>
+            <view class="btn view"  v-if="[3].includes(detail.state) && !!detail.voucher_link" @click="goPwd">查看卡券</view>
             <view class="btn pay"   @click="goRefund"  v-if="[4].includes(detail.state)">申请退款</view>
         </view>
     </view>
diff --git a/src/pages/ycnc/components/product-item.vue b/src/pages/ycnc/components/product-item.vue
index b7858cc..5f9a078 100644
--- a/src/pages/ycnc/components/product-item.vue
+++ b/src/pages/ycnc/components/product-item.vue
@@ -2,7 +2,7 @@
    <view class="pro-item-wrapper flex flex-col box-border flex-justify-between" @click="toDetail">
     <view class="img-container">
       <image
-        :src="detail.voucherIcon"
+        :src="detail?.voucherIcon"
         mode="scaleToFill"
         class="img"
       />
diff --git a/src/pages/ycnc/config.js b/src/pages/ycnc/config.js
index 0ab0545..ebadc06 100644
--- a/src/pages/ycnc/config.js
+++ b/src/pages/ycnc/config.js
@@ -22,7 +22,7 @@ const config = {
     height:584,
   },
   "CoCo":{
-    name:'COCO',
+    name:'CoCo',
     src:CoCo,
     height:584,
   },
diff --git a/src/pages/ycnc/detail.vue b/src/pages/ycnc/detail.vue
index 1fdd976..b88e503 100644
--- a/src/pages/ycnc/detail.vue
+++ b/src/pages/ycnc/detail.vue
@@ -82,9 +82,9 @@
             product_id:unref(id)
         }
         goPay({params}).then(res => {
-            const {order_no,notify_url} = res;
+            const {order_no,notify_url,sign,plain_text} = res;
             const {payFunc} = usePay();
-            payFunc({order_no,notify_url,TranAmt:detailObj.price})
+            payFunc({order_no,notify_url,TranAmt:detailObj.price,MerName:detailObj.brand,sign,plain_text})
         }).catch(err => {
             console.log(err);
         })
diff --git a/src/pages/ycnc/hooks/usePay.js b/src/pages/ycnc/hooks/usePay.js
index 93b3783..1145335 100644
--- a/src/pages/ycnc/hooks/usePay.js
+++ b/src/pages/ycnc/hooks/usePay.js
@@ -1,5 +1,5 @@
 import dayjs from "dayjs";
-
+import md5 from 'js-md5';
 const handleParams = (obj) => Object.entries(obj).reduce((total,curr) => {
     if(!total){
         total += `${curr[0]}=${curr[1]}`
@@ -12,20 +12,29 @@ const handleParams = (obj) => Object.entries(obj).reduce((total,curr) => {
 
 export default function usePay(){
     const payFunc = (args) => {
-        const {order_no,notify_url,TranAmt} = args;
+        const {order_no,notify_url,TranAmt,MerName,sign,plain_text} = args;
+        const MercCode = import.meta.env.VITE_YCNC_MERCH_CODE
+        const tranAmt = Number(TranAmt).toFixed(2)
+        // const plainText = handleParams({MercCode,TranAmt:tranAmt,TermSsn:order_no})
         const Plain = {
             MercUrl:notify_url,
-            TranAmt:Number(TranAmt).toFixed(2),
+            TranAmt:tranAmt,
             TermSsn:order_no,
-            BackLink:encodeURIComponent(`${window.location.origin}/#/pages/ycnc/orderDetail?order_no=${order_no}`),
+            BackLink:encodeURIComponent(`${window.location.origin}/#/pages/ycnc/orderDetail?order_no=${order_no}&isPayBack=true`),
             psbcmcc:'LSXD',
             TxnDt:dayjs(Date.now()).format('YYYY-MM-DD'),
-            MercCode:import.meta.env.VITE_YCNC_MERCH_CODE
+            MercCode:MercCode,
+            IsIntegral:'1',
+            MerName:MerName,
         }
         const params = {
             Plain:handleParams(Plain),
+            plainText:plain_text,
+            sign:sign,
+            Signature: '',
         }
-        console.log('handCodePay-params',Plain);
+        console.log('handCodePay-plain',Plain);
+        console.log('handCodePay-params',params);
         Fw.device.api.handCodePay(params);
     }
     return {payFunc}
diff --git a/src/pages/ycnc/index.vue b/src/pages/ycnc/index.vue
index a2f2a61..44ebeb7 100644
--- a/src/pages/ycnc/index.vue
+++ b/src/pages/ycnc/index.vue
@@ -27,7 +27,7 @@
     // import { getQueryString , isIOS, isAndroid } from '../../utils/utils';
     import useCode from './hooks/useCode';
     import usePay from './hooks/usePay';
-
+    import config from './config';
     const productList = ref([]);
     const authCode = ref('');
    
@@ -43,15 +43,15 @@
     }
 
     const pay = (productData) => {
-        const {ProductId,voucherAmount} = productData
+        const {ProductId,voucherAmount,brandFlag} = productData
         console.log('商品数据',productData);
         const params = {
             product_id:ProductId
         }
         goPay({params}).then(res => {
-            const {order_no,notify_url} = res;
+            const {order_no,notify_url,sign,plain_text} = res;
             const {payFunc} = usePay();
-            payFunc({order_no,notify_url,TranAmt:voucherAmount})
+            payFunc({order_no,notify_url,TranAmt:voucherAmount,MerName:config[brandFlag].name,sign,plain_text})
         }).catch(err => {
             console.log(err);
         })
diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue
index 348901c..4e3cfab 100644
--- a/src/pages/ycnc/order.vue
+++ b/src/pages/ycnc/order.vue
@@ -119,9 +119,9 @@
 
     function pay(orderData){
         console.log(orderData);
-        const {order_no,notify_url,price} = orderData;
+        const {order_no,notify_url,price,brand,sign,plain_text} = orderData;
         const {payFunc} = usePay();
-        payFunc({order_no,notify_url,TranAmt:price})
+        payFunc({order_no,notify_url,TranAmt:price,MerName:brand,sign,plain_text})
     }
 
     function viewDetail(orderData){
diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue
index bba52e3..7782de0 100644
--- a/src/pages/ycnc/orderDetail.vue
+++ b/src/pages/ycnc/orderDetail.vue
@@ -9,197 +9,262 @@
 </route>
 
 <template>
-<view class="w-full h-full flex flex-col flex-items-center page">
-    <view class="wrapper">
-        <view class="pro-info">
-            <view class="title">订单详情</view>
-            <view class="content flex">
-                <image
-                    class="pro-img"
-                    :src="orderDetail.main_image"
-                />
-                <view class="flex flex-1 flex-col">
-                    <view class="flex flex-justify-between name" style="margin-bottom:12rpx">
-                        <view class="text-over">{{ orderDetail.product_name }}</view>
-                        <view class="amount"><text>￥</text>{{ orderDetail.price }}<text>元</text></view>
-                    </view>
-                    <view  class="flex flex-justify-between num">
-                        <view>数量</view>
-                        <view>x1</view>
+    <view class="w-full h-full flex flex-col flex-items-center page">
+        <view class="wrapper" v-if="pageType === 1">
+            <view class="pro-info">
+                <view class="title">订单详情</view>
+                <view class="content flex">
+                    <image class="pro-img" :src="orderDetail.main_image" />
+                    <view class="flex flex-1 flex-col">
+                        <view class="flex flex-justify-between name" style="margin-bottom:12rpx">
+                            <view class="text-over">{{ orderDetail.product_name }}</view>
+                            <view class="amount"><text>￥</text>{{ orderDetail.price }}<text>元</text></view>
+                        </view>
+                        <view class="flex flex-justify-between num">
+                            <view>数量</view>
+                            <view>x1</view>
+                        </view>
                     </view>
                 </view>
             </view>
+            <view class="order-info">
+                <view class="info-item">订单编号：{{ orderDetail.order_no }}</view>
+                <view class="info-item" v-if="!!orderDetail.exchange_time && ![9].includes(orderDetail.state)">支付时间：{{
+                    orderDetail.exchange_time }}</view>
+                <view class="info-item">下单时间：{{ orderDetail.create_time }}</view>
+                <view class="info-item" style="margin-bottom: 24rpx;">订单金额：{{ orderDetail.price }}</view>
+            </view>
         </view>
-        <view class="order-info">
-            <view class="info-item">订单编号：{{ orderDetail.order_no }}</view>
-            <view class="info-item" v-if="!!orderDetail.exchange_time && ![9].includes(orderDetail.state)">支付时间：{{ orderDetail.exchange_time }}</view>
-            <view class="info-item">下单时间：{{ orderDetail.create_time }}</view>
-            <view class="info-item" style="margin-bottom: 24rpx;">订单金额：{{ orderDetail.price }}</view>
+        <view class="btns" v-if="pageType === 1">
+            <view class="btn pwd" @click="viewPwd(orderDetail)"
+                v-if="[3].includes(orderDetail.state) && orderDetail.voucher_link">查看卡券</view>
+            <view class="btn pwd" @click="pay(orderDetail)" v-if="[1].includes(orderDetail.state)">立即付款</view>
+            <view class="btn pwd" v-if="[4].includes(orderDetail.state)" @click="goRefund">申请退款</view>
+            <view class="btn back" @click="backIndex">返回首页</view>
         </view>
     </view>
-    <view class="btns">
-        <view class="btn pwd" @click="viewPwd(orderDetail)"  v-if="[3].includes(orderDetail.state) && !!orderDetail.voucher_link">查看卡密</view>
-        <view class="btn pwd" @click="pay(orderDetail)"  v-if="[1].includes(orderDetail.state)">立即付款</view>
-        <view class="btn pwd" v-if="[4].includes(orderDetail.state)" @click="goRefund">申请退款</view>
-        <view class="btn back" @click="backIndex">返回首页</view>
-    </view>
-</view>
 </template>
 
 <script setup>
-    import { onShow } from '@dcloudio/uni-app';
-    import { onMounted, reactive, ref, unref } from 'vue';
-    import { queryOrderDetail,refundOrder} from '../../api/ycnc';
-    import {getQueryString} from '../../utils/utils'
-    import usePay from './hooks/usePay';
-    const id = ref('');
-    const orderNo = ref('');
-    const orderDetail = reactive({});
+import { onShow, onHide, onUnload } from '@dcloudio/uni-app';
+import { onMounted, reactive, ref, unref } from 'vue';
+import { queryOrderDetail, refundOrder, queryOrderState } from '../../api/ycnc';
+import { getQueryString } from '../../utils/utils'
+import usePay from './hooks/usePay';
+const id = ref('');
+const orderNo = ref('');
+const orderDetail = reactive({});
+const pageType = ref(0)
+let timer = undefined
 
-    // 用onshow 解决h5页面被缓存的问题
-    onShow(()=>{
-        const url = window.location.href
-        console.log('url-->',url);
-        const order_id = getQueryString('order_id')
-        const order_no = getQueryString('order_no')
-        console.log(order_id,order_no);
-        if(!order_id && !order_no) return
-        id.value = order_id
-        orderNo.value = order_no;
+// 用onshow 解决h5页面被缓存的问题
+onShow(() => {
+    const url = window.location.href
+    console.log('url-->', url);
+    const order_id = getQueryString('order_id')
+    const order_no = getQueryString('order_no')
+    const isPayBack = getQueryString('isPayBack')
+    console.log(order_id, order_no);
+    console.log('isPayBack', isPayBack);
+    if (!order_id && !order_no) return
+    id.value = order_id
+    orderNo.value = order_no;
+    if (isPayBack) {
+        queryEvent()
+    } else {
         getDetail();
-    })
-
-    const backIndex = () => {
-        uni.navigateTo({
-            url:`/pages/ycnc/index`
-        })
     }
-    
-    const viewPwd = (detailData) => {
-        const {voucher_link} = detailData
-        if(voucher_link){
-            console.log(`跳转外部链接-->${voucher_link}`);
-            window.location.href = voucher_link
+})
+
+onHide(() => {
+    timer && clearInterval(timer)
+})
+
+onUnload(() => {
+    timer && clearInterval(timer)
+})
+
+const backIndex = () => {
+    uni.navigateTo({
+        url: `/pages/ycnc/index`
+    })
+}
+
+const timerEvent = () => {
+    timer && clearInterval(timer)
+    uni.showLoading({
+        title: "加载中",
+        mask: true,
+    });
+    timer = setInterval(()=>{
+        queryEvent()
+    }, 2500)
+}
+
+const queryEvent = () => {
+    uni.hideLoading()
+    const params = {
+        order_id: unref(id),
+        order_no: unref(orderNo)
+    }
+    queryOrderState({ params }).then(res => {
+        const { state, voucher_link } = res
+        if([3].includes(state)){
+            if(voucher_link){
+                timer && clearInterval(timer)
+                window.location.replace(voucher_link)
+            }else{
+                timerEvent()
+            }
+        }else if([1,2].includes(state)){
+            timerEvent()
         }else{
-            console.error(`voucher_link无有效值`);
+            timer && clearInterval(timer)
+            getDetail()
         }
-    }
-
-    const goRefund = () => {
-        const {id} = orderDetail
-        if(!id){
-            uni.showToast({
-                icon:'none',
-                title: '无有效的订单id',
-            });
-            return
-        }
-        const params = {order_id:id}
-        refundOrder({params}).then(res => {
-            uni.showToast({
-                icon:'success',
-                title: '退款成功',
-            });
-        }).catch(err => {
-            console.log(err);
-        })
-    }
-
-    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()
     })
+}
 
-    const getDetail = () => {
-        const params = {
-            order_id:unref(id),
-            order_no:unref(orderNo)
-        }
-        queryOrderDetail({params}).then(res => {
-            Object.assign(orderDetail,res)
-        })
+const viewPwd = (detailData) => {
+    const { voucher_link } = detailData
+    if (voucher_link) {
+        console.log(`跳转外部链接-->${voucher_link}`);
+        window.location.href = voucher_link
+    } else {
+        console.error(`voucher_link无有效值`);
     }
+}
+
+const goRefund = () => {
+    const { id } = orderDetail
+    if (!id) {
+        uni.showToast({
+            icon: 'none',
+            title: '无有效的订单id',
+        });
+        return
+    }
+    const params = { order_id: id }
+    refundOrder({ params }).then(res => {
+        uni.showToast({
+            icon: 'success',
+            title: '退款成功',
+        });
+    }).catch(err => {
+        console.log(err);
+    })
+}
+
+function pay(orderData) {
+    console.log(orderData);
+    const { order_no, notify_url, price,brand,sign,plain_text } = orderData;
+    const { payFunc } = usePay();
+    payFunc({ order_no, notify_url, TranAmt: price,MerName:brand,sign,plain_text })
+}
+
+onMounted(() => {
+    //   getDetail()
+})
+
+const getDetail = () => {
+    const params = {
+        order_id: unref(id),
+        order_no: unref(orderNo)
+    }
+    pageType.value = 1
+    queryOrderDetail({ params }).then(res => {
+        Object.assign(orderDetail, res)
+    })
+}
 </script>
 
 <style lang="scss" scoped>
-.page{
+.page {
     background-color: #fafafa;
 }
-.wrapper{
+
+.wrapper {
     width: 702rpx;
     height: 486rpx;
     background: #FFFFFF;
     border-radius: 24rpx;
-    margin-top:24rpx;
+    margin-top: 24rpx;
     box-sizing: border-box;
-    padding:32rpx 24rpx;
-    .pro-info{
+    padding: 32rpx 24rpx;
+
+    .pro-info {
         border-bottom: 1rpx solid #F0E1E1;
-        .title{
+
+        .title {
             font-weight: 500;
             font-size: 28rpx;
             color: #333333;
             margin-bottom: 28rpx;
         }
-        .content{
-            margin-bottom:24rpx;
+
+        .content {
+            margin-bottom: 24rpx;
             font-weight: 400;
-            .pro-img{
+
+            .pro-img {
                 display: block;
-                width:90rpx;
-                height:90rpx;
-                margin-right:34rpx;
+                width: 90rpx;
+                height: 90rpx;
+                margin-right: 34rpx;
             }
-            .text-over{
-                max-width:80%;
+
+            .text-over {
+                max-width: 80%;
                 text-overflow: ellipsis;
                 overflow: hidden;
-                white-space: nowrap; 
+                white-space: nowrap;
             }
-            .name{
+
+            .name {
                 font-size: 24rpx;
                 color: #333333;
                 font-weight: 700;
             }
-            .amount{
+
+            .amount {
                 color: #333333;
                 font-weight: 400;
-                font-size:24rpx;
-                
-                text:nth-child(1){
-                    font-size:20rpx;
+                font-size: 24rpx;
+
+                text:nth-child(1) {
+                    font-size: 20rpx;
                 }
-                text:nth-child(2){
-                    font-size:22rpx;
+
+                text:nth-child(2) {
+                    font-size: 22rpx;
                 }
             }
-            .num{
+
+            .num {
                 font-weight: 400;
                 font-size: 24rpx;
                 color: #9E9E9E;
             }
         }
     }
-    .order-info{
+
+    .order-info {
         border-bottom: 1rpx solid #F0E1E1;
-        .info-item{
+
+        .info-item {
             font-weight: 400;
             font-size: 22rpx;
             color: #6C6C6C;
-            margin-top:24rpx;
+            margin-top: 24rpx;
         }
     }
 }
-.btns{
-    margin-top:146rpx;
+
+.btns {
+    margin-top: 146rpx;
     display: flex;
-    .btn{
+
+    .btn {
         width: 312rpx;
         height: 76rpx;
         border-radius: 38rpx;
@@ -208,14 +273,16 @@
         align-items: center;
         justify-content: center;
     }
-    .pwd{
+
+    .pwd {
         font-weight: 500;
         font-size: 32rpx;
         color: #FFFFFF;
         background: #EA0000;
-        margin-right:10rpx;
+        margin-right: 10rpx;
     }
-    .back{
+
+    .back {
         font-weight: 400;
         font-size: 32rpx;
         color: #B9C8C7;
diff --git a/vite.config.js b/vite.config.js
index e3e030b..2673ce5 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -35,7 +35,7 @@ export default defineConfig(({ command, mode }) => {
       }),
     ],
     esbuild: {
-      drop: ["console", "debugger"], //打包去掉console,debugger
+      // drop: ["console", "debugger"], //打包去掉console,debugger
     },
   }
 })
\ No newline at end of file