Merge refs/remotes/origin/master into refs/heads/master

闫增涛

2024-03-28 0b523220931d70aa752c3beaca5ed32ca85511c5

 pages/cart/paymentPage/index.js

@@ -132,12 +132,13 @@
    app.MG.store.confirmOrder(query).then(res => {
      console.log(res.orderNumber, 'res');
      if (res.orderNumber) {
        const resOrderNum = {
        let resOrderNum = {
          orderNum: res.orderNumber,
        };

        console.log(resOrderNum, 'resOrderNum');
        // 用户未绑定微信 报500
        app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
          console.log(payRes, 'payRes');
          const payVal = JSON.parse(payRes);
          wx.requestPayment({
            "appId": payVal.appId,