1.更新了体检上门

2.修复自费成功页面无法隐藏加载中页面问题

pages/wxDetail/wxDetail.js

@@ -51,7 +51,13 @@ Page({
         });
     }
   },
-  getWxDetail(id) {
+  hideLoading() {
+    this.setData({ loadingHidden: true });
+  },
+  showLoading() {
+    this.setData({ loadingHidden: false });
+  },
+  async getWxDetail(id) {
     let reqDTO = {
       out_trade_no: id,
     }
@@ -77,8 +83,15 @@ Page({
           console.log("获取的信息是：" + res.data.data)
           console.log(res.data.data)
           if(res.data.data.tradeState=='SUCCESS'){
-            await this.sendMessage(this.data.obj)
+            //await this.sendMessage(this.data.obj)
+            try {
+              await this.sendMessage(this.data.obj);  // ✅ 等推送完成
+              console.log("推送完成，准备隐藏加载");
+            } catch (err) {
+              console.error("推送失败，但仍允许退出", err);
+            }
           }
+          this.hideLoading(); //隐藏对话框
         } else {
           wx.showModal({
             content: res.data.errMsg,
@@ -115,32 +128,63 @@ Page({
       url: '/pages/payment/payment',
     })
   },
-  async sendMessage(data) {
-    console.log("开始推送消息")
-    let reqData = {
-      type: "jfcgwx",
-      operateTime: data.gmtOutCreate,
-      openId: app.globalData.openId,
-      amount: data.totalFee
-    }
-    console.log("reqData is :" + reqData)
-    //推送站内消息
-    wx.request({
-      url: 'https://fy.btlsoln.com:8443/generatePayMessage',
-      method: "GET",
-      data: reqData,
-      header: {
-        'content-type': 'application/json'
-      },
-      success: (responseData) => {
-        console.log(responseData)
-      }
-    })
-  },
+  sendMessage(data) {
+    return new Promise((resolve, reject) => {
+      console.log("开始推送消息");
+  
+      const reqData = {
+        type: "jfcgwx",
+        operateTime: data.gmtOutCreate,
+        openId: app.globalData.openId,
+        amount: data.totalFee
+      };
+  
+      wx.request({
+        url: 'https://fy.btlsoln.com:8443/generatePayMessage',
+        method: "GET",
+        data: reqData,
+        header: {
+          'content-type': 'application/json'
+        },
+        success: (res) => {
+          console.log("推送成功:", res);
+          resolve(res);
+        },
+        fail: (err) => {
+          console.error("推送失败:", err);
+          reject(err);
+        }
+      });
+    });
+  },  
+  // async sendMessage(data) {
+  //   console.log("开始推送消息")
+  //   let reqData = {
+  //     type: "jfcgwx",
+  //     operateTime: data.gmtOutCreate,
+  //     openId: app.globalData.openId,
+  //     amount: data.totalFee
+  //   }
+  //   console.log("reqData is :" + reqData)
+  //   //推送站内消息
+  //   wx.request({
+  //     url: 'https://fy.btlsoln.com:8443/generatePayMessage',
+  //     method: "GET",
+  //     data: reqData,
+  //     header: {
+  //       'content-type': 'application/json'
+  //     },
+  //     success: (responseData) => {
+  //       console.log(responseData)
+  //     }
+  //   })
+  // },
   /** 
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    this.showLoading();
+
     wx.enableAlertBeforeUnload({
       message: "支付内容更新中,确定要退出吗?",
       success: function (res) {
@@ -159,9 +203,6 @@ Page({
     //   this.getWxDetail(data)
     //   // this.getWxDetail(options.hosp_out_trade_no)
     // }
-    this.setData({
-      loadingHidden: false,
-    })
 
   },