fix

 西园寺预约
 西园寺预约
 
 
 库：git@gitlab.kmlab.com:hooke1234/xysBooking.git
 库：git@gitlab.kmlab.com:hooke1234/xysBooking.git
-编译上传：npm run build_tar => npm run scp-jcedu 进入服务器 /home/www/f/ 执行 tar -xzvf dist.tar.gz && rm -rf dist.tar.gz
+编译上传：npm run build_tar && npm run scp-jcedu 进入服务器 /home/www/f/ 执行 tar -xzvf dist.tar.gz && rm -rf dist.tar.gz
+本地删除压缩包 rm -rf dist.tar.gz

 <!--
 <!--
  * @Date: 2024-01-26 10:24:45
  * @Date: 2024-01-26 10:24:45
  * @LastEditors: hookehuyr hookehuyr@gmail.com
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-01-29 13:44:24
+ * @LastEditTime: 2024-01-29 14:50:15
  * @FilePath: /xysBooking/src/views/callback.vue
  * @FilePath: /xysBooking/src/views/callback.vue
  * @Description: 反馈页面
  * @Description: 反馈页面
 -->
 -->
@@ -14,14 +14,14 @@
       </div>
       </div>
       <div v-else class="text-prompts">
       <div v-else class="text-prompts">
         <img src="https://cdn.ipadbiz.cn/xys/booking/%E6%88%90%E5%8A%9F@2x.png">
         <img src="https://cdn.ipadbiz.cn/xys/booking/%E6%88%90%E5%8A%9F@2x.png">
-        <div class="text">支付完成</div>
+        <!-- <div class="text">支付完成</div> -->
       </div>
       </div>
       <div class="appointment-information">
       <div class="appointment-information">
         <div class="number-of-visitors">参观人数：<span>{{ billInfo?.total_qty }} 人</span></div>
         <div class="number-of-visitors">参观人数：<span>{{ billInfo?.total_qty }} 人</span></div>
         <div class="visit-time">参访时间：<span>{{ billInfo?.datetime }}</span></div>
         <div class="visit-time">参访时间：<span>{{ billInfo?.datetime }}</span></div>
         <div class="payment-amount">支付金额：<span>¥ {{ billInfo?.total_amt }}</span></div>
         <div class="payment-amount">支付金额：<span>¥ {{ billInfo?.total_amt }}</span></div>
       </div>
       </div>
-      <div style="border-bottom: 1px dashed #A67939; padding: 0.5rem; display: flex; justify-content: center;">
+      <div style="padding: 0.5rem; display: flex; justify-content: center; margin-top: 1rem;">
         <van-button color="#A67939" size="small" @click="returnMerchant()">返回商户</van-button>
         <van-button color="#A67939" size="small" @click="returnMerchant()">返回商户</van-button>
       </div>
       </div>
       <!-- <div class="appointment-notice">
       <!-- <div class="appointment-notice">
@@ -59,7 +59,7 @@ const PAY_STATUS = {
   FAIL: '1',
   FAIL: '1',
   UNKNOWN: '2',
   UNKNOWN: '2',
 }
 }
-const pay_status = ref('1');
+const pay_status = ref('0'); // 默认支付完成
 
 
 //获取url中返回参数
 //获取url中返回参数
 function  getQueryString(name) {
 function  getQueryString(name) {
@@ -75,11 +75,13 @@ function  getQueryString(name) {
 }
 }
 
 
 
 
-const out_trade_no = getQueryString('out_trade_no');
+// const out_trade_no = getQueryString('out_trade_no');
+// const out_trade_no = '110286610147000542401290012506';
+const out_trade_no = $route.query.out_trade_no;
 
 
 const callback = async () => {
 const callback = async () => {
   // 获取订单详情
   // 获取订单详情
-  const { code:code_pay, data:data_pay } = await onAuthBillInfoAPI({ pay_id: out_trade_no });
+  const { code:code_pay, data:data_pay } = await onAuthBillInfoAPI({ order_id: out_trade_no });
   if (code_pay) {
   if (code_pay) {
     //
     //
     data_pay.datetime = data_pay && formatDatetime(data_pay);
     data_pay.datetime = data_pay && formatDatetime(data_pay);
@@ -110,12 +112,15 @@ onMounted(async () => {
 .callback-page {
 .callback-page {
   position: relative;
   position: relative;
   background-color: #FFF;
   background-color: #FFF;
+  height: 600px;
+  border-bottom: 1px dashed #A67939;
   .text-prompts {
   .text-prompts {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: center;
     justify-content: center;
     height: 20vh;
     height: 20vh;
     flex-direction: column;
     flex-direction: column;
+    padding-top: 1rem;
     img {
     img {
       width: 30vw;
       width: 30vw;
     }
     }